Compare commits

..

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

905 changed files with 21376 additions and 52882 deletions

10
.gitignore vendored
View File

@ -4,14 +4,11 @@ Project/.idea
Project/.vs Project/.vs
Project/.vsconfig Project/.vsconfig
!Project/Binaries/Win64/* Project/Binaries
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/GasaGen.raddbgi Project/Binaries/vc140.pdb
Project/Binaries/GasaGen.rdi
# Project/Binaries/vc140.pdb
!Project/Binaries/GasaEditor.target
Project/Intermediate Project/Intermediate
@ -39,6 +36,3 @@ Project/Saved/SourceControl
*.target *.target
GasaGen_*.pdb GasaGen_*.pdb
Project/Content/
.vs
.vs

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", "_DEBUG",
"UNICODE", "UNICODE",
"_UNICODE", "_UNICODE",
"GASA_INTELLISENSE_DIRECTIVES=1", "GASA_INTELLISENSE_DIRECTIVES=1"
"WITH_EDITOR=1",
], ],
"windowsSdkVersion": "10.0.22621.0", "windowsSdkVersion": "10.0.22621.0",
"compilerPath": "cl.exe" "compilerPath": "cl.exe"

View File

@ -1,8 +1,4 @@
{ {
"autoHide.autoHideSideBar": false, "autoHide.autoHideSideBar": false,
"autoHide.autoHidePanel": false, "autoHide.autoHidePanel": false
"files.associations": {
"*.rmd": "markdown",
"*.rh": "cpp"
}
} }

View File

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

View File

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

Binary file not shown.

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