Skip to content

Commit

Permalink
Merge branch 'TurningWheel:master' into openal_refresh
Browse files Browse the repository at this point in the history
  • Loading branch information
damiencarol authored Nov 6, 2024
2 parents aa33e40 + 0251595 commit feb4ef9
Show file tree
Hide file tree
Showing 151 changed files with 52,013 additions and 5,845 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -75,4 +75,5 @@ steam_appid.txt
xcode/Barony/Barony.xcodeproj/project.xcworkspace/*
xcode/Barony/Barony.xcodeproj/xcuserdata/*
*.ps1
!LICENSE.nativefiledialog.txt
!LICENSE.nativefiledialog.txt
/VS.2015/Barony/x64/Debug
6 changes: 4 additions & 2 deletions VS-includes/Config.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@

#define BASE_DATA_DIR "./"

//#define DEBUG_ACHIEVEMENTS
//#define DEBUG_EVENT_TIMERS
#ifndef NDEBUG
#define DEBUG_ACHIEVEMENTS
#define DEBUG_EVENT_TIMERS
#endif

#ifdef BARONY_DRM_FREE

Expand Down
1 change: 0 additions & 1 deletion VS.2015/Barony.sln
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@ Global
{8D0CEB30-DFEC-462D-B107-1EA02D317151}.Debug|Win32.ActiveCfg = Release|Win32
{8D0CEB30-DFEC-462D-B107-1EA02D317151}.Debug|Win32.Build.0 = Release|Win32
{8D0CEB30-DFEC-462D-B107-1EA02D317151}.Debug|x64.ActiveCfg = Debug|x64
{8D0CEB30-DFEC-462D-B107-1EA02D317151}.Debug|x64.Build.0 = Debug|x64
{8D0CEB30-DFEC-462D-B107-1EA02D317151}.EOS Debug|Win32.ActiveCfg = EOS Debug|Win32
{8D0CEB30-DFEC-462D-B107-1EA02D317151}.EOS Debug|x64.ActiveCfg = EOS Debug|x64
{8D0CEB30-DFEC-462D-B107-1EA02D317151}.EOS|Win32.ActiveCfg = EOS|Win32
Expand Down
14 changes: 10 additions & 4 deletions VS.2015/Barony/Barony.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,7 @@
<PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
<EnableASAN>false</EnableASAN>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Steam Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
Expand Down Expand Up @@ -464,7 +465,7 @@ if %errorlevel% leq 1 exit 0 else exit %errorlevel%</Command>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);BARONY_DRM_FREE;USE_IMGUI;USE_THEORA_VIDEO;CURL_STATICLIB;</PreprocessorDefinitions>
<ShowIncludes>true</ShowIncludes>
<AdditionalIncludeDirectories>"$(SolutionDir)\..\VS-includes"</AdditionalIncludeDirectories>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
Expand All @@ -474,7 +475,7 @@ if %errorlevel% leq 1 exit 0 else exit %errorlevel%</Command>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>OpenGL32.lib;glu32.lib;SDL2.lib;SDL2main.lib;SDL2_net.lib;SDL2_image.lib;fmodex_vc.lib;libpng.lib;zlib.lib;steam_api.lib;SDL2_ttf.lib;physfs.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>OpenGL32.lib;glu32.lib;SDL2.lib;SDL2main.lib;SDL2_net.lib;SDL2_image.lib;fmod_vc.lib;libpng16.lib;zlib.lib;SDL2_ttf.lib;physfs.lib;libtheoraplayer.lib;glew32.lib;nfd.lib;libcurl.lib;ws2_32.lib;Normaliz.lib;Crypt32.lib;Wldap32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PostBuildEvent>
<Command>robocopy "$(TargetDir)\" "$(SolutionDir)Release" $(TargetFileName)
Expand Down Expand Up @@ -651,7 +652,7 @@ if %errorlevel% leq 1 exit 0 else exit %errorlevel%</Command>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);USE_EOS;STEAMWORKS;USE_THEORA_VIDEO;USE_IMGUI;CURL_STATICLIB;USE_LIBCURL;USE_PLAYFAB</PreprocessorDefinitions>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);USE_EOS;STEAMWORKS;USE_THEORA_VIDEO;USE_IMGUI;CURL_STATICLIB;USE_LIBCURL;USE_PLAYFAB;</PreprocessorDefinitions>
<AdditionalIncludeDirectories>"$(SolutionDir)\..\VS-includes"</AdditionalIncludeDirectories>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<UndefinePreprocessorDefinitions>
Expand Down Expand Up @@ -903,13 +904,15 @@ copy "$(TargetDir)$(TargetFileName)" "$(SolutionDir)EOS 4\barony_test.exe" </Com
<ObjectFileName>$(IntDir)%(RelativeDir)</ObjectFileName>
<AdditionalOptions>/DBUILD_PR="$(BARONY_BUILD_PR)" /DBUILD_CC="$(BARONY_BUILD_CC)" /DBUILD_CS="$(BARONY_BUILD_CS)" /DBUILD_DE="$(BARONY_BUILD_DE)" /DBUILD_SA="$(BARONY_BUILD_SA)" /DBUILD_GSE="$(BARONY_BUILD_GSTATE)" /DBUILD_PFTID="$(BARONY_BUILD_PFTID)" /DBUILD_PFHID="$(BARONY_BUILD_PFHID)" %(AdditionalOptions)</AdditionalOptions>
<LanguageStandard>stdcpp17</LanguageStandard>
<TreatWarningAsError>false</TreatWarningAsError>
<ConformanceMode>true</ConformanceMode>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalDependencies>OpenGL32.lib;glu32.lib;SDL2.lib;SDL2main.lib;SDL2_net.lib;SDL2_image.lib;fmod_vc.lib;libpng16.lib;zlib.lib;SDL2_ttf.lib;physfs.lib;EOSSDK-Win64-Shipping.lib;steam_api64.lib;libtheoraplayer.lib;glew32.lib;nfd.lib;libcurl.lib;ws2_32.lib;Normaliz.lib;Crypt32.lib;Wldap32.lib;XPlatCppWindows_debug.lib;lib_json_debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>OpenGL32.lib;glu32.lib;SDL2.lib;SDL2main.lib;SDL2_net.lib;SDL2_image.lib;fmodL_vc.lib;libpng16.lib;zlib.lib;SDL2_ttf.lib;physfs.lib;EOSSDK-Win64-Shipping.lib;steam_api64.lib;libtheoraplayer.lib;glew32.lib;nfd.lib;libcurl.lib;ws2_32.lib;Normaliz.lib;Crypt32.lib;Wldap32.lib;XPlatCppWindows_debug.lib;lib_json_debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
<Profile>true</Profile>
</Link>
Expand Down Expand Up @@ -1183,6 +1186,8 @@ if %errorlevel% leq 1 exit 0 else exit %errorlevel%</Command>
<ClCompile Include="..\..\src\menu.cpp" />
<ClCompile Include="..\..\src\messages.cpp" />
<ClCompile Include="..\..\src\monster_automaton.cpp" />
<ClCompile Include="..\..\src\monster_bat.cpp" />
<ClCompile Include="..\..\src\monster_bugbear.cpp" />
<ClCompile Include="..\..\src\monster_cockatrice.cpp" />
<ClCompile Include="..\..\src\monster_crystalgolem.cpp" />
<ClCompile Include="..\..\src\monster_demon.cpp" />
Expand Down Expand Up @@ -1247,6 +1252,7 @@ if %errorlevel% leq 1 exit 0 else exit %errorlevel%</Command>
<ClInclude Include="..\..\src\classdescriptions.hpp" />
<ClInclude Include="..\..\src\cppfuncs.hpp" />
<ClInclude Include="..\..\src\credits.hpp" />
<ClInclude Include="..\..\src\draw.hpp" />
<ClInclude Include="..\..\src\engine\audio\music_pc.hpp" />
<ClInclude Include="..\..\src\engine\audio\sound.hpp" />
<ClInclude Include="..\..\src\engine\filepc.hpp" />
Expand Down
9 changes: 9 additions & 0 deletions VS.2015/Barony/Barony.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -495,6 +495,12 @@
<ClCompile Include="..\..\src\monster_mimic.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\monster_bat.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\monster_bugbear.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\src\book.hpp">
Expand Down Expand Up @@ -674,6 +680,9 @@
<ClInclude Include="..\..\src\playfab.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\src\draw.hpp">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Image Include="..\..\src\game.ico">
Expand Down
6 changes: 5 additions & 1 deletion VS.2015/editor/editor.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -709,7 +709,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EOS Debug|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>MaxSpeed</Optimization>
<Optimization>Disabled</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
Expand All @@ -728,6 +728,10 @@
<AdditionalDependencies>OpenGL32.lib;glu32.lib;SDL2.lib;SDL2main.lib;SDL2_net.lib;SDL2_image.lib;fmod_vc.lib;libpng16.lib;zlib.lib;SDL2_ttf.lib;physfs.lib;glew32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SubSystem>Windows</SubSystem>
</Link>
<Manifest>
<EnableDpiAwareness>
</EnableDpiAwareness>
</Manifest>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Steam Debug|x64'">
<ClCompile>
Expand Down
19 changes: 19 additions & 0 deletions lang/compendium_lang/contents_achievements.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"version": 1,
"contents": [
{" CATEGORIES": "-"},
{"ADVENTURE": "adventure"},
{"EXPERIENCE": "experience"},
{"JOKER'S CHOICE": "joker"},
{"TEAMWORK": "teamwork"},
{"TECHNIQUE": "technique"}
],
"contents_alphabetical": [
{" CATEGORIES": "-"},
{"ADVENTURE": "adventure"},
{"EXPERIENCE": "experience"},
{"JOKER'S CHOICE": "joker"},
{"TEAMWORK": "teamwork"},
{"TECHNIQUE": "technique"}
]
}
111 changes: 111 additions & 0 deletions lang/compendium_lang/contents_codex.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
{
"version": 1,
"contents": [
{" CHARACTER": "-"},
{"CLASS OVERVIEW": "class"},
{"CLASSES": "classes list"},
{"RACE & ALIGNMENT": "races"},
{"EXPERIENCE POINTS (XP)": "xp"},
{"LEVELING UP": "leveling up"},
{"STATS & METASTATS": "stats metastats"},
{"SKILLS": "skills"},
{" ACTIONS": "-"},
{"MELEE ATTACKS": "melee"},
{"CRITICAL STRIKES": "crits"},
{"FLANKING STRIKES": "flanking"},
{"BACKSTABBING": "backstabs"},
{"SNEAKING": "sneaking"},
{"LEGENDARY STRIKES": "legendary strikes"},
{"BLOCKING": "blocking"},
{"STRAFE & BACKPEDAL": "strafing"},
{"MEMORIZED CASTING": "memorized"},
{"SPELLBOOK CASTING": "spellbook casting"},
{"MISSILE ATTACKS": "missiles"},
{"THROWN ATTACKS": "thrown"},
{"ITEM DEGRADATION": "equipment degradation"},
{"WANTED STATUS": "wanted"},
{" STATS & METASTATS": "-"},
{"STRENGTH (STR)": "str"},
{"DEXTERITY (DEX)": "dex"},
{"CONSTITUTION (CON)": "con"},
{"INTELLIGENCE (INT)": "int"},
{"PERCEPTION (PER)": "per"},
{"CHARISMA (CHR)": "chr"},
{"ARMOR CLASS (AC)": "ac"},
{"HEALTH POINTS (HP)": "hp"},
{"MAGIC POINTS (MP)": "mp"},
{"MAGIC RESIST (RES)": "res"},
{"MAGIC POWER (PWR)": "pwr"},
{"REGENERATION (RGN)": "rgn"},
{"WEIGHT (WGT)": "wgt"},
{" SKILLS": "-"},
{"SWORD SKILL": "sword skill"},
{"AXE SKILL": "axe skill"},
{"POLEARM SKILL": "polearm skill"},
{"MACE SKILL": "mace skill"},
{"UNARMED SKILL": "unarmed skill"},
{"STEALTH SKILL": "stealth skill"},
{"BLOCKING SKILL": "blocking skill"},
{"RANGED SKILL": "ranged skill"},
{"MAGIC SKILL": "magic skill"},
{"CASTING SKILL": "casting skill"},
{"APPRAISAL SKILL": "appraisal skill"},
{"SWIMMING SKILL": "swimming skill"},
{"LEADERSHIP SKILL": "leadership skill"},
{"TRADING SKILL": "trading skill"},
{"ALCHEMY SKILL": "alchemy skill"},
{"TINKERING SKILL": "tinkering skill"}
],
"contents_alphabetical": [
{"ALCHEMY SKILL": "alchemy skill"},
{"APPRAISAL SKILL": "appraisal skill"},
{"ARMOR CLASS (AC)": "ac"},
{"AXE SKILL": "axe skill"},
{"BACKSTABBING": "backstabs"},
{"BLOCKING SKILL": "blocking skill"},
{"BLOCKING": "blocking"},
{"CASTING MEMORIZED SPELLS": "memorized"},
{"CASTING SKILL": "casting skill"},
{"CHARISMA (CHR)": "chr"},
{"CLASS": "class"},
{"CLASSES LIST": "classes list"},
{"CONSTITUTION (CON)": "con"},
{"CRITICAL STRIKES": "crits"},
{"DEXTERITY (DEX)": "dex"},
{"EXPERIENCE POINTS (XP)": "xp"},
{"FLANKING STRIKES": "flanking"},
{"HEALTH POINTS (HP)": "hp"},
{"INTELLIGENCE (INT)": "int"},
{"ITEM DURABILITY": "equipment degradation"},
{"LEADERSHIP SKILL": "leadership skill"},
{"LEGENDARY STRIKES": "legendary strikes"},
{"LEVELING UP": "leveling up"},
{"MACE SKILL": "mace skill"},
{"MAGIC POINTS (MP)": "mp"},
{"MAGIC POWER (PWR)": "pwr"},
{"MAGIC RESIST (RES)": "res"},
{"MAGIC SKILL": "magic skill"},
{"MELEE ATTACKS": "melee"},
{"MISSILE ATTACKS": "missiles"},
{"PERCEPTION (PER)": "per"},
{"POLEARM SKILL": "polearm skill"},
{"RACE & ALIGNMENT": "races"},
{"RANGED SKILL": "ranged skill"},
{"REGENERATION (RGN)": "rgn"},
{"SKILLS": "skills"},
{"SNEAKING": "sneaking"},
{"SPELLBOOK CASTING": "spellbook casting"},
{"STATS & METASTATS": "stats metastats"},
{"STEALTH SKILL": "stealth skill"},
{"STRAFE & BACKPEDAL": "strafing"},
{"STRENGTH (STR)": "str"},
{"SWIMMING SKILL": "swimming skill"},
{"SWORD SKILL": "sword skill"},
{"THROWN ATTACKS": "thrown"},
{"TINKERING SKILL": "tinkering skill"},
{"TRADING SKILL": "trading skill"},
{"UNARMED SKILL": "unarmed skill"},
{"WANTED STATUS": "wanted"},
{"WEIGHT (WGT)": "wgt"}
]
}
Loading

0 comments on commit feb4ef9

Please sign in to comment.