|
|
07cebb6ea5
|
Merge branch 'feature/boost-puzzle-design' into 'main'
Feature/boost puzzle design
Closes #73
See merge request kernel-panic/revival!55
|
2021-03-25 11:53:06 +00:00 |
|
|
|
01e8c30439
|
Merge branch 'main' into feature/boost-puzzle-design
|
2021-03-25 11:24:50 +00:00 |
|
|
|
e2a4d6dd45
|
fix compile errors
|
2021-03-25 10:51:22 +00:00 |
|
|
|
4b5124e8ba
|
Merge branch 'feature/chain-platforms' into 'main'
implement falling platform chain
Closes #116
See merge request kernel-panic/revival!57
|
2021-03-25 10:47:00 +00:00 |
|
|
|
94959bcb71
|
Merge branch 'main' into feature/boost-puzzle-design
|
2021-03-25 10:43:47 +00:00 |
|
|
|
122d0e1ff3
|
implement falling platform chain
|
2021-03-24 16:54:34 +00:00 |
|
|
|
cfa6ac4027
|
Merge branch '14-power_freeze' into 'main'
Resolve "glove: freeze"
See merge request kernel-panic/revival!47
|
2021-03-24 12:54:04 +00:00 |
|
|
|
1611962ae9
|
messy messy merge >n<
|
2021-03-24 12:45:19 +00:00 |
|
|
|
ff9735c016
|
Merge branch 'feature/music' into 'main'
i added music triggers
Closes #85
See merge request kernel-panic/revival!56
|
2021-03-24 12:06:45 +00:00 |
|
|
|
317a1ea53b
|
settings tweaked
|
2021-03-24 11:52:01 +00:00 |
|
|
|
9bcde1e028
|
added music triggers
|
2021-03-24 11:50:07 +00:00 |
|
|
|
7d786ecdf6
|
added parameter driven audio
|
2021-03-24 11:25:57 +00:00 |
|
|
|
4fe8d7d18c
|
added parameter driven audio
|
2021-03-24 11:24:23 +00:00 |
|
|
|
832449c01d
|
remove editor namespace lol
|
2021-03-23 15:09:19 +00:00 |
|
|
|
b93eaa0296
|
Merge branch 'Animations_Run,Jump(Takeoff,InAir,Landing)+Boost' into 'main'
Animations
See merge request kernel-panic/revival!54
|
2021-03-23 15:05:16 +00:00 |
|
|
|
a83cad4a2a
|
create 3rd boost puzzle
|
2021-03-23 15:03:18 +00:00 |
|
|
|
733e3f0b59
|
commited player w/ cheats enabled oopsie
|
2021-03-23 11:52:33 +00:00 |
|
|
|
da33cc4a4a
|
updated animation controller, got new anims in-game
|
2021-03-23 11:48:43 +00:00 |
|
LojZa33
|
9ae930df56
|
Animations
|
2021-03-22 23:34:02 +01:00 |
|
|
|
927a1b9dd7
|
create killbox prefab
|
2021-03-22 16:45:42 +00:00 |
|
|
|
0fdc569380
|
Merge branch 'main' into feature/boost-puzzle-design
|
2021-03-22 15:59:28 +00:00 |
|
|
|
b0d1f36571
|
Merge branch 'feature/109-arrow-wall-redesign' into 'main'
redesign arrow wall trap objects
Closes #109
See merge request kernel-panic/revival!53
|
2021-03-22 11:51:14 +00:00 |
|
|
|
91be3b97b9
|
redesign arrow wall trap objects
|
2021-03-18 17:25:34 +00:00 |
|
|
|
7893db3d19
|
Merge branch 'feature/72-juice-falling-platforms' into 'main'
Feature/72 juice falling platforms
Closes #72
See merge request kernel-panic/revival!51
|
2021-03-18 12:39:44 +00:00 |
|
|
|
af519d2ffe
|
pop-in animation on platform respawn
|
2021-03-17 18:37:56 +00:00 |
|
|
|
9037fd264c
|
animation and audio event on falling platforms
|
2021-03-17 18:31:33 +00:00 |
|
|
|
44e55b22fe
|
import falling platform sound
|
2021-03-17 18:28:13 +00:00 |
|
|
|
63ed52fe4a
|
import dotween
|
2021-03-17 18:12:17 +00:00 |
|
|
|
292ca65bb2
|
respawn fallaway floor after a few seconds in the safe zone
|
2021-03-17 18:04:31 +00:00 |
|
|
|
fbb510e70f
|
Merge branch 'time-freezing-artefact' into 'main'
Time freezing artefact
Closes #96
See merge request kernel-panic/revival!50
|
2021-03-17 15:33:21 +00:00 |
|
|
|
4370729700
|
monochrome emission
|
2021-03-17 15:24:03 +00:00 |
|
|
|
f5ceac5d0d
|
assign textures in orb mat, use specular workflow, assign mat to model
|
2021-03-17 15:20:26 +00:00 |
|
|
|
13438cd751
|
re-import textures and create smoothness map
|
2021-03-17 15:19:00 +00:00 |
|
LojZa33
|
9f25b5f426
|
Orb_MAT
|
2021-03-17 01:00:53 +01:00 |
|
LojZa33
|
27f459f068
|
Merge branch 'main' of https://gitlab.badbrain.dev/kernel-panic/game into time-freezing-artefact
|
2021-03-16 20:01:46 +01:00 |
|
|
|
e92ae299d8
|
boost puzzles 1 2 complete 3 wip
|
2021-03-16 16:38:46 +00:00 |
|
Novvator
|
b94d9d7f32
|
changes made as per code review
|
2021-03-16 15:49:54 +00:00 |
|
|
|
eb82f4d95d
|
cursor
|
2021-03-15 18:30:52 +00:00 |
|
|
|
b5a3054b5f
|
fixed weird subtitle issues
|
2021-03-15 17:15:18 +00:00 |
|
|
|
ed9be08db3
|
Merge branch 'Camera2ndPass' into 'main'
Camera2nd pass
See merge request kernel-panic/revival!49
|
2021-03-15 16:51:40 +00:00 |
|
|
|
f8d3529420
|
Merge branch 'feature/inject-prompt-artefact-ui' into 'main'
basic world space artefact interaction prompt
Closes #93
See merge request kernel-panic/revival!46
|
2021-03-15 16:44:54 +00:00 |
|
|
|
0712af572f
|
Merge branch 'main' into Camera2ndPass
|
2021-03-15 16:36:48 +00:00 |
|
|
|
b57ee3dcb1
|
applied changes to prefabs
|
2021-03-15 16:35:38 +00:00 |
|
|
|
9f352f6ffe
|
Merge branch 'main' into feature/inject-prompt-artefact-ui
|
2021-03-15 16:23:04 +00:00 |
|
|
|
a6a8f0ee2d
|
fixed dialogue font
|
2021-03-15 16:21:40 +00:00 |
|
|
|
9cedec4d74
|
Merge branch 'feature/path-spline' into 'main'
Feature/path spline
Closes #44
See merge request kernel-panic/revival!45
|
2021-03-15 16:13:41 +00:00 |
|
LojZa33
|
04c462d9a8
|
timefreeze Orb
|
2021-03-15 16:36:01 +01:00 |
|
LojZa33
|
42196fa144
|
Merge branch 'main' of https://gitlab.badbrain.dev/kernel-panic/game into Animation_IdletoWalkLocoMotion
|
2021-03-15 16:04:53 +01:00 |
|
Programmer-DField
|
a07f31fbf2
|
Final check over before merge request.
|
2021-03-15 12:56:45 +00:00 |
|
Programmer-DField
|
b724107be4
|
Added the cursor script to the camera prefab. One problem is that the cursor needs to be visible and contained to the window in the artifiact screen. Will catch up with Cinder about this.
|
2021-03-15 12:52:43 +00:00 |
|
