Commit Graph

  • 6e8f8c313f update player in main scene Cat Flynn 2021-03-05 18:06:37 +0000
  • 4d971c8170 Merge branch 'main' into Animation_IdletoWalkLocoMotion Cat Flynn 2021-03-05 18:01:07 +0000
  • 143b3c2a7e update player prefab Cat Flynn 2021-03-05 18:00:50 +0000
  • dba218cc7e delete script Cat Flynn 2021-03-05 17:50:10 +0000
  • e81cab42e0 no message LojZa33 2021-03-05 18:44:27 +0100
  • 4ca7a5b91b Merge branch 'main' into feature/audio-integration cyndrdev 2021-03-05 17:19:17 +0000
  • de3cfe7449 tweaked VO settings cyndrdev 2021-03-05 17:17:58 +0000
  • f628ac8aa1 Merge branch 'feature/falling-floor-trap-integration' into 'main' Cinder Foster-Smith 2021-03-05 16:59:29 +0000
  • ec8648b67c Merge branch 'main' into feature/falling-floor-trap-integration Cat Flynn 2021-03-05 16:36:03 +0000
  • 43a01934bc update trap prefab Cat Flynn 2021-03-05 16:32:21 +0000
  • e016e2b122 clean up trap floor prefab Cat Flynn 2021-03-05 16:24:50 +0000
  • 154d809540 Merge branch 'feature/audio-integration' into 'main' Cinder Foster-Smith 2021-03-05 15:48:36 +0000
  • 687762b59e Merge branch 'feature/menus' into 'main' Cat Flynn 2021-03-05 15:45:02 +0000
  • afdf5ce87b Merge branch 'main' into feature/audio-integration Cat Flynn 2021-03-05 15:39:03 +0000
  • f5262cda2c implement vo lines via programmer instrument lol Cat Flynn 2021-03-05 15:34:52 +0000
  • f31bea874a Merge branch 'bug/artefact-interaction' into 'main' Cinder Foster-Smith 2021-03-05 15:34:08 +0000
  • a5b2f863fe finalised main menu cyndrdev 2021-03-05 15:29:20 +0000
  • 69e68e4879 Merge branch 'main' into feature/menus cyndrdev 2021-03-05 14:16:58 +0000
  • 87e5249578 tried to fix FMOD dialogue issue cyndrdev 2021-03-05 14:11:16 +0000
  • 6a1a99d59b Merge branch 'main' into feature/audio-integration cyndrdev 2021-03-05 13:42:27 +0000
  • 377a13fb4c meta shenanigans cyndrdev 2021-03-05 13:42:06 +0000
  • f20fe247a7 added VO FMOD events cyndrdev 2021-03-05 13:34:45 +0000
  • 6100035289 banks weren't tracked? Cat Flynn 2021-03-05 13:26:45 +0000
  • 1aee232cb6 artefact registration, register event listeners after awake event Cat Flynn 2021-03-05 13:26:15 +0000
  • b164558076 added temporary VO lines cyndrdev 2021-03-05 13:02:07 +0000
  • b64e4e30af update fmod meta file apparently Cat Flynn 2021-03-05 12:52:40 +0000
  • 1978a691d1 development build on ci Cat Flynn 2021-03-05 12:52:28 +0000
  • 27e512a780 delete unused script Cat Flynn 2021-03-05 12:49:44 +0000
  • 5e63fc8154 Merge branch 'Traps' into 'main' Cinder Foster-Smith 2021-03-05 12:17:25 +0000
  • 98a9003556 Merge branch 'main' into Traps cyndrdev 2021-03-05 12:06:35 +0000
  • ba60e1e567 Merge branch 'Feature/alpha-level-design' into 'main' Cinder Foster-Smith 2021-03-05 12:00:22 +0000
  • a2003fa4a0 Merge branch 'main' into Anims_Idle+Walk Cat Flynn 2021-03-05 11:32:43 +0000
  • 1a47208d3f Added the Arrow wall functionality. The arrow will fire in a specified direction at a specified speed. The arrow will destory itself on contact with the player immediately and after a specified time when colliding with any other game object (to give the effect the arrow is stuck in the wall). If the arrow collides with the player they will die, and be respawned at the last safe position. Programmer-DField 2021-03-04 23:31:22 +0000
  • e0a80e3103 Animations Idle Walk(to be fixed) LojZa33 2021-03-04 23:11:28 +0100
  • 427ca62821 place artefacts and add dialogue triggers Cat Flynn 2021-03-04 18:53:12 +0000
  • fe1e69fa94 add safe and kill planes Cat Flynn 2021-03-04 16:55:29 +0000
  • d8b2e1e977 added events & banks for new audio cyndrdev 2021-03-04 15:40:32 +0000
  • 363ae1cb58 added cai's WIP music track cyndrdev 2021-03-04 15:05:39 +0000
  • 695440e978 added cai's audio stuff cyndrdev 2021-03-04 14:52:46 +0000
  • 45ec2145ef minor bug fixes CharlieTinley 2021-03-03 21:36:35 +0000
  • e772598beb add level geometry to main scene Cat Flynn 2021-03-03 20:29:55 +0000
  • 4b7fbae286 Merge branch 'artefactUI_fixes' into 'main' Cat Flynn 2021-03-03 17:57:53 +0000
  • faf6c30b3e small fixes Novvator 2021-03-03 16:45:09 +0000
  • b6888e891c Added artifacts from source. Programmer-DField 2021-03-03 13:12:11 +0000
  • 53c5ec45d5 Merge branch 'bug/broken-respawn' into 'main' Cat Flynn 2021-03-03 13:08:35 +0000
  • 0290806bbc use SO-based references for respawn position and events Cat Flynn 2021-03-03 12:53:52 +0000
  • 84c67b7f11 Merge branch 'Feature/TrimSheet' into 'main' Cat Flynn 2021-03-02 21:07:43 +0000
  • be850a3795 Changes made as per code review. Programmer-DField 2021-03-02 19:47:28 +0000
  • 88fd38453b Created the ALPHA level with collisions on geometry CharlieTinley 2021-03-02 19:33:54 +0000
  • 76c07b7fa1 Merge branch 'CineCamera' into 'main' Cinder Foster-Smith 2021-03-02 19:19:04 +0000
  • ad40b0195e made main use new cameras cyndrdev 2021-03-02 19:06:17 +0000
  • 1e8710a926 Merge branch 'main' into CineCamera cyndrdev 2021-03-02 19:05:19 +0000
  • 7551e3434e added player glue prefab cyndrdev 2021-03-02 19:04:38 +0000
  • f90267dedf added cameras into seperate prefab cyndrdev 2021-03-02 18:59:04 +0000
  • f28e4e27fa bump wait time in build Cat Flynn 2021-03-02 18:44:59 +0000
  • ef203777ae Merge branch 'main' into CineCamera cyndrdev 2021-03-02 18:44:31 +0000
  • 83b313dc8d Merge branch 'feature/scripted-dialogue-triggers' into 'main' Cinder Foster-Smith 2021-03-02 18:37:56 +0000
  • 3690668097 Merge branch 'artefactUI' into 'main' Cat Flynn 2021-03-02 18:35:16 +0000
  • 1d8eff8015 fixed camera rotation issues' cyndrdev 2021-03-02 18:28:13 +0000
  • bdbbaa32a8 trigger dialogue after artefact ui is dismissed Cat Flynn 2021-03-02 18:27:51 +0000
  • 0281749075 Merge branch 'main' into artefactUI Cat Flynn 2021-03-02 18:20:23 +0000
  • e79053ebb5 bug fix in InputSettings UpdateMode Novvator 2021-03-02 17:50:27 +0000
  • f58f89a9ee fixed bug when timeScale = 0 Novvator 2021-03-02 17:10:12 +0000
  • af34631ed8 artefactUI now works Novvator 2021-03-02 16:33:31 +0000
  • cc28ee3c2f add prefab for scripted dialogue trigger zone Cat Flynn 2021-03-02 13:24:18 +0000
  • 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. Programmer-DField 2021-03-01 23:26:35 +0000
  • 7fee30a4bd No drastic changes. Just demo shown to the team. Programmer-DField 2021-03-01 18:33:28 +0000
  • 0e6d9f2a8b See below Programmer-DField 2021-03-01 18:10:11 +0000
  • 81ef58415a artefactUI test Novvator 2021-03-01 18:09:21 +0000
  • 40075087aa As before Programmer-DField 2021-03-01 18:03:57 +0000
  • 169c2a4477 Now have a work around for the camera. Programmer-DField 2021-03-01 18:03:30 +0000
  • f2cf6256c1 menu WIP cyndrdev 2021-03-01 17:57:41 +0000
  • baf850d5f8 Merge branch 'Feature/TrimSheet' into 'main' Cat Flynn 2021-03-01 17:54:13 +0000
  • bc22b55334 Merge branch 'feature/artefact-dialogue' into 'main' Cat Flynn 2021-03-01 16:56:19 +0000
  • 14a4d3c1b8 Merge branch 'main' into feature/artefact-dialogue Cat Flynn 2021-03-01 16:18:24 +0000
  • 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. Programmer-DField 2021-03-01 16:04:17 +0000
  • 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? Programmer-DField 2021-02-28 00:54:20 +0000
  • 895fe53fdd Added the trim sheet to Engine wiht its meshes, Set up some basic lighting pass, Built some of the world CharlieTinley 2021-02-26 18:40:13 +0000
  • 4a504f2d7f Merge branch 'artefact_inheritance' into 'main' Cat Flynn 2021-02-26 17:32:37 +0000
  • 51f32cc70f Merge branch 'main' into artefact_inheritance Cat Flynn 2021-02-26 17:17:42 +0000
  • 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. Programmer-DField 2021-02-26 17:08:41 +0000
  • 2773c3f954 Continued work on getting the respawn system working, merge has broken functionality. Programmer-DField 2021-02-26 15:02:33 +0000
  • 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. Programmer-DField 2021-02-26 14:50:30 +0000
  • a8d79c2b10 Changes in Artefact inheritance Novvator 2021-02-25 20:12:08 +0000
  • 7e06b98577 Added Artefact inheritance PowerArtefacts now can unlock PlayerPowers Novvator 2021-02-25 14:21:35 +0000
  • 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". Programmer-DField 2021-02-25 00:51:11 +0000
  • 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. Programmer-DField 2021-02-24 23:41:33 +0000
  • c540e2c7cb Merge branch '33-trap-pitfall-art' into 'main' Cat Flynn 2021-02-24 15:40:31 +0000
  • f2a9cf4229 Merge branch 'main' into 33-trap-pitfall-art Cat Flynn 2021-02-24 15:33:47 +0000
  • cbb5825c20 Added SpikePit trap with the associated textures. Also did a small lighting change: added fog, some post processing effects etc CharlieTinley 2021-02-24 15:21:44 +0000
  • cb279d7135 added menu font cyndrdev 2021-02-24 12:55:09 +0000
  • e47f04fb79 trigger dialogue on artefact pickup Cat Flynn 2021-02-23 13:05:42 +0000
  • 35d652bb95 unregister event on disable Cat Flynn 2021-02-23 12:54:51 +0000
  • c66bf6f1f1 replicate main scene setup in dialogue dev scene Cat Flynn 2021-02-23 09:58:49 +0000
  • d945aea322 add game event scriptable object Cat Flynn 2021-02-23 09:52:00 +0000
  • 9ef1d12a40 ignore FMOD cache Cat Flynn 2021-02-23 09:27:10 +0000
  • 5076b2b344 dont ignore banks lol Cat Flynn 2021-02-22 17:55:00 +0000
  • 6b659a25c9 relative path to fmod project Cat Flynn 2021-02-22 17:28:58 +0000
  • 8a96a44a64 Merge branch 'feature/dialogue-frontend' into 'main' Cinder Foster-Smith 2021-02-22 17:13:47 +0000
  • 6f8ed8ee6d power tweaks, scene & prefab fixes cyndrdev 2021-02-22 17:11:15 +0000