Commit Graph

366 Commits

Author SHA1 Message Date
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 cae8358341 updated scene changes 2022-11-25 23:10:17 +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
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
Sri Sham Haran 27aadf67d3 threw in AI to maingame.shade 2022-11-25 19:03:23 +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 413156dabb Merge branch 'main' into PlayerController 2022-11-25 15:45:35 +08:00
Glence 6ac9bc4e94 added breakables to the main game and fix issues with it 2022-11-25 14:45:19 +08:00
Diren D Bharwani afd2abf036 Fixed pre & post physics transforms update routines 2022-11-25 14:06:20 +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
maverickdgg f3e7f1747a Merge branch 'main' into SP3-141-Camera-System 2022-11-25 10:06:11 +08:00
maverickdgg 428f8f29c6 Camera collision. WIP 2022-11-25 10:06:02 +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 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 ff318cee2e added ai scripts and in the scene 2022-11-23 21:02:33 +08:00
Glence caefae3aac added the change scene into winscene 2022-11-23 20:51:22 +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 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
Xiao Qi 8ad46afc22 Removed spaces from UI Test scene to stop regenerating of asset meta 2022-11-23 13:06:50 +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
maverickdgg 7c36886669 Fix for Canvas scaler 2022-11-22 21:03:53 +08:00
maverickdgg 142f025692 Added check for editor camera. 2022-11-22 20:54:16 +08:00
Diren D Bharwani 053c3e04fd Merge remote-tracking branch 'origin/main' into SP3-2-Physics 2022-11-22 19:26:47 +08:00
Diren D Bharwani c18d58cba3 Fixed various physics bugs
Fixed bug where world was prebuilt and entity IDs were wrongly synced
Fixed collider properties not being synced in the first frame during mass property computations
Fixed static objects being wrongly updated post world update
2022-11-22 19:26:17 +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 81d44e6c59 small changes to the scene 2022-11-22 14:59:46 +08:00
Glence 219d5025f3 adding in the env and world 2022-11-22 14:14:55 +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 a77740db51 Merge branch 'main' into PlayerController 2022-11-18 17:16:04 +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
Kah Wei 3affaf426d WIP Runtime Material Editing support 2022-11-16 09:06:29 +08:00
Glence 37bbf22779 added changes 2022-11-14 19:05:48 +08:00
Glence 22da6e237d Merge branch 'main' into PlayerController 2022-11-14 16:17:03 +08:00
Glence bba85c3d1f removing the constructor for c# 2022-11-14 15:20:58 +08:00
Diren D Bharwani fe1b9d14f5 Partial implementation of syncing SHADE and ReactPhysics active states 2022-11-14 00:25:24 +08:00
Diren D Bharwani c953931f4f Merge branch 'main' into SP3-2-Physics 2022-11-13 17:57:30 +08:00
Sri Sham Haran eed950f26f Merge branch 'main' into SP3-4-Editor 2022-11-13 17:26:56 +08:00
Sri Sham Haran b1c004771c Gave the damn entities names cuz i was going crazy 2022-11-13 17:26:35 +08:00
Kah Wei 4dc8527395 Reworked scripts to no longer need definition of constructors 2022-11-13 16:29:25 +08:00
Diren D Bharwani 3512ed3397 AHHHHHH
i want to pull my hair out
2022-11-13 15:50:03 +08:00
Diren D Bharwani f8bbcdd909 Small fixes 2022-11-12 17:28:49 +08:00
Diren D Bharwani 4ad23a605f Fixed compilation issues from merge 2022-11-12 17:04:09 +08:00
Diren D Bharwani c40992b48c Merge remote-tracking branch 'origin/main' into SP3-2-Physics 2022-11-10 14:44:18 +08:00
Diren D Bharwani 3efecd64e7 Added box & sphere debug draw for physics 2022-11-10 14:30:30 +08:00
Diren D Bharwani eeab3494ba Reworked SceneGraph Interface 2022-11-10 03:30:02 +08:00
Diren D Bharwani f8417f6116 Merge remote-tracking branch 'origin/main' into SP3-2-Physics 2022-11-08 15:22:28 +08:00
Kah Wei ddd93a85f4 Added support for null GameObjects (loading is buggy) 2022-11-08 00:53:47 +08:00
Diren D Bharwani 8fbd32a144 Added Relative Sizes to Shapes 2022-11-08 00:46:09 +08:00
Sri Sham Haran de38b29f25 small fixes for ms2 submission 2022-11-05 18:15:18 +08:00
Sri Sham Haran ab17d57756 Asset browser now recurses down subassets 2022-11-04 23:32:29 +08:00
Sri Sham Haran b30da7e495 Fixes 2022-11-04 19:16:32 +08:00
Sri Sham Haran 1267442210 Deserialization flow is now as follows:
Create entities and components >> Fetch Assets needed >> Load assets needed >> Initialize entities
Some other bug fixes
2022-11-04 18:27:25 +08:00
Sri Sham Haran 4ee0294977 Scene loads correctly now 2022-11-04 14:44:18 +08:00