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
|
d8289dce3f
|
Reset blood loss to 3
|
2022-04-02 13:48:45 -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
|
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
|
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 |
|
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
|
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
|
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
|
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 |
|
Yann Dupont 01
|
5bf42826ed
|
Merge branch 'dev' into yann
|
2022-04-02 01:38:31 -04:00 |
|
Yann Dupont 01
|
c428a0e96f
|
Throw start
|
2022-04-02 01:34:50 -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
|
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 |
|
Yann Dupont 01
|
17c95b8f01
|
Enemy Spawner
|
2022-04-02 00:40:32 -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
|
a197f5f5e6
|
Actually use rigidbody2d
|
2022-04-01 23:50:33 -04:00 |
|
Jason Durand 01
|
1e1f4b29f0
|
Merge branch 'dev' into jason
|
2022-04-01 23:36:13 -04:00 |
|
Jason Durand 01
|
edea89cc59
|
Added quick joystick to move + scriptableobject
|
2022-04-01 23:35:34 -04:00 |
|