51479d2bd0
Fixed bug where meshes added to the mesh library will not have correct corresponding "null" vertex bone weights and indices
2022-12-16 21:43:33 +08:00
12a46c4266
Merge branch 'main' into SP3-17-animation-system
...
# Conflicts:
# SHADE_Engine/src/Graphics/MiddleEnd/Batching/SHBatch.cpp
# SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHDebugDrawSystem.cpp
# SHADE_Engine/src/Graphics/MiddleEnd/Meshes/SHPrimitiveGenerator.cpp
# SHADE_Engine/src/Graphics/MiddleEnd/Meshes/SHPrimitiveGenerator.h
2022-12-16 12:59:11 +08:00
c479e6c8d8
Merge pull request #294 from SHADE-DP/SP3-1-DebugDraw
...
Reworked DebugDraw System
2022-12-16 02:21:32 +08:00
0a3ff527d9
SHDebugDraw drawing functions now have the colour parameter defaulted to white
2022-12-16 00:05:03 +08:00
77a164cefb
Updated C# Gizmos class with DrawCube and DrawSphere in
2022-12-15 23:33:53 +08:00
8978515cb9
Reworked SHDebugDraw to fit new interface of SHDebugDrawSystem
2022-12-15 23:25:49 +08:00
eb06eebc32
Added ability to debug draw circles
2022-12-15 20:30:20 +08:00
78575b11e4
Added debug draw of wire spheres, filled cube and filled sphere
2022-12-15 18:08:12 +08:00
b6ab7b44d9
Renamed DrawWireBox to DrawWireCube
2022-12-15 02:19:30 +08:00
9ef005346b
Merge branch 'main' into SP3-1-DebugDraw
2022-12-15 01:46:26 +08:00
98ff16d00c
Added deebug drawing of cubes of any transform
2022-12-15 01:45:44 +08:00
3041761e96
Merge branch 'main' into SP3-10-input-management
2022-12-14 16:13:27 +08:00
06cc969658
Reworked DebugDraw system (only lines now)
2022-12-14 01:20:12 +08:00
269edfcdfc
Merge pull request #293 from SHADE-DP/SP3-12-SceneGraph
...
Added ActiveInHierarchy property to Scene Nodes
2022-12-13 21:58:13 +08:00
775dcd5337
Merge branch 'main' into SP3-10-input-management
2022-12-12 20:11:51 +08:00
7820d332b1
Changed managed code's GameObject to synce with the node's active state
2022-12-12 17:58:15 +08:00
9b17c62b1d
Added active in hierarchy property to scene nodes
2022-12-12 17:07:18 +08:00
970b9e7ec0
Merge remote-tracking branch 'origin/main' into SP3-12-SceneGraph
2022-12-12 17:00:43 +08:00
82765648c4
fix colliderpanel
2022-12-12 11:49:52 +08:00
a820d19670
Merge branch 'main' into SP3-4-Editor
2022-12-12 10:39:07 +08:00
8df2d66f79
Merge pull request #291 from SHADE-DP/SP3-12-SceneGraph
...
Added Scene Init Exit events
2022-12-06 13:39:58 +08:00
4f1007e6be
Added scene init exit events
2022-12-06 13:09:47 +08:00
9eddcc8460
Merge branch 'main' into SP3-12-SceneGraph
2022-12-06 12:54:43 +08:00
9a5dc52d77
Minor fixes to input manager
...
- Pass binding names into functions by const reference instead of by value
- Fixed oversight of not being able to modify or read mouse Y positive multiplier for a binding
2022-12-05 23:25:43 +08:00
d25253118f
Merge pull request #286 from SHADE-DP/PlayerController
...
Change Script folders and added more audio
2022-11-26 10:09:23 +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
128f07030b
Merge pull request #285 from SHADE-DP/PlayerController
...
Updated Audio and Scene along with bug fixes
2022-11-25 23:11:01 +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
e20675b144
Merge pull request #284 from SHADE-DP/Fix-Material
...
Fixed crash which occurs when changing the material of an object twice in a row in the inspector
2022-11-25 22:34:31 +08:00
c098f92532
Merge pull request #283 from SHADE-DP/AIFinalFixesGAM300M3
...
Fixed AI C# Script for final submission
2022-11-25 22:33:57 +08:00
fb512e7fc5
added the new banks in
...
removed unneeded bank
added new audio
2022-11-25 22:32:41 +08:00
c84e33731b
Fixed crash which occurs when changing the material of an object twice in a row
2022-11-25 22:24:30 +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
6694ce2e17
Merge pull request #282 from SHADE-DP/MergeAIToMainScene
...
Added in AI to maingame.shade
2022-11-25 19:05:31 +08:00
27aadf67d3
threw in AI to maingame.shade
2022-11-25 19:03:23 +08:00
173b10ca64
Merge pull request #281 from SHADE-DP/PlayerController
...
Updated Player and MainGame scene, fix bugs
2022-11-25 16:34:51 +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
b778b6d6e9
Merge pull request #280 from SHADE-DP/SP3-2-Physics
...
Fixed transform updates to clear dirty flags appropriately
2022-11-25 15:10:32 +08:00
6ac9bc4e94
added breakables to the main game and fix issues with it
2022-11-25 14:45:19 +08:00
1cfd3cfd3a
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-11-25 14:06:28 +08:00
afd2abf036
Fixed pre & post physics transforms update routines
2022-11-25 14:06:20 +08:00
43a5cb4deb
Reverted world extents computation
2022-11-25 14:05:43 +08:00
9daaade56a
Merge branch 'main' into PlayerController
2022-11-25 13:22:51 +08:00
Kah Wei