7e1a909709
Merge pull request #179 from SHADE-DP/FixesForMs2Submission
...
small fixes for ms2 submission - delete this branch
2022-11-05 18:18:40 +08:00
de38b29f25
small fixes for ms2 submission
2022-11-05 18:15:18 +08:00
5506d14f84
Merge pull request #178 from SHADE-DP/PlayerController
...
made rb a properties
2022-11-05 17:46:16 +08:00
b9996c7b51
made rb a properties
2022-11-05 17:44:34 +08:00
a5c0456eb7
Merge pull request #177 from SHADE-DP/SP3-6-c-scripting
...
Scenes are now reloaded and scripts are no longer lost when building scripts
2022-11-05 15:36:05 +08:00
04e2c255b0
Build script options are now disabled when in play or pause mode
2022-11-05 15:34:56 +08:00
09f1b152e8
Merge branch 'main' into SP3-1-Rendering
2022-11-05 15:10:50 +08:00
06afd384af
Scenes are now reloaded and scripts are no longer lost when building scripts
2022-11-05 14:56:52 +08:00
29c25c2d6d
Merge pull request #176 from SHADE-DP/SP3-1-BuiltInMesh
...
Pregenerates default meshes and provides a function to retrieve them
2022-11-05 00:13:45 +08:00
81d94c0a29
Merge remote-tracking branch 'origin/main' into main
2022-11-05 00:13:29 +08:00
7bfe459c02
Called assimp git pull from root bat directly instead of calling bat inside dependency
2022-11-05 00:13:24 +08:00
40422a6d23
Added built-in primitives
2022-11-05 00:10:54 +08:00
841a73b712
Merge pull request #175 from SHADE-DP/SP3-4-Editor
...
Asset browser now recurses down subassets
2022-11-04 23:35:41 +08:00
ab17d57756
Asset browser now recurses down subassets
2022-11-04 23:32:29 +08:00
740c144565
Merge pull request #174 from SHADE-DP/SP3-305-configurationsMerge
...
Scenes now load from file based on application config starting scene id
Added application config
Load starting scene from application config
Pressing play saves the scene
Pressing stop reloads the scene
2022-11-04 19:21:42 +08:00
b5bc64456c
Added debug names for some SHVkBuffers
2022-11-04 19:16:57 +08:00
b30da7e495
Fixes
2022-11-04 19:16:32 +08:00
d8ee991213
Steps in the rendering process are now highlighted and named for debugging tools
2022-11-04 18:39:45 +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
378e4a67ce
Merge pull request #173 from SHADE-DP/SP3-13-Assets-Manager
...
Support for External Model Compiler and Model/Mesh sub assets
Compiling of external files (.gltf, .fbx) done by externally built exe
Models recognised as whole assets, contained meshes recognises and individual assets as well but saved into one file
Structured control paths for assets with and without sub assets for loading
2022-11-04 17:53:04 +08:00
f2b589071c
Merge branch 'main' into SP3-13-Assets-Manager
2022-11-04 17:49:43 +08:00
6ad6db7997
Merge pull request #172 from SHADE-DP/PlayerController
...
additional changes for player controller
added itemweight to affect player jump
small bug fix to player throw
player caught will now reset its location
2022-11-04 17:49:25 +08:00
6d0089ee12
Merge branch 'main' into SP3-13-Assets-Manager
2022-11-04 17:49:13 +08:00
be16fbed19
added item script in the scene
2022-11-04 17:35:09 +08:00
d6804c09f4
fixed player throwing
...
added item script
player jump is now affected by item weight
2022-11-04 17:31:53 +08:00
9ef956029e
Changed name check for hardcoded racoon mesh
2022-11-04 17:20:52 +08:00
1f0d54486d
Added sub asset data members
...
Changed some control flow in asset manager to accommodate for subassets
Read/Write meta files for assets with sub assets
2022-11-04 17:20:42 +08:00
6984653b64
Renamed and restructured model asset members
...
Added mesh asset vector for model asset to contain
2022-11-04 17:18:40 +08:00
608b204f88
Changed premake to copy model compiler exe
2022-11-04 17:17:48 +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
3b90c84a85
Merge pull request #171 from SHADE-DP/SP3-4-Editor
...
Fix drag-drop parenting issue
Users can now drop onto empty space in hierarchy panel to unparent
2022-11-04 16:11:38 +08:00
c7f6ded5ae
Merge pull request #170 from SHADE-DP/Fix-MultiplyShader
...
Switched shaders to use multiply colour instead of additive
2022-11-04 16:11:12 +08:00
2b34e8c13b
Fix drag-drop parenting issue
...
Users can now drop onto empty space in hierarchy panel to unparent
2022-11-04 16:09:15 +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
74b9882024
Merge pull request #169 from SHADE-DP/ScriptingAI
...
AI Capture Mechanic
AI will set player's state to 'CAUGHT' if close enough. This threshold distance can be set in the editor.
2022-11-04 10:34:50 +08:00
ecd1efee56
AI Capture Mechanic
2022-11-03 21:25:43 +08:00
544716547e
Added preprocessor check for debug to turn off renderdoc
2022-11-03 02:37:38 +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
f24346a6fd
Revert "TEMPORARY Push with all relative paths changed for building exe"
...
This reverts commit 0979ee93e6
2022-11-03 00:11:56 +08:00
0979ee93e6
TEMPORARY Push with all relative paths changed for building exe
2022-11-02 22:44:27 +08:00
c96eeb7c5b
Removed xml
2022-11-02 22:36:44 +08:00
09792d23ad
Merge pull request #165 from SHADE-DP/ScriptingAI
...
AI Prototype implemented
Runs about four fixed corners in the scene. Chases an object called "Player" if it exists and is close enough. Stops chasing and resumes patrol if player is far enough.
2022-11-02 22:36:16 +08:00
02e9df4df7
Merge pull request #164 from SHADE-DP/SP3-10-input-management
...
Zero out arrays in input manager
Properly zero out arrays in input manager so that it works in Release Mode, where arrays are not zeroed-out to save time.
2022-11-02 22:35:57 +08:00
4b09f42adc
Merge pull request #168 from SHADE-DP/SP3-4-Editor
...
Added material inspector and setting of materials
Fixed imgui breaking in release
Added material inspector
Allow setting of materials to renderable component
2022-11-02 21:48:07 +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
d1f624b2eb
Removed SHMeshData declaration/definition in graphics middle end
...
Renamed some data members in SHMeshData
Replaced calls and references to mesh data in Primitive Generator
2022-11-02 21:09:53 +08:00
XiaoQiDigipen