e0a80e3103
Animations Idle Walk(to be fixed)
2021-03-04 23:11:28 +01:00
Cat Flynn
427ca62821
place artefacts and add dialogue triggers
2021-03-04 18:53:12 +00:00
Cat Flynn
fe1e69fa94
add safe and kill planes
2021-03-04 16:55:29 +00:00
cyndrdev
d8b2e1e977
added events & banks for new audio
2021-03-04 15:40:32 +00:00
cyndrdev
363ae1cb58
added cai's WIP music track
2021-03-04 15:05:39 +00:00
cyndrdev
695440e978
added cai's audio stuff
2021-03-04 14:52:46 +00:00
45ec2145ef
minor bug fixes
2021-03-03 21:36:35 +00:00
Cat Flynn
e772598beb
add level geometry to main scene
2021-03-03 20:29:55 +00:00
faf6c30b3e
small fixes
2021-03-03 16:45:09 +00:00
Cat Flynn
0290806bbc
use SO-based references for respawn position and events
2021-03-03 12:53:52 +00:00
Cat Flynn
84c67b7f11
Merge branch 'Feature/TrimSheet' into 'main'
...
ALPHA LEVEL
See merge request kernel-panic/revival!24
2021-03-02 21:07:43 +00:00
be850a3795
Changes made as per code review.
2021-03-02 19:47:28 +00:00
88fd38453b
Created the ALPHA level with collisions on geometry
2021-03-02 19:33:54 +00:00
cyndrdev
ad40b0195e
made main use new cameras
2021-03-02 19:06:17 +00:00
cyndrdev
1e8710a926
Merge branch 'main' into CineCamera
2021-03-02 19:05:19 +00:00
cyndrdev
7551e3434e
added player glue prefab
2021-03-02 19:04:38 +00:00
cyndrdev
f90267dedf
added cameras into seperate prefab
2021-03-02 18:59:04 +00:00
cyndrdev
ef203777ae
Merge branch 'main' into CineCamera
2021-03-02 18:44:31 +00:00
Cinder Foster-Smith
83b313dc8d
Merge branch 'feature/scripted-dialogue-triggers' into 'main'
...
add prefab for scripted dialogue trigger zone
See merge request kernel-panic/revival!20
2021-03-02 18:37:56 +00:00
cyndrdev
1d8eff8015
fixed camera rotation issues'
2021-03-02 18:28:13 +00:00
Cat Flynn
bdbbaa32a8
trigger dialogue after artefact ui is dismissed
2021-03-02 18:27:56 +00:00
Cat Flynn
0281749075
Merge branch 'main' into artefactUI
2021-03-02 18:20:23 +00:00
e79053ebb5
bug fix in InputSettings UpdateMode
2021-03-02 17:50:27 +00:00
f58f89a9ee
fixed bug when timeScale = 0
2021-03-02 17:10:12 +00:00
af34631ed8
artefactUI now works
2021-03-02 16:33:31 +00:00
Cat Flynn
cc28ee3c2f
add prefab for scripted dialogue trigger zone
2021-03-02 13:24:18 +00:00
368b03f848
Camera now has collison detection. As well as main functionality. These are easily edited using the Cinemachine freelook options. The camera is controlled using the Cinemachine input provider and is attached to the current look controls.
2021-03-01 23:26:35 +00:00
7fee30a4bd
No drastic changes. Just demo shown to the team.
2021-03-01 18:33:28 +00:00
0e6d9f2a8b
See below
2021-03-01 18:10:11 +00:00
81ef58415a
artefactUI test
2021-03-01 18:09:21 +00:00
40075087aa
As before
2021-03-01 18:03:57 +00:00
169c2a4477
Now have a work around for the camera.
2021-03-01 18:03:30 +00:00
cyndrdev
f2cf6256c1
menu WIP
2021-03-01 17:57:41 +00:00
Cat Flynn
baf850d5f8
Merge branch 'Feature/TrimSheet' into 'main'
...
Added the trim sheet to Engine with its meshes, Set up some basic lighting...
See merge request kernel-panic/revival!16
2021-03-01 17:54:13 +00:00
Cat Flynn
14a4d3c1b8
Merge branch 'main' into feature/artefact-dialogue
2021-03-01 16:18:24 +00:00
a46f4ddb74
Have solved the problem where the camera seemed to be setting the player as dead. The script now checks to see if the collison was with player and only acts if true.
2021-03-01 16:04:17 +00:00
4bead84e56
Added the falling rocks trap. The player can now trigger the rocks to fall and the death and respawn script will run when a collision is detected. Need to look at an issue where the collision is detected even when the player is not hit. Possibly the camera?
2021-02-28 00:54:20 +00:00
895fe53fdd
Added the trim sheet to Engine wiht its meshes, Set up some basic lighting pass, Built some of the world
2021-02-26 18:40:13 +00:00
Cat Flynn
51f32cc70f
Merge branch 'main' into artefact_inheritance
2021-02-26 17:17:42 +00:00
078e356810
The respawwn system is now ppicking up the position of the player correctly. However, still not sending the player to the last known respawn point.
2021-02-26 17:08:41 +00:00
2773c3f954
Continued work on getting the respawn system working, merge has broken functionality.
2021-02-26 15:02:33 +00:00
3ef56e2bc1
Added a shader with dissolve effect. Ckleaned up use of tags now using compare.tag which is more efficient. The spike trap is now functionally working however, ppolish does need to be applied to the final outcome.
2021-02-26 14:50:30 +00:00
a8d79c2b10
Changes in Artefact inheritance
2021-02-25 20:12:08 +00:00
7e06b98577
Added Artefact inheritance
...
PowerArtefacts now can unlock PlayerPowers
2021-02-25 14:21:35 +00:00
1f4c063c60
Updated the FallingFloor script. The floor now begins to lower, waits for a set period and then is destroyed. I plan to add a disssolve effect to make this transition look better. The player begins to slowly fall with the floor until the object is destroyed at which point the player falls with gravity hitting the sspike trap and "dying".
2021-02-25 00:51:11 +00:00
83cd280778
Working to get the trap system working. Added a prototype for the spike trap. Need to work on the code to get the floor to fall away under the player.
2021-02-24 23:41:33 +00:00
Cat Flynn
f2a9cf4229
Merge branch 'main' into 33-trap-pitfall-art
2021-02-24 15:33:47 +00:00
cbb5825c20
Added SpikePit trap with the associated textures. Also did a small lighting change: added fog, some post processing effects etc
2021-02-24 15:21:44 +00:00
cyndrdev
cb279d7135
added menu font
2021-02-24 12:55:09 +00:00
Cat Flynn
e47f04fb79
trigger dialogue on artefact pickup
2021-02-23 13:05:42 +00:00
Cat Flynn
35d652bb95
unregister event on disable
2021-02-23 12:54:51 +00:00
Cat Flynn
c66bf6f1f1
replicate main scene setup in dialogue dev scene
2021-02-23 09:58:49 +00:00
Cat Flynn
d945aea322
add game event scriptable object
2021-02-23 09:52:04 +00:00
Cat Flynn
9ef1d12a40
ignore FMOD cache
2021-02-23 09:27:10 +00:00
Cat Flynn
5076b2b344
dont ignore banks lol
2021-02-22 17:55:00 +00:00
Cat Flynn
6b659a25c9
relative path to fmod project
2021-02-22 17:46:36 +00:00
Cinder Foster-Smith
8a96a44a64
Merge branch 'feature/dialogue-frontend' into 'main'
...
Feature/dialogue frontend
See merge request kernel-panic/revival!10
2021-02-22 17:13:47 +00:00
cyndrdev
6f8ed8ee6d
power tweaks, scene & prefab fixes
2021-02-22 17:11:15 +00:00
Cat Flynn
60634152d3
play audio via FMOD using key from dialogue database
2021-02-22 15:29:17 +00:00
Cat Flynn
d0cfd38119
add fmod project to repository
2021-02-22 15:28:31 +00:00
Cinder Foster-Smith
0839767d25
Merge branch 'feature/checkpoints' into 'main'
...
Checkpoints
See merge request kernel-panic/revival!9
2021-02-22 15:26:00 +00:00
Cat Flynn
f8f037203c
import fmod plugin
2021-02-22 15:25:38 +00:00
Cat Flynn
955972e4a3
Merge branch 'main' into feature/dialogue-frontend
2021-02-22 10:33:36 +00:00
Cat Flynn
1fe3bbd79d
Merge branch 'main' into artefacts_list
2021-02-22 09:01:33 +00:00
f5cc5a4f14
Added nearbyArtefactID SerialInt
2021-02-19 20:38:45 +00:00
Cat Flynn
5d79c1b637
begin dialogue frontend implementation, placeholder dialogue ui
2021-02-19 16:33:02 +00:00
Cat Flynn
ddce06585f
use custom .data instead of raw csv file in dialogue db
2021-02-19 16:26:15 +00:00
4397ec0326
Changed Artefact and ArtefactInventory to Scriptable objects
...
Added artefact prefab
2021-02-19 15:14:14 +00:00
Cat Flynn
f1c9f8a752
fix error spam in edit mode
2021-02-18 17:24:15 +00:00
Cat Flynn
28b8b860d1
make log readable
2021-02-15 23:26:42 +00:00
Cat Flynn
9eea5cd4d5
add log that should have been there in the first place
2021-02-15 23:11:29 +00:00
Cat Flynn
618dab1052
Merge branch 'main' into Checkpoints
2021-02-15 18:58:35 +00:00
Cinder Foster-Smith
96860632ff
Feature/character controller
2021-02-15 18:09:32 +00:00
079fa914a2
Updated animations. Disabled player controller during death. Generally cleaned code.
2021-02-15 16:23:29 +00:00
Cat Flynn
4e76ea2168
Feature/import dialogue
2021-02-15 13:42:14 +00:00
adb0c9e673
Added the Respawn Manager which allows for the use of multiple safe zones. Cleeaned up the code and made more efficient.
2021-02-15 13:14:42 +00:00
3b9e31a4b3
Added a safezone that reports the position of the player whenever they are within the area.
...
Added a deathzone that plays a death animation on trigger, fades the screen, respawns the player at the last known safe position and the fades the screen back in.
Added scripts for safezone and deathzone.
Added some make do animations and animators.
Added some materials for testing purposes.
2021-02-15 09:44:04 +00:00
7ff4569fde
Added Artefacts - Artefact Inventory (tracking system)
2021-02-14 15:08:59 +00:00
cyndrdev
7a25b61f90
fixed ci issue
2021-02-12 14:12:26 +00:00
cyndrdev
95f04ad618
Merge branch 'feature/flow' of https://gitlab.badbrain.dev/kernel-panic/game into feature/flow
2021-02-12 14:05:16 +00:00
cyndrdev
7c769a2371
changes from code review
2021-02-12 14:04:12 +00:00
Cat Flynn
4424659082
Merge branch 'main' into feature/flow
2021-02-12 10:36:41 +00:00
cyndrdev
d62f3a7b6b
debug text visibility
2021-02-12 09:35:59 +00:00
cyndrdev
a4906a35d4
gameflow
2021-02-12 09:32:10 +00:00
e790ef7493
Created small block out of the level for the programmers to test the mechanics
2021-02-09 15:48:42 +00:00
Cat Flynn
e681a3f306
properly tail log and check build result
2021-02-01 18:00:00 +00:00
Cat Flynn
a24decc606
update game title in project settings
2021-01-27 16:27:17 +00:00
Cat Flynn
0b67970c3c
stop tracking user settings
2021-01-27 16:25:48 +00:00
cyndrdev
7fefaae405
basic camera controller
2021-01-27 12:06:17 +00:00
cyndrdev
ab7cd608cb
basic player controller and input handling
2021-01-27 11:27:56 +00:00
cyndrdev
10a02047ce
package setup
2021-01-27 07:43:40 +00:00
Cat Flynn
bd5bc825d3
initial commit
2021-01-25 19:44:17 +00:00
LojZa33
Cat Flynn
cyndrdev
CharlieTinley
Novvator
Programmer-DField