Compare commits

...

No commits in common. "master" and "old_repo_org" have entirely different histories.

906 changed files with 21377 additions and 52901 deletions

11
.gitignore vendored
View File

@ -4,14 +4,11 @@ Project/.idea
Project/.vs
Project/.vsconfig
!Project/Binaries/Win64/*
Project/Binaries
Project/Binaries/GasaGen.exe
Project/Binaries/GasaGen.map
Project/Binaries/GasaGen.obj
Project/Binaries/GasaGen.raddbgi
Project/Binaries/GasaGen.rdi
# Project/Binaries/vc140.pdb
!Project/Binaries/GasaEditor.target
Project/Binaries/vc140.pdb
Project/Intermediate
@ -39,7 +36,3 @@ Project/Saved/SourceControl
*.target
GasaGen_*.pdb
Project/Content/
.vs
.vs
Project/Binaries

View File

@ -1,3 +0,0 @@
{
"CurrentProjectSetting": "No Configurations"
}

View File

@ -1,7 +0,0 @@
{
"ExpandedNodes": [
""
],
"SelectedNode": "\\Gasa.sln",
"PreviewInSolutionExplorer": false
}

Binary file not shown.

View File

@ -9,8 +9,7 @@
"_DEBUG",
"UNICODE",
"_UNICODE",
"GASA_INTELLISENSE_DIRECTIVES=1",
"WITH_EDITOR=1",
"GASA_INTELLISENSE_DIRECTIVES=1"
],
"windowsSdkVersion": "10.0.22621.0",
"compilerPath": "cl.exe"

26
.vscode/settings.json vendored
View File

@ -1,28 +1,4 @@
{
"autoHide.autoHideSideBar": false,
"autoHide.autoHidePanel": false,
"files.associations": {
"*.rmd": "markdown",
"*.rh": "cpp"
},
"workbench.colorCustomizations": {
"activityBar.activeBackground": "#65c89b",
"activityBar.background": "#65c89b",
"activityBar.foreground": "#15202b",
"activityBar.inactiveForeground": "#15202b99",
"activityBarBadge.background": "#945bc4",
"activityBarBadge.foreground": "#e7e7e7",
"commandCenter.border": "#15202b99",
"sash.hoverBorder": "#65c89b",
"statusBar.background": "#42b883",
"statusBar.foreground": "#15202b",
"statusBarItem.hoverBackground": "#359268",
"statusBarItem.remoteBackground": "#42b883",
"statusBarItem.remoteForeground": "#15202b",
"titleBar.activeBackground": "#42b883",
"titleBar.activeForeground": "#15202b",
"titleBar.inactiveBackground": "#42b88399",
"titleBar.inactiveForeground": "#15202b99"
},
"peacock.color": "#42b883"
"autoHide.autoHidePanel": false
}

View File

@ -1,8 +1,8 @@
<?xml version="1.0"?>
<N10X>
<Workspace>
<IncludeFilter>*.*,</IncludeFilter>
<ExcludeFilter>*.obj,*.lib,*.pch,*.dll,*.pdb,.vs,Debug,Release,x64,obj,*.user,Intermediate,</ExcludeFilter>
<IncludeFilter>*.*</IncludeFilter>
<ExcludeFilter>*.obj,*.lib,*.pch,*.dll,*.pdb,.vs,Debug,Release,x64,obj,*.user,Intermediate</ExcludeFilter>
<SyncFiles>true</SyncFiles>
<Recursive>true</Recursive>
<ShowEmptyFolders>true</ShowEmptyFolders>
@ -15,13 +15,12 @@
<CleanCommand></CleanCommand>
<BuildWorkingDirectory></BuildWorkingDirectory>
<CancelBuild></CancelBuild>
<Exe></Exe>
<Args></Args>
<WorkingDirectory></WorkingDirectory>
<RunCommand></RunCommand>
<RunCommandWorkingDirectory></RunCommandWorkingDirectory>
<DebugCommand></DebugCommand>
<ExePathCommand></ExePathCommand>
<DebugSln></DebugSln>
<UseVisualStudioEnvBat>false</UseVisualStudioEnvBat>
<CaptureExeOutput>false</CaptureExeOutput>
<Configurations>
<Configuration>Debug</Configuration>
<Configuration>Release</Configuration>
@ -40,24 +39,8 @@
<AdditionalIncludePath>C:\Program Files (x86)\Windows Kits\10\\include\10.0.22621.0\\cppwinrt</AdditionalIncludePath>
<AdditionalIncludePath>C:\Program Files (x86)\Windows Kits\NETFXSDK\4.8\include\um</AdditionalIncludePath>
</AdditionalIncludePaths>
<Defines>
<Define>GASA_INTELLISENSE_DIRECTIVES</Define>
</Defines>
<ConfigProperties>
<ConfigAndPlatform>
<Name>Debug:x64</Name>
<Defines></Defines>
<ForceIncludes></ForceIncludes>
</ConfigAndPlatform>
<Config>
<Name>Debug</Name>
<Defines></Defines>
</Config>
<Platform>
<Name>x64</Name>
<Defines></Defines>
</Platform>
</ConfigProperties>
<Defines></Defines>
<ConfigProperties></ConfigProperties>
<Children></Children>
</Workspace>
</N10X>

View File

@ -1,20 +0,0 @@
{
"folders": [
{
"path": "."
},
{
"path": "../Surgo/UE"
}
],
"settings": {
"autoHide.autoHideSideBar": false,
"autoHide.autoHidePanel": false,
"files.associations": {
"*.rmd": "markdown",
"*.ipp": "cpp",
"__hash_table": "cpp",
"string": "cpp"
}
}
}

Binary file not shown.

BIN
Project/Binaries/Win64/UnrealEditor-GasaEditor.dll (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -5,12 +5,12 @@ ProjectName=GASATHON
CopyrightNotice=
[/Script/Gasa.GasaDevOptions]
+AttributeSets=/Game/Core/Tables/DT_GasaAttributeSet.DT_GasaAttributeSet
TaggedMessageTable=/Game/Core/Tables/DT_TaggedMessages.DT_TaggedMessages
Tag_PPV=Global_PPV
Tag_GlobalPPV=Global_PPV
Template_PlayerCamera=/Game/Actors/BP_CameraMount.BP_CameraMount_C
Template_HUD_HostUI=/Game/UI/UI_Host.UI_Host_C
Template_HostWidgetController=/Game/UI/BP_HostWidgetController.BP_HostWidgetController_C
Tag_GlobalPPV=Global_PPV
TaggedMessageTable=/Game/Core/Tables/DT_TaggedMessages.DT_TaggedMessages
[/Script/GameplayAbilities.AbilitySystemGlobals]
bUseDebugTargetFromHud=true

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
Project/Content/Actors/Aura/Animations/Abilities/Stun.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Project/Content/Actors/Aura/Animations/AuraPose.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Project/Content/Actors/Aura/Animations/Idle.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Project/Content/Actors/Aura/Animations/IdleWalkRun.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Project/Content/Actors/Aura/Animations/InAir.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Project/Content/Actors/Aura/Animations/Run.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Project/Content/Actors/Aura/Animations/Walk.uasset (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
Project/Content/Actors/Aura/Materials/M_ArmGuard.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Project/Content/Actors/Aura/Materials/M_Belt.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Project/Content/Actors/Aura/Materials/M_Body.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Project/Content/Actors/Aura/Materials/M_Eyes.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Project/Content/Actors/Aura/Materials/M_Hair.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Project/Content/Actors/Aura/Materials/M_Tunic.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Project/Content/Actors/Aura/PA_Aura.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Project/Content/Actors/Aura/SKM_Aura.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Project/Content/Actors/Aura/SK_Aura.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Project/Content/Actors/Aura/Staff/Materials/M_Floaty.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Project/Content/Actors/Aura/Staff/Materials/M_Staff.uasset (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
Project/Content/Actors/Aura/Staff/PA_Staff.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Project/Content/Actors/Aura/Staff/SKM_Staff.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Project/Content/Actors/Aura/Staff/SK_Staff.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Project/Content/Actors/Aura/Staff/SM_Staff.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Project/Content/Actors/BP_CameraMount.uasset (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
Project/Content/Actors/Enemies/Demon/PA_Demon.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Project/Content/Actors/Enemies/Demon/SKM_Demon.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Project/Content/Actors/Enemies/Demon/SK_Demon.uasset (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
Project/Content/Actors/Enemies/Ghoul/Animations/Death.uasset (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

BIN
Project/Content/Actors/Enemies/Ghoul/Animations/Idle.uasset (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

BIN
Project/Content/Actors/Enemies/Ghoul/Animations/Stun.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Project/Content/Actors/Enemies/Ghoul/Animations/Walk.uasset (Stored with Git LFS) Normal file

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More