-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
0241052
commit e7dc0b2
Showing
89 changed files
with
6,548 additions
and
355 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
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.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
{ | ||
"BuildId": "16433597", | ||
"BuildId": "19206456", | ||
"Modules": | ||
{ | ||
"CombatSystem": "UnrealEditor-CombatSystem.dll" | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified
BIN
+683 Bytes
(110%)
CombatSystem/Content/Blueprints/States/BP_StateAim.uasset
Binary file not shown.
Binary file modified
BIN
+24 Bytes
(100%)
CombatSystem/Content/Characters/ErikaArcher/Animation/ABP_ErikaArcher.uasset
Binary file not shown.
Binary file modified
BIN
-61.4 KB
(99%)
CombatSystem/Content/Characters/ErikaArcher/Animation/Combat/rolling_slash.uasset
Binary file not shown.
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion
2
...em/Intermediate/Build/Win64/CombatSystemEditor/Development/CombatSystemEditor.uhtmanifest
Large diffs are not rendered by default.
Oops, something went wrong.
Binary file modified
BIN
+4.28 KB
(110%)
CombatSystem/Intermediate/Build/Win64/CombatSystemEditor/Development/DependencyCache.bin
Binary file not shown.
Binary file modified
BIN
-37.1 KB
(98%)
CombatSystem/Intermediate/Build/Win64/CombatSystemEditor/Development/Makefile.bin
Binary file not shown.
Binary file modified
BIN
-8.98 KB
(99%)
CombatSystem/Intermediate/Build/Win64/CombatSystemEditor/Development/TargetMetadata.dat
Binary file not shown.
Binary file modified
BIN
+4.79 KB
(130%)
CombatSystem/Intermediate/Build/Win64/UnrealEditor/Development/ActionHistory.bin
Binary file not shown.
35 changes: 35 additions & 0 deletions
35
...ermediate/Build/Win64/UnrealEditor/Development/CombatSystem/CSActionComponent.cpp.lc.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
{ | ||
"Version": "1.1", | ||
"Data": { | ||
"Source": "c:\\users\\marc\\documents\\github\\combatsystem\\combatsystem\\source\\combatsystem\\private\\components\\csactioncomponent.cpp", | ||
"ProvidedModule": "", | ||
"PCH": "c:\\users\\marc\\documents\\github\\combatsystem\\combatsystem\\intermediate\\build\\win64\\combatsystemeditor\\development\\engine\\sharedpch.engine.shadowerrors.h.pch", | ||
"Includes": [ | ||
"c:\\users\\marc\\documents\\github\\combatsystem\\combatsystem\\intermediate\\build\\win64\\unrealeditor\\development\\combatsystem\\definitions.combatsystem.h", | ||
"c:\\users\\marc\\documents\\github\\combatsystem\\combatsystem\\source\\combatsystem\\public\\components\\csactioncomponent.h", | ||
"c:\\users\\marc\\documents\\github\\combatsystem\\combatsystem\\source\\combatsystem\\public\\actions\\cscharacterstate.h", | ||
"d:\\epicgames\\ue_5.0\\engine\\source\\runtime\\coreuobject\\public\\uobject\\noexporttypes.h", | ||
"d:\\epicgames\\ue_5.0\\engine\\source\\runtime\\coreuobject\\public\\uobject\\propertyaccessutil.h", | ||
"d:\\epicgames\\ue_5.0\\engine\\source\\runtime\\core\\public\\math\\unitconversion.h", | ||
"d:\\epicgames\\ue_5.0\\engine\\source\\runtime\\core\\public\\math\\unitconversion.inl", | ||
"d:\\epicgames\\ue_5.0\\engine\\source\\runtime\\core\\public\\internationalization\\polyglottextdata.h", | ||
"d:\\epicgames\\ue_5.0\\engine\\source\\runtime\\coreuobject\\public\\assetregistry\\arfilter.h", | ||
"c:\\users\\marc\\documents\\github\\combatsystem\\combatsystem\\intermediate\\build\\win64\\unrealeditor\\inc\\combatsystem\\cscharacterstate.generated.h", | ||
"c:\\users\\marc\\documents\\github\\combatsystem\\combatsystem\\intermediate\\build\\win64\\unrealeditor\\inc\\combatsystem\\csactioncomponent.generated.h", | ||
"c:\\users\\marc\\documents\\github\\combatsystem\\combatsystem\\source\\combatsystem\\public\\actions\\cscharacterstate_attack.h", | ||
"c:\\users\\marc\\documents\\github\\combatsystem\\combatsystem\\intermediate\\build\\win64\\unrealeditor\\inc\\combatsystem\\cscharacterstate_attack.generated.h", | ||
"c:\\users\\marc\\documents\\github\\combatsystem\\combatsystem\\source\\combatsystem\\public\\actions\\cscharacterstate_dodge.h", | ||
"c:\\users\\marc\\documents\\github\\combatsystem\\combatsystem\\intermediate\\build\\win64\\unrealeditor\\inc\\combatsystem\\cscharacterstate_dodge.generated.h", | ||
"c:\\users\\marc\\documents\\github\\combatsystem\\combatsystem\\source\\combatsystem\\public\\cscharacter.h", | ||
"d:\\epicgames\\ue_5.0\\engine\\source\\runtime\\engine\\classes\\gameframework\\character.h", | ||
"d:\\epicgames\\ue_5.0\\engine\\source\\runtime\\engine\\classes\\gameframework\\charactermovementreplication.h", | ||
"d:\\epicgames\\ue_5.0\\engine\\intermediate\\build\\win64\\unrealeditor\\inc\\engine\\charactermovementreplication.generated.h", | ||
"d:\\epicgames\\ue_5.0\\engine\\source\\runtime\\engine\\classes\\gameframework\\rootmotionsource.h", | ||
"d:\\epicgames\\ue_5.0\\engine\\intermediate\\build\\win64\\unrealeditor\\inc\\engine\\rootmotionsource.generated.h", | ||
"d:\\epicgames\\ue_5.0\\engine\\intermediate\\build\\win64\\unrealeditor\\inc\\engine\\character.generated.h", | ||
"c:\\users\\marc\\documents\\github\\combatsystem\\combatsystem\\intermediate\\build\\win64\\unrealeditor\\inc\\combatsystem\\cscharacter.generated.h" | ||
], | ||
"ImportedModules": [], | ||
"ImportedHeaderUnits": [] | ||
} | ||
} |
56 changes: 56 additions & 0 deletions
56
...te/Build/Win64/UnrealEditor/Development/CombatSystem/CSCameraManagerComponent.cpp.lc.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,56 @@ | ||
{ | ||
"Version": "1.1", | ||
"Data": { | ||
"Source": "c:\\users\\marc\\documents\\github\\combatsystem\\combatsystem\\source\\combatsystem\\private\\components\\cscameramanagercomponent.cpp", | ||
"ProvidedModule": "", | ||
"PCH": "c:\\users\\marc\\documents\\github\\combatsystem\\combatsystem\\intermediate\\build\\win64\\combatsystemeditor\\development\\engine\\sharedpch.engine.shadowerrors.h.pch", | ||
"Includes": [ | ||
"c:\\users\\marc\\documents\\github\\combatsystem\\combatsystem\\intermediate\\build\\win64\\unrealeditor\\development\\combatsystem\\definitions.combatsystem.h", | ||
"c:\\users\\marc\\documents\\github\\combatsystem\\combatsystem\\source\\combatsystem\\public\\components\\cscameramanagercomponent.h", | ||
"c:\\users\\marc\\documents\\github\\combatsystem\\combatsystem\\intermediate\\build\\win64\\unrealeditor\\inc\\combatsystem\\cscameramanagercomponent.generated.h", | ||
"c:\\users\\marc\\documents\\github\\combatsystem\\combatsystem\\source\\combatsystem\\public\\cscharacter.h", | ||
"d:\\epicgames\\ue_5.0\\engine\\source\\runtime\\engine\\classes\\gameframework\\character.h", | ||
"d:\\epicgames\\ue_5.0\\engine\\source\\runtime\\engine\\classes\\gameframework\\charactermovementreplication.h", | ||
"d:\\epicgames\\ue_5.0\\engine\\intermediate\\build\\win64\\unrealeditor\\inc\\engine\\charactermovementreplication.generated.h", | ||
"d:\\epicgames\\ue_5.0\\engine\\source\\runtime\\engine\\classes\\gameframework\\rootmotionsource.h", | ||
"d:\\epicgames\\ue_5.0\\engine\\intermediate\\build\\win64\\unrealeditor\\inc\\engine\\rootmotionsource.generated.h", | ||
"d:\\epicgames\\ue_5.0\\engine\\intermediate\\build\\win64\\unrealeditor\\inc\\engine\\character.generated.h", | ||
"c:\\users\\marc\\documents\\github\\combatsystem\\combatsystem\\intermediate\\build\\win64\\unrealeditor\\inc\\combatsystem\\cscharacter.generated.h", | ||
"d:\\epicgames\\ue_5.0\\engine\\source\\runtime\\engine\\classes\\gameframework\\charactermovementcomponent.h", | ||
"d:\\epicgames\\ue_5.0\\engine\\source\\runtime\\engine\\classes\\ai\\navigation\\navigationavoidancetypes.h", | ||
"d:\\epicgames\\ue_5.0\\engine\\intermediate\\build\\win64\\unrealeditor\\inc\\engine\\navigationavoidancetypes.generated.h", | ||
"d:\\epicgames\\ue_5.0\\engine\\source\\runtime\\engine\\public\\ai\\rvoavoidanceinterface.h", | ||
"d:\\epicgames\\ue_5.0\\engine\\intermediate\\build\\win64\\unrealeditor\\inc\\engine\\rvoavoidanceinterface.generated.h", | ||
"d:\\epicgames\\ue_5.0\\engine\\source\\runtime\\engine\\classes\\gameframework\\pawnmovementcomponent.h", | ||
"d:\\epicgames\\ue_5.0\\engine\\source\\runtime\\engine\\classes\\gameframework\\navmovementcomponent.h", | ||
"d:\\epicgames\\ue_5.0\\engine\\source\\runtime\\engine\\classes\\ai\\navigation\\pathfollowingagentinterface.h", | ||
"d:\\epicgames\\ue_5.0\\engine\\intermediate\\build\\win64\\unrealeditor\\inc\\engine\\pathfollowingagentinterface.generated.h", | ||
"d:\\epicgames\\ue_5.0\\engine\\source\\runtime\\engine\\classes\\gameframework\\movementcomponent.h", | ||
"d:\\epicgames\\ue_5.0\\engine\\intermediate\\build\\win64\\unrealeditor\\inc\\engine\\movementcomponent.generated.h", | ||
"d:\\epicgames\\ue_5.0\\engine\\intermediate\\build\\win64\\unrealeditor\\inc\\engine\\navmovementcomponent.generated.h", | ||
"d:\\epicgames\\ue_5.0\\engine\\intermediate\\build\\win64\\unrealeditor\\inc\\engine\\pawnmovementcomponent.generated.h", | ||
"d:\\epicgames\\ue_5.0\\engine\\source\\runtime\\engine\\classes\\interfaces\\networkpredictioninterface.h", | ||
"d:\\epicgames\\ue_5.0\\engine\\intermediate\\build\\win64\\unrealeditor\\inc\\engine\\networkpredictioninterface.generated.h", | ||
"d:\\epicgames\\ue_5.0\\engine\\source\\runtime\\engine\\public\\charactermovementcomponentasync.h", | ||
"d:\\epicgames\\ue_5.0\\engine\\intermediate\\build\\win64\\unrealeditor\\inc\\engine\\charactermovementcomponentasync.generated.h", | ||
"d:\\epicgames\\ue_5.0\\engine\\intermediate\\build\\win64\\unrealeditor\\inc\\engine\\charactermovementcomponent.generated.h", | ||
"d:\\epicgames\\ue_5.0\\engine\\source\\runtime\\engine\\classes\\camera\\cameracomponent.h", | ||
"d:\\epicgames\\ue_5.0\\engine\\intermediate\\build\\win64\\unrealeditor\\inc\\engine\\cameracomponent.generated.h", | ||
"d:\\epicgames\\ue_5.0\\engine\\source\\runtime\\engine\\classes\\gameframework\\springarmcomponent.h", | ||
"d:\\epicgames\\ue_5.0\\engine\\intermediate\\build\\win64\\unrealeditor\\inc\\engine\\springarmcomponent.generated.h", | ||
"d:\\epicgames\\ue_5.0\\engine\\source\\runtime\\engine\\classes\\kismet\\kismetmathlibrary.h", | ||
"d:\\epicgames\\ue_5.0\\engine\\intermediate\\build\\win64\\unrealeditor\\inc\\engine\\kismetmathlibrary.generated.h", | ||
"d:\\epicgames\\ue_5.0\\engine\\source\\runtime\\engine\\classes\\kismet\\kismetmathlibrary.inl", | ||
"c:\\users\\marc\\documents\\github\\combatsystem\\combatsystem\\source\\combatsystem\\public\\actions\\cscharacterstate.h", | ||
"d:\\epicgames\\ue_5.0\\engine\\source\\runtime\\coreuobject\\public\\uobject\\noexporttypes.h", | ||
"d:\\epicgames\\ue_5.0\\engine\\source\\runtime\\coreuobject\\public\\uobject\\propertyaccessutil.h", | ||
"d:\\epicgames\\ue_5.0\\engine\\source\\runtime\\core\\public\\math\\unitconversion.h", | ||
"d:\\epicgames\\ue_5.0\\engine\\source\\runtime\\core\\public\\math\\unitconversion.inl", | ||
"d:\\epicgames\\ue_5.0\\engine\\source\\runtime\\core\\public\\internationalization\\polyglottextdata.h", | ||
"d:\\epicgames\\ue_5.0\\engine\\source\\runtime\\coreuobject\\public\\assetregistry\\arfilter.h", | ||
"c:\\users\\marc\\documents\\github\\combatsystem\\combatsystem\\intermediate\\build\\win64\\unrealeditor\\inc\\combatsystem\\cscharacterstate.generated.h" | ||
], | ||
"ImportedModules": [], | ||
"ImportedHeaderUnits": [] | ||
} | ||
} |
15 changes: 15 additions & 0 deletions
15
...uild/Win64/UnrealEditor/Development/CombatSystem/CSCameraManagerComponent.gen.cpp.lc.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
{ | ||
"Version": "1.1", | ||
"Data": { | ||
"Source": "c:\\users\\marc\\documents\\github\\combatsystem\\combatsystem\\intermediate\\build\\win64\\unrealeditor\\inc\\combatsystem\\cscameramanagercomponent.gen.cpp", | ||
"ProvidedModule": "", | ||
"PCH": "c:\\users\\marc\\documents\\github\\combatsystem\\combatsystem\\intermediate\\build\\win64\\combatsystemeditor\\development\\engine\\sharedpch.engine.shadowerrors.h.pch", | ||
"Includes": [ | ||
"c:\\users\\marc\\documents\\github\\combatsystem\\combatsystem\\intermediate\\build\\win64\\unrealeditor\\development\\combatsystem\\definitions.combatsystem.h", | ||
"c:\\users\\marc\\documents\\github\\combatsystem\\combatsystem\\source\\combatsystem\\public\\components\\cscameramanagercomponent.h", | ||
"c:\\users\\marc\\documents\\github\\combatsystem\\combatsystem\\intermediate\\build\\win64\\unrealeditor\\inc\\combatsystem\\cscameramanagercomponent.generated.h" | ||
], | ||
"ImportedModules": [], | ||
"ImportedHeaderUnits": [] | ||
} | ||
} |
21 changes: 21 additions & 0 deletions
21
...ntermediate/Build/Win64/UnrealEditor/Development/CombatSystem/CSCharacter.gen.cpp.lc.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
{ | ||
"Version": "1.1", | ||
"Data": { | ||
"Source": "c:\\users\\marc\\documents\\github\\combatsystem\\combatsystem\\intermediate\\build\\win64\\unrealeditor\\inc\\combatsystem\\cscharacter.gen.cpp", | ||
"ProvidedModule": "", | ||
"PCH": "c:\\users\\marc\\documents\\github\\combatsystem\\combatsystem\\intermediate\\build\\win64\\combatsystemeditor\\development\\engine\\sharedpch.engine.shadowerrors.h.pch", | ||
"Includes": [ | ||
"c:\\users\\marc\\documents\\github\\combatsystem\\combatsystem\\intermediate\\build\\win64\\unrealeditor\\development\\combatsystem\\definitions.combatsystem.h", | ||
"c:\\users\\marc\\documents\\github\\combatsystem\\combatsystem\\source\\combatsystem\\public\\cscharacter.h", | ||
"d:\\epicgames\\ue_5.0\\engine\\source\\runtime\\engine\\classes\\gameframework\\character.h", | ||
"d:\\epicgames\\ue_5.0\\engine\\source\\runtime\\engine\\classes\\gameframework\\charactermovementreplication.h", | ||
"d:\\epicgames\\ue_5.0\\engine\\intermediate\\build\\win64\\unrealeditor\\inc\\engine\\charactermovementreplication.generated.h", | ||
"d:\\epicgames\\ue_5.0\\engine\\source\\runtime\\engine\\classes\\gameframework\\rootmotionsource.h", | ||
"d:\\epicgames\\ue_5.0\\engine\\intermediate\\build\\win64\\unrealeditor\\inc\\engine\\rootmotionsource.generated.h", | ||
"d:\\epicgames\\ue_5.0\\engine\\intermediate\\build\\win64\\unrealeditor\\inc\\engine\\character.generated.h", | ||
"c:\\users\\marc\\documents\\github\\combatsystem\\combatsystem\\intermediate\\build\\win64\\unrealeditor\\inc\\combatsystem\\cscharacter.generated.h" | ||
], | ||
"ImportedModules": [], | ||
"ImportedHeaderUnits": [] | ||
} | ||
} |
29 changes: 29 additions & 0 deletions
29
...termediate/Build/Win64/UnrealEditor/Development/CombatSystem/CSCharacterState.cpp.lc.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
{ | ||
"Version": "1.1", | ||
"Data": { | ||
"Source": "c:\\users\\marc\\documents\\github\\combatsystem\\combatsystem\\source\\combatsystem\\private\\actions\\cscharacterstate.cpp", | ||
"ProvidedModule": "", | ||
"PCH": "c:\\users\\marc\\documents\\github\\combatsystem\\combatsystem\\intermediate\\build\\win64\\combatsystemeditor\\development\\engine\\sharedpch.engine.shadowerrors.h.pch", | ||
"Includes": [ | ||
"c:\\users\\marc\\documents\\github\\combatsystem\\combatsystem\\intermediate\\build\\win64\\unrealeditor\\development\\combatsystem\\definitions.combatsystem.h", | ||
"c:\\users\\marc\\documents\\github\\combatsystem\\combatsystem\\source\\combatsystem\\public\\actions\\cscharacterstate.h", | ||
"d:\\epicgames\\ue_5.0\\engine\\source\\runtime\\coreuobject\\public\\uobject\\noexporttypes.h", | ||
"d:\\epicgames\\ue_5.0\\engine\\source\\runtime\\coreuobject\\public\\uobject\\propertyaccessutil.h", | ||
"d:\\epicgames\\ue_5.0\\engine\\source\\runtime\\core\\public\\math\\unitconversion.h", | ||
"d:\\epicgames\\ue_5.0\\engine\\source\\runtime\\core\\public\\math\\unitconversion.inl", | ||
"d:\\epicgames\\ue_5.0\\engine\\source\\runtime\\core\\public\\internationalization\\polyglottextdata.h", | ||
"d:\\epicgames\\ue_5.0\\engine\\source\\runtime\\coreuobject\\public\\assetregistry\\arfilter.h", | ||
"c:\\users\\marc\\documents\\github\\combatsystem\\combatsystem\\intermediate\\build\\win64\\unrealeditor\\inc\\combatsystem\\cscharacterstate.generated.h", | ||
"c:\\users\\marc\\documents\\github\\combatsystem\\combatsystem\\source\\combatsystem\\public\\cscharacter.h", | ||
"d:\\epicgames\\ue_5.0\\engine\\source\\runtime\\engine\\classes\\gameframework\\character.h", | ||
"d:\\epicgames\\ue_5.0\\engine\\source\\runtime\\engine\\classes\\gameframework\\charactermovementreplication.h", | ||
"d:\\epicgames\\ue_5.0\\engine\\intermediate\\build\\win64\\unrealeditor\\inc\\engine\\charactermovementreplication.generated.h", | ||
"d:\\epicgames\\ue_5.0\\engine\\source\\runtime\\engine\\classes\\gameframework\\rootmotionsource.h", | ||
"d:\\epicgames\\ue_5.0\\engine\\intermediate\\build\\win64\\unrealeditor\\inc\\engine\\rootmotionsource.generated.h", | ||
"d:\\epicgames\\ue_5.0\\engine\\intermediate\\build\\win64\\unrealeditor\\inc\\engine\\character.generated.h", | ||
"c:\\users\\marc\\documents\\github\\combatsystem\\combatsystem\\intermediate\\build\\win64\\unrealeditor\\inc\\combatsystem\\cscharacter.generated.h" | ||
], | ||
"ImportedModules": [], | ||
"ImportedHeaderUnits": [] | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.