Merge branch 'dev'

gwdevhub · Jun 7, 2018 · 57ca7e1 · 57ca7e1
2 parents 62f8feb + 2f23cbc
commit 57ca7e1
Show file tree

Hide file tree

Showing 15 changed files with 699 additions and 576 deletions.
diff --git a/Dependencies/GWCA b/Dependencies/GWCA
diff --git a/Dependencies/imgui b/Dependencies/imgui
diff --git a/GWToolbox/GWToolbox.vcxproj b/GWToolbox/GWToolbox.vcxproj
@@ -56,7 +56,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;WIN32;_DEBUG;_WINDOWS;_USRDLL;API_EXPORTS;_USE_MATH_DEFINES;NOMINMAX;_CRT_SECURE_NO_WARNINGS;IMGUI_USE_BGRA_PACKED_COLOR;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>ENABLE_BORDERLESS;WIN32_LEAN_AND_MEAN;WIN32;_DEBUG;_WINDOWS;_USRDLL;API_EXPORTS;_USE_MATH_DEFINES;NOMINMAX;_CRT_SECURE_NO_WARNINGS;IMGUI_USE_BGRA_PACKED_COLOR;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <ForcedIncludeFiles>GWCA\Utilities\Export.h</ForcedIncludeFiles>
       <ShowIncludes>false</ShowIncludes>
@@ -81,7 +81,7 @@
       <Optimization>Full</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;WIN32;NDEBUG;_WINDOWS;_USRDLL;API_EXPORTS;_USE_MATH_DEFINES;NOMINMAX;_CRT_SECURE_NO_WARNINGS;IMGUI_USE_BGRA_PACKED_COLOR;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>ENABLE_BORDERLESS;WIN32_LEAN_AND_MEAN;WIN32;NDEBUG;_WINDOWS;_USRDLL;API_EXPORTS;_USE_MATH_DEFINES;NOMINMAX;_CRT_SECURE_NO_WARNINGS;IMGUI_USE_BGRA_PACKED_COLOR;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <AdditionalIncludeDirectories>
+1 −0		.gitignore
+3 −2		GWCA/Context/WorldContext.h
+9 −0		GWCA/GameContainers/Array.h
+16 −1		GWCA/GameEntities/Friendslist.h
+2 −1		GWCA/GameEntities/Hero.h
+52 −52		GWCA/GameEntities/Map.h
+6 −0		GWCA/GameEntities/Quest.h
+1 −1		GWCA/Managers/ChatMgr.h
+8 −2		GWCA/Managers/FriendListMgr.h
+11 −0		GWCA/Managers/UIMgr.h
+34 −1		GWCA/Packets/StoC.h
+5 −16		GWCA/src/AgentMgr.cpp
+30 −21		GWCA/src/ChatMgr.cpp
+48 −6		GWCA/src/FriendListMgr.cpp
+9 −4		GWCA/src/Render.cpp
+28 −2		GWCA/src/StoCMgr.cpp
+119 −2		GWCA/src/UIMgr.cpp