Merge branch 'master' of ssh://git.breab.org:2222/gamejam-gpn15/dyingIsMainstream
Conflicts:
Assets/Prefabs/GameStateTracker.prefab
Assets/Prefabs/PortableFire.prefab
Assets/Prefabs/Shield.prefab
Assets/game.unity
Showing
Assets/Prefabs/Effects.meta
0 → 100644
File added
No preview for this file type
No preview for this file type
No preview for this file type
Assets/Prefabs/Turret.prefab
0 → 100644
File added
Assets/Prefabs/Turret.prefab.meta
0 → 100644
No preview for this file type
Assets/Scripts/TurretButton.cs
0 → 100644
Assets/Scripts/TurretButton.cs.meta
0 → 100644
Assets/Sprites/Effects.meta
0 → 100644
Assets/Sprites/Effects/fireball_hit_.meta
0 → 100644
File added
18.6 KB
24.3 KB
36.6 KB
File added
35.9 KB
30.8 KB
25.6 KB
19.6 KB
14.3 KB
9.51 KB
2.31 KB
File added
12.1 KB
13.3 KB
12.6 KB
12.9 KB
File added
12.1 KB
12.8 KB
Assets/Sprites/button.png
0 → 100644
46.1 KB
Assets/Sprites/button.png.meta
0 → 100644