Rafal/EndlessVendetta
Rafal/EndlessVendetta
1
0
Fork 0
Code Issues Pull Requests Releases 1 Activity

Bugfix Head Bobbing Merge Conflicts

Browse Source
This commit is contained in:
Rafal Swierczek 2024-01-19 18:01:13 +00:00
parent d5f98d5d39
commit d203b89320
5 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml
View File

@ -7,9 +7,11 @@
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager">
<list default="true" id="540e0aa0-3712-4a9f-939c-2afb74f5ba60" name="Changes" comment="">
<list default="true" id="8acc2658-cb31-4c49-857f-282cfee74640" name="Changes" comment="">
<change beforePath="$PROJECT_DIR$/.idea/.idea.EndlessVendetta/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.EndlessVendetta/.idea/misc.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/.idea.EndlessVendetta/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.EndlessVendetta/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Content/BountySystem/Waypoint/WaypointArrow.uasset" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Content/Levels/ControlTutorialLevel.umap" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Levels/ControlTutorialLevel.umap" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Content/StarterContent/Particles/P_Ambient_Dust.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/StarterContent/Particles/P_Ambient_Dust.uasset" afterDir="false" />
</list>
@ -28,7 +30,7 @@
"customColor": "",
"associatedIndex": 5
}]]></component>
<component name="ProjectId" id="2axphwqVLfBYoH0vSLbNM1tQPuB" />
<component name="ProjectId" id="2bBQ5ZFjKADdlvCf2VePqJdIy1m" />
<component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
@ -121,12 +123,12 @@
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="540e0aa0-3712-4a9f-939c-2afb74f5ba60" name="Changes" comment="" />
<created>1705270207676</created>
<changelist id="8acc2658-cb31-4c49-857f-282cfee74640" name="Changes" comment="" />
<created>1705685810960</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1705270207676</updated>
<workItem from="1705270210657" duration="1288000" />
<updated>1705685810960</updated>
<workItem from="1705685813496" duration="640000" />
</task>
<servers />
</component>

BIN
EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/Levels/ControlTutorialLevel.umap (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/StarterContent/Particles/P_Ambient_Dust.uasset (Stored with Git LFS)
View File

Binary file not shown.