Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/youneuoy/M2TWEOP-library …
Browse files Browse the repository at this point in the history 
…into add-battlemap-zoom
  • Loading branch information
@EddieEldridge
EddieEldridge committed Aug 3, 2023
2 parents 70a4df0 + bd914cd commit 6ba14aa
Show file tree
Hide file tree
Showing 84 changed files with 1,217 additions and 285 deletions.
Binary file removed M2TWEOP Code/3rd/discord-files/lib/discord_game_sdk.dll
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion ...3rd/discord-files/achievement_manager.cpp → ... Code/3rd/discord/achievement_manager.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ IDiscordAchievementEvents AchievementManager::events_{
};

void AchievementManager::SetUserAchievement(Snowflake achievementId,
std::int64_t percentComplete,
std::uint8_t percentComplete,
std::function<void(Result)> callback)
{
static auto wrapper = [](void* callbackData, EDiscordResult result) -> void {
Expand Down
2 changes: 1 addition & 1 deletion ...e/3rd/discord-files/achievement_manager.h → ...OP Code/3rd/discord/achievement_manager.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class AchievementManager final {
~AchievementManager() = default;

void SetUserAchievement(Snowflake achievementId,
std::int64_t percentComplete,
std::uint8_t percentComplete,
std::function<void(Result)> callback);
void FetchUserAchievements(std::function<void(Result)> callback);
void CountUserAchievements(std::int32_t* count);
Expand Down
0 ...de/3rd/discord-files/activity_manager.cpp → ...EOP Code/3rd/discord/activity_manager.cpp
View file
File renamed without changes.
0 ...Code/3rd/discord-files/activity_manager.h → M2TWEOP Code/3rd/discord/activity_manager.h
View file
File renamed without changes.
0 ...3rd/discord-files/application_manager.cpp → ... Code/3rd/discord/application_manager.cpp
View file
File renamed without changes.
0 ...e/3rd/discord-files/application_manager.h → ...OP Code/3rd/discord/application_manager.h
View file
File renamed without changes.
0 M2TWEOP Code/3rd/discord-files/core.cpp → M2TWEOP Code/3rd/discord/core.cpp
View file
File renamed without changes.
0 M2TWEOP Code/3rd/discord-files/core.h → M2TWEOP Code/3rd/discord/core.h
View file
File renamed without changes.
0 M2TWEOP Code/3rd/discord-files/discord.h → M2TWEOP Code/3rd/discord/discord.h
View file
File renamed without changes.
0 M2TWEOP Code/3rd/discord-files/event.h → M2TWEOP Code/3rd/discord/event.h
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion M2TWEOP Code/3rd/discord-files/ffi.h → M2TWEOP Code/3rd/discord/ffi.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -836,7 +836,7 @@ struct IDiscordAchievementEvents {
struct IDiscordAchievementManager {
void (*set_user_achievement)(struct IDiscordAchievementManager* manager,
DiscordSnowflake achievement_id,
int64_t percent_complete,
uint8_t percent_complete,
void* callback_data,
void (*callback)(void* callback_data, enum EDiscordResult result));
void (*fetch_user_achievements)(struct IDiscordAchievementManager* manager,
Expand Down
0 ... Code/3rd/discord-files/image_manager.cpp → M2TWEOP Code/3rd/discord/image_manager.cpp
View file
File renamed without changes.
0 ...OP Code/3rd/discord-files/image_manager.h → M2TWEOP Code/3rd/discord/image_manager.h
View file
File renamed without changes.
Binary file added M2TWEOP Code/3rd/discord/lib/discord_game_sdk.dll
View file
Binary file not shown.
Binary file renamed ...iscord-files/lib/discord_game_sdk.dll.lib → .../3rd/discord/lib/discord_game_sdk.dll.lib
View file
Binary file not shown.
0 ... Code/3rd/discord-files/lobby_manager.cpp → M2TWEOP Code/3rd/discord/lobby_manager.cpp
View file
File renamed without changes.
0 ...OP Code/3rd/discord-files/lobby_manager.h → M2TWEOP Code/3rd/discord/lobby_manager.h
View file
File renamed without changes.
0 ...ode/3rd/discord-files/network_manager.cpp → M2TWEOP Code/3rd/discord/network_manager.cpp
View file
File renamed without changes.
0 ... Code/3rd/discord-files/network_manager.h → M2TWEOP Code/3rd/discord/network_manager.h
View file
File renamed without changes.
0 ...ode/3rd/discord-files/overlay_manager.cpp → M2TWEOP Code/3rd/discord/overlay_manager.cpp
View file
File renamed without changes.
0 ... Code/3rd/discord-files/overlay_manager.h → M2TWEOP Code/3rd/discord/overlay_manager.h
View file
File renamed without changes.
0 ...rd/discord-files/relationship_manager.cpp → ...Code/3rd/discord/relationship_manager.cpp
View file
File renamed without changes.
0 .../3rd/discord-files/relationship_manager.h → ...P Code/3rd/discord/relationship_manager.h
View file
File renamed without changes.
0 ...ode/3rd/discord-files/storage_manager.cpp → M2TWEOP Code/3rd/discord/storage_manager.cpp
View file
File renamed without changes.
0 ... Code/3rd/discord-files/storage_manager.h → M2TWEOP Code/3rd/discord/storage_manager.h
View file
File renamed without changes.
0 ... Code/3rd/discord-files/store_manager.cpp → M2TWEOP Code/3rd/discord/store_manager.cpp
View file
File renamed without changes.
0 ...OP Code/3rd/discord-files/store_manager.h → M2TWEOP Code/3rd/discord/store_manager.h
View file
File renamed without changes.
0 M2TWEOP Code/3rd/discord-files/types.cpp → M2TWEOP Code/3rd/discord/types.cpp
View file
File renamed without changes.
0 M2TWEOP Code/3rd/discord-files/types.h → M2TWEOP Code/3rd/discord/types.h
View file
File renamed without changes.
0 ...P Code/3rd/discord-files/user_manager.cpp → M2TWEOP Code/3rd/discord/user_manager.cpp
View file
File renamed without changes.
0 ...EOP Code/3rd/discord-files/user_manager.h → M2TWEOP Code/3rd/discord/user_manager.h
View file
File renamed without changes.
0 ... Code/3rd/discord-files/voice_manager.cpp → M2TWEOP Code/3rd/discord/voice_manager.cpp
View file
File renamed without changes.
0 ...OP Code/3rd/discord-files/voice_manager.h → M2TWEOP Code/3rd/discord/voice_manager.h
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion M2TWEOP Code/M2TWEOP Common/m2tweopConstData.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#pragma once
namespace eopConstData
{
const char eopVersionName[] = "M2TWEOP-2.2.1";
const char eopVersionName[] = "M2TWEOP-2.2.3";
}
43 changes: 38 additions & 5 deletions M2TWEOP Code/M2TWEOP GUI/M2TWEOP GUI.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,13 +72,13 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
<IncludePath>$(DXSDK_DIR)\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(SolutionDir)\3rd\imguiDocking;$(SolutionDir)\3rd\M2TWEOPBoost;$(SolutionDir)\3rd\sdl\include;$(SolutionDir)\3rd\ImNotify;$(SolutionDir)\3rd\nlohmann;$(SolutionDir)\3rd\IPC</IncludePath>
<LibraryPath>$(SolutionDir)\3rd\sfml\lib;$(DXSDK_DIR)\lib\x86;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(SolutionDir)\3rd\M2TWEOPBoost\boostLibs;$(SolutionDir)\3rd\sdl\libs</LibraryPath>
<IncludePath>$(SolutionDir)\3rd\discord;$(DXSDK_DIR)\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(SolutionDir)\3rd\imguiDocking;$(SolutionDir)\3rd\M2TWEOPBoost;$(SolutionDir)\3rd\sdl\include;$(SolutionDir)\3rd\ImNotify;$(SolutionDir)\3rd\nlohmann;$(SolutionDir)\3rd\IPC</IncludePath>
<LibraryPath>$(SolutionDir)\3rd\discord\lib;$(SolutionDir)\3rd\sfml\lib;$(DXSDK_DIR)\lib\x86;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(SolutionDir)\3rd\M2TWEOPBoost\boostLibs;$(SolutionDir)\3rd\sdl\libs</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<IncludePath>$(DXSDK_DIR)\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(SolutionDir)\3rd\imguiDocking;$(SolutionDir)\3rd\M2TWEOPBoost;$(SolutionDir)\3rd\sdl\include;$(SolutionDir)\3rd\ImNotify;$(SolutionDir)\3rd\nlohmann;$(SolutionDir)\3rd\IPC</IncludePath>
<LibraryPath>$(SolutionDir)\3rd\sfml\lib;$(DXSDK_DIR)\lib\x86;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(SolutionDir)\3rd\M2TWEOPBoost\boostLibs;$(SolutionDir)\3rd\sdl\libs</LibraryPath>
<IncludePath>$(SolutionDir)\3rd\discord;$(DXSDK_DIR)\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(SolutionDir)\3rd\imguiDocking;$(SolutionDir)\3rd\M2TWEOPBoost;$(SolutionDir)\3rd\sdl\include;$(SolutionDir)\3rd\ImNotify;$(SolutionDir)\3rd\nlohmann;$(SolutionDir)\3rd\IPC</IncludePath>
<LibraryPath>$(SolutionDir)\3rd\discord\lib;$(SolutionDir)\3rd\sfml\lib;$(DXSDK_DIR)\lib\x86;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(SolutionDir)\3rd\M2TWEOPBoost\boostLibs;$(SolutionDir)\3rd\sdl\libs</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
Expand All @@ -104,7 +104,7 @@
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>winmm.lib;imm32.lib;version.lib;Setupapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>winmm.lib;imm32.lib;version.lib;Setupapi.lib;discord_game_sdk.dll.lib;%(AdditionalDependencies)</AdditionalDependencies>
<UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
<EnableUAC>true</EnableUAC>
<AdditionalOptions>/Force:Multiple %(AdditionalOptions)</AdditionalOptions>
Expand Down Expand Up @@ -180,6 +180,20 @@
<ClCompile Include="..\3rd\imguiDocking\imgui_tables.cpp" />
<ClCompile Include="..\3rd\imguiDocking\imgui_widgets.cpp" />
<ClCompile Include="..\3rd\imguiDocking\md4c.c" />
<ClCompile Include="..\3rd\discord\achievement_manager.cpp" />
<ClCompile Include="..\3rd\discord\activity_manager.cpp" />
<ClCompile Include="..\3rd\discord\application_manager.cpp" />
<ClCompile Include="..\3rd\discord\core.cpp" />
<ClCompile Include="..\3rd\discord\image_manager.cpp" />
<ClCompile Include="..\3rd\discord\lobby_manager.cpp" />
<ClCompile Include="..\3rd\discord\network_manager.cpp" />
<ClCompile Include="..\3rd\discord\overlay_manager.cpp" />
<ClCompile Include="..\3rd\discord\relationship_manager.cpp" />
<ClCompile Include="..\3rd\discord\storage_manager.cpp" />
<ClCompile Include="..\3rd\discord\store_manager.cpp" />
<ClCompile Include="..\3rd\discord\types.cpp" />
<ClCompile Include="..\3rd\discord\user_manager.cpp" />
<ClCompile Include="..\3rd\discord\voice_manager.cpp" />
<ClCompile Include="aboutUI.cpp" />
<ClCompile Include="dataG.cpp" />
<ClCompile Include="gameRunnerUI.cpp" />
Expand All @@ -194,6 +208,7 @@
<ClCompile Include="modSettingsUI.cpp" />
<ClCompile Include="redistUI.cpp" />
<ClCompile Include="toolRoutine.cpp" />
<ClCompile Include="discordManager.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\3rd\imguiDocking\eopImgui.h" />
Expand All @@ -216,6 +231,23 @@
<ClInclude Include="..\3rd\ImNotify\font_awesome_5.h" />
<ClInclude Include="..\3rd\ImNotify\imgui_notify.h" />
<ClInclude Include="..\3rd\nlohmann\json.hpp" />
<ClInclude Include="..\3rd\discord\achievement_manager.h" />
<ClInclude Include="..\3rd\discord\activity_manager.h" />
<ClInclude Include="..\3rd\discord\application_manager.h" />
<ClInclude Include="..\3rd\discord\core.h" />
<ClInclude Include="..\3rd\discord\discord.h" />
<ClInclude Include="..\3rd\discord\event.h" />
<ClInclude Include="..\3rd\discord\ffi.h" />
<ClInclude Include="..\3rd\discord\image_manager.h" />
<ClInclude Include="..\3rd\discord\lobby_manager.h" />
<ClInclude Include="..\3rd\discord\network_manager.h" />
<ClInclude Include="..\3rd\discord\overlay_manager.h" />
<ClInclude Include="..\3rd\discord\relationship_manager.h" />
<ClInclude Include="..\3rd\discord\storage_manager.h" />
<ClInclude Include="..\3rd\discord\store_manager.h" />
<ClInclude Include="..\3rd\discord\types.h" />
<ClInclude Include="..\3rd\discord\user_manager.h" />
<ClInclude Include="..\3rd\discord\voice_manager.h" />
<ClInclude Include="..\M2TWEOP Common\m2tweopConstData.h" />
<ClInclude Include="aboutUI.h" />
<ClInclude Include="dataG.h" />
Expand All @@ -232,6 +264,7 @@
<ClInclude Include="redistUI.h" />
<ClInclude Include="resource.h" />
<ClInclude Include="toolRoutine.h" />
<ClInclude Include="discordManager.h" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="M2TWEOP GUI.rc" />
Expand Down
102 changes: 102 additions & 0 deletions M2TWEOP Code/M2TWEOP GUI/M2TWEOP GUI.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@
<Filter Include="Исходные файлы\ui\redists">
<UniqueIdentifier>{ad2c4b91-ba09-485f-8602-acb5ad7cc75a}</UniqueIdentifier>
</Filter>
<Filter Include="3rd\discord">
<UniqueIdentifier>{92d88ef8-2df2-49eb-9c8d-3a534dc208f5}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="main.cpp">
Expand Down Expand Up @@ -81,6 +84,9 @@
<ClCompile Include="toolRoutine.cpp">
<Filter>Исходные файлы</Filter>
</ClCompile>
<ClCompile Include="discordManager.cpp">
<Filter>Исходные файлы</Filter>
</ClCompile>
<ClCompile Include="managerG.cpp">
<Filter>Исходные файлы\manager</Filter>
</ClCompile>
Expand Down Expand Up @@ -123,6 +129,48 @@
<ClCompile Include="redistUI.cpp">
<Filter>Исходные файлы\ui\redists</Filter>
</ClCompile>
<ClCompile Include="..\3rd\discord\achievement_manager.cpp">
<Filter>3rd\discord</Filter>
</ClCompile>
<ClCompile Include="..\3rd\discord\activity_manager.cpp">
<Filter>3rd\discord</Filter>
</ClCompile>
<ClCompile Include="..\3rd\discord\application_manager.cpp">
<Filter>3rd\discord</Filter>
</ClCompile>
<ClCompile Include="..\3rd\discord\core.cpp">
<Filter>3rd\discord</Filter>
</ClCompile>
<ClCompile Include="..\3rd\discord\image_manager.cpp">
<Filter>3rd\discord</Filter>
</ClCompile>
<ClCompile Include="..\3rd\discord\lobby_manager.cpp">
<Filter>3rd\discord</Filter>
</ClCompile>
<ClCompile Include="..\3rd\discord\network_manager.cpp">
<Filter>3rd\discord</Filter>
</ClCompile>
<ClCompile Include="..\3rd\discord\overlay_manager.cpp">
<Filter>3rd\discord</Filter>
</ClCompile>
<ClCompile Include="..\3rd\discord\relationship_manager.cpp">
<Filter>3rd\discord</Filter>
</ClCompile>
<ClCompile Include="..\3rd\discord\storage_manager.cpp">
<Filter>3rd\discord</Filter>
</ClCompile>
<ClCompile Include="..\3rd\discord\store_manager.cpp">
<Filter>3rd\discord</Filter>
</ClCompile>
<ClCompile Include="..\3rd\discord\types.cpp">
<Filter>3rd\discord</Filter>
</ClCompile>
<ClCompile Include="..\3rd\discord\user_manager.cpp">
<Filter>3rd\discord</Filter>
</ClCompile>
<ClCompile Include="..\3rd\discord\voice_manager.cpp">
<Filter>3rd\discord</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="resource.h">
Expand Down Expand Up @@ -173,6 +221,9 @@
<ClInclude Include="toolRoutine.h">
<Filter>Исходные файлы</Filter>
</ClInclude>
<ClInclude Include="discordManager.h">
<Filter>Исходные файлы</Filter>
</ClInclude>
<ClInclude Include="managerGHelpers.h">
<Filter>Исходные файлы\manager</Filter>
</ClInclude>
Expand Down Expand Up @@ -233,6 +284,57 @@
<ClInclude Include="redistUI.h">
<Filter>Исходные файлы\ui\redists</Filter>
</ClInclude>
<ClInclude Include="..\3rd\discord\achievement_manager.h">
<Filter>3rd\discord</Filter>
</ClInclude>
<ClInclude Include="..\3rd\discord\activity_manager.h">
<Filter>3rd\discord</Filter>
</ClInclude>
<ClInclude Include="..\3rd\discord\application_manager.h">
<Filter>3rd\discord</Filter>
</ClInclude>
<ClInclude Include="..\3rd\discord\core.h">
<Filter>3rd\discord</Filter>
</ClInclude>
<ClInclude Include="..\3rd\discord\discord.h">
<Filter>3rd\discord</Filter>
</ClInclude>
<ClInclude Include="..\3rd\discord\event.h">
<Filter>3rd\discord</Filter>
</ClInclude>
<ClInclude Include="..\3rd\discord\ffi.h">
<Filter>3rd\discord</Filter>
</ClInclude>
<ClInclude Include="..\3rd\discord\image_manager.h">
<Filter>3rd\discord</Filter>
</ClInclude>
<ClInclude Include="..\3rd\discord\lobby_manager.h">
<Filter>3rd\discord</Filter>
</ClInclude>
<ClInclude Include="..\3rd\discord\network_manager.h">
<Filter>3rd\discord</Filter>
</ClInclude>
<ClInclude Include="..\3rd\discord\overlay_manager.h">
<Filter>3rd\discord</Filter>
</ClInclude>
<ClInclude Include="..\3rd\discord\relationship_manager.h">
<Filter>3rd\discord</Filter>
</ClInclude>
<ClInclude Include="..\3rd\discord\storage_manager.h">
<Filter>3rd\discord</Filter>
</ClInclude>
<ClInclude Include="..\3rd\discord\store_manager.h">
<Filter>3rd\discord</Filter>
</ClInclude>
<ClInclude Include="..\3rd\discord\types.h">
<Filter>3rd\discord</Filter>
</ClInclude>
<ClInclude Include="..\3rd\discord\user_manager.h">
<Filter>3rd\discord</Filter>
</ClInclude>
<ClInclude Include="..\3rd\discord\voice_manager.h">
<Filter>3rd\discord</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="M2TWEOP GUI.rc">
Expand Down
3 changes: 3 additions & 0 deletions M2TWEOP Code/M2TWEOP GUI/dataG.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ class dataG
string exeName;
string gameArgs;

// Discord Rich Presence
bool isDiscordRichPresenceEnabled = true;

// Customization Options
string modTitle = "";
string buttonColorString = "";
Expand Down
Loading

0 comments on commit 6ba14aa

Please sign in to comment.