14 Commits

Author SHA1 Message Date
Jason Durand 01
da9eefa00e Cleared off nullable warnings 2022-04-03 16:02:01 -04:00
Jason Durand 01
179a3f7d22 Blur fade! 2022-04-03 16:01:49 -04:00
Jason Durand 01
4b96196b69 Added GameFlowState change update to kill velocity 2022-04-03 15:19:14 -04:00
Jason Durand 01
6a81231cc9 Integrated SampleScene 2022-04-03 13:32:49 -04:00
Jason Durand 01
4d59cedef3 Merge remote-tracking branch 'origin/dev' into jason
# Conflicts:
#	Assets/Scripts/AIEntity.cs
#	Assets/Scripts/GameFlowManager.cs
2022-04-03 13:25:16 -04:00
Jason Durand 01
93f6b72212 Pause menu! 2022-04-03 13:21:15 -04:00
Soulaha Balde
50690c4100 merge Soulaha into dev 2022-04-03 03:02:31 -04:00
Jason Durand 01
543ae0599b Added start button to pause game 2022-04-03 00:21:51 -04:00
Jason Durand 01
5440c56426 Fixed throwing minions without direction 2022-04-03 00:11:01 -04:00
Jason Durand 01
7d66b97f5d Fixed dying twice 2022-04-02 23:37:40 -04:00
Jason Durand 01
8eff81aa54 Pause without freeze timeScale when dying 2022-04-02 19:17:37 -04:00
Jason Durand 01
dd3d1fb57c Merge remote-tracking branch 'origin/dev' into jason
# Conflicts:
#	Assets/Prefabs/UI Canvas.prefab
#	Assets/Scripts/Arena Stats.asset
#	Assets/Scripts/GameFlowManager.cs
2022-04-02 17:54:42 -04:00
Jason Durand 01
25a10047ad Added quick game timer 2022-04-02 15:14:04 -04:00
Jason Durand 01
3d804d9f44 Moved GameFlowManager to Scripts/ 2022-04-02 14:49:11 -04:00