Conjure/ludumdare50
4
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
96 Commits 5 Branches 0 Tags
Commit Graph

58 Commits

Author SHA1 Message Date
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
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
e3aba142c8 merge yann 2022-04-02 17:14:56 -04:00
Yann Dupont 01
eaef42e6a8 Start and safe zone prompts 2022-04-02 16:54:00 -04:00
Yann Dupont 01
231070af77 Main menu 2022-04-02 16:30:32 -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
Yann Dupont 01
1b51d18790 Merge dev 2022-04-02 15:46:43 -04:00
Soulaha Balde
7bf70e3356 Merge branch 'Soulaha' into dev 2022-04-02 15:28:26 -04:00
Yann Dupont 01
8da172f91a Entities health bars 2022-04-02 15:23:48 -04:00
Yann Dupont 01
67fc4da188 Suck gain health 2022-04-02 15:14:48 -04:00
Jason Durand 01
25a10047ad Added quick game timer 2022-04-02 15:14:04 -04:00
Soulaha Balde
d1016df8bf Change minion to Entity 2022-04-02 15:12:15 -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
cc20964c12 Recopied SampleScene to JasonScene 2022-04-02 14:31:42 -04:00
Soulaha Balde
bdd20faaa8 Entity when target is dead, start roaming 2022-04-02 14:02:27 -04:00
Yann Dupont 01
63cd2600e1 Merge dev 2022-04-02 13:58:19 -04:00
Yann Dupont 01
afbd15217a Merge dev 2022-04-02 13:52:10 -04:00
Jason Durand 01
f9ae46b504 Basic play replay game loop 2022-04-02 13:46:27 -04:00
Jason Durand 01
172345c2ad Lose blood overtime and switch to Dead state 2022-04-02 13:22:38 -04:00
Soulaha Balde
0fa714cda9 Entity choose target, attack then stop if they die 2022-04-02 13:13:59 -04:00
Yann Dupont 01
6676819bbe Merge dev 2022-04-02 13:11:47 -04:00
Jason Durand 01
c6b9e5da93 Added Press Start to start (without prompt though) 2022-04-02 12:51:53 -04:00
Yann Dupont 01
0db69eab59 Blood sucking start 2022-04-02 12:25:09 -04:00
Jason Durand 01
7ac89eb72f Added rough paused state 2022-04-02 12:05:08 -04:00
Yann Dupont 01
755e6f4f0b Camera switch when in safe zone 2022-04-02 11:04:11 -04:00
Yann Dupont 01
62bdfa65ab throw minions 2022-04-02 10:06:38 -04:00
Yann Dupont 01
f1d104d7cd Merge branch 'dev' into yann 2022-04-02 09:14:11 -04:00
Jason Durand 01
74eb85dad5 Quickly integrated health bar 2022-04-02 05:12:27 -04:00
Jason Durand 01
6343c83a4e Unzoomed camera 2022-04-02 04:50:55 -04:00
Jason Durand 01
761d6876cc Fixed safezone collider enabled by default + Added empty Arena component 2022-04-02 04:16:36 -04:00
Jason Durand 01
4daed34748 Added UI Canvas to SampleScene + Added Arena sorting layer 2022-04-02 04:05:55 -04:00
Jason Durand 01
8e2e737214 Moved Camera/Lights to SampleScene via prefab 2022-04-02 03:57:55 -04:00
Jason Durand 01
c96de9dabd Merge branch 'dev' of https://bitbucket.clubconjure.com/scm/cegj/ludumdare50 into jason 2022-04-02 03:42:19 -04:00
Jason Durand 01
35b28e65b4 Pretty ok transition in out of safe zone 2022-04-02 03:35:56 -04:00
Yann Dupont 01
5845572062 Throw start 2022-04-02 02:00:40 -04:00
Yann Dupont 01
5bf42826ed Merge branch 'dev' into yann 2022-04-02 01:38:31 -04:00
Soulaha Balde
5dc00cf751 Merge branch 'dev' of https://bitbucket.clubconjure.com/scm/cegj/ludumdare50 into dev 2022-04-02 01:33:28 -04:00
Soulaha Balde
fd74f48350 Entity can damage another with periodic attacks 2022-04-02 01:29:49 -04:00
Jason Durand 01
10f36045f8 Merge remote-tracking branch 'origin/dev' into jason 2022-04-02 01:15:56 -04:00
Jason Durand 01
4d15122de9 Moved input action setup to PlayerInput component 2022-04-02 01:14:22 -04:00
Jason Durand 01
c6c92a6e5e Quick normal to jumping transition + Camera 2022-04-02 01:12:35 -04:00
Yann Dupont 01
2657ca3d20 Sound manager 2022-04-02 00:45:56 -04:00
Soulaha Balde
10e9fc074b Basic entities move into atk range to target 2022-04-02 00:30:13 -04:00
Yann Dupont 01
8794d913bf Health bar 2022-04-02 00:15:10 -04:00
Yann Dupont 01
606b349c92 Minion bar cont'd 2022-04-01 23:52:36 -04:00
Jason Durand 01
df13976d24 Apply changes to Vampire prefab 2022-04-01 23:52:25 -04:00