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

..

Prefabs

Merge remote-tracking branch 'origin/dev' into jason

2022-04-02 17:54:42 -04:00

Scenes

Merge remote-tracking branch 'origin/dev' into jason

2022-04-02 17:54:42 -04:00

Scripts

Merge remote-tracking branch 'origin/dev' into jason

2022-04-02 17:54:42 -04:00

Settings

Merge dev

2022-04-02 13:58:19 -04:00

Sprites

Highlight halo

2022-04-02 15:00:06 -04:00

TextMesh Pro

Minion bar start

2022-04-01 23:21:49 -04:00

AudioMixer.mixer

Sound manager

2022-04-02 00:45:56 -04:00

AudioMixer.mixer.meta

Sound manager

2022-04-02 00:45:56 -04:00

Prefabs.meta

Initial commit

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

Scenes.meta

Initial commit

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

Scripts.meta

Initial commit

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

Settings.meta

Initial commit

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

Sprites.meta

Highlight halo

2022-04-02 15:00:06 -04:00

TextMesh Pro.meta

Minion bar start

2022-04-01 23:21:49 -04:00

Zero Friction.physicsMaterial2D

Actually use rigidbody2d

2022-04-01 23:50:33 -04:00

Zero Friction.physicsMaterial2D.meta

Actually use rigidbody2d

2022-04-01 23:50:33 -04:00