Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
Game_jam19
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Erno Lokkila
Game_jam19
Commits
033c8391
Commit
033c8391
authored
6 years ago
by
Tuisku Polvinen
Browse files
Options
Downloads
Plain Diff
Merge branch 'master' of
https://gitlab.utu.fi/eolokk/game_jam19
parents
d44a5a6c
b9fce0c9
No related branches found
No related tags found
No related merge requests found
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Assets/Prefab/worker.prefab
+1
-1
1 addition, 1 deletion
Assets/Prefab/worker.prefab
Assets/Scenes/MainScene.meta
+8
-0
8 additions, 0 deletions
Assets/Scenes/MainScene.meta
Assets/Scenes/MainScene.unity
+222
-388
222 additions, 388 deletions
Assets/Scenes/MainScene.unity
with
231 additions
and
389 deletions
Assets/Prefab/worker.prefab
+
1
−
1
View file @
033c8391
...
...
@@ -98,7 +98,7 @@ MonoBehaviour:
move_to
:
{
fileID
:
0
}
max_amount
:
10
amount
:
0
home
:
{
fileID
:
0
}
home
:
{
fileID
:
7607310651946833762
,
guid
:
118ed7528555d45418acb5a87b330000
,
type
:
3
}
resource
:
{
fileID
:
0
}
speed
:
1
---
!u!61
&548039319383633028
...
...
This diff is collapsed.
Click to expand it.
Assets/Scenes/MainScene.meta
0 → 100644
+
8
−
0
View file @
033c8391
fileFormatVersion: 2
guid: 829c46be4b50d504a8fd053e72cf24e3
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
This diff is collapsed.
Click to expand it.
Assets/Scenes/MainScene.unity
+
222
−
388
View file @
033c8391
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment