maint: remove spooky references
This commit is contained in:
parent
c1c5a06c24
commit
94e9429926
2
.github/CODEOWNERS
vendored
2
.github/CODEOWNERS
vendored
@ -1,3 +1,3 @@
|
|||||||
# SPDX-License-Identifier: GPL-3.0
|
# SPDX-License-Identifier: GPL-3.0
|
||||||
|
|
||||||
* @XLabsProject/Developers
|
* @diamante0018
|
||||||
|
4
.github/ISSUE_TEMPLATE/config.yml
vendored
4
.github/ISSUE_TEMPLATE/config.yml
vendored
@ -3,6 +3,6 @@ contact_links:
|
|||||||
- name: Discord Server
|
- name: Discord Server
|
||||||
url: https://discord.gg/sKeVmR3/
|
url: https://discord.gg/sKeVmR3/
|
||||||
about: Please ask and answer support questions here.
|
about: Please ask and answer support questions here.
|
||||||
- name: XLabsProject Website
|
- name: AlterWare Website
|
||||||
url: https://xlabs.dev/
|
url: https://alterware.dev/
|
||||||
about: The official website.
|
about: The official website.
|
4
.github/ISSUE_TEMPLATE/get-help.md
vendored
4
.github/ISSUE_TEMPLATE/get-help.md
vendored
@ -8,8 +8,8 @@ assignees: ''
|
|||||||
---
|
---
|
||||||
|
|
||||||
_Do not open an issue here if you need help with modding or have a problem getting the client to run.
|
_Do not open an issue here if you need help with modding or have a problem getting the client to run.
|
||||||
It is very likely your problem will be resolved by reading the [FAQ](https://xlabs.dev/iw4x_faq) carefully.
|
It is very likely your problem will be resolved by reading the [FAQ](https://youtu.be/dQw4w9WgXcQ) carefully.
|
||||||
Ask in `iw4x-support` or `iw4x-modding` channels on the [Discord](https://discord.gg/sKeVmR3) server if you still have problems.
|
Ask in `iw4x-support` or `iw4x-modding` channels on the [Discord](https://alterware.dev/) server if you still have problems.
|
||||||
If this does not apply, please continue by filling in the template below._
|
If this does not apply, please continue by filling in the template below._
|
||||||
|
|
||||||
**What are you trying to do?**
|
**What are you trying to do?**
|
||||||
|
2
.github/ISSUE_TEMPLATE/request-a-feature.md
vendored
2
.github/ISSUE_TEMPLATE/request-a-feature.md
vendored
@ -7,7 +7,7 @@ assignees: ''
|
|||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
_Before opening a new feature request, please see [Issues](https://github.com/XLabsProject/iw4x-client/issues) and check that a similar issue does not already exist.
|
_Before opening a new feature request, please see [Issues](https://github.com/diamante0018/iw4x-client/issues) and check that a similar issue does not already exist.
|
||||||
If this a new request, help us help you by filling in the template below._
|
If this a new request, help us help you by filling in the template below._
|
||||||
|
|
||||||
**What problem will this solve?**
|
**What problem will this solve?**
|
||||||
|
4
.github/pull_request_template.md
vendored
4
.github/pull_request_template.md
vendored
@ -14,6 +14,6 @@ Add any other context about your changes here.
|
|||||||
**Did you check all the boxes?**
|
**Did you check all the boxes?**
|
||||||
|
|
||||||
- [ ] Focus on a single fix or feature; remove any unrelated formatting or code changes
|
- [ ] Focus on a single fix or feature; remove any unrelated formatting or code changes
|
||||||
- [ ] Mention any [related issues](https://github.com/XLabsProject/iw4x-client/issues) (put `closes #XXXX` in comment to auto-close issue when PR is merged)
|
- [ ] Mention any [related issues](https://github.com/diamante0018/iw4x-client/issues) (put `closes #XXXX` in comment to auto-close issue when PR is merged)
|
||||||
- [ ] Follow our [coding conventions](https://github.com/XLabsProject/iw4x-client/blob/master/CODESTYLE.md)
|
- [ ] Follow our [coding conventions](https://github.com/diamante0018/iw4x-client/blob/master/CODESTYLE.md)
|
||||||
- [ ] Minimize the number of commits
|
- [ ] Minimize the number of commits
|
||||||
|
@ -1,15 +1,10 @@
|
|||||||
## iw4x-client Security
|
## iw4x-client Security
|
||||||
We take security very seriously at XLabsProject. We welcome any peer review of our 100% free software source code to ensure nobody's IW4x clients or servers are ever compromised or hacked.
|
We take security very seriously at AlterWare. We welcome any peer review of our 100% free software source code to ensure nobody's IW4x clients or servers are ever compromised or hacked.
|
||||||
|
|
||||||
### Where should I report security issues?
|
### Where should I report security issues?
|
||||||
|
|
||||||
In order to give the community time to respond and upgrade we strongly urge you report all security issues privately.
|
In order to give the community time to respond and upgrade we strongly urge you report all security issues privately.
|
||||||
Please e-mail MauriceHeumann@gmail.com directly to provide details and repro steps.
|
Please e-mail iw4x-sp@proton.me directly to provide details and repro steps.
|
||||||
|
|
||||||
### Other key people
|
|
||||||
|
|
||||||
In the exceptional case that you do not receive a response within a reasonable time frame from our lead developer, please contact any of the following people:
|
|
||||||
- Future/diamante0018: iw4x-sp@proton.me
|
|
||||||
|
|
||||||
We will try respond as soon as possible, but please note:
|
We will try respond as soon as possible, but please note:
|
||||||
|
|
||||||
|
@ -153,7 +153,7 @@ namespace Components
|
|||||||
CoTaskMemFree(path);
|
CoTaskMemFree(path);
|
||||||
});
|
});
|
||||||
|
|
||||||
return std::filesystem::path(path) / "xlabs";
|
return std::filesystem::path(path);
|
||||||
}
|
}
|
||||||
|
|
||||||
std::vector<std::string> FileSystem::GetFileList(const std::string& path, const std::string& extension)
|
std::vector<std::string> FileSystem::GetFileList(const std::string& path, const std::string& extension)
|
||||||
@ -376,7 +376,7 @@ namespace Components
|
|||||||
// Handle IWD freeing
|
// Handle IWD freeing
|
||||||
Utils::Hook(0x642F60, IwdFreeStub, HOOK_CALL).install()->quick();
|
Utils::Hook(0x642F60, IwdFreeStub, HOOK_CALL).install()->quick();
|
||||||
|
|
||||||
// Set the working dir based on info from the Xlabs launcher
|
// Set the working dir based on info from the AlterWare launcher
|
||||||
Utils::Hook(0x4326E0, Sys_DefaultInstallPath_Hk, HOOK_JUMP).install()->quick();
|
Utils::Hook(0x4326E0, Sys_DefaultInstallPath_Hk, HOOK_JUMP).install()->quick();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -767,16 +767,7 @@ namespace Components
|
|||||||
|
|
||||||
UIScript::Add("downloadDLC", []([[maybe_unused]] const UIScript::Token& token, [[maybe_unused]] const Game::uiInfo_s* info)
|
UIScript::Add("downloadDLC", []([[maybe_unused]] const UIScript::Token& token, [[maybe_unused]] const Game::uiInfo_s* info)
|
||||||
{
|
{
|
||||||
int dlc = token.get<int>();
|
const auto dlc = token.get<int>();
|
||||||
|
|
||||||
for (const auto& pack : Maps::DlcPacks)
|
|
||||||
{
|
|
||||||
if (pack.index == dlc)
|
|
||||||
{
|
|
||||||
ShellExecuteW(0, 0, L"https://xlabs.dev/support_iw4x_client.html", 0, 0, SW_SHOW);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Game::ShowMessageBox(Utils::String::VA("DLC %d does not exist!", dlc), "ERROR");
|
Game::ShowMessageBox(Utils::String::VA("DLC %d does not exist!", dlc), "ERROR");
|
||||||
});
|
});
|
||||||
|
@ -245,10 +245,10 @@ namespace Components
|
|||||||
}
|
}
|
||||||
|
|
||||||
auto workingDir = std::filesystem::current_path().string();
|
auto workingDir = std::filesystem::current_path().string();
|
||||||
auto binary = FileSystem::GetAppdataPath() / "data" / "iw4x" / *Game::sys_exitCmdLine;
|
const std::string binary = *Game::sys_exitCmdLine;
|
||||||
|
|
||||||
SetEnvironmentVariableA("XLABS_MW2_INSTALL", workingDir.data());
|
SetEnvironmentVariableA("MW2_INSTALL", workingDir.data());
|
||||||
Utils::Library::LaunchProcess(binary.string(), "-singleplayer", workingDir);
|
Utils::Library::LaunchProcess(binary, "-singleplayer", workingDir);
|
||||||
}
|
}
|
||||||
|
|
||||||
__declspec(naked) void QuickPatch::SND_GetAliasOffset_Stub()
|
__declspec(naked) void QuickPatch::SND_GetAliasOffset_Stub()
|
||||||
@ -320,7 +320,7 @@ namespace Components
|
|||||||
|
|
||||||
Utils::Hook::Set<void(*)(Game::XAssetHeader, void*)>(0x51FCDD, QuickPatch::R_AddImageToList_Hk);
|
Utils::Hook::Set<void(*)(Game::XAssetHeader, void*)>(0x51FCDD, QuickPatch::R_AddImageToList_Hk);
|
||||||
|
|
||||||
Utils::Hook::Set<const char*>(0x41DB8C, "iw4x-sp.exe");
|
Utils::Hook::Set<const char*>(0x41DB8C, "iw4-sp.exe");
|
||||||
Utils::Hook(0x4D6989, QuickPatch::Sys_SpawnQuitProcess_Hk, HOOK_CALL).install()->quick();
|
Utils::Hook(0x4D6989, QuickPatch::Sys_SpawnQuitProcess_Hk, HOOK_CALL).install()->quick();
|
||||||
|
|
||||||
// Fix crash as nullptr goes unchecked
|
// Fix crash as nullptr goes unchecked
|
||||||
|
@ -61,7 +61,7 @@ BOOL APIENTRY DllMain(HINSTANCE /*hinstDLL*/, DWORD fdwReason, LPVOID /*lpvReser
|
|||||||
MessageBoxA(nullptr,
|
MessageBoxA(nullptr,
|
||||||
"Failed to load game binary.\n"
|
"Failed to load game binary.\n"
|
||||||
"You did not install the iw4x-rawfiles!\n"
|
"You did not install the iw4x-rawfiles!\n"
|
||||||
"Please use the XLabs launcher to run the game. For support, please visit https://xlabs.dev/support_iw4x_client",
|
"Please use the AlterWare launcher to run the game. For support, please visit https://alterware.dev/",
|
||||||
"ERROR",
|
"ERROR",
|
||||||
MB_ICONERROR
|
MB_ICONERROR
|
||||||
);
|
);
|
||||||
|
@ -63,7 +63,7 @@ BEGIN
|
|||||||
BEGIN
|
BEGIN
|
||||||
BLOCK "040904b0"
|
BLOCK "040904b0"
|
||||||
BEGIN
|
BEGIN
|
||||||
VALUE "CompanyName", "XLabsProject"
|
VALUE "CompanyName", "AlterWare"
|
||||||
#ifdef _DEBUG
|
#ifdef _DEBUG
|
||||||
VALUE "FileDescription", "IW4 client modification (DEBUG)"
|
VALUE "FileDescription", "IW4 client modification (DEBUG)"
|
||||||
#else
|
#else
|
||||||
@ -71,7 +71,7 @@ BEGIN
|
|||||||
#endif
|
#endif
|
||||||
VALUE "FileVersion", REVISION_STR
|
VALUE "FileVersion", REVISION_STR
|
||||||
VALUE "InternalName", "iw4x"
|
VALUE "InternalName", "iw4x"
|
||||||
VALUE "LegalCopyright", "Copyright 2023 The XLabsProject Team. All rights reserved."
|
VALUE "LegalCopyright", "Copyright 2023 The AlterWare Team. All rights reserved."
|
||||||
VALUE "OriginalFilename", "iw4x.dll"
|
VALUE "OriginalFilename", "iw4x.dll"
|
||||||
VALUE "ProductName", "IW4x"
|
VALUE "ProductName", "IW4x"
|
||||||
VALUE "ProductVersion", REVISION_STR
|
VALUE "ProductVersion", REVISION_STR
|
||||||
|
@ -5,8 +5,8 @@ namespace Utils
|
|||||||
{
|
{
|
||||||
const char* Cache::Urls[] =
|
const char* Cache::Urls[] =
|
||||||
{
|
{
|
||||||
"https://raw.githubusercontent.com/XLabsProject/iw4x-client",
|
"https://raw.githubusercontent.com/diamante0018/iw4x-client",
|
||||||
"https://xlabs.dev",
|
"https://alterware.dev",
|
||||||
};
|
};
|
||||||
|
|
||||||
std::string Cache::ValidUrl;
|
std::string Cache::ValidUrl;
|
||||||
|
@ -112,15 +112,15 @@ namespace Utils
|
|||||||
auto* exeBaseName = std::wcsrchr(binaryPath, L'\\');
|
auto* exeBaseName = std::wcsrchr(binaryPath, L'\\');
|
||||||
exeBaseName[0] = L'\0';
|
exeBaseName[0] = L'\0';
|
||||||
|
|
||||||
// Make the game work without the xlabs launcher
|
// Make the game work without the AlterWare launcher
|
||||||
SetCurrentDirectoryW(binaryPath);
|
SetCurrentDirectoryW(binaryPath);
|
||||||
}
|
}
|
||||||
|
|
||||||
void SetEnvironment()
|
void SetEnvironment()
|
||||||
{
|
{
|
||||||
wchar_t* buffer{};
|
char* buffer{};
|
||||||
std::size_t size{};
|
std::size_t size{};
|
||||||
if (_wdupenv_s(&buffer, &size, L"XLABS_MW2_INSTALL") != 0 || buffer == nullptr)
|
if (_dupenv_s(&buffer, &size, "MW2_INSTALL") != 0 || buffer == nullptr)
|
||||||
{
|
{
|
||||||
SetLegacyEnvironment();
|
SetLegacyEnvironment();
|
||||||
return;
|
return;
|
||||||
@ -128,8 +128,8 @@ namespace Utils
|
|||||||
|
|
||||||
const auto _0 = gsl::finally([&] { std::free(buffer); });
|
const auto _0 = gsl::finally([&] { std::free(buffer); });
|
||||||
|
|
||||||
SetCurrentDirectoryW(buffer);
|
SetCurrentDirectoryA(buffer);
|
||||||
SetDllDirectoryW(buffer);
|
SetDllDirectoryA(buffer);
|
||||||
}
|
}
|
||||||
|
|
||||||
HMODULE GetNTDLL()
|
HMODULE GetNTDLL()
|
||||||
|
Loading…
Reference in New Issue
Block a user