Update
This commit is contained in:
113
.idea/.idea.HALLUCINATE/.idea/workspace.xml
generated
113
.idea/.idea.HALLUCINATE/.idea/workspace.xml
generated
@@ -6,108 +6,6 @@
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="f9183c68-daf0-43b8-be4c-fad79983f91b" name="Changes" comment="">
|
||||
<change beforePath="$PROJECT_DIR$/.idea/.idea.HALLUCINATE/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.HALLUCINATE/.idea/workspace.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Prefabs/Player.prefab" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Prefabs/Player.prefab" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/RecursiveDFS.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/RecursiveDFS/LightingData.asset" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/RecursiveDFS/LightingData.asset.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/RecursiveDFS/ReflectionProbe-0.exr" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/RecursiveDFS/ReflectionProbe-0.exr.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Scove/Optimiization.unity" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Scove/Optimiization.unity.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Scove/Player Movement.unity" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scove/Player Movement.unity" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Steve.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Steve/Animations.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Steve/Animations/Fire.anim" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Steve/Animations/Fire.anim.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Steve/Animations/Reloading.anim" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Steve/Animations/Reloading.anim.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Steve/Animations/Rifle Aiming Idle.anim" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Steve/Animations/Rifle Aiming Idle.anim.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Steve/Animations/Rifle Idle.anim" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Steve/Animations/Rifle Idle.anim.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Steve/Animations/Walk With Rifle.anim" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Steve/Animations/Walk With Rifle.anim.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Steve/Animations/Walk and Fire.anim" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Steve/Animations/Walk and Fire.anim.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Steve/Audio.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Steve/Audio/Footstep01.wav" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Steve/Audio/Footstep01.wav.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Steve/Audio/Footstep02.wav" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Steve/Audio/Footstep02.wav.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Steve/Audio/Footstep03.wav" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Steve/Audio/Footstep03.wav.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Steve/Audio/Footstep04.wav" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Steve/Audio/Footstep04.wav.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Steve/Audio/Jump.wav" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Steve/Audio/Jump.wav.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Steve/Audio/Land.wav" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Steve/Audio/Land.wav.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Steve/Audio/shot.wav" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Steve/Audio/shot.wav.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Steve/FPC.controller" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Steve/FPC.controller.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Steve/FPC.prefab" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Steve/FPC.prefab.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Steve/FPController.cs" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Steve/FPController.cs.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Steve/Gloves.mat" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Steve/Gloves.mat.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Steve/Skin.mat" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Steve/Skin.mat.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Steve/SoundController.cs" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Steve/SoundController.cs.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Steve/SteveTorsoGood.fbx" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Steve/SteveTorsoGood.fbx.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Steve/Steve_FPCharacter.prefab" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Steve/Steve_FPCharacter.prefab.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Steve/Textures.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Steve/Textures/Body_Diffuse.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Steve/Textures/Body_Diffuse.png.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Steve/Textures/Body_Normal.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Steve/Textures/Body_Normal.png.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Steve/Textures/Glove_Diffuse.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Steve/Textures/Glove_Diffuse.png.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Steve/Textures/Glove_Gloss.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Steve/Textures/Glove_Gloss.png.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Steve/Textures/Glove_Normal.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Steve/Textures/Glove_Normal.png.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Steve/Textures/Top_Diffuse.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Steve/Textures/Top_Diffuse.png.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Steve/Textures/Top_Gloss.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Steve/Textures/Top_Gloss.png.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Steve/Textures/Top_Normal.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Steve/Textures/Top_Normal.png.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Steve/Top.mat" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Steve/Top.mat.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Steve/Weapon.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Steve/Weapon/Terraformer_Weapon_A_1P.fbx" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Steve/Weapon/Terraformer_Weapon_A_1P.fbx.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Steve/Weapon/Terraformer_Weapon_A_BaseColor_A.tif" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Steve/Weapon/Terraformer_Weapon_A_BaseColor_A.tif.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Steve/Weapon/Terraformer_Weapon_A_Material.mat" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Steve/Weapon/Terraformer_Weapon_A_Material.mat.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Steve/Weapon/Terraformer_Weapon_Container_Material.mat" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Steve/Weapon/Terraformer_Weapon_Container_Material.mat.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Steve/Weapon/Terraformer_Weapon_Glass_Material.mat" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Steve/Weapon/Terraformer_Weapon_Glass_Material.mat.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Steve/Weapon/Terraformer_Weapon_Liquid_Material.mat" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Steve/Weapon/Terraformer_Weapon_Liquid_Material.mat.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/TEST CUA TUAN/Black.mat" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/TEST CUA TUAN/Black.mat.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/TEST CUA TUAN/Crawler.cs" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/TEST CUA TUAN/Crawler.cs.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/TEST CUA TUAN/DEMO HAH.unity" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/TEST CUA TUAN/DEMO HAH.unity.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/TEST CUA TUAN/Extensions.cs" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/TEST CUA TUAN/Extensions.cs.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/TEST CUA TUAN/Maze.cs" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/TEST CUA TUAN/Maze.cs.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/TEST CUA TUAN/Prims.cs" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/TEST CUA TUAN/Prims.cs.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/TEST CUA TUAN/Recursive.cs" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/TEST CUA TUAN/Recursive.cs.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/TEST CUA TUAN/Wilsons.cs" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/TEST CUA TUAN/Wilsons.cs.meta" beforeDir="false" />
|
||||
</list>
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
@@ -115,12 +13,18 @@
|
||||
<option name="LAST_RESOLUTION" value="IGNORE" />
|
||||
</component>
|
||||
<component name="EmbeddingIndexingInfo">
|
||||
<option name="cachedIndexableFilesCount" value="12" />
|
||||
<option name="fileBasedEmbeddingIndicesEnabled" value="true" />
|
||||
</component>
|
||||
<component name="Git.Settings">
|
||||
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
||||
</component>
|
||||
<component name="HighlightingSettingsPerFile">
|
||||
<setting file="file://$PROJECT_DIR$/Assets/Scripts/GameSetup/Maze/Crawler.cs" root0="FORCE_HIGHLIGHTING" />
|
||||
<setting file="file://$PROJECT_DIR$/Assets/Scripts/GameSetup/Maze/Maze.cs" root0="FORCE_HIGHLIGHTING" />
|
||||
<setting file="file://$PROJECT_DIR$/Assets/Scripts/GameSetup/Maze/Prims.cs" root0="FORCE_HIGHLIGHTING" />
|
||||
<setting file="file://$PROJECT_DIR$/Assets/Scripts/GameSetup/Maze/Recursive.cs" root0="FORCE_HIGHLIGHTING" />
|
||||
<setting file="file://$PROJECT_DIR$/Assets/Scripts/GameSetup/Maze/Wilsons.cs" root0="FORCE_HIGHLIGHTING" />
|
||||
</component>
|
||||
<component name="McpProjectServerCommands">
|
||||
<commands />
|
||||
<urls />
|
||||
@@ -149,6 +53,7 @@
|
||||
"node.js.selected.package.eslint": "(autodetect)",
|
||||
"node.js.selected.package.tslint": "(autodetect)",
|
||||
"nodejs_package_manager_path": "npm",
|
||||
"settings.editor.selected.configurable": "preferences.pluginManager",
|
||||
"to.speed.mode.migration.done": "true",
|
||||
"vue.rearranger.settings.migration": "true"
|
||||
}
|
||||
@@ -203,6 +108,8 @@
|
||||
<workItem from="1774584869078" duration="15790000" />
|
||||
<workItem from="1774662478399" duration="5691000" />
|
||||
<workItem from="1774845976092" duration="1720000" />
|
||||
<workItem from="1774876724085" duration="378000" />
|
||||
<workItem from="1774877122490" duration="1477000" />
|
||||
</task>
|
||||
<servers />
|
||||
</component>
|
||||
|
||||
Reference in New Issue
Block a user