Skip to content
Snippets Groups Projects
Commit 7356a539 authored by Kimi Heinonen's avatar Kimi Heinonen
Browse files

Merge branch 'master' of https://gitlab.utu.fi/eolokk/game_jam19

parents 39ea8de4 fdb88788
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
ProjectSettings/EditorBuildSettings.asset
+ 8
− 2
View file @ 7356a539
...@@ -5,7 +5,13 @@ EditorBuildSettings: ...@@ -5,7 +5,13 @@ EditorBuildSettings:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
serializedVersion: 2 serializedVersion: 2
m_Scenes: m_Scenes:
- enabled: 0
path:
guid: 00000000000000000000000000000000
- enabled: 1 - enabled: 1
path: Assets/Scenes/SampleScene.unity path: Assets/Scenes/MainMenu.unity
guid: 2cda990e2423bbf4892e6590ba056729 guid: 782780faed4d8b1409a6034453c0627c
- enabled: 1
path: Assets/Scenes/MainScene.unity
guid: cad276c071768944288a0c09b5741599
m_configObjects: {} m_configObjects: {}
ProjectSettings/TagManager.asset
+ 2
− 0
View file @ 7356a539
...@@ -8,6 +8,8 @@ TagManager: ...@@ -8,6 +8,8 @@ TagManager:
- Tree - Tree
- Resource - Resource
- Home - Home
- Flag
- Buildable
layers: layers:
- Default - Default
- TransparentFX - TransparentFX
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment