Commit Graph

42 Commits

Author SHA1 Message Date
Sri Sham Haran de8c2ce630 Merge branch 'main' into SP3-4-editor_fix 2022-09-26 15:59:38 +08:00
Xiao Qi 1c45b49937 Merge branch 'main' into SP3-13-Assets-Manager 2022-09-26 14:40:57 +08:00
Sri Sham Haran 247930ea68 Merge branch 'main' into SP3-4-editor_fix 2022-09-26 14:04:02 +08:00
Sri Sham Haran 335c19cfc7 Editor 2022-09-25 22:33:07 +08:00
Kah Wei 4e60b3495a Handles will now properly show up automatically dereferenced or NULL in Visual Studio's debug views 2022-09-25 20:28:01 +08:00
Xiao Qi 18eca1897e Added in post build command to copy assimp dll
Added in SH_API to asset manager class
2022-09-24 22:52:42 +08:00
Xiao Qi 225c247a85 Added missing SDL line back into engine premake 2022-09-24 12:59:21 +08:00
Xiao Qi a13e8f43fd Merge branch 'main' into SP3-13-Assets-Manager 2022-09-22 11:41:44 +08:00
Kah Wei af1d24d874 Fixed certain DLLs and includes missing when copying 2022-09-22 10:52:07 +08:00
Xiao Qi c6e1ba7f15 Added tinyddsloader to dependencies 2022-09-19 18:40:27 +08:00
Brandon Mak eb975d96c6 Merge remote-tracking branch 'origin/main' into SP3-1-Rendering 2022-09-16 14:08:36 +08:00
Kah Wei e5b7742955 Merge branch 'main' into SP3-6-c-scripting
# Conflicts:
#	Dependencies.bat
2022-09-15 12:22:37 +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
Kah Wei e1fb74f784 SHADE_Engine now copies the SDL2.dll to the out directory 2022-09-15 11:55:22 +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
Kah Wei c48a467e57 Disabled warnings for DLL export 2022-09-15 11:33:40 +08:00
Sri Sham Haran 20f4b59f41 Merge branch 'main' into SDLIntegration 2022-09-15 09:30:03 +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
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
XiaoQiDigipen 98d61f1ca7
Merge branch 'main' into SetWorkingDirectory 2022-09-15 01:39:10 +08:00
Kah Wei 7bc0dfb399 Set working directory of the application to be the executable location 2022-09-15 00:33:12 +08:00
Sri Sham Haran 599f1e4ffe add sdl to dependencies 2022-09-14 21:47:39 +08:00
Kah Wei 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
Kah Wei 7c64a12896 Moved spdlog lib link to SHADE_Engine and removed KTX references in Premake 2022-09-14 20:09:01 +08:00
Kah Wei 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
Brandon Mak 44e529f06f Merge branch 'SP3-4-editor' into SP3-1-Rendering 2022-09-14 19:44:01 +08:00
Kah Wei 44ef3a500f Added post build command to copy spdlog.dll to output 2022-09-14 13:29:23 +08:00
Sri Sham Haran a3e4b0a845 update premakes for spdlog changes 2022-09-14 09:14:18 +08:00
Kah Wei cba3aa0663 Converted SHADE_Engine to a DLL project and exported common use classes 2022-09-13 21:08:13 +08:00
Kah Wei 91709b16c3 Changed out and intermediatery directories for all projects to use shared directories 2022-09-13 20:35:30 +08:00
Kah Wei 60a51eb101 Converted projects to use MD instead of MT library 2022-09-13 18:24:39 +08:00
Kah Wei 0ed5cecbf3 Fixed ECS references in various files in SHADE_Managed 2022-09-13 15:18:56 +08:00
Kah Wei 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
Xiao Qi 4aedf9f65a Added new shaderc lib link
WALAO BRANDON
2022-09-13 11:35:36 +08:00
Kah Wei ccdb1d0e19 Added shlwapi.lib linker input for SHADE_Engine 2022-09-13 00:18:54 +08:00
Kah Wei ba5bea9d53 Added dotnet dependencies acquisition 2022-09-12 16:04:08 +08:00
Brandon Mak bed017e539 Fixed some warnings and premake files now include hpp files 2022-09-09 13:28:57 +08:00
Brandon Mak 62c67909ee Rendering Integration 2022-09-08 19:11:25 +08:00
Sri Sham Haran 060937344b Update Dependencies and Premake 2022-09-06 10:39:12 +08:00
Xiao Qi aee5e3b4d6 Properly changed entrypoint to winmain 2022-09-05 15:29:02 +08:00
Xiao Qi 0436ec45f6 Added dependencies into premake 2022-08-26 14:30:41 +08:00
Xiao Qi 3313127e8c Basic Project set up with premake 2022-08-26 14:04:03 +08:00