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

..

Arena.prefab

Can throw enemies from safe zone

2022-04-02 17:20:01 -04:00

Arena.prefab.meta

Pretty ok transition in out of safe zone

2022-04-02 03:35:56 -04:00

Blood Suck Particles.prefab

Blood suck particles

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

Blood Suck Particles.prefab.meta

Blood suck particles

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

Gladiator.prefab

Merge dev

2022-04-02 15:46:43 -04:00

Gladiator.prefab.meta

Added basic monster spawners

2022-04-02 04:45:21 -04:00

Health Bar Canvas.prefab

Entities health bars

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

Health Bar Canvas.prefab.meta

Entities health bars

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

Minion Icon.prefab

Minion throw health cost and reload time

2022-04-02 10:35:52 -04:00

Minion Icon.prefab.meta

Minion bar start

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

Minion Placeholder.prefab

Throw start

2022-04-02 02:00:40 -04:00

Minion Placeholder.prefab.meta

Throw start

2022-04-02 02:00:40 -04:00

Monster.prefab

Fixed throwing on ground

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

Monster.prefab.meta

Added basic monster spawners

2022-04-02 04:45:21 -04:00

SceneStuff.prefab

Screenshake script

2022-04-02 17:04:04 -04:00

SceneStuff.prefab.meta

Moved Camera/Lights to SampleScene via prefab

2022-04-02 03:57:55 -04:00

UI Canvas.prefab

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

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

UI Canvas.prefab.meta

Added UI Canvas to SampleScene + Added Arena sorting layer

2022-04-02 04:05:55 -04:00

Vampire.prefab

Blood suck particles

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

Vampire.prefab.meta

Added player prefab + Input map

2022-04-01 22:56:38 -04:00