Compare commits

..

3 Commits

Author SHA1 Message Date
Ed_
d97ee1d302 Making scripts for major changes 2024-10-18 15:43:22 -04:00
Ed_
1b5d2a3ff6 just origanizing gitignore 2024-10-18 15:15:52 -04:00
Ed_
ca779b627b Commiting last latest changes before making repo modifications 2024-10-18 15:11:13 -04:00
13 changed files with 146 additions and 36 deletions

51
.gitignore vendored
View File

@ -1,31 +1,38 @@
Project/Binaries */Binaries/Win64/*.patch_*.*
Project/Intermediate
Project/Saved/Crashes Project/.idea
Project/Saved/SourceControl
Project/Saved/ShaderDebugInfo
Project/Saved/Logs
Project/Saved/Autosaves
Project/Saved/Config/CrashReportClient
Project/Saved/Config/WindowsEditor
Project/Saved/Config/WorldState
Project/Saved/AutoScreenshot.png
Project/Platforms
Project/.vs Project/.vs
Project/.vsconfig Project/.vsconfig
*.sln
*.target
*.modules
Project/.idea
Project/Saved/Screenshots Project/Binaries
*/Binaries/Win64/*.patch_*.*
Project/Saved/ImGui
Project/Saved/ImGui/imgui.ini
GasaGen_*.pdb
Project/Binaries/GasaGen.exe Project/Binaries/GasaGen.exe
Project/Binaries/GasaGen.map Project/Binaries/GasaGen.map
Project/Binaries/GasaGen.obj Project/Binaries/GasaGen.obj
Project/Binaries/vc140.pdb Project/Binaries/vc140.pdb
Project/Intermediate
Project/Platforms
Project/Saved/Config/ConsoleHistory.ini Project/Saved/Config/ConsoleHistory.ini
*.pdb
Project/Saved/Autosaves
Project/Saved/AutoScreenshot.png
Project/Saved/Config/CrashReportClient
Project/Saved/Config/WindowsEditor
Project/Saved/Config/WorldState
Project/Saved/Crashes
Project/Saved/Diff Project/Saved/Diff
Project/Saved/ImGui
Project/Saved/ImGui/imgui.ini
Project/Saved/Logs
Project/Saved/Screenshots
Project/Saved/ShaderDebugInfo
Project/Saved/SourceControl
*.modules
*.pdb
*.sln
*.target
GasaGen_*.pdb

Binary file not shown.

File diff suppressed because one or more lines are too long

View File

@ -49,6 +49,15 @@ r.ReflectionMethod=1
r.Shadow.Virtual.Enable=1 r.Shadow.Virtual.Enable=1
r.DefaultFeature.AutoExposure.ExtendDefaultLuminanceRange=True r.DefaultFeature.AutoExposure.ExtendDefaultLuminanceRange=True
r.CustomDepth=3 r.CustomDepth=3
r.DefaultFeature.Bloom=False
r.DefaultFeature.AmbientOcclusion=False
r.DefaultFeature.AmbientOcclusionStaticFraction=False
r.DefaultFeature.AutoExposure=False
r.DefaultFeature.MotionBlur=False
r.AntiAliasingMethod=0
r.MSAACount=1
r.ScreenPercentage.Default=25.000000
r.SupportSkyAtmosphere=False
[/Script/WorldPartitionEditor.WorldPartitionEditorSettings] [/Script/WorldPartitionEditor.WorldPartitionEditorSettings]
CommandletClass=Class'/Script/UnrealEd.WorldPartitionConvertCommandlet' CommandletClass=Class'/Script/UnrealEd.WorldPartitionConvertCommandlet'
@ -130,3 +139,4 @@ ManualIPAddress=
+CollisionChannelRedirects=(OldName="Dynamic",NewName="WorldDynamic") +CollisionChannelRedirects=(OldName="Dynamic",NewName="WorldDynamic")
+CollisionChannelRedirects=(OldName="VehicleMovement",NewName="Vehicle") +CollisionChannelRedirects=(OldName="VehicleMovement",NewName="Vehicle")
+CollisionChannelRedirects=(OldName="PawnMovement",NewName="Pawn") +CollisionChannelRedirects=(OldName="PawnMovement",NewName="Pawn")

BIN
Project/Content/UI/Globes/MI_BlackBG.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Project/Content/UI/UI_GlobeTemplate.uasset (Stored with Git LFS)

Binary file not shown.

View File

@ -1,4 +1,4 @@
#include "GasaUserWidget.h" #include "GasaUserWidget.h"
#include "Blueprint/WidgetBlueprintGeneratedClass.h" #include "Blueprint/WidgetBlueprintGeneratedClass.h"
#include "Blueprint/WidgetTree.h" #include "Blueprint/WidgetTree.h"
@ -227,7 +227,7 @@ bool UGasaUserWidget::Initialize()
// For backward compatibility, run the initialize event on widget that doesn't have a player context only when the class authorized it. // For backward compatibility, run the initialize event on widget that doesn't have a player context only when the class authorized it.
bool bClassWantsToRunInitialized = BGClass && BGClass->bCanCallInitializedWithoutPlayerContext; bool bClassWantsToRunInitialized = BGClass && BGClass->bCanCallInitializedWithoutPlayerContext;
if (!IsDesignTime() && (PlayerContext.IsValid() || bClassWantsToRunInitialized)) if (!IsDesignTime() && (GetPlayerContext().IsValid() || bClassWantsToRunInitialized))
{ {
NativeOnInitialized(); NativeOnInitialized();
} }

View File

@ -1,4 +1,4 @@
#include "GlobeProgressBar.h" #include "GlobeProgressBar.h"
#include "GasaImage.h" #include "GasaImage.h"
#include "GasaOverlay.h" #include "GasaOverlay.h"

View File

@ -5,7 +5,7 @@
#include "WidgetController.h" #include "WidgetController.h"
#include "HostWidgetController.generated.h" #include "HostWidgetController.generated.h"
DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam( FAttributeFloatChangedSig, float, NewValue ); DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam( FAttributeChangedSig, float, NewValue );
UCLASS( Blueprintable, BlueprintType ) UCLASS( Blueprintable, BlueprintType )
class GASA_API UHostWidgetController : public UWidgetController class GASA_API UHostWidgetController : public UWidgetController
@ -16,16 +16,16 @@ public:
// Attribute Events are generated by GasaGen/GasaGen_HostWidgetController.cpp // Attribute Events are generated by GasaGen/GasaGen_HostWidgetController.cpp
UPROPERTY( BlueprintAssignable, Category = "Attributes" ) UPROPERTY( BlueprintAssignable, Category = "Attributes" )
FAttributeFloatChangedSig Event_OnHealthChanged; FAttributeChangedSig Event_OnHealthChanged;
UPROPERTY( BlueprintAssignable, Category = "Attributes" ) UPROPERTY( BlueprintAssignable, Category = "Attributes" )
FAttributeFloatChangedSig Event_OnMaxHealthChanged; FAttributeChangedSig Event_OnMaxHealthChanged;
UPROPERTY( BlueprintAssignable, Category = "Attributes" ) UPROPERTY( BlueprintAssignable, Category = "Attributes" )
FAttributeFloatChangedSig Event_OnManaChanged; FAttributeChangedSig Event_OnManaChanged;
UPROPERTY( BlueprintAssignable, Category = "Attributes" ) UPROPERTY( BlueprintAssignable, Category = "Attributes" )
FAttributeFloatChangedSig Event_OnMaxManaChanged; FAttributeChangedSig Event_OnMaxManaChanged;
void HealthChanged( FOnAttributeChangeData const& Data ); void HealthChanged( FOnAttributeChangeData const& Data );
void MaxHealthChanged( FOnAttributeChangeData const& Data ); void MaxHealthChanged( FOnAttributeChangeData const& Data );

View File

@ -72,7 +72,7 @@ void gen_UHostWidgetController()
)); ));
attribute_events.append(fmt_newline); attribute_events.append(fmt_newline);
attribute_events.append( parse_variable( attribute_events.append( parse_variable(
token_fmt( "field", (StrC) attribute_field.Name, stringize( FAttributeFloatChangedSig Event_On<field>Changed; )) token_fmt( "field", (StrC) attribute_field.Name, stringize( FAttributeChangedSig Event_On<field>Changed; ))
)); ));
attribute_events.append(fmt_newline); attribute_events.append(fmt_newline);
} }

83
scripts/clean_shit_up.ps1 Normal file
View File

@ -0,0 +1,83 @@
# PowerShell script to set up Git LFS for Content directory
clear-host
$path_scripts = $PSScriptRoot
$path_helpers = join-path $path_scripts 'helpers'
$path_root = split-path -Parent -Path $path_scripts
$path_ue = join-path '../../Surgo' 'UE'
$path_project = join-path $path_root 'Project'
# Set your repository paths here
$path_content = join-path $path_project 'Content'
# Function to remove Content directory from Git history
function Remove-ContentFromGitHistory {
push-location $path_repo
$cgit_filter_branch = 'filter-branch'
$cgit_for_each_ref = 'for-each-ref'
$cgit_update_ref = 'update-ref'
$cgit_reflog_expire = 'reflog expire'
$cgit_garbage_collect = 'gc'
$fgit_agressive = '--aggressive'
$fgit_all = '--all'
$fgit_cached = '--cached'
$fgit_format = '--format'
$fgit_expire_now = '--expire=now'
$fgit_ignore_unmatch = '--ignore-unmatch'
$fgit_index_filter = '--index-filter'
$fgit_force = '--force'
$fgit_prune_empty = '--prune-empty'
$fgit_prune_now = '--prune=now'
$fgit_tag_name_filter = '--tag-name-filter'
$fgit_stdin = '--stdin'
$fgit_filter_concat = 'cat'
$fgit_filter_separate = '--'
$fmt_delete_refs = 'delete $(refname)'
$original_refs = 'refs/original'
$filter_cmd = 'git rm -r --cached'
# Construct filter-branch command
$filter_branch_args = @()
$filter_branch_args += $fgit_force
$filter_branch_args += $fgit_index_filter
$filter_branch_args += "git rm -r $fgit_cached $fgit_ignore_unmatch $path_content"
$filter_branch_args += $fgit_prune_empty
$filter_branch_args += $fgit_tag_name_filter
$filter_branch_args += $fgit_filter_concat
$filter_branch_args += $fgit_filter_separate
$filter_branch_args += $fgit_all
# Execute filter-branch command
& git $cgit_filter_branch $filter_branch_args
# Construct for-each-ref command
$for_each_ref_args = @()
$for_each_ref_args += "$fgit_format='$fmt_delete_refs'"
$for_each_ref_args += $original_refs
# Execute for-each-ref and pipe to update-ref
$refs_to_delete = & git $cgit_for_each_ref $for_each_ref_args
$refs_to_delete | & git $cgit_update_ref $fgit_stdin
# Construct and execute reflog expire command
$reflog_expire_args = @()
$reflog_expire_args += $fgit_expire_now
$reflog_expire_args += $fgit_all
& git $cgit_reflog_expire $reflog_expire_args
# Construct and execute garbage collect command
$gc_args = @()
$gc_args += $fgit_prune_now
$gc_args += $fgit_aggressive
& git $cgit_garbage_collect $gc_args
pop-location
}
Remove-ContentFromGitHistory

View File

@ -54,7 +54,7 @@ elseif ( $release -eq $false ) {
else { else {
$optimize = $true $optimize = $true
} }
#endregion Configuration
. $vendor_toolchain . $vendor_toolchain
. $incremental_checks . $incremental_checks
@ -103,3 +103,4 @@ function run-gengasa
Pop-Location Pop-Location
} }
run-gengasa run-gengasa
#endregion Building

View File

@ -0,0 +1,4 @@
clear-host