4 Commits

Author	SHA1	Message	Date
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
Yann Dupont 01	eaef42e6a8	Start and safe zone prompts	2022-04-02 16:54:00 -04:00
Jason Durand 01	25a10047ad	Added quick game timer	2022-04-02 15:14:04 -04:00
Jason Durand 01	4daed34748	Added UI Canvas to SampleScene + Added Arena sorting layer	2022-04-02 04:05:55 -04:00