27760a95c9
Tested physics interactions with scripts
2022-12-15 23:00:15 +08:00
98ff16d00c
Added deebug drawing of cubes of any transform
2022-12-15 01:45:44 +08:00
06cc969658
Reworked DebugDraw system (only lines now)
2022-12-14 01:20:12 +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
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
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
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
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
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
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
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
6d2591331b
Merge pull request #257 from SHADE-DP/SP3-6-c-scripting
...
Fixed bug where rendering inspectors for scripts that contain uninitialized List<T>s causes crashes
2022-11-23 13:49:42 +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
0edd2f24e3
Added VS and FS shaders to tile singular textures
...
Added shader stage flag bit for vertex shaders
2022-11-23 13:02:33 +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
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
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
f1c7f42e13
Merge branch 'main' into PlayerController
2022-11-22 16:21:28 +08:00
71e8ba6044
doing up the main menu
2022-11-22 16:18:16 +08:00
1ca216801f
Merge pull request #245 from SHADE-DP/SP3-1-Rendering
...
Updated SSAO shader
2022-11-22 16:01:11 +08:00
780c716199
Updated SSAO shader
2022-11-22 16:00:05 +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
3b6d1c815d
Merge branch 'main' into SP3-17-animation-system
2022-11-22 13:55:17 +08:00
6c4ec7c807
Merge branch 'main' into PlayerController
2022-11-22 13:44:27 +08:00
437cb075d3
Merge pull request #242 from SHADE-DP/SP3-141-Camera-System
...
FIxed major crashes caused by main camera retrieval and entity destroy
2022-11-22 12:55:17 +08:00
858e200fb3
Bug fixes
2022-11-22 11:32:19 +08:00
4377972315
Added functionality for graphics system to render to swapchain image
...
- Added functionality for graphics system to render to swapchain image when SHEDITOR is disabled. This is done via rendering a simple quad on screen and using an input attachment as a texture to the shader.
2022-11-22 10:10:26 +08:00
964b375ccd
Write to swapchain image without SHEDITOR defined WIP
2022-11-22 09:05:56 +08:00
56e7f73bbb
adding var audios into scripting
2022-11-21 21:01:44 +08:00
1ff8c9715d
Merge branch 'main' into SP3-17-animation-system
2022-11-21 12:15:57 +08:00
293cc586d1
aiming is done in player
2022-11-21 00:12:09 +08:00
e10c1f518f
Merge pull request #234 from SHADE-DP/SP3-1-Rendering
...
Implemented serialization and editor inspector display for text renderer component
2022-11-20 22:41:06 +08:00
5d3603ac7d
Text Renderer Component serialization
2022-11-20 22:24:24 +08:00
c686954c77
Implemented Text Rendering
...
- The Text Renderer Component serialization and reflection onto inspector is not in yet, but there is basic functionality.
- Updated shaders
- Topology for text rendering is changed to triangle fan. Front facing for primitives is clockwise. Vertex state has both the positionOffset and glyphIndex attribute set as instanced.
- Freetype instance is now initialized in InitBoilerplate
- SHCamera no longer calling SetPerspective/Ortho inside HandleResize
- Font Geometry is now loaded in SHFontLoader into SHFontAsset fontGeometry variable.
2022-11-20 19:03:12 +08:00
5871f32547
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-11-20 17:23:38 +08:00
8107c92754
Merge branch 'main' into PlayerController
2022-11-20 16:53:12 +08:00
875657cfde
added playerstate scripts
...
added sub folders for player
remove unneeded scripts
2022-11-20 16:27:39 +08:00
a0f4f3b00a
Added collision tag names file
2022-11-20 15:32:33 +08:00
575132c4bb
Added UI Component check in SHBatch
...
- UI Component shader changes
- Fixed picking issue
2022-11-20 01:45:14 +08:00
841948b82c
Added support for Bone Weights and Bone Indices vertex attributes for meshes
2022-11-20 01:33:55 +08:00
d55adcdfe4
Merge remote-tracking branch 'origin/main' into UI_Integration
2022-11-19 22:08:16 +08:00
6d1f30e05b
Merge branch 'SP3-1-Rendering' into UI_Integration
2022-11-19 21:45:21 +08:00
223276dd87
Created partial functionality to render a texture to swapchain image
2022-11-19 21:44:41 +08:00
798803cf81
UI WIP
2022-11-18 22:03:21 +08:00
a77740db51
Merge branch 'main' into PlayerController
2022-11-18 17:16:04 +08:00
0551b1fb8a
added the new banks
...
added onplay/onpause/onstop for audiosytem
2022-11-18 17:04:06 +08:00
03ce142137
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2022-11-18 16:37: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
f991e7b227
Fixed some text shaders and changed some image parameters
...
- SHApplication has a font compiler exe call to test compiling a sample font
- SHVkImage now takes in a vector instead of a span for mip offsets (fuck it, copy the mip offset. The RAM can cry about it).
- Removed font data descriptor set layouts from graphics global data
- FONT_DATA set index is changed to 4 instead. This clashes with Render graph resource set index but it won't matter.
- Added entity ID render graph resource to scene render graph
- SHFont format for images is now R8G8B8A8UNorm
2022-11-16 16:57:08 +08:00
3affaf426d
WIP Runtime Material Editing support
2022-11-16 09:06:29 +08:00
3f3770f74f
now hard sets the vel instead of adding force
2022-11-15 18:52:46 +08:00
96cb832e81
Font meta file and line in application to manually trigger font load
2022-11-15 13:48:54 +08:00
4eb5fa64e0
Text Rendering WIP
2022-11-14 19:31:26 +08:00
37bbf22779
added changes
2022-11-14 19:05:48 +08:00
2a05d821d5
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2022-11-14 18:36:33 +08:00
d95ed3f067
Text Rendering WIP
2022-11-14 18:36:26 +08:00
22da6e237d
Merge branch 'main' into PlayerController
2022-11-14 16:17:03 +08:00
ac17721363
Merge branch 'main' into SP3-1-Rendering
2022-11-14 15:38:33 +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
3c61b7519b
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-11-14 00:25:52 +08:00
fe1b9d14f5
Partial implementation of syncing SHADE and ReactPhysics active states
2022-11-14 00:25:24 +08:00
d9beeda7e0
adding the base for fsm for player
2022-11-13 21:56:28 +08:00
e3d2515740
Modular house part asset test
2022-11-13 20:49:31 +08:00
d0bcd4869f
Removed unused raw asset files
2022-11-13 20:19:26 +08:00
a8d4f9c756
On building of asset file directory, check for recognised assets without meta file and generate
2022-11-13 19:51:19 +08:00
c953931f4f
Merge branch 'main' into SP3-2-Physics
2022-11-13 17:57:30 +08:00
eed950f26f
Merge branch 'main' into SP3-4-Editor
2022-11-13 17:26:56 +08:00
b1c004771c
Gave the damn entities names cuz i was going crazy
2022-11-13 17:26:35 +08:00
4dc8527395
Reworked scripts to no longer need definition of constructors
2022-11-13 16:29:25 +08:00
3512ed3397
AHHHHHH
...
i want to pull my hair out
2022-11-13 15:50:03 +08:00
86ca047c88
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-11-13 14:49:44 +08:00
f8bbcdd909
Small fixes
2022-11-12 17:28:49 +08:00
4ad23a605f
Fixed compilation issues from merge
2022-11-12 17:04:09 +08:00
3faf3804aa
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-11-12 16:57:45 +08:00
24dcd77f32
Added tooltip and range attribute support for lists in scripts
2022-11-12 12:17:11 +08:00
4c01d68f95
Added list editor tests
2022-11-12 02:33:12 +08:00
fbec2bf866
Auto stash before merge of "main" and "origin/main"
2022-11-11 14:17:47 +08:00
4f9015995c
Merge branch 'main' into PlayerController
2022-11-11 09:21:36 +08:00
8670b419d0
Merge branch 'main' into SP3-6-c-scripting
2022-11-10 22:25:58 +08:00
9d367a359a
Text Rendering WIP
2022-11-10 16:59:26 +08:00
c40992b48c
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-11-10 14:44:18 +08:00
3efecd64e7
Added box & sphere debug draw for physics
2022-11-10 14:30:30 +08:00
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
be6a11c629
Text Rendering WIP
2022-11-10 08:28:44 +08:00
eeab3494ba
Reworked SceneGraph Interface
2022-11-10 03:30:02 +08:00
f8417f6116
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-11-08 15:22:28 +08:00
ddd93a85f4
Added support for null GameObjects (loading is buggy)
2022-11-08 00:53:47 +08:00
8fbd32a144
Added Relative Sizes to Shapes
2022-11-08 00:46:09 +08:00
de38b29f25
small fixes for ms2 submission
2022-11-05 18:15:18 +08:00
ab17d57756
Asset browser now recurses down subassets
2022-11-04 23:32:29 +08:00
b30da7e495
Fixes
2022-11-04 19:16:32 +08:00
b86f092f52
Merge branch 'main' into SP3-305-configurationsMerge
2022-11-04 18:37:19 +08:00
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
6d0089ee12
Merge branch 'main' into SP3-13-Assets-Manager
2022-11-04 17:49:13 +08:00
04113a0480
Shifted assets and generated new assets
2022-11-04 17:17:24 +08:00
4eecc0c08d
Removed old mesh and meta files
2022-11-04 16:23:13 +08:00
4ee0294977
Scene loads correctly now
2022-11-04 14:44:18 +08:00
eea35600d3
Switched shaders to use multiply colour instead of additive
2022-11-04 14:04:59 +08:00
5fe10ce8d1
Changes to main for presentation
...
Change TestCube_FS.glsl
Change debugdraw Key input to F10
TestScene changes
AI waypoint changed
playercontroller camera axis change
2022-11-03 01:50:02 +08:00
86254a5bf3
Merge branch 'main' into SP3-4-Editor
2022-11-02 21:41:38 +08:00
e609b5634a
Material Inspector
...
Can set material
2022-11-02 21:31:27 +08:00
ebc94225e7
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2022-11-02 17:04:31 +08:00
73be299aae
new SHMETA
2022-11-02 15:05:34 +08:00
eb569a4263
Shader updates
2022-11-02 14:21:27 +08:00
b0d08d27fd
SSAO is fully implemented
2022-11-01 20:10:59 +08:00
Diren D Bharwani