f7c33bc89a
Various null checks
2023-03-03 14:26:36 +08:00
81da3e501d
fix minor preview level bug
2023-03-03 00:40:16 +08:00
7763a969b2
Merge branch 'main' into SP3-10-input-management
2023-03-02 22:55:29 +08:00
0984eee6bb
Gameplay UI WIP
2023-03-02 17:34:11 +08:00
8c74ec85d3
Done with level preview
2023-03-02 17:33:02 +08:00
802924141a
Scene Fade In and Out Fixes
2023-03-02 15:47:00 +08:00
1e734b6006
Merge branch 'main' into SP3-10-input-management
2023-03-02 13:31:13 +08:00
2834414115
Merge branch 'main' into PlayerController
2023-03-02 13:05:28 +08:00
381fe476be
Game UI WIP
2023-03-02 11:33:21 +08:00
30923389ae
Merge branch 'main' into SP3-20-UI-System
2023-03-02 10:23:09 +08:00
4131c58c08
Modified calls to IsCursorVisible
2023-03-02 10:01:52 +08:00
e0ee2a8079
Gameplay UI progress
2023-03-02 09:55:41 +08:00
e4345d4937
Changed all button textures and update win and lose screen to use buttonFX
2023-03-02 02:30:59 +08:00
2af19baccd
Added the transition back to the scene
2023-03-02 00:02:18 +08:00
b2c702c780
Merge branch 'main' into PlayerController
2023-03-02 00:01:34 +08:00
a04eee0a2f
mouse centering and visibility when appropriate
2023-03-01 23:56:40 +08:00
403df62a0b
cleaning up scenes and WIP for previewlevel camera
2023-03-01 18:05:42 +08:00
1f5cfd36f7
Scene transitions done
2023-03-01 17:36:02 +08:00
17a7db8a91
Merge branch 'main' into scenetransitions
2023-03-01 12:51:43 +08:00
d5c9010661
Clean up the scenes
2023-03-01 01:16:34 +08:00
ab92d56cf0
disable movement when pop out is in place
2023-03-01 00:51:57 +08:00
bd9349eae7
FRC fix, stealfood popup almost done and reset dt when load
2023-02-28 21:42:05 +08:00
04c19fb586
Merge branch 'main' into PlayerController
2023-02-28 19:13:11 +08:00
0bdab3b079
WIP for steal food pop up
2023-02-28 18:35:43 +08:00
52ba54a82a
Fix ShinyHighlight issue and updated level 3
2023-02-28 15:42:28 +08:00
2ab4981a43
renamed cutscene to cutsceneIntro and adjusted level 2
2023-02-28 15:06:19 +08:00
d563247ec2
Merge branch 'main' into scenetransitions
2023-02-28 06:49:55 +08:00
b3ec2fb4df
implementing in progress
2023-02-28 06:49:40 +08:00
380de28358
cutscene for intro done
2023-02-28 01:57:00 +08:00
79cb0f12ae
WIP for Alpha, added material name in editor WIP for cutscene
2023-02-27 18:09:05 +08:00
4f1ecf1b50
multiplierTextFX WIP
2023-02-27 17:01:46 +08:00
cbb334d48e
Slider Text Default Value fix
2023-02-27 16:39:31 +08:00
75295b5d6e
Merge branch 'main' into PlayerController
2023-02-27 15:58:37 +08:00
c912dd2e4b
WIP for cutscene and added test for KW
2023-02-27 15:33:58 +08:00
ba89dcea14
Merge branch 'main' into scenetransitions
2023-02-27 15:30:04 +08:00
f9c90ece7e
Scene Transition Script
2023-02-27 15:28:05 +08:00
08e4db134a
Tweaked main menu UI
2023-02-27 15:16:48 +08:00
984473bdab
Slider text fixed
2023-02-27 10:28:20 +08:00
949ade5775
Options Layout done
2023-02-27 09:55:54 +08:00
90763ded71
Change Canvas Button Script
2023-02-27 08:08:04 +08:00
f23853c85c
Main Menu Canvas Layout with button FX and scalebounce
2023-02-27 07:32:26 +08:00
efcca56c99
WIP foir silhouette, renamed scene files and fix breakable bug
2023-02-27 00:41:25 +08:00
027a2c490b
Added elapsedTime and shiny Highlight along with Level 3 asset and scene
2023-02-25 21:56:49 +08:00
86b662c7dc
Merge branch 'main' into PlayerController
2023-02-23 19:45:38 +08:00
c4db16bb95
Merge branch 'main' into SP3-20-UI-System
2023-02-23 13:44:12 +08:00
69f2e678df
re-enabled scene change and disabled debug logs
2023-02-23 13:42:22 +08:00
1b865b129b
Added finalizeChanges call and debug logs for hover enter
2023-02-23 12:50:42 +08:00
8d10c48645
Bug fixes and WIP for alpha
2023-02-21 19:31:50 +08:00
d7725f4e26
Pause is done
2023-02-21 00:47:20 +08:00
09d88b5a70
small bug fixes for text and serialization and added game pause
2023-02-20 19:53:22 +08:00
f2e9d3b349
Merge branch 'main' into PlayerController
2023-02-20 19:07:56 +08:00
dfe4d047e9
added a jumppad to the game
2023-02-18 22:21:23 +08:00
916a7315da
Merge branch 'main' into SP3-6-CSharpStaticReset
2023-02-18 12:24:17 +08:00
670ddee65a
Added rayheight for pickandthrow
2023-02-04 16:02:59 +08:00
a97dfe7049
remove watermelon debug
2023-02-04 15:56:37 +08:00
ccd1d883d9
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2023-02-04 15:18:22 +08:00
c0249531d3
Potential fix to physics collision states being incorrect
2023-02-04 15:18:15 +08:00
a594df5a4d
added physics fix and raycast change
...
called clear container in physicsSystem
move raycast of player higher
2023-02-04 15:17:58 +08:00
7cf5ef4b81
Solved merge conflicts from main
2023-02-04 14:21:40 +08:00
a4ceffcfad
Small changes for publish build
...
Level1 ai fix
Ai speed fix
item vel reset back when return
player hard set rotation
can go to nesxt scene correctly now
scoring now checks for trigger
2023-02-04 14:11:16 +08:00
d1bad74791
Merge branch 'main' into AudioImplementation
2023-02-04 02:45:09 +08:00
d1ae9b3756
Fix camera arm and win scene issue
2023-02-04 02:42:30 +08:00
6e8b2bc460
Merge branch 'main' into AudioImplementation
2023-02-04 02:11:41 +08:00
0c455c55f6
correct collision tag issue and fix player controller keypress
2023-02-04 02:05:32 +08:00
1866d4ba40
SFX for item scoring
2023-02-04 01:45:34 +08:00
a7238c6eba
Merge branch 'main' into AudioImplementation
2023-02-04 01:45:09 +08:00
23f7812a70
Fix StopAllSounds
2023-02-04 01:44:00 +08:00
9d73806573
Merge branch 'main' into PlayerController
2023-02-04 01:11:56 +08:00
436846d03c
Fix level1 and fix ontrigger calling twice
2023-02-04 01:11:47 +08:00
c7b99df2f6
Merge branch 'main' into AudioImplementation
2023-02-04 00:31:23 +08:00
49fadfed74
Dynamic BGM
2023-02-04 00:23:05 +08:00
3cd1778d08
Fixed SHUIComponent serialization
2023-02-04 00:04:25 +08:00
21695fd4f3
Merge branch 'main' into SP3-20-UI-System
2023-02-03 23:28:17 +08:00
fdacaf5036
Added reminaing buttons for win and lose screens
2023-02-03 23:28:08 +08:00
136d86dce3
Fix Item Score SFX
2023-02-03 23:19:12 +08:00
d71790022f
Merge branch 'main' into AudioImplementation
2023-02-03 23:16:47 +08:00
b15b5eadbc
Merge branch 'main' into SP3-20-UI-System
2023-02-03 22:59:56 +08:00
ebf1ab39cf
Added some buttons to lose screen
2023-02-03 22:59:49 +08:00
c61be35da0
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2023-02-03 22:44:58 +08:00
382a2d0f6a
Added start game button. Texture changing for buttons now only change when necessary
2023-02-03 22:44:02 +08:00
2ee46f33df
update collision tag to have a save button and clamp raycast draw
2023-02-03 21:28:50 +08:00
a6bc9ed2b4
Updates on audio
2023-02-03 19:37:18 +08:00
36de32447d
Fixed some bugs with serialisation
2023-02-03 18:40:45 +08:00
929bfa8a54
Merge branch 'SP3-6-c-scripting' into SP3-6-CSharpStaticReset
2023-02-03 17:05:56 +08:00
60fa4335a0
Merge branch 'main' into AudioImplementation
2023-02-03 17:01:11 +08:00
6b5bd43110
Merge branch 'main' into PlayerController
2023-02-03 16:48:51 +08:00
c73275f2d3
Added temporary use of collision layers to C# and fixed raycast drawing
2023-02-03 16:11:30 +08:00
b81e71ed08
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2023-02-03 02:03:12 +08:00
d1a3214d41
Change banks
2023-02-03 00:40:22 +08:00
5bf3af2ed2
corrected transition to diff scenes
2023-02-03 00:03:05 +08:00
4af3440db7
added gameplay for level1 and multiplier combo is done
2023-02-02 22:44:48 +08:00
931f6fe5e2
Fixed almost everything. Ray debug drawing has a small bug
2023-02-02 20:56:55 +08:00
1d0522e334
Audio Implementation for AI
2023-02-02 16:58:40 +08:00
5b628baedf
changes breakable to only minus count on items
2023-02-02 11:16:56 +08:00
39fbfbd6fa
Added more reliable method of reloading static C# data
2023-02-01 00:34:09 +08:00
8d43fca1cc
added models for level 1 and made gamemanager a singleton
2023-01-31 18:13:34 +08:00
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
3e015d924e
Merge branch 'main' into PlayerController
2023-01-30 23:30:55 +08:00
7d9ab7a381
items changes
...
items now return back to their original position when owner collides with it
2023-01-25 18:20:26 +08:00
19c11447c0
added base to return item back to original pos
2023-01-16 21:31:38 +08:00
affa6f0dd8
added implantation for audio scripting
2023-01-16 21:05:21 +08:00
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
1302a7e58d
added jump var changes
...
change jump to be in update
added audio for AI
2022-11-25 22:53:38 +08:00
92ce7c96a8
Merge branch 'main' into PlayerController
2022-11-25 22:34:49 +08:00
fb512e7fc5
added the new banks in
...
removed unneeded bank
added new audio
2022-11-25 22:32:41 +08:00
609be908f9
Revert "Made player jumping more responsive"
...
This reverts commit d6fab4439f
2022-11-25 20:18:36 +08:00
a541565e55
Merge branch 'main' into AIFinalFixesGAM300M3
2022-11-25 20:17:11 +08:00
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
181af5b3e5
fix throw food bug
...
added inverse camera controls
2022-11-25 16:23:26 +08:00
7499011ea2
Merge branch 'main' into ScriptingAI
2022-11-25 16:14:06 +08:00
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
6ac9bc4e94
added breakables to the main game and fix issues with it
2022-11-25 14:45:19 +08:00
9daaade56a
Merge branch 'main' into PlayerController
2022-11-25 13:22:51 +08:00
d72a532623
Added object checks in leaf scripts
2022-11-25 12:09:03 +08:00
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
4daaa8e897
Added SFX to AI
...
- Footsteps, alert yell and unalert humming
2022-11-25 00:56:40 +08:00
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
f71675ad0e
Merge branch 'main' into PlayerController
2022-11-24 22:41:00 +08:00
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
c0f3720fd2
AI expected to work with the scene. To Verify.
2022-11-24 21:26:05 +08:00
9473359076
added the base for raycast in pickandthrow
2022-11-24 14:05:02 +08:00
5ee8403e80
make starting scene mainmenu
...
change playercontroller to fixed dt
2022-11-24 01:08:08 +08:00
d8b2addd1f
added the fix for AI
2022-11-23 22:44:15 +08:00
ff318cee2e
added ai scripts and in the scene
2022-11-23 21:02:33 +08:00
8469ebd960
setting the value into scripts
2022-11-23 20:48:40 +08:00
af93e59d0e
added text to maingame
2022-11-23 20:26:53 +08:00
ee4e31f45f
remove unwanted items in some scripts
2022-11-23 19:11:41 +08:00
22972d7455
updated the music banks
...
update a tem fix for physicsSystem
2022-11-23 17:37:06 +08:00
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
33bab64f12
Merge branch 'main' into PlayerController
2022-11-23 14:00:28 +08:00
5356cd0800
added item model and setting the main game scene
2022-11-23 13:44:03 +08:00
67db744856
Uninitialized List<> will no longer cause crashes with the script inspector
2022-11-23 10:08:48 +08:00
4cacbb3300
adding main/lose/win scene
2022-11-23 00:44:27 +08:00
332d0a846d
Merge branch 'main' into PlayerController
2022-11-22 22:13:52 +08:00
1bd19b90a8
Merge branch 'main' into SP3-6-c-scripting
2022-11-22 18:11:17 +08:00
4478b6db62
Added editor support for FontAsset, MeshAsset and MaterialAsset.
2022-11-22 17:48:01 +08:00
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
71e8ba6044
doing up the main menu
2022-11-22 16:18:16 +08:00
219d5025f3
adding in the env and world
2022-11-22 14:14:55 +08:00
56e7f73bbb
adding var audios into scripting
2022-11-21 21:01:44 +08:00
293cc586d1
aiming is done in player
2022-11-21 00:12:09 +08:00
875657cfde
added playerstate scripts
...
added sub folders for player
remove unneeded scripts
2022-11-20 16:27:39 +08:00
0551b1fb8a
added the new banks
...
added onplay/onpause/onstop for audiosytem
2022-11-18 17:04:06 +08:00
7d2435131f
added game manager along with scoring zones for item to be thrown in
2022-11-17 12:54:08 +08:00
e4f23dc6c3
added a game manager along with some player controller changes
2022-11-17 00:23:38 +08:00
df9cb11446
add to vel instead of setting it
2022-11-16 22:28:08 +08:00
3f3770f74f
now hard sets the vel instead of adding force
2022-11-15 18:52:46 +08:00
37bbf22779
added changes
2022-11-14 19:05:48 +08:00
bba85c3d1f
removing the constructor for c#
2022-11-14 15:20:58 +08:00
04273620a6
Merge branch 'main' into PlayerController
2022-11-14 15:03:04 +08:00
mushgunAX