Xiao Qi
0373754e37
Merge branch 'main' into SP3-5-ECS
2022-09-16 14:06:05 +08:00
XiaoQiDigipen
7a7807b7fa
Merge pull request #26 from SHADE-DP/BackTo5.0
...
Downgraded back to .NET 5.0 due to lack of VS 2019 support
2022-09-16 14:05:30 +08:00
Kah Wei
c89fe48182
Merge branch 'BackTo5.0' into SP3-6-c-scripting
2022-09-16 14:04:56 +08:00
Kah Wei
aaf3d67eed
Downgraded back to .NET 5.0 due to lack of VS 2019 support
2022-09-16 14:02:55 +08:00
Kah Wei
da582e0f1d
added serial
2022-09-16 13:58:08 +08:00
Sri Sham Haran
6f67c1acc7
Base Editor (WIP, no vulkan)
2022-09-16 13:55:29 +08:00
Kah Wei
b933b0f7fc
Added SerializeField attribute
2022-09-16 13:13:38 +08:00
Brandon Mak
f0b9f19f4d
clear color value fix
2022-09-16 12:33:42 +08:00
XiaoQiDigipen
cf3f74e47d
Merge pull request #25 from SHADE-DP/SP3-18-Events
...
SP3-18 SP3-108 Event/Messaging System
Ported over Events Manager from 200
Removed singleton design pattern
Removed event package design
Implemented event dynamic data
Instructions to use are in SHEventManager.h
2022-09-16 01:33:47 +08:00
Xiao Qi
1dde480a9f
Merge branch 'main' into SP3-18-Events
2022-09-15 18:38:11 +08:00
Xiao Qi
f9743f394d
Added some lines in comments for clarity
2022-09-15 18:37:05 +08:00
Xiao Qi
e1074887c8
Added instructions
2022-09-15 18:34:07 +08:00
Xiao Qi
5af0bf7d25
Instructions on how to use events
2022-09-15 18:33:36 +08:00
XiaoQiDigipen
415451535c
Merge pull request #24 from SHADE-DP/IgnoreVcxProjSln
...
Removed and ignored VS project and solution files
2022-09-15 17:10:33 +08:00
Kah Wei
382d75528a
Removed and ignored VS project and solution files
2022-09-15 12:50:48 +08:00
XiaoQiDigipen
ae570969ad
Merge pull request #23 from SHADE-DP/SP3-6-c-scripting
...
Integration of .NET Scripting Backend
After this is merged, the following tools need to be installed in Visual Studio:
C++/CLI support for v142 build tools
.NET 6.0 Runtime
2022-09-15 12:31:30 +08:00
Kah Wei
2714503efa
Fixed warnings
2022-09-15 12:28:53 +08:00
Kah Wei
e5b7742955
Merge branch 'main' into SP3-6-c-scripting
...
# Conflicts:
# Dependencies.bat
2022-09-15 12:22:37 +08:00
maverickdgg
7900c52984
Merge branch 'main' into SP3-5-ECS
2022-09-15 12:18:20 +08:00
maverickdgg
6da2fa9c4e
Merge pull request #22 from SHADE-DP/SP3-209-System-Manager-Rework
...
Sp3 209 system manager rework
2022-09-15 12:14:14 +08:00
Glence
58cd71110a
Merge remote-tracking branch 'origin/main' into main
2022-09-15 12:10:50 +08:00
Glence
f6ad22530a
fix dependencies.bat
2022-09-15 12:10:45 +08:00
maverickdgg
a90c137445
#comment Completed System Routine Added Unit Test version 1
2022-09-15 12:10:06 +08:00
Xiao Qi
ddf6a7bee5
SP3-108
...
Removed singleton instance from event manager and changed it to static class instead.
WARNING: Might need to change back to singleton next time, I had to do it previously for some reason but I don't remember why
2022-09-15 12:06:09 +08:00
Kah Wei
972fe46ec2
Merge branch 'main' into SP3-6-c-scripting
...
# Conflicts:
# SHADE_Engine/SHADE_Engine.vcxproj
# SHADE_Engine/SHADE_Engine.vcxproj.filters
# SHADE_Engine/premake5.lua
2022-09-15 12:05:12 +08:00
XiaoQiDigipen
e1b7cb05bf
Merge pull request #20 from SHADE-DP/CopySDLDLL
...
SHADE_Engine now copies the SDL2.dll to the out directory
2022-09-15 12:02:45 +08:00
Kah Wei
e1fb74f784
SHADE_Engine now copies the SDL2.dll to the out directory
2022-09-15 11:55:22 +08:00
Kah Wei
9b25d909dd
Merge branch 'main' into SP3-6-c-scripting
...
# Conflicts:
# SHADE_Engine/SHADE_Engine.vcxproj.filters
2022-09-15 11:43:30 +08:00
Kah Wei
10c38a10a7
Merge branch 'DisableDllWarnings' into SP3-6-c-scripting
...
# Conflicts:
# Dependencies.bat
# SHADE_Application/SHADE_Application.vcxproj
# SHADE_Application/premake5.lua
# SHADE_Application/src/Application/SBApplication.cpp
# SHADE_Engine/SHADE_Engine.vcxproj
2022-09-15 11:43:03 +08:00
XiaoQiDigipen
d680a07918
Merge pull request #19 from SHADE-DP/DisableDllWarnings
...
Disable DLL Export Warnings (4251)
Might not be the 100% correct way but in existing usage in GAM 200, there were no issues at all.
2022-09-15 11:38:27 +08:00
XiaoQiDigipen
5ebdf87714
Merge pull request #18 from SHADE-DP/SP3-19-frame-rate-controller
...
FRC implemented
Handles the main game loop, which includes:
Handling restarting of scenes by freeing and initializing again
Handling changes of scenes by unloading previous scene and loading the next
Calling to update on a fixed time basis and reducing the accumulator
Calling to render on a variable time basis and adding to the accumulator
Measuring of variable time elapsed per frame
Ready for integration. Anticipating much change from this implementation during integration.
2022-09-15 11:34:53 +08:00
Kah Wei
67290c03e7
Updated vcxproj files
2022-09-15 11:34:04 +08:00
Kah Wei
c48a467e57
Disabled warnings for DLL export
2022-09-15 11:33:40 +08:00
Kah Wei
12cfbb9952
Fixed SHDotNetRuntime::IsLoaded() giving incorrect data and updated qualifiers and comment formats
2022-09-15 11:25:58 +08:00
Xiao Qi
ff3f5db397
Merge remote-tracking branch 'origin/main' into main
2022-09-15 09:32:23 +08:00
XiaoQiDigipen
96a844c9d8
Merge pull request #17 from SHADE-DP/SDLIntegration
...
SDL integration (To Archive SDLIntegration Branch)
Integrate SDL into application (For editor usage)
2022-09-15 09:31:51 +08:00
Xiao Qi
8f09c0b34c
Replaced premake exe with custom compiled one
2022-09-15 09:31:37 +08:00
Sri Sham Haran
20f4b59f41
Merge branch 'main' into SDLIntegration
2022-09-15 09:30:03 +08:00
Sri Sham Haran
bd69c6043a
SDL Updates
2022-09-15 09:26:43 +08:00
Kah Wei
9a97d12d96
Fixed SHADE_Managed target and intermediate directory paths
2022-09-15 09:23:40 +08:00
Kah Wei
79828740fd
Fixed hot reloading copying the wrong DLL
2022-09-15 09:21:51 +08:00
Kah Wei
ad7df083bf
Merge branch 'main' into SP3-6-c-scripting
...
# Conflicts:
# Premake/premake5.exe
# SHADE_Application/src/Application/SBApplication.cpp
# SHADE_Engine/SHADE_Engine.vcxproj
# SHADE_Engine/SHADE_Engine.vcxproj.filters
# SHADE_Engine/premake5.lua
2022-09-15 09:17:17 +08:00
Brandon Mak
169822c221
Render graph execution fixed
...
GetVkQueue function deleted. More specific function implemented (Present).
2022-09-15 09:16:13 +08:00
Kah Wei
196ef93fed
CSProj for SHADE_Scripting is now generated if a build is attempted without it existing
2022-09-15 09:11:02 +08:00
Xiao Qi
d62201367a
Merge branch 'main' into SP3-18-Events
2022-09-15 09:10:49 +08:00
Xiao Qi
8e601e60e5
Added SHCommonTypes header file
...
Changed C++ std from latest to 20
Updated premake program
2022-09-15 01:51:04 +08:00
Xiao Qi
a3b1660013
SP3-108 Removed old event register method
...
added new events define
2022-09-15 01:46:11 +08:00
XiaoQiDigipen
0cf4093b63
Merge pull request #16 from SHADE-DP/SetWorkingDirectory
...
Set working directory of the application to be the executable location
2022-09-15 01:39:33 +08:00
XiaoQiDigipen
98d61f1ca7
Merge branch 'main' into SetWorkingDirectory
2022-09-15 01:39:10 +08:00
XiaoQiDigipen
cff0b29ce8
Merge pull request #15 from SHADE-DP/CleanUpPremake
...
Moved spdlog lib link to SHADE_Engine and removed KTX references in Premake
2022-09-15 01:37:32 +08:00