Skip to content

[UNR-4342] 4.26 Support #233

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

Merged
merged 8 commits into from
Dec 15, 2020
Merged

[UNR-4342] 4.26 Support #233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b34ed18
Camera shake update with 4.26
mironec Oct 12, 2020
9eac9fb
Revert to just 4.26 as there is no known workaround for this issue atm
mironec Dec 1, 2020
d20f517
Merge remote-tracking branch 'origin/master' into experiment/4.26
improbable-valy Dec 8, 2020
d484e79
Merge remote-tracking branch 'origin/master' into experiment/4.26
mironec Dec 8, 2020
a14e259
Merge branch 'experiment/4.26' of https://github.com/spatialos/Unreal…
improbable-valy Dec 9, 2020
23a2c88
Merge remote-tracking branch 'origin/master' into experiment/4.26
improbable-valy Dec 11, 2020
1cd8f71
Increase min iOS version, adjust FOV
improbable-valy Dec 11, 2020
ae14e75
Merge branch 'master' into experiment/4.26
ImprobableMatthew Dec 15, 2020
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 Game/Config/DefaultEngine.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ GlobalDefaultServerGameMode=None
ServerDefaultMap=/Game/Maps/Control_Small.Control_Small

[/Script/IOSRuntimeSettings.IOSRuntimeSettings]
MinimumiOSVersion=IOS_11
MinimumiOSVersion=IOS_12

[/Script/HardwareTargeting.HardwareTargetingSettings]
TargetedHardwareClass=Desktop
Expand Down
Binary file modified Game/Content/Blueprints/Weapons/BP_AutomaticRifle.uasset
View file
Open in desktop
Binary file not shown.
Binary file modified Game/Content/Blueprints/Weapons/BP_GrenadeLauncher_Frag.uasset
View file
Open in desktop
Binary file not shown.
Binary file modified Game/Content/Characters/BP_FPS_Character.uasset
View file
Open in desktop
Binary file not shown.
Binary file modified Game/Content/Controllers/BP_GDK_PlayerController.uasset
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion Game/Source/GDKShooter/Public/Weapons/Weapon.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ class GDKSHOOTER_API AWeapon : public AHoldable

//Recoil applied as a CameraShake
UPROPERTY(EditAnywhere, BlueprintReadOnly)
TSubclassOf<UCameraShake> RecoilShake;
TSubclassOf<UCameraShakeBase> RecoilShake;

virtual void StartPrimaryUse_Implementation() override;
virtual void StopPrimaryUse_Implementation() override;
Expand Down