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

..

JasonScene.unity

Fixed flakiness on safezone hopping

2022-04-02 17:52:41 -04:00

JasonScene.unity.meta

Recopied SampleScene to JasonScene

2022-04-02 14:31:42 -04:00

Main Menu.unity

Main menu

2022-04-02 16:30:32 -04:00

Main Menu.unity.meta

Main menu

2022-04-02 16:30:32 -04:00

SampleScene.unity

merge yann

2022-04-02 17:14:56 -04:00

SampleScene.unity.meta

Initial commit

2022-03-30 20:31:37 -04:00

SoulahaScene.unity

Change minion to Entity

2022-04-02 15:12:15 -04:00

SoulahaScene.unity.meta

Change minion to Entity

2022-04-02 15:12:15 -04:00

YannTest.unity

Start and safe zone prompts

2022-04-02 16:54:00 -04:00

YannTest.unity.meta

Suck gain health

2022-04-02 15:14:48 -04:00