Skip to content

Update for 7.4 & API 14 #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BoxuChan wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update for 7.4 & API 14 #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DrahsidLib
Open in desktop
Submodule DrahsidLib updated from 34d9bd to 617be4
6 changes: 6 additions & 0 deletions HybridCamera.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ VisualStudioVersion = 16.0.34931.43
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HybridCamera", "HybridCamera\HybridCamera.csproj", "{96A11C55-C1E2-410E-A6AC-300BFCEF4F5D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DrahsidLib", "DrahsidLib\DrahsidLib.csproj", "{36FCE424-621F-404F-A842-C400D674654C}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -15,6 +17,10 @@ Global
{96A11C55-C1E2-410E-A6AC-300BFCEF4F5D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{96A11C55-C1E2-410E-A6AC-300BFCEF4F5D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{96A11C55-C1E2-410E-A6AC-300BFCEF4F5D}.Release|Any CPU.Build.0 = Release|Any CPU
{36FCE424-621F-404F-A842-C400D674654C}.Debug|Any CPU.ActiveCfg = Debug|x64
{36FCE424-621F-404F-A842-C400D674654C}.Debug|Any CPU.Build.0 = Debug|x64
{36FCE424-621F-404F-A842-C400D674654C}.Release|Any CPU.ActiveCfg = Release|x64
{36FCE424-621F-404F-A842-C400D674654C}.Release|Any CPU.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
8 changes: 1 addition & 7 deletions HybridCamera/HybridCamera.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,4 @@
<Project Sdk="Dalamud.NET.Sdk/13.0.0">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<LangVersion>preview</LangVersion>
<NoWarn>1701;1702;CA1416</NoWarn>
</PropertyGroup>
<Project Sdk="Dalamud.NET.Sdk/14.0.1">

<PropertyGroup>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
Expand Down
1 change: 1 addition & 0 deletions HybridCamera/HybridCamera.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"Description": "Hybrid camera/movement mode! Move freely!",
"Punchline": "Legacy and standard movement in one! Move freely!",
"RepoUrl": "https://github.com/Drahsid/HybridCamera",
"tags": ["camera", "qol", "gameplay"]
}


6 changes: 3 additions & 3 deletions HybridCamera/MovementHook.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ public static unsafe void MovementDirectionUpdate(MoveControllerSubMemberForMine
shouldContinue = false;
}

MovementDirectionUpdateHook.Original(thisx, wishdir_h, wishdir_v, rotatedir, align_with_camera, autorun, dont_rotate_with_camera);
MovementDirectionUpdateHook?.Original(thisx, wishdir_h, wishdir_v, rotatedir, align_with_camera, autorun, dont_rotate_with_camera);

if (!shouldContinue) return;

Expand Down Expand Up @@ -387,12 +387,12 @@ public static unsafe void MovementDirectionUpdate(MoveControllerSubMemberForMine

public static unsafe void MovementUpdate(MoveControllerSubMemberForMine* thisx, float wishdir_h, float wishdir_v, char arg4, byte align_with_camera, Vector3* direction)
{
MovementUpdateHook.Original(thisx, wishdir_h, wishdir_v, arg4, align_with_camera, direction);
MovementUpdateHook?.Original(thisx, wishdir_h, wishdir_v, arg4, align_with_camera, direction);
}

public static unsafe void MovementUpdate2(MoveControllerSubMemberForMine* thisx, Vector3* direction, byte arg3, UInt64 align_with_camera, byte arg5, byte arg6, Vector3* arg7, UInt64 arg8)
{
MovementUpdate2Hook.Original(thisx, direction, arg3, align_with_camera, arg5, arg6, arg7, arg8); // thisx->Moved indirectly gets updated in here if direction is laterally non-zero
MovementUpdate2Hook?.Original(thisx, direction, arg3, align_with_camera, arg5, arg6, arg7, arg8); // thisx->Moved indirectly gets updated in here if direction is laterally non-zero
}

public static unsafe void MovementSpeedUpdate(MoveControllerSubMemberForMine* thisx)
Expand Down
16 changes: 8 additions & 8 deletions HybridCamera/packages.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
{
"version": 1,
"dependencies": {
"net9.0": {
"net10.0-windows7.0": {
"DalamudPackager": {
"type": "Direct",
"requested": "[13.0.0, )",
"resolved": "13.0.0",
"contentHash": "Mb3cUDSK/vDPQ8gQIeuCw03EMYrej1B4J44a1AvIJ9C759p9XeqdU9Hg4WgOmlnlPe0G7ILTD32PKSUpkQNa8w=="
"requested": "[14.0.1, )",
"resolved": "14.0.1",
"contentHash": "y0WWyUE6dhpGdolK3iKgwys05/nZaVf4ZPtIjpLhJBZvHxkkiE23zYRo7K7uqAgoK/QvK5cqF6l3VG5AbgC6KA=="
},
"DotNet.ReproducibleBuilds": {
"type": "Direct",
"requested": "[1.2.25, )",
"resolved": "1.2.25",
"contentHash": "xCXiw7BCxHJ8pF6wPepRUddlh2dlQlbr81gXA72hdk4FLHkKXas7EH/n+fk5UCA/YfMqG1Z6XaPiUjDbUNBUzg=="
"requested": "[1.2.39, )",
"resolved": "1.2.39",
"contentHash": "fcFN01tDTIQqDuTwr1jUQK/geofiwjG5DycJQOnC72i1SsLAk1ELe+apBOuZ11UMQG8YKFZG1FgvjZPbqHyatg=="
},
"drahsidlib": {
"type": "Project",
"dependencies": {
"DalamudPackager": "[13.0.0, )"
"DalamudPackager": "[14.0.1, )"
}
}
}
Expand Down