Commit Graph

182 Commits

Author SHA1 Message Date
maverickdgg ebf1ab39cf Added some buttons to lose screen 2023-02-03 22:59:49 +08:00
Diren D Bharwani c61be35da0 Merge remote-tracking branch 'origin/main' into SP3-2-Physics 2023-02-03 22:44:58 +08:00
maverickdgg 382a2d0f6a Added start game button. Texture changing for buttons now only change when necessary 2023-02-03 22:44:02 +08:00
Glence 2ee46f33df update collision tag to have a save button and clamp raycast draw 2023-02-03 21:28:50 +08:00
mushgunAX a6bc9ed2b4 Updates on audio 2023-02-03 19:37:18 +08:00
Diren D Bharwani 36de32447d Fixed some bugs with serialisation 2023-02-03 18:40:45 +08:00
Kah Wei 929bfa8a54 Merge branch 'SP3-6-c-scripting' into SP3-6-CSharpStaticReset 2023-02-03 17:05:56 +08:00
mushgunAX 60fa4335a0 Merge branch 'main' into AudioImplementation 2023-02-03 17:01:11 +08:00
Glence 6b5bd43110 Merge branch 'main' into PlayerController 2023-02-03 16:48:51 +08:00
Diren D Bharwani c73275f2d3 Added temporary use of collision layers to C# and fixed raycast drawing 2023-02-03 16:11:30 +08:00
Diren D Bharwani b81e71ed08 Merge remote-tracking branch 'origin/main' into SP3-2-Physics 2023-02-03 02:03:12 +08:00
mushgunAX d1a3214d41 Change banks 2023-02-03 00:40:22 +08:00
Glence 5bf3af2ed2 corrected transition to diff scenes 2023-02-03 00:03:05 +08:00
Glence 4af3440db7 added gameplay for level1 and multiplier combo is done 2023-02-02 22:44:48 +08:00
Diren D Bharwani 931f6fe5e2 Fixed almost everything. Ray debug drawing has a small bug 2023-02-02 20:56:55 +08:00
mushgunAX 1d0522e334 Audio Implementation for AI 2023-02-02 16:58:40 +08:00
Glence 5b628baedf changes breakable to only minus count on items 2023-02-02 11:16:56 +08:00
Kah Wei 39fbfbd6fa Added more reliable method of reloading static C# data 2023-02-01 00:34:09 +08:00
Glence 8d43fca1cc added models for level 1 and made gamemanager a singleton 2023-01-31 18:13:34 +08:00
Glence d1d7d430b1 added breakable food into the scene
#issues to fix
egg collision too small so weight is really small
throwing heavy objects doesnt give enuff force compared to rolling and hitting it
2023-01-31 00:43:25 +08:00
Glence 3e015d924e Merge branch 'main' into PlayerController 2023-01-30 23:30:55 +08:00
Glence 7d9ab7a381 items changes
items now return back to their original position when owner collides with it
2023-01-25 18:20:26 +08:00
Glence 19c11447c0 added base to return item back to original pos 2023-01-16 21:31:38 +08:00
Glence affa6f0dd8 added implantation for audio scripting 2023-01-16 21:05:21 +08:00
Glence 81978a90b6 added more audio and tidy up folder
tidy up scripts folder
added more audio (cause burden randall cant make up his mind)
adjusted main scene abit
2022-11-26 08:28:37 +08:00
Glence 1302a7e58d added jump var changes
change jump to be in update
added audio for AI
2022-11-25 22:53:38 +08:00
Glence 92ce7c96a8 Merge branch 'main' into PlayerController 2022-11-25 22:34:49 +08:00
Glence fb512e7fc5 added the new banks in
removed unneeded bank
added new audio
2022-11-25 22:32:41 +08:00
mushgunAX 609be908f9 Revert "Made player jumping more responsive"
This reverts commit d6fab4439f.
2022-11-25 20:18:36 +08:00
mushgunAX a541565e55 Merge branch 'main' into AIFinalFixesGAM300M3 2022-11-25 20:17:11 +08:00
mushgunAX 5b41e832c6 Enhanced AI with better chase logic
- AI now keeps track of last waypoint he has seen player at and heads there in an attempt to chase him down
- AI can be made to reverse his chase/patrol path by running around him
- The scene with the AI fix is called "MainGameWithAIFixed"
2022-11-25 20:16:31 +08:00
Glence 181af5b3e5 fix throw food bug
added inverse camera controls
2022-11-25 16:23:26 +08:00
mushgunAX 7499011ea2 Merge branch 'main' into ScriptingAI 2022-11-25 16:14:06 +08:00
mushgunAX 7003262a5d Fixed AI even after scene change
-More reliance on the blackboard for keeping variables among a tree's nodes
-Half extents of the AI fixed
2022-11-25 16:12:58 +08:00
Glence 6ac9bc4e94 added breakables to the main game and fix issues with it 2022-11-25 14:45:19 +08:00
Glence 9daaade56a Merge branch 'main' into PlayerController 2022-11-25 13:22:51 +08:00
Xiao Qi d72a532623 Added object checks in leaf scripts 2022-11-25 12:09:03 +08:00
mushgunAX c5d490b8b2 Added null checks for AI blackboard data
- Null checks added to prevent AI causing the engine to crash
2022-11-25 11:44:58 +08:00
mushgunAX 4daaa8e897 Added SFX to AI
- Footsteps, alert yell and unalert humming
2022-11-25 00:56:40 +08:00
Glence c07fa3c5ae remove the clamp from the phsysicSystem routines
added cheats for maingame
added raycast for pick throw
2022-11-25 00:54:45 +08:00
Glence f71675ad0e Merge branch 'main' into PlayerController 2022-11-24 22:41:00 +08:00
mushgunAX d6fab4439f Made player jumping more responsive
- Changed the input check in the jump function from a GetKeyDown() / GetKeyUp() to a GetKey() / !GetKey()
- This makes jumping a lot more responsive
- This also means holding the jump button causes the raccoon to "bunny hop" until jump button is released
2022-11-24 21:56:06 +08:00
mushgunAX c0f3720fd2 AI expected to work with the scene. To Verify. 2022-11-24 21:26:05 +08:00
Glence 9473359076 added the base for raycast in pickandthrow 2022-11-24 14:05:02 +08:00
Glence 5ee8403e80 make starting scene mainmenu
change playercontroller to fixed dt
2022-11-24 01:08:08 +08:00
Glence d8b2addd1f added the fix for AI 2022-11-23 22:44:15 +08:00
Glence ff318cee2e added ai scripts and in the scene 2022-11-23 21:02:33 +08:00
Glence 8469ebd960 setting the value into scripts 2022-11-23 20:48:40 +08:00
Glence af93e59d0e added text to maingame 2022-11-23 20:26:53 +08:00
Glence ee4e31f45f remove unwanted items in some scripts 2022-11-23 19:11:41 +08:00
Glence 22972d7455 updated the music banks
update a tem fix for physicsSystem
2022-11-23 17:37:06 +08:00
Glence 152007e810 adding audio for the rest of the level
setting player position so it doesnt fall through the floor
2022-11-23 16:57:32 +08:00
Glence 33bab64f12 Merge branch 'main' into PlayerController 2022-11-23 14:00:28 +08:00
Glence 5356cd0800 added item model and setting the main game scene 2022-11-23 13:44:03 +08:00
Kah Wei 67db744856 Uninitialized List<> will no longer cause crashes with the script inspector 2022-11-23 10:08:48 +08:00
Glence 4cacbb3300 adding main/lose/win scene 2022-11-23 00:44:27 +08:00
Glence 332d0a846d Merge branch 'main' into PlayerController 2022-11-22 22:13:52 +08:00
Kah Wei 1bd19b90a8 Merge branch 'main' into SP3-6-c-scripting 2022-11-22 18:11:17 +08:00
Kah Wei 4478b6db62 Added editor support for FontAsset, MeshAsset and MaterialAsset. 2022-11-22 17:48:01 +08:00
Glence c91897f46a made changescene a public in sceneManager.hxx
added a main menu scene 
added some new texture
2022-11-22 17:28:48 +08:00
Glence 71e8ba6044 doing up the main menu 2022-11-22 16:18:16 +08:00
Glence 219d5025f3 adding in the env and world 2022-11-22 14:14:55 +08:00
Glence 56e7f73bbb adding var audios into scripting 2022-11-21 21:01:44 +08:00
Glence 293cc586d1 aiming is done in player 2022-11-21 00:12:09 +08:00
Glence 875657cfde added playerstate scripts
added sub folders for player
remove unneeded scripts
2022-11-20 16:27:39 +08:00
Glence 0551b1fb8a added the new banks
added onplay/onpause/onstop for audiosytem
2022-11-18 17:04:06 +08:00
Glence 7d2435131f added game manager along with scoring zones for item to be thrown in 2022-11-17 12:54:08 +08:00
Glence e4f23dc6c3 added a game manager along with some player controller changes 2022-11-17 00:23:38 +08:00
Glence df9cb11446 add to vel instead of setting it 2022-11-16 22:28:08 +08:00
Glence 3f3770f74f now hard sets the vel instead of adding force 2022-11-15 18:52:46 +08:00
Glence 37bbf22779 added changes 2022-11-14 19:05:48 +08:00
Glence bba85c3d1f removing the constructor for c# 2022-11-14 15:20:58 +08:00
Glence 04273620a6 Merge branch 'main' into PlayerController 2022-11-14 15:03:04 +08:00
Glence d9beeda7e0 adding the base for fsm for player 2022-11-13 21:56:28 +08:00
Xiao Qi a8d4f9c756 On building of asset file directory, check for recognised assets without meta file and generate 2022-11-13 19:51:19 +08:00
Kah Wei 4dc8527395 Reworked scripts to no longer need definition of constructors 2022-11-13 16:29:25 +08:00
Kah Wei 24dcd77f32 Added tooltip and range attribute support for lists in scripts 2022-11-12 12:17:11 +08:00
Kah Wei 4c01d68f95 Added list editor tests 2022-11-12 02:33:12 +08:00
Glence fbec2bf866 Auto stash before merge of "main" and "origin/main" 2022-11-11 14:17:47 +08:00
Glence 4f9015995c Merge branch 'main' into PlayerController 2022-11-11 09:21:36 +08:00
Kah Wei 8670b419d0 Merge branch 'main' into SP3-6-c-scripting 2022-11-10 22:25:58 +08:00
Xiao Qi fa0787d349 Changed hardcoded paths to use defined asset root folder
Shifted scripts and project into folder in assets
2022-11-10 10:33:21 +08:00