Jason Durand 01
20d5e2c411
Merge remote-tracking branch 'origin/dev' into jason
2022-04-03 15:19:51 -04:00
Jason Durand 01
e470d5e918
Add minion icon on selector bar
2022-04-03 15:19:45 -04:00
Jason Durand 01
417bcd9485
Check IsTargetable in FindTarget
2022-04-03 15:19:35 -04:00
Jason Durand 01
4b96196b69
Added GameFlowState change update to kill velocity
2022-04-03 15:19:14 -04:00
Soulaha Balde
ea96a6ec7e
Merge branch 'soulaha' into dev
2022-04-03 15:04:05 -04:00
Soulaha Balde
65216fd6df
AI goes around safezone
2022-04-03 14:57:57 -04:00
Jason Durand 01
e015e467e9
Replaced circle collider by flat capsule
2022-04-03 14:19:32 -04:00
Jason Durand 01
cfbde817a6
Sped up cam zoom and started when entering safe zone
2022-04-03 14:19:16 -04:00
Jason Durand 01
c2f414ac03
Fixed minion cooldown starting half way in build
2022-04-03 13:49:44 -04:00
Jason Durand 01
49e9a157a7
Pull request #10 : Jason
...
Merge in CEGJ/ludumdare50 from jason to dev
* commit 'fb0ddc76eaeddec773b26acda7e38994fb9792c6':
Forgot to hook up quit game
Integrated SampleScene
Pause menu!
Added start button to pause game
Fixed throwing minions without direction
2022-04-03 17:36:34 +00:00
Jason Durand 01
fb0ddc76ea
Forgot to hook up quit game
2022-04-03 13:36:08 -04:00
Jason Durand 01
6a81231cc9
Integrated SampleScene
2022-04-03 13:32:49 -04:00
Jason Durand 01
4d59cedef3
Merge remote-tracking branch 'origin/dev' into jason
...
# Conflicts:
# Assets/Scripts/AIEntity.cs
# Assets/Scripts/GameFlowManager.cs
2022-04-03 13:25:16 -04:00
Jason Durand 01
93f6b72212
Pause menu!
2022-04-03 13:21:15 -04:00
Yann Dupont 01
3d2396966b
Entities drop shadows
2022-04-03 11:00:07 -04:00
Yann Dupont 01
6be7beb09a
Lights
2022-04-03 10:46:00 -04:00
Yann Dupont 01
3bee3d98e9
Merge dev
2022-04-03 10:27:53 -04:00
Soulaha Balde
50690c4100
merge Soulaha into dev
2022-04-03 03:02:31 -04:00
Soulaha Balde
c289e1832d
Missing apply to prefab arena
2022-04-03 01:28:53 -04:00
Yann Dupont 01
6df8135146
Reduce safe zone camera ease in/out duration
2022-04-03 01:01:29 -04:00
Yann Dupont 01
3700cf800a
Fix health bar flip
2022-04-03 00:58:11 -04:00
Yann Dupont 01
48041ea26e
Blood particles distance fix
2022-04-03 00:52:13 -04:00
Jason Durand 01
4afbbeb4f1
Merge remote-tracking branch 'origin/dev' into jason
2022-04-03 00:26:47 -04:00
Yann Dupont 01
eafc0c63b6
Merge dev
2022-04-03 00:24:37 -04:00
Jason Durand 01
543ae0599b
Added start button to pause game
2022-04-03 00:21:51 -04:00
Jason Durand 01
5440c56426
Fixed throwing minions without direction
2022-04-03 00:11:01 -04:00
Yann Dupont 01
1970399711
Health bars size fix
2022-04-03 00:03:03 -04:00
Yann Dupont 01
fda1fdace1
Arena graphics
2022-04-02 23:57:27 -04:00
Jason Durand 01
1d8d4c572e
Pull request #9 : Fixed dying twice
...
Merge in CEGJ/ludumdare50 from jason to dev
* commit '5545e42e5aff22b859a3f55bcb8a896e8195a25f':
Fixed dying twice
2022-04-03 03:40:59 +00:00
Jason Durand 01
5545e42e5a
Merge remote-tracking branch 'origin/dev' into jason
2022-04-02 23:37:50 -04:00
Jason Durand 01
7d66b97f5d
Fixed dying twice
2022-04-02 23:37:40 -04:00
Yann Dupont 01
5a4bb33d78
Tileset
2022-04-02 23:14:33 -04:00
Jason Durand 01
605f812517
Pull request #8 : Jason
...
Merge in CEGJ/ludumdare50 from jason to dev
* commit '9b9a4a7380e454f366519442c8b410a43fab0b0b':
Integrated into SampleScene
Avoid FindObjectsOfType
Added control icon set
2022-04-03 02:48:09 +00:00
Jason Durand 01
9b9a4a7380
Integrated into SampleScene
2022-04-02 22:46:47 -04:00
Jason Durand 01
4c73354230
Merge remote-tracking branch 'origin/dev' into jason
...
# Conflicts:
# Assets/Scripts/MinionThrower.cs
2022-04-02 22:38:17 -04:00
Jason Durand 01
c19966a4d2
Avoid FindObjectsOfType
2022-04-02 22:36:26 -04:00
Jason Durand 01
cc5507a2a5
Added control icon set
2022-04-02 22:29:55 -04:00
Yann Dupont 01
40ed3d3921
Minions and gladiators sprites
2022-04-02 21:56:11 -04:00
Yann Dupont 01
c259b3f4b6
merge dev
2022-04-02 19:34:26 -04:00
Yann Dupont 01
29731b13e0
Merge dev
2022-04-02 19:23:07 -04:00
Jason Durand 01
958218856e
Pull request #7 : Pause without freeze timeScale when dying
...
Merge in CEGJ/ludumdare50 from jason to dev
* commit '271bd1d93f11cc373fefc96c3736fbf4d24fba18':
Pause without freeze timeScale when dying
2022-04-02 23:22:06 +00:00
Jason Durand 01
271bd1d93f
Merge remote-tracking branch 'origin/dev' into jason
...
# Conflicts:
# Assets/Scripts/VampireEntity.cs
2022-04-02 19:18:50 -04:00
Jason Durand 01
8eff81aa54
Pause without freeze timeScale when dying
2022-04-02 19:17:37 -04:00
Yann Dupont 01
2140b3ff69
Merge branch 'dev' into yann
2022-04-02 19:07:27 -04:00
Soulaha Balde
3d34d50acb
Merge branch 'Soulaha' into dev
2022-04-02 19:04:39 -04:00
Soulaha Balde
a1d2beca4f
Represent death on sprites
2022-04-02 18:58:56 -04:00
Yann Dupont 01
8ce45566a0
Player sprite
2022-04-02 18:58:13 -04:00
Jason Durand 01
01e26e6aad
Pull request #6 : Jason
...
Merge in CEGJ/ludumdare50 from jason to dev
* commit 'c3a6575d87bc26e89bae966cbf614fc7eb0b1107':
Reintegrated inspector stuff
Use IsInSafeZone + remove debug log
Fixed flakiness on safezone hopping
Fixed throwing on ground
Can throw enemies from safe zone
Started adding AIEntity's ThrownState
Added quick game timer
Moved GameFlowManager to Scripts/
Recopied SampleScene to JasonScene
2022-04-02 22:04:01 +00:00
Jason Durand 01
c3a6575d87
Reintegrated inspector stuff
2022-04-02 18:00:59 -04:00
Jason Durand 01
83d8bd6cf9
Use IsInSafeZone + remove debug log
2022-04-02 17:58:32 -04:00
