Merge branch 'master' of gitlab.utu.fi:eolokk/game_jam19
Showing
- Assets/Audio/Ogg/Winmusic.ogg 0 additions, 0 deletionsAssets/Audio/Ogg/Winmusic.ogg
- Assets/Audio/Ogg/Winmusic.ogg.meta 22 additions, 0 deletionsAssets/Audio/Ogg/Winmusic.ogg.meta
- Assets/Prefab/City.prefab 105 additions, 5 deletionsAssets/Prefab/City.prefab
- Assets/Prefab/ResourcePanel.prefab 46 additions, 0 deletionsAssets/Prefab/ResourcePanel.prefab
- Assets/Prefab/ResourcePanel.prefab.meta 7 additions, 0 deletionsAssets/Prefab/ResourcePanel.prefab.meta
- Assets/Prefab/ResourceRow.prefab 175 additions, 0 deletionsAssets/Prefab/ResourceRow.prefab
- Assets/Prefab/ResourceRow.prefab.meta 7 additions, 0 deletionsAssets/Prefab/ResourceRow.prefab.meta
- Assets/Scenes/MainScene.unity 6 additions, 1 deletionAssets/Scenes/MainScene.unity
- Assets/Scripts/AudioSystem.cs 8 additions, 2 deletionsAssets/Scripts/AudioSystem.cs
- Assets/Scripts/City.meta 8 additions, 0 deletionsAssets/Scripts/City.meta
- Assets/Scripts/City/City.cs 21 additions, 3 deletionsAssets/Scripts/City/City.cs
- Assets/Scripts/City/City.cs.meta 1 addition, 1 deletionAssets/Scripts/City/City.cs.meta
- Assets/Scripts/City/ResourcePanel.cs 28 additions, 0 deletionsAssets/Scripts/City/ResourcePanel.cs
- Assets/Scripts/City/ResourcePanel.cs.meta 11 additions, 0 deletionsAssets/Scripts/City/ResourcePanel.cs.meta
- Assets/Scripts/City/ResourcePool.cs 12 additions, 0 deletionsAssets/Scripts/City/ResourcePool.cs
- Assets/Scripts/City/ResourcePool.cs.meta 1 addition, 1 deletionAssets/Scripts/City/ResourcePool.cs.meta
- Assets/Scripts/City/ResourceRow.cs 31 additions, 0 deletionsAssets/Scripts/City/ResourceRow.cs
- Assets/Scripts/City/ResourceRow.cs.meta 11 additions, 0 deletionsAssets/Scripts/City/ResourceRow.cs.meta
- Assets/Scripts/Resources/Outcrop.cs 6 additions, 7 deletionsAssets/Scripts/Resources/Outcrop.cs
Loading
Please register or sign in to comment