4 Commits

Author SHA1 Message Date
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