update
This commit is contained in:
17
.idea/.idea.BABA_YAGA/.idea/workspace.xml
generated
17
.idea/.idea.BABA_YAGA/.idea/workspace.xml
generated
@@ -6,17 +6,10 @@
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="d308d1cb-09fc-4331-ba20-00f7b43d1576" name="Changes" comment="">
|
||||
<change beforePath="$PROJECT_DIR$/.idea/.idea.BABA_YAGA/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.BABA_YAGA/.idea/workspace.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Scenes/Test site/prefab test site.unity" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Scenes/Test site/prefab test site.unity.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Third Parties/Opsive/UltimateCharacterController/Demo/Materials/Items/Magic/Embers.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Third Parties/Opsive/UltimateCharacterController/Demo/Materials/Items/Magic/Embers.mat" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Third Parties/Opsive/UltimateCharacterController/Demo/Materials/Items/Magic/ShieldBubble.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Third Parties/Opsive/UltimateCharacterController/Demo/Materials/Items/Magic/ShieldBubble.mat" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Third Parties/Opsive/UltimateCharacterController/Demo/Materials/Items/Shooter/AssaultRifle/MuzzleFlash.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Third Parties/Opsive/UltimateCharacterController/Demo/Materials/Items/Shooter/AssaultRifle/MuzzleFlash.mat" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Third Parties/Opsive/UltimateCharacterController/Demo/Materials/Items/Shooter/Bullets/BulletDecalWood1.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Third Parties/Opsive/UltimateCharacterController/Demo/Materials/Items/Shooter/Bullets/BulletDecalWood1.mat" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Third Parties/Opsive/UltimateCharacterController/Demo/Materials/Items/Shooter/Bullets/BulletDecalWood2.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Third Parties/Opsive/UltimateCharacterController/Demo/Materials/Items/Shooter/Bullets/BulletDecalWood2.mat" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Third Parties/Opsive/UltimateCharacterController/Demo/Materials/Items/Shooter/Bullets/BulletDecalWood4.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Third Parties/Opsive/UltimateCharacterController/Demo/Materials/Items/Shooter/Bullets/BulletDecalWood4.mat" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Third Parties/Opsive/UltimateCharacterController/Demo/Materials/Items/Shooter/Shotgun/MuzzleFlash.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Third Parties/Opsive/UltimateCharacterController/Demo/Materials/Items/Shooter/Shotgun/MuzzleFlash.mat" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Third Parties/Opsive/UltimateCharacterController/Demo/Materials/Scene/Turret/MuzzleFlash.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Third Parties/Opsive/UltimateCharacterController/Demo/Materials/Scene/Turret/MuzzleFlash.mat" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ProjectSettings/TagManager.asset" beforeDir="false" afterPath="$PROJECT_DIR$/ProjectSettings/TagManager.asset" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Prefabs/Nolan/Nolan.prefab" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Prefabs/Nolan/Nolan.prefab" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Scenes/Main Scene.unity" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scenes/Main Scene.unity" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Scenes/Test site/testing 2.unity" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scenes/Test site/testing 2.unity" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Third Parties/Opsive/UltimateCharacterController/Materials/InvisibleShadowCaster.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Third Parties/Opsive/UltimateCharacterController/Materials/InvisibleShadowCaster.mat" afterDir="false" />
|
||||
</list>
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
@@ -129,7 +122,7 @@
|
||||
<workItem from="1781412609976" duration="4823000" />
|
||||
<workItem from="1781578060019" duration="4632000" />
|
||||
<workItem from="1781727437862" duration="1257000" />
|
||||
<workItem from="1781765548760" duration="4839000" />
|
||||
<workItem from="1781765548760" duration="6459000" />
|
||||
</task>
|
||||
<servers />
|
||||
</component>
|
||||
|
||||
Reference in New Issue
Block a user