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
67290c03e7
Updated vcxproj files
2022-09-15 11:34:04 +08:00
c48a467e57
Disabled warnings for DLL export
2022-09-15 11:33:40 +08:00
12cfbb9952
Fixed SHDotNetRuntime::IsLoaded() giving incorrect data and updated qualifiers and comment formats
2022-09-15 11:25:58 +08:00
ff3f5db397
Merge remote-tracking branch 'origin/main' into main
2022-09-15 09:32:23 +08:00
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
8f09c0b34c
Replaced premake exe with custom compiled one
2022-09-15 09:31:37 +08:00
20f4b59f41
Merge branch 'main' into SDLIntegration
2022-09-15 09:30:03 +08:00
bd69c6043a
SDL Updates
2022-09-15 09:26:43 +08:00
9a97d12d96
Fixed SHADE_Managed target and intermediate directory paths
2022-09-15 09:23:40 +08:00
79828740fd
Fixed hot reloading copying the wrong DLL
2022-09-15 09:21:51 +08:00
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
196ef93fed
CSProj for SHADE_Scripting is now generated if a build is attempted without it existing
2022-09-15 09:11:02 +08:00
8e601e60e5
Added SHCommonTypes header file
...
Changed C++ std from latest to 20
Updated premake program
2022-09-15 01:51:04 +08:00
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
98d61f1ca7
Merge branch 'main' into SetWorkingDirectory
2022-09-15 01:39:10 +08:00
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
5e4eabc582
[WIP] SDL Window wrap
2022-09-15 00:48:43 +08:00
7bc0dfb399
Set working directory of the application to be the executable location
2022-09-15 00:33:12 +08:00
599f1e4ffe
add sdl to dependencies
2022-09-14 21:47:39 +08:00
57393ad7e4
Updated projects to use .NET 6.0
2022-09-14 20:29:40 +08:00
95c3609d21
Removed all references to Plushie
2022-09-14 20:26:31 +08:00
7e4c6a986a
Merge branch 'CleanUpPremake' into SP3-6-c-scripting
...
# Conflicts:
# SHADE_Engine/SHADE_Engine.vcxproj
# SHADE_Engine/SHADE_Engine.vcxproj.filters
2022-09-14 20:10:10 +08:00
7c64a12896
Moved spdlog lib link to SHADE_Engine and removed KTX references in Premake
2022-09-14 20:09:01 +08:00
e67b90c6a8
Added calls to SHScriptEngine in SBApplication
2022-09-14 20:07:13 +08:00
08f3a52dab
Merge branch 'main' into SP3-6-c-scripting
...
# Conflicts:
# SHADE_Application/premake5.lua
# SHADE_Engine/SHADE_Engine.vcxproj
# SHADE_Engine/SHADE_Engine.vcxproj.filters
# SHADE_Engine/premake5.lua
# premake5.lua
2022-09-14 19:57:59 +08:00
becce86160
Merge pull request #14 from SHADE-DP/UseSharedOutInterDirs
...
Convert SHADE_Engine to a DLL and made all projects use a shared output and intermediate directory
2022-09-14 19:40:50 +08:00
b66e2cf3d1
Merge branch 'main' into UseSharedOutInterDirs
2022-09-14 19:40:33 +08:00
414b6204a5
Merge pull request #13 from SHADE-DP/SP3-15-Tools
...
SP3-15 Tools
NEW
Added Logging Functions that wrap around logging macros for C++/CLI
2022-09-14 19:29:12 +08:00
803b29146e
Fixed memory error with SHLogger & spdlog
...
The logger needs to be registered outside the library. As such, a macro SHLOG_REGISTER has been added, as well as a variable to the actual logger. The logger needs to be passed into the macro anywhere outside the library after it has been initialised to work on the dll. This has already been done right before the application runs.
2022-09-14 17:57:36 +08:00
44ef3a500f
Added post build command to copy spdlog.dll to output
2022-09-14 13:29:23 +08:00
a3e4b0a845
update premakes for spdlog changes
2022-09-14 09:14:18 +08:00
2332e5401f
Merge branch 'main' into SP3-15-Tools
2022-09-13 23:29:44 +08:00
e45e589ba9
Added functions that wrap around logging macros for C++/CLI integration
2022-09-13 23:29:20 +08:00
cba3aa0663
Converted SHADE_Engine to a DLL project and exported common use classes
2022-09-13 21:08:13 +08:00
91709b16c3
Changed out and intermediatery directories for all projects to use shared directories
2022-09-13 20:35:30 +08:00
8e45b5895e
Removed references to SHLogger in Debug.cxx
2022-09-13 20:31:08 +08:00
0c28199acf
Converted SHScriptEngine to static and replaced json references with yaml
2022-09-13 20:30:32 +08:00
cfa12eb865
Added NOMINMAX to SHADE_Managed
2022-09-13 20:28:34 +08:00
9c833da88a
Added implementation for various GameObject functions
2022-09-13 18:42:43 +08:00
073cf902a9
Fixed warnings and errors in Vector2/3 and GameObject
2022-09-13 18:37:05 +08:00
32a68d22ae
Merge branch 'main' into SP3-6-c-scripting
2022-09-13 18:31:24 +08:00
95440b8d26
Merge pull request #12 from SHADE-DP/MTtoMD
...
Converted projects to use MD instead of MT library
2022-09-13 18:27:34 +08:00
60a51eb101
Converted projects to use MD instead of MT library
2022-09-13 18:24:39 +08:00
d643fe66b0
Fixed errors in SHADE_Managed
2022-09-13 17:16:36 +08:00
0ed5cecbf3
Fixed ECS references in various files in SHADE_Managed
2022-09-13 15:18:56 +08:00
04cae0fad9
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-13 14:09:32 +08:00
b674805547
Added ECS and Component classes for SHADE_Managed
2022-09-13 13:51:11 +08:00
5f56344a74
Shifted ECS_Base out of Engine Folder
2022-09-13 13:49:24 +08:00
4ed417cbea
Added EngineInterface
2022-09-13 11:43:49 +08:00
Kah Wei