Skip to content

Commit

Permalink
Change branding to Fusion
Browse files Browse the repository at this point in the history
The reason being I don't want it to get confused with Amalgam if rei-kes comes back, and I chose Fusion as the name because its essentially similar to the word amalgam and its just a fork
  • Loading branch information
Viceroyy committed Jul 30, 2024
1 parent a547187 commit d77ed95
Show file tree
Hide file tree
Showing 440 changed files with 23 additions and 22 deletions.
6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
---
name: Bug Report
about: Create a report and help us improve AmalgamEdits!
about: Create a report and help us improve Fusion!
title: A quick Description of Bug
labels: bug
assignees: ''
---
<!-- The template provided below is specifically for bug reports, if you intend to ask a question or recommend a feature/improvement, please head to the discussions tab instead. -->
**AmalgamEdits Build Date:** <!-- Ex: Jul 30 2024 -->
**Fusion Build Date:** <!-- Ex: Jul 30 2024 -->
**Windows Version:** <!-- Ex: Windows 11 Pro 23H2 See: https://learn.microsoft.com/en-us/windows/client-management/client-tools/windows-version-search -->

## Configs used:
<!-- Upload both your normal and visual configs found in Team Fortress 2/Amalgam and Team Fortress 2/Amalgam/Visuals respectively. You can upload the contents of these files to any text-based hosting server. -->
<!-- Upload both your normal and visual configs found in Team Fortress 2/Fusion and Team Fortress 2/Fusion/Visuals respectively. You can upload the contents of these files to any text-based hosting server. -->

## Description:
<!-- Describe what the issue is. -->
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/msbuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ jobs:

- name: Build
working-directory: ${{ github.workspace }}
run: msbuild Amalgam.sln /p:Platform=x64 /p:Configuration=${{ matrix.configuration }}
run: msbuild Fusion.sln /p:Platform=x64 /p:Configuration=${{ matrix.configuration }}

- uses: actions/[email protected]
with:
name: Amalgam${{ matrix.configuration }}
name: Fusion${{ matrix.configuration }}
path: output/${{ matrix.configuration }}/*.dll
2 changes: 1 addition & 1 deletion Amalgam.sln → Fusion.sln
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.8.34525.116
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Amalgam", "Amalgam\Amalgam.vcxproj", "{2550C133-72A8-4AF7-B22A-A8012BD9F376}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Fusion", "Fusion\Fusion.vcxproj", "{2550C133-72A8-4AF7-B22A-A8012BD9F376}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
3 changes: 2 additions & 1 deletion Amalgam/Amalgam.vcxproj → Fusion/Fusion.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,9 @@
<VCProjectVersion>17.0</VCProjectVersion>
<Keyword>Win32Proj</Keyword>
<ProjectGuid>{2550c133-72a8-4af7-b22a-a8012bd9f376}</ProjectGuid>
<RootNamespace>Amalgam</RootNamespace>
<RootNamespace>Fusion</RootNamespace>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
<ProjectName>Fusion</ProjectName>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
8 changes: 4 additions & 4 deletions Amalgam/src/Core/Core.cpp → Fusion/src/Core/Core.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ __forceinline bool CheckRenderIsCompatible()
// Check for if we are running in DXVK mode.
if (GetModuleHandleA("dxvk_d3d9.dll"))
{
MessageBoxA(nullptr, "You are running with graphics options that Amalgam does not support.\n"
MessageBoxA(nullptr, "You are running with graphics options that Fusion does not support.\n"
"Please remove -vulkan from your launch options and reinject.", "Error", MB_ICONERROR);
U::Core.bUnload = true;
return false;
Expand All @@ -86,7 +86,7 @@ __forceinline bool CheckRenderIsCompatible()
auto iLevel = cvDXLevel->GetInt();
if (iLevel < 90)
{
std::string fmt = std::format("You are running with graphics options that Amalgam does not support.\nPlease remove -dxlevel {} from your launch options and reinject.\0", iLevel);
std::string fmt = std::format("You are running with graphics options that Fusion does not support.\nPlease remove -dxlevel {} from your launch options and reinject.\0", iLevel);
MessageBox(nullptr, fmt.c_str(), "Error", MB_ICONERROR);
U::Core.bUnload = true;
return false;
Expand Down Expand Up @@ -117,7 +117,7 @@ void CCore::Load()
F::Menu.ConfigLoaded = true;

I::MatSystemSurface->PlaySound("hl1/fvox/activated.wav");
SDK::Output("Amalgam", "Loaded", { 175, 150, 255, 255 });
SDK::Output("Fusion", "Loaded", { 175, 150, 255, 255 });
}

void CCore::Unload()
Expand Down Expand Up @@ -151,7 +151,7 @@ void CCore::Unload()
}

I::MatSystemSurface->PlaySound("hl1/fvox/deactivated.wav");
SDK::Output("Amalgam", "Unloaded", { 175, 150, 255, 255 });
SDK::Output("Fusion", "Unloaded", { 175, 150, 255, 255 });
}

bool CCore::ShouldUnload()
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ void CConfigs::LoadJson(boost::property_tree::ptree& mapTree, const char* name,

CConfigs::CConfigs()
{
sConfigPath = std::filesystem::current_path().string() + "\\Amalgam";
sConfigPath = std::filesystem::current_path().string() + "\\Fusion";
sVisualsPath = sConfigPath + "\\Visuals";

if (!std::filesystem::exists(sConfigPath))
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit d77ed95

Please sign in to comment.