Yann Dupont 01
|
d3ecdce23f
|
Merge branch 'dev' into yann
|
2022-04-04 01:20:49 -04:00 |
|
Yann Dupont 01
|
c396d1b839
|
New music test
|
2022-04-04 01:20:30 -04:00 |
|
Jason Durand 01
|
91961f6622
|
Merge remote-tracking branch 'origin/dev' into jason
# Conflicts:
# Assets/Scripts/PlayerMovement.cs
|
2022-04-04 01:16:28 -04:00 |
|
Jason Durand 01
|
01bdce2e81
|
Removed joystick min strength + can throw far
|
2022-04-04 01:15:02 -04:00 |
|
Soulaha Balde
|
04c9f0d8d1
|
Merge branch 'soulaha' into dev
|
2022-04-03 23:41:15 -04:00 |
|
Soulaha Balde
|
972d62398d
|
Added regular knight sprites
|
2022-04-03 22:37:38 -04:00 |
|
Jason Durand 01
|
ad25e11cf7
|
Use new fonts on menu buttons
|
2022-04-03 22:08:06 -04:00 |
|
Jason Durand 01
|
081f9ff086
|
Fullscreen mode dropdown
|
2022-04-03 21:40:15 -04:00 |
|
Jason Durand 01
|
9451309526
|
Cleaned option flow
|
2022-04-03 21:14:58 -04:00 |
|
Jason Durand 01
|
1e48a07b1b
|
Fixed buttons not choosable via controller
|
2022-04-03 20:20:11 -04:00 |
|
Yann Dupont 01
|
f863312652
|
Update prefabs
|
2022-04-03 18:59:30 -04:00 |
|
Yann Dupont 01
|
e43d36b6dd
|
Menu SFX
|
2022-04-03 18:56:58 -04:00 |
|
Soulaha Balde
|
c718c9e595
|
Merge branch 'soulaha' into dev
|
2022-04-03 17:02:25 -04:00 |
|
Jason Durand 01
|
5bd494aaca
|
Integrated SampleScene
|
2022-04-03 16:55:30 -04:00 |
|
Soulaha Balde
|
ef113a6a43
|
Wave size increases by x every y wave
|
2022-04-03 15:58:24 -04:00 |
|
Soulaha Balde
|
b60ff1ca91
|
Merge branch 'soulaha' into dev
|
2022-04-03 15:29:12 -04:00 |
|
Soulaha Balde
|
e2ef01755a
|
Health bar different color for monster/gladiator
|
2022-04-03 15:26:26 -04:00 |
|
Jason Durand 01
|
20d5e2c411
|
Merge remote-tracking branch 'origin/dev' into jason
|
2022-04-03 15:19:51 -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
|
cfbde817a6
|
Sped up cam zoom and started when entering safe zone
|
2022-04-03 14:19:16 -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 |
|
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
|
eafc0c63b6
|
Merge dev
|
2022-04-03 00:24:37 -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
|
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
|
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 |
|
Yann Dupont 01
|
40ed3d3921
|
Minions and gladiators sprites
|
2022-04-02 21:56:11 -04:00 |
|
Yann Dupont 01
|
29731b13e0
|
Merge dev
|
2022-04-02 19:23:07 -04: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 |
|
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 |
|