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
e0ee2a8079
Gameplay UI progress
2023-03-02 09:55:41 +08:00
9dd01f5fa1
Replaced How to play screen and credits placeholder
2023-03-02 03:01:24 +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
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
a65735e0b3
progress
2023-03-01 16:37:33 +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
4e56061ebe
adjust text in cutscene
2023-02-28 22:53:54 +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
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
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
4c7d06452e
viewport changed
2023-02-27 15:25:01 +08:00
08e4db134a
Tweaked main menu UI
2023-02-27 15:16:48 +08:00
db8ed27cb7
main Menu layout complete for now
2023-02-27 10:05:30 +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
eb3d8b6b8b
Slider done, Slider Shader bugged
2023-02-27 05:42:54 +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
acc548678e
Merge branch 'main' into PlayerController
2023-02-24 21:10:10 +08:00
d85382a06d
Merge pull request #363 from SHADE-DP/SP3-1-Rendering
...
Implemented scanline and silhouette effect
2023-02-24 17:20:45 +08:00
18f6720055
Merge branch 'main' into SP3-1-Rendering
2023-02-24 17:18:40 +08:00
6045214b13
Camera width to resize with view port
2023-02-24 15:35:02 +08:00
f7bb8606be
Shader, text, asset manager events and generic data desc sets
...
- Made shader for shiniy effect (half done)
- Text objects in scene now use a UI component for better scaling
- Asset manager now creates an event for compilation of assets
- Descriptor for generic data is implemented
2023-02-22 16:39:21 +08:00
8d10c48645
Bug fixes and WIP for alpha
2023-02-21 19:31:50 +08:00
269d5ffc15
Merge pull request #356 from SHADE-DP/SP3-20-UI-System
...
Added 3 button event. Changed hovered and clicked boolean to be stored in UIComponent instead. Fixed Canvas Scaling matrix.
2023-02-21 15:49:27 +08:00
a3112f9c60
Fixed Canvas Scaler to keep AR of the UI Elements
2023-02-21 10:48:07 +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
5acca02363
Implemented different shadow mapping technique
2023-02-15 21:34:22 +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
e41c161202
Adjusted lighting a bit cuz it looked janky at one portion
...
Hide and clip mouse cursor for builds without editor (only when window is active)
2023-02-04 11:21:25 +08:00
d1ae9b3756
Fix camera arm and win scene issue
2023-02-04 02:42:30 +08:00
f617a1a984
Merge pull request #345 from SHADE-DP/SP3-141-Camera-System
...
Camera Collision fix. Still have some minor bugs
2023-02-04 02:39:55 +08:00
1f7f86dd01
Merge remote-tracking branch 'origin/main' into main
2023-02-04 02:39:37 +08:00
33807de93d
Pushed scene change and animator component bug fix for models without rigs
2023-02-04 02:32:35 +08:00
c5296db6f6
Camera Collision fix
2023-02-04 02:20:42 +08:00
5b6217f923
Merge branch 'main' into SP3-141-Camera-System
2023-02-04 02:10:16 +08:00
94fe055aa9
fixed collision
2023-02-04 02:10:08 +08:00
0c455c55f6
correct collision tag issue and fix player controller keypress
2023-02-04 02:05:32 +08:00
44e28f0d3f
Merge branch 'main' into SP3-141-Camera-System
2023-02-04 01:20:45 +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
81d63f9776
Merge branch 'main' into SP3-141-Camera-System
2023-02-04 00:43:41 +08:00
63a546b7aa
Merge branch 'main' into SP3-141-Camera-System
2023-02-04 00:32:41 +08:00
4de32341e1
Merge branch 'main' into SP3-20-UI-System
2023-02-04 00:24:59 +08:00
c88ce23d45
WIP collision
2023-02-04 00:17:29 +08:00
3cd1778d08
Fixed SHUIComponent serialization
2023-02-04 00:04:25 +08:00
0281446538
Merge remote-tracking branch 'origin/main' into main
2023-02-03 23:50:40 +08:00
1bae1c97d6
Added demo animation objects
2023-02-03 23:50:35 +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
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
e00b891bf7
added lights to level 2
2023-02-03 22:03:55 +08:00
36de32447d
Fixed some bugs with serialisation
2023-02-03 18:40:45 +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
b6d91d5492
Fixed bug with collision tags not behaving as intended
...
Why the damn hell must react's system be so confusing??
2023-02-03 01:37:45 +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
d5c731dd20
Fixed collision shape debug drawing and more serialisation bugs
2023-02-02 20:48:32 +08:00
3593df3ada
Fixed collider shape serialisation
2023-02-02 20:15:59 +08:00
71f4cdd29e
Fixed rigidbody serialisation
2023-02-02 19:23:42 +08:00
6a57be2e60
Refactored old physics to match new interface
...
Compiles but still buggy, need a bit of time to clear up all the bugs
2023-02-02 19:06:56 +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
3ff2e6bb92
Revert "Implemented a custom physics engine"
2023-01-30 14:40:55 +08:00
4ed7aa3aed
Reverted an attempt to stabilise edge detection between polyhedrons
2023-01-23 03:03:40 +08:00
5730381302
Physics objects can be implicity static if only a collider was added.
...
Removed the need to create an extra body. Math is great.
2023-01-23 00:56:46 +08:00
a0f6cd3ae7
Cached SAT for improved stability
...
The effects of baumgarte stabilisation can be rather obvious especially when polyhedrons are thrown around at angles. Regardless, the system is relatively stable bar the added energy from the solving method, which may make for a more "bombastic" physics playground
2023-01-23 00:37:22 +08:00
0c3106f15b
Abstracted contact derivation as setup for cached SAT
2023-01-22 19:20:03 +08:00
1dc16fdcda
Fixed typos
2023-01-22 17:38:51 +08:00
36e01260ec
Merge changes from main missing from previous commit
2023-01-16 16:23:48 +08:00
dc55c31c36
Merge remote-tracking branch 'origin/main' into SHPhysics
2023-01-16 16:23:20 +08:00
8475bdccd7
Merge remote-tracking branch 'origin/main' into SHPhysics
2023-01-16 16:22:59 +08:00
09911cc50c
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2023-01-16 15:33:37 +08:00
e115d4b965
Reverted light properties back to main
2023-01-16 15:33:20 +08:00
c077575a73
Fixed convex-convex face detection
...
Minor bugs with contact point detection. Will test more before pushing into main
2023-01-16 15:01:14 +08:00
a41354f2ce
Added changing texture of buttons
2023-01-16 14:35:16 +08:00
02ba0c6dc9
merge
2023-01-16 11:44:34 +08:00
0c7224b8be
Merge branch 'main' into UI-Test
2023-01-16 11:37:38 +08:00
5190c490c9
added events
2023-01-16 11:36:12 +08:00
5aa7bfe03e
button fixed
2023-01-16 07:34:44 +08:00
19bffc9124
First half of re-implementing face-face contact derivation
2023-01-16 02:44:27 +08:00
ef5016351b
Reverted changes to inertia tensors
...
Created a new branch since I reverted to an older commit but kept some new updates. This will be the main branch moving forward.
2023-01-13 15:26:21 +08:00
f217562fef
Shadows are sort of working
2023-01-11 20:04:53 +08:00
4cd9a6cea0
shadows WIP
2023-01-11 10:35:29 +08:00
4a06032bea
Shadows WIP
2023-01-11 08:25:38 +08:00
88491ffbd8
ToggleButton fix
2023-01-09 09:56:46 +08:00
e89b6f5c4c
Fixing button
2023-01-09 09:38:53 +08:00
5f11a931c7
Added Toggle Button, Fixed canvas Scalar
2023-01-09 09:24:20 +08:00
b293b28a56
Button fix
2023-01-09 07:14:40 +08:00
8ca4045d55
R for retard
2023-01-05 17:53:48 +08:00
0c92e7ff6c
Added more comments and clarity for polyhedron edge contacts
2023-01-05 14:40:59 +08:00
68e11ba48e
Added edge vs edge contacts for convex polyhedron collisions
2023-01-05 13:42:17 +08:00
c484a088fd
Added first half of Gauss Map Optimised SAT
2023-01-05 01:12:25 +08:00
a49c674c2b
Generalised the Parallel Axis Theorem for computing inertia tensors
2023-01-04 15:03:58 +08:00
f7e867098d
Small changes to rigidbody tooltips
2023-01-03 20:30:20 +08:00
b2645fb584
Added support for composite colliders
2023-01-03 18:53:21 +08:00
0460d776b0
Fixed collision tag panel fallacies and saving of tag masks
2023-01-03 10:40:02 +08:00
1b5024793c
Added debug drawing for rays
2023-01-03 10:14:39 +08:00
1f2a9820d1
Readded collision tags and moved collision filtering to an earlier stage
2023-01-02 22:49:12 +08:00
58a44997b2
Reworked raycasting on engine side. Re-added raycasting to scripting
2023-01-02 22:31:48 +08:00
6f55f202b9
Added planes
2023-01-01 16:53:13 +08:00
37db6a2bf1
Merge remote-tracking branch 'origin/main' into PhySH
2023-01-01 14:11:47 +08:00
f3c0bdbcfd
Clean up
2023-01-01 03:24:34 +08:00
67907b1ca9
Replaced twin-edge dependency on sphere vs convex polyhedron
2023-01-01 02:48:02 +08:00
00f8726e46
Solved edge case for sphere vs convex polyhedron
2023-01-01 02:42:44 +08:00
3a7336fe15
Improved stability of sphere vs convex polyhedron except for one edge case
2022-12-31 18:43:46 +08:00
6451ca5e95
forgot to flip a normal
2022-12-31 01:40:28 +08:00
896b47c1a0
Fixed and optimised sphere vs convex polyhedron
...
Improved sphere vs convex polyhedron from O(n^2) to O(n). Math is amazing.
2022-12-31 01:11:25 +08:00
82d46fce99
Fixed voronoi region tests for sphere vs convex polyhedron
2022-12-30 23:53:45 +08:00
3586c7ffdc
Added mostly working sphere vs convex polyhedron collision detection
2022-12-30 21:43:22 +08:00
50e3ddf0dd
Fixed box inertia tensor calculation
2022-12-30 17:59:59 +08:00
400cbb35d9
Partial implementation of a generic convex polyhedron object
2022-12-30 00:45:37 +08:00
8e2c32d110
Graphics refactor more or less tested and working
...
- Descriptors sets are now independent from a set index. Camera matrices for example can be bound to set index 1 for the batching system but index 2 for compute shaders.
- Truly global descriptors sets (misc data, textures and light data) are now manually bound to a global static class that allows retrieval of these sets to be bound whenever in the middle end.
- Predefined descriptor set layouts (but not truly global such as camera data, materials and font) have their layouts predefined in a class and used for descriptor set initialization within the middle end. The sets themselves are allocated using these layouts (also accessible globally).
- Descriptor sets that are more flexible with their bindings such as render graph resources are introspected from shaders and not predefined at all (though their types are recorded in SHGraphicsPredefinedData to avoid magic numbers when binding descriptor sets in some systems).
- Systems now have fixed mappings for descriptors used in shaders and these are defined in SHGraphicsPredefinedData. Batching for example has 3 fixed descriptors: Static global bound at 0, camera data bound at 1, materials bound at 2.
- Viewports no longer contain renderers and renderers no longer contain render graphs. The graphics system only has 1 render graph and subpasses can have both viewports and renderers bound to them to have options for viewport/scissor and camera settings.
- Light data is now bound before every compute system.
- There is only 1 render graph in the entire system and contains only 6 nodes: G-Buffer pass (with lighting compute pass), debug draw with depth, debug draw, screen space pass, dummy pass for transition to input attachment for imGui and lastly the imGui pass for rendering editor to swapchain.
2022-12-29 14:29:25 +08:00
0df6e09ed6
Added box collision shapes
2022-12-24 13:32:50 +08:00
89f1f60064
Added physics settings menu for easily toggling debug draw states
2022-12-24 02:19:53 +08:00
b667e4df87
Implemented axis locking constraints
2022-12-22 03:11:14 +08:00
f4f6cb7eae
Fixed sequential impulses
2022-12-22 01:10:25 +08:00
92ed8a29ff
Fixed bug with non-dynamic masses being overriden
2022-12-21 19:04:10 +08:00
d109d06764
Implemented sequential impulses using baumgarte stabilisation
...
There is a bug with masses of static bodies not being properly set
2022-12-21 18:57:10 +08:00
265a5bece8
Slight refactor to fix collision states for very fast moving objects
2022-12-21 00:40:01 +08:00
751a16dcc3
Tested collision detection with collision states
2022-12-20 02:13:06 +08:00
cf9d4ef04b
Implemented backbone for collision detection with broadphase
2022-12-19 16:56:34 +08:00
6b8232ae91
Fixed bug where intertia tensors were not reset when unlocking axes
2022-12-16 02:02:20 +08:00
27760a95c9
Tested physics interactions with scripts
2022-12-15 23:00:15 +08:00
af3a5e7dc9
Re-implemented Collider Debug Drawing
2022-12-13 03:54:37 +08:00
c1d7702914
Moved debug draw state to colliders. Synced collider positions with rigid bodies
2022-12-11 20:12:26 +08:00
38b1c46d1f
Added physics world and tested applied gravity for linear movement
2022-12-05 00:20:29 +08:00
ca45a12186
Restructured Physics Systems & Interfaces
2022-12-04 17:31:22 +08:00
6cd203179a
Added Rigid Body
2022-12-02 19:01:08 +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
cae8358341
updated scene changes
2022-11-25 23:10:17 +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
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
27aadf67d3
threw in AI to maingame.shade
2022-11-25 19:03:23 +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
413156dabb
Merge branch 'main' into PlayerController
2022-11-25 15:45:35 +08:00
6ac9bc4e94
added breakables to the main game and fix issues with it
2022-11-25 14:45:19 +08:00
afd2abf036
Fixed pre & post physics transforms update routines
2022-11-25 14:06:20 +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
f3e7f1747a
Merge branch 'main' into SP3-141-Camera-System
2022-11-25 10:06:11 +08:00
428f8f29c6
Camera collision. WIP
2022-11-25 10:06:02 +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
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
ff318cee2e
added ai scripts and in the scene
2022-11-23 21:02:33 +08:00
caefae3aac
added the change scene into winscene
2022-11-23 20:51:22 +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
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
8ad46afc22
Removed spaces from UI Test scene to stop regenerating of asset meta
2022-11-23 13:06:50 +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
7c36886669
Fix for Canvas scaler
2022-11-22 21:03:53 +08:00
142f025692
Added check for editor camera.
2022-11-22 20:54:16 +08:00
053c3e04fd
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-11-22 19:26:47 +08:00
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
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
81d44e6c59
small changes to the scene
2022-11-22 14:59:46 +08:00
219d5025f3
adding in the env and world
2022-11-22 14:14:55 +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
a77740db51
Merge branch 'main' into PlayerController
2022-11-18 17:16:04 +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
maverickdgg