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

74 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Durand 01
a7a29f4cce Started adding AIEntity's ThrownState 2022-04-02 15:50:30 -04:00
Jason Durand 01
25a10047ad Added quick game timer 2022-04-02 15:14:04 -04:00
Jason Durand 01
3d804d9f44 Moved GameFlowManager to Scripts/ 2022-04-02 14:49:11 -04:00
Jason Durand 01
cc20964c12 Recopied SampleScene to JasonScene 2022-04-02 14:31:42 -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
ddccbf21a9 Pull request #5: Jason 
Merge in CEGJ/ludumdare50 from jason to dev

* commit 'd8289dce3f31a83e05a5c2ddb5cf9ea0823557c0':
  Reset blood loss to 3
  Basic play replay game loop
  Lose blood overtime and switch to Dead state
 2022-04-02 17:50:29 +00:00
Jason Durand 01
d8289dce3f Reset blood loss to 3 2022-04-02 13:48:45 -04:00
Jason Durand 01
f3e2a3b3d8 Merge remote-tracking branch 'origin/dev' into jason 2022-04-02 13:47:15 -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
Yann Dupont 01
6676819bbe Merge dev 2022-04-02 13:11:47 -04:00
Jason Durand 01
64b5704d34 Pull request #4: Jason 
Merge in CEGJ/ludumdare50 from jason to dev

* commit 'bd5efcb31a1335a9f65b63f37e5ae47b74ee7e0c':
  Fixed exiting safe zone before game starts
  Forgot to resolve deltaTime to Time.fixedDeltaTime
 2022-04-02 17:07:55 +00:00
Jason Durand 01
bd5efcb31a Fixed exiting safe zone before game starts 2022-04-02 13:06:36 -04:00
Jason Durand 01
87ef184ec7 Forgot to resolve deltaTime to Time.fixedDeltaTime 2022-04-02 13:03:35 -04:00
Jason Durand 01
5c4be70437 Pull request #3: Jason 
Merge in CEGJ/ludumdare50 from jason to dev

* commit '1112e06d471ef8a67c209a2bfa28b0ef34d5e781':
  Added Press Start to start (without prompt though)
  Added rough paused state
  Added Entity.beingPushed() state without actually using it
  Added NaughtyAttributes
 2022-04-02 16:57:25 +00:00
Jason Durand 01
1112e06d47 Merge remote-tracking branch 'origin/dev' into jason 
# Conflicts:
#	Assets/Scripts/Entity.cs
 2022-04-02 12:54:54 -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
2284280d01 Blood tokens 2022-04-02 12:34:07 -04:00
Soulaha Balde
95e4388610 WIP base of AIEntity 2022-04-02 12:31:24 -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
Yann Dupont 01
24d739af4a Merge branch 'dev' into yann 2022-04-02 12:25:40 -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
Jason Durand 01
fe334f8d15 Added Entity.beingPushed() state without actually using it 2022-04-02 11:02:29 -04:00
Jason Durand 01
54c1a142e4 Merge remote-tracking branch 'origin/dev' into jason 2022-04-02 10:58:07 -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
Yann Dupont 01
310c4ce85f Minion throw health cost and reload time 2022-04-02 10:35:52 -04:00
Yann Dupont 01
62bdfa65ab throw minions 2022-04-02 10:06:38 -04:00
Soulaha Balde
7af161f29d Only attack if target is not null 2022-04-02 10:01:52 -04:00
Yann Dupont 01
f1d104d7cd Merge branch 'dev' into yann 2022-04-02 09:14:11 -04:00
Jason Durand 01
e50546b061 Pull request #2: Jason 
Merge in CEGJ/ludumdare50 from jason to dev

* commit '0d33a6b3c66512af2e25b538c4b7b541332a75f5':
  Lowered monster speed
  Use rigidbodies to move Entities
  Toggle player rigidbody on safe zone instead of zone's collider
  Using AnimationCurve instead of cubic ease out for jump
  Quickly integrated health bar
  Unzoomed camera
  Added basic monster spawners
  Fixed safezone collider enabled by default + Added empty Arena component
  Added UI Canvas to SampleScene + Added Arena sorting layer
  Moved Camera/Lights to SampleScene via prefab
 2022-04-02 10:06:53 +00:00
Jason Durand 01
0d33a6b3c6 Lowered monster speed 2022-04-02 06:05:38 -04:00
Jason Durand 01
9484c6d2fb Use rigidbodies to move Entities 2022-04-02 05:55:33 -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
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
c8649ed6f9 Added basic monster spawners 2022-04-02 04:45:21 -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
907a828d84 Pull request #1: Jason 
Merge in CEGJ/ludumdare50 from jason to dev

* commit '4e91117d4bfe1d5b811a65b5fd008b715891f55a':
  Forgot to remove BaseState
  Pretty ok transition in out of safe zone
  Moved input action setup to PlayerInput component
  Quick normal to jumping transition + Camera
  Apply changes to Vampire prefab
  Actually use rigidbody2d
  Added quick joystick to move + scriptableobject
 2022-04-02 07:45:52 +00:00
Jason Durand 01
4e91117d4b Forgot to remove BaseState 2022-04-02 03:45:01 -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