26 Commits

Author SHA1 Message Date
Jason Durand 01
83d8bd6cf9 Use IsInSafeZone + remove debug log 2022-04-02 17:58:32 -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
ba164e5961 Fixed flakiness on safezone hopping 2022-04-02 17:52:41 -04:00
Jason Durand 01
d57eab3e92 Fixed throwing on ground 2022-04-02 17:42:24 -04:00
Jason Durand 01
c07aa285c8 Can throw enemies from safe zone 2022-04-02 17:20:01 -04:00
Yann Dupont 01
eaef42e6a8 Start and safe zone prompts 2022-04-02 16:54:00 -04:00
Jason Durand 01
29711ae0e3 Merge remote-tracking branch 'origin/dev' into jason
# Conflicts:
#	Assets/Scripts/AIStats.cs
#	Assets/Scripts/Entity.cs
2022-04-02 15:53:17 -04:00
Jason Durand 01
a7a29f4cce Started adding AIEntity's ThrownState 2022-04-02 15:50:30 -04:00
Soulaha Balde
7bf70e3356 Merge branch 'Soulaha' into dev 2022-04-02 15:28:26 -04:00
Soulaha Balde
e4a304fdba Gladiator roam when vamp is safe and no monster 2022-04-02 14:41:47 -04:00
Jason Durand 01
f9ae46b504 Basic play replay game loop 2022-04-02 13:46:27 -04:00
Jason Durand 01
bd5efcb31a Fixed exiting safe zone before game starts 2022-04-02 13:06:36 -04:00
Jason Durand 01
c6b9e5da93 Added Press Start to start (without prompt though) 2022-04-02 12:51:53 -04:00
Jason Durand 01
027c287a43 Merge remote-tracking branch 'origin/dev' into jason
# Conflicts:
#	Assets/Scripts/PlayerMovement.cs
2022-04-02 12:26:45 -04:00
Jason Durand 01
7ac89eb72f Added rough paused state 2022-04-02 12:05:08 -04:00
Soulaha Balde
41e7ddfd48 Null check on current state drawGizmos 2022-04-02 10:47:46 -04:00
Soulaha Balde
d0d51a82f1 Extracted baseState to its own file 2022-04-02 10:44:40 -04:00
Jason Durand 01
fbae06233e Added NaughtyAttributes 2022-04-02 10:44:39 -04:00
Jason Durand 01
0fa139faca Toggle player rigidbody on safe zone instead of zone's collider 2022-04-02 05:38:55 -04:00
Jason Durand 01
b275bcc1db Using AnimationCurve instead of cubic ease out for jump 2022-04-02 05:26:04 -04:00
Jason Durand 01
c8649ed6f9 Added basic monster spawners 2022-04-02 04:45:21 -04:00
Jason Durand 01
35b28e65b4 Pretty ok transition in out of safe zone 2022-04-02 03:35:56 -04:00
Jason Durand 01
c6c92a6e5e Quick normal to jumping transition + Camera 2022-04-02 01:12:35 -04:00
Jason Durand 01
a197f5f5e6 Actually use rigidbody2d 2022-04-01 23:50:33 -04:00
Jason Durand 01
edea89cc59 Added quick joystick to move + scriptableobject 2022-04-01 23:35:34 -04:00
Jason Durand 01
18cf3b7870 Added player prefab + Input map 2022-04-01 22:56:38 -04:00