mirror of
https://github.com/ConjureETS/Bomberman.git
synced 2026-03-23 18:00:59 +00:00
Added .idea to gitignore
This commit is contained in:
misabiko
parent
063735b0e6
commit
fed88514a7
2
.gitignore
vendored
2
.gitignore
vendored
@ -46,3 +46,5 @@ sysinfo.txt
|
||||
|
||||
# Crashlytics generated file
|
||||
crashlytics-build.properties
|
||||
|
||||
.idea/
|
||||
8
.idea/.idea.Bomberman/.idea/.idea.Bomberman.iml
generated
8
.idea/.idea.Bomberman/.idea/.idea.Bomberman.iml
generated
@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module type="RIDER_MODULE" version="4">
|
||||
<component name="NewModuleRootManager">
|
||||
<content url="file://$MODULE_DIR$" />
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
</component>
|
||||
</module>
|
||||
62
.idea/.idea.Bomberman/.idea/contentModel.xml
generated
62
.idea/.idea.Bomberman/.idea/contentModel.xml
generated
@ -1,62 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="ContentModelStore">
|
||||
<e p="C:\Users\misabiko\AppData\Local\JetBrains\Rider2020.1\extResources" t="IncludeRecursive" />
|
||||
<e p="C:\Users\misabiko\AppData\Local\JetBrains\Rider2020.1\resharper-host\Local\Transient\ReSharperHost\v201\SolutionCaches\_Bomberman.867671047.00" t="ExcludeRecursive" />
|
||||
<e p="C:\Users\misabiko\AppData\Roaming\JetBrains\Rider2020.1\scratches" t="IncludeRecursive" />
|
||||
<e p="C:\Users\misabiko\Documents\Coding\UnityProjects\Bomberman" t="IncludeRecursive">
|
||||
<e p="Assembly-CSharp-Editor-firstpass.csproj" t="IncludeRecursive" />
|
||||
<e p="Assembly-CSharp.csproj" t="IncludeRecursive" />
|
||||
<e p="Assets" t="Include">
|
||||
<e p="Plugins" t="Include">
|
||||
<e p="GitHub" t="Include">
|
||||
<e p="Editor" t="Include">
|
||||
<e p="credits.txt" t="Include" />
|
||||
<e p="eula.txt" t="Include" />
|
||||
<e p="ExtensionLoader.cs" t="Include" />
|
||||
<e p="UnityAPIWrapper.cs" t="Include" />
|
||||
</e>
|
||||
</e>
|
||||
</e>
|
||||
<e p="Scripts" t="Include">
|
||||
<e p="MapData.cs" t="Include" />
|
||||
<e p="PlayerData.cs" t="Include" />
|
||||
<e p="PlayerMovement.cs" t="Include" />
|
||||
<e p="SimpleCameraController.cs" t="Include" />
|
||||
</e>
|
||||
<e p="TextMesh Pro" t="Include">
|
||||
<e p="Fonts" t="Include">
|
||||
<e p="LiberationSans - OFL.txt" t="Include" />
|
||||
</e>
|
||||
<e p="Resources" t="Include">
|
||||
<e p="LineBreaking Following Characters.txt" t="Include" />
|
||||
<e p="LineBreaking Leading Characters.txt" t="Include" />
|
||||
<e p="Shaders" t="Include">
|
||||
<e p="TMP_Bitmap-Custom-Atlas.shader" t="Include" />
|
||||
<e p="TMP_Bitmap-Mobile.shader" t="Include" />
|
||||
<e p="TMP_Bitmap.shader" t="Include" />
|
||||
<e p="TMP_SDF Overlay.shader" t="Include" />
|
||||
<e p="TMP_SDF-Mobile Masking.shader" t="Include" />
|
||||
<e p="TMP_SDF-Mobile Overlay.shader" t="Include" />
|
||||
<e p="TMP_SDF-Mobile.shader" t="Include" />
|
||||
<e p="TMP_SDF-Surface-Mobile.shader" t="Include" />
|
||||
<e p="TMP_SDF-Surface.shader" t="Include" />
|
||||
<e p="TMP_SDF.shader" t="Include" />
|
||||
<e p="TMP_Sprite.shader" t="Include" />
|
||||
<e p="TMPro.cginc" t="Include" />
|
||||
<e p="TMPro_Properties.cginc" t="Include" />
|
||||
<e p="TMPro_Surface.cginc" t="Include" />
|
||||
</e>
|
||||
</e>
|
||||
<e p="Sprites" t="Include">
|
||||
<e p="EmojiOne Attribution.txt" t="Include" />
|
||||
</e>
|
||||
</e>
|
||||
</e>
|
||||
<e p="Bomberman.sln" t="IncludeFlat" />
|
||||
<e p="obj" t="ExcludeRecursive" />
|
||||
<e p="Packages" t="ExcludeRecursive" />
|
||||
<e p="Temp\bin" t="ExcludeRecursive" />
|
||||
</e>
|
||||
</component>
|
||||
</project>
|
||||
4
.idea/.idea.Bomberman/.idea/encodings.xml
generated
4
.idea/.idea.Bomberman/.idea/encodings.xml
generated
@ -1,4 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="Encoding" addBOMForNewFiles="with BOM under Windows, with no BOM otherwise" />
|
||||
</project>
|
||||
30
.idea/.idea.Bomberman/.idea/indexLayout.xml
generated
30
.idea/.idea.Bomberman/.idea/indexLayout.xml
generated
@ -1,30 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="ContentModelUserStore">
|
||||
<attachedFolders />
|
||||
<explicitIncludes>
|
||||
<Path>Library/PackageCache/com.unity.cinemachine@2.5.0</Path>
|
||||
<Path>Library/PackageCache/com.unity.collab-proxy@1.2.16</Path>
|
||||
<Path>Library/PackageCache/com.unity.ext.nunit@1.0.0</Path>
|
||||
<Path>Library/PackageCache/com.unity.ide.rider@1.1.4</Path>
|
||||
<Path>Library/PackageCache/com.unity.ide.vscode@1.2.0</Path>
|
||||
<Path>Library/PackageCache/com.unity.inputsystem@1.0.0</Path>
|
||||
<Path>Library/PackageCache/com.unity.render-pipelines.core@7.3.1</Path>
|
||||
<Path>Library/PackageCache/com.unity.render-pipelines.universal@7.3.1</Path>
|
||||
<Path>Library/PackageCache/com.unity.shadergraph@7.3.1</Path>
|
||||
<Path>Library/PackageCache/com.unity.test-framework@1.1.14</Path>
|
||||
<Path>Library/PackageCache/com.unity.textmeshpro@2.0.1</Path>
|
||||
<Path>Library/PackageCache/com.unity.timeline@1.2.14</Path>
|
||||
<Path>Packages</Path>
|
||||
<Path>ProjectSettings</Path>
|
||||
</explicitIncludes>
|
||||
<explicitExcludes>
|
||||
<Path>.git</Path>
|
||||
<Path>.idea</Path>
|
||||
<Path>Library</Path>
|
||||
<Path>Logs</Path>
|
||||
<Path>Temp</Path>
|
||||
<Path>obj</Path>
|
||||
</explicitExcludes>
|
||||
</component>
|
||||
</project>
|
||||
9
.idea/.idea.Bomberman/.idea/modules.xml
generated
9
.idea/.idea.Bomberman/.idea/modules.xml
generated
@ -1,9 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="ProjectModuleManager">
|
||||
<modules>
|
||||
<module fileurl="file://$PROJECT_DIR$/.idea/.idea.Bomberman/.idea/.idea.Bomberman.iml" filepath="$PROJECT_DIR$/.idea/.idea.Bomberman/.idea/.idea.Bomberman.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/.idea/.idea.Bomberman/riderModule.iml" filepath="$PROJECT_DIR$/.idea/.idea.Bomberman/riderModule.iml" />
|
||||
</modules>
|
||||
</component>
|
||||
</project>
|
||||
@ -1,6 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="RiderProjectSettingsUpdater">
|
||||
<option name="vcsConfiguration" value="2" />
|
||||
</component>
|
||||
</project>
|
||||
6
.idea/.idea.Bomberman/.idea/vcs.xml
generated
6
.idea/.idea.Bomberman/.idea/vcs.xml
generated
@ -1,6 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="VcsDirectoryMappings">
|
||||
<mapping directory="$PROJECT_DIR$" vcs="Git" />
|
||||
</component>
|
||||
</project>
|
||||
215
.idea/.idea.Bomberman/.idea/workspace.xml
generated
215
.idea/.idea.Bomberman/.idea/workspace.xml
generated
@ -1,215 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="BranchesTreeState">
|
||||
<expand>
|
||||
<path>
|
||||
<item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
|
||||
<item name="LOCAL_ROOT" type="e8cecc67:BranchNodeDescriptor" />
|
||||
</path>
|
||||
</expand>
|
||||
<select />
|
||||
</component>
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="093b0649-4999-4ce7-a733-d62e04356272" name="Default Changelist" comment="">
|
||||
<change beforePath="$PROJECT_DIR$/.idea/.idea.Bomberman/.idea/contentModel.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.Bomberman/.idea/contentModel.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/.idea.Bomberman/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.Bomberman/.idea/workspace.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Scenes/MainScene Movement.unity" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scenes/MainScene Movement.unity" afterDir="false" />
|
||||
</list>
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
||||
<option name="LAST_RESOLUTION" value="IGNORE" />
|
||||
</component>
|
||||
<component name="Git.Settings">
|
||||
<option name="RECENT_BRANCH_BY_REPOSITORY">
|
||||
<map>
|
||||
<entry key="$PROJECT_DIR$" value="master" />
|
||||
</map>
|
||||
</option>
|
||||
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
||||
</component>
|
||||
<component name="HighlightingSettingsPerFile">
|
||||
<setting file="file://$PROJECT_DIR$/Assets/Scripts/PlayerMovement.cs" root0="FORCE_HIGHLIGHTING" />
|
||||
<setting file="mock:///PlayerMovement.cs" root0="SKIP_HIGHLIGHTING" />
|
||||
<setting file="file://$PROJECT_DIR$/Assets/TextMesh Pro/Resources/Style Sheets/Default Style Sheet.asset" root0="FORCE_HIGHLIGHTING" />
|
||||
<setting file="file://$PROJECT_DIR$/Assets/Scenes/MainScene Movement/LightingData.asset" root0="FORCE_HIGHLIGHTING" />
|
||||
<setting file="file://$PROJECT_DIR$/Assets/Scripts/MapData.cs.meta" root0="FORCE_HIGHLIGHTING" />
|
||||
<setting file="mock:///MapData.cs" root0="SKIP_HIGHLIGHTING" />
|
||||
<setting file="file://$PROJECT_DIR$/Assets/Scenes/MainScene Movement.unity" root0="FORCE_HIGHLIGHTING" />
|
||||
<setting file="file://$PROJECT_DIR$/Assets/Scripts/MapData.cs" root0="FORCE_HIGHLIGHTING" />
|
||||
<setting file="mock:///PlayerMovement.cs" root0="SKIP_HIGHLIGHTING" />
|
||||
<setting file="mock:///MapData.cs" root0="SKIP_HIGHLIGHTING" />
|
||||
<setting file="mock:///MainScene Movement.unity" root0="SKIP_HIGHLIGHTING" />
|
||||
<setting file="file://$PROJECT_DIR$/Assets/Settings/Bomberman.inputactions" root0="FORCE_HIGHLIGHTING" />
|
||||
<setting file="file://$PROJECT_DIR$/Assets/Scripts/SimpleCameraController.cs" root0="FORCE_HIGHLIGHTING" />
|
||||
<setting file="mock:///PlayerMovement.cs" root0="SKIP_HIGHLIGHTING" />
|
||||
<setting file="file://$PROJECT_DIR$/Assets/Scripts/PlayerData.cs" root0="FORCE_HIGHLIGHTING" />
|
||||
<setting file="mock:///Documentation.meta" root0="SKIP_HIGHLIGHTING" />
|
||||
<setting file="mock:///PlayerMovement.cs" root0="SKIP_HIGHLIGHTING" />
|
||||
</component>
|
||||
<component name="IdeDocumentHistory">
|
||||
<option name="CHANGED_PATHS">
|
||||
<list>
|
||||
<option value="$PROJECT_DIR$/Assets/ScriptableObjects/PlayerData.cs" />
|
||||
<option value="$PROJECT_DIR$/Assets/Scripts/PlayerData.cs" />
|
||||
<option value="$PROJECT_DIR$/Assets/Scripts/MapData.cs" />
|
||||
<option value="$PROJECT_DIR$/Assets/Scripts/PlayerMovement.cs" />
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
<component name="ProjectId" id="1d0J2e6oBF13I0coouPEnRJdFyF" />
|
||||
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
|
||||
<component name="ProjectViewState">
|
||||
<option name="autoscrollFromSource" value="true" />
|
||||
<option name="hideEmptyMiddlePackages" value="true" />
|
||||
<option name="showLibraryContents" value="true" />
|
||||
</component>
|
||||
<component name="PropertiesComponent">
|
||||
<property name="Discover.Launch.Via.Unity" value="true" />
|
||||
<property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
|
||||
<property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
|
||||
</component>
|
||||
<component name="RunManager" selected="Attach to Unity Editor.Attach to Unity Editor">
|
||||
<configuration name="Attach to Unity Editor & Play" type="UNITY_DEBUG_RUN_CONFIGURATION" factoryName="UNITY_ATTACH_AND_PLAY" show_console_on_std_err="false" show_console_on_std_out="false" port="50000" address="localhost">
|
||||
<option name="allowRunningInParallel" value="false" />
|
||||
<option name="listenPortForConnections" value="false" />
|
||||
<option name="pid" />
|
||||
<method v="2" />
|
||||
</configuration>
|
||||
<configuration name="Attach to Unity Editor" type="UNITY_DEBUG_RUN_CONFIGURATION" factoryName="Unity Debug" show_console_on_std_err="false" show_console_on_std_out="false" port="50000" address="localhost">
|
||||
<option name="allowRunningInParallel" value="false" />
|
||||
<option name="listenPortForConnections" value="false" />
|
||||
<option name="pid" />
|
||||
<method v="2" />
|
||||
</configuration>
|
||||
</component>
|
||||
<component name="TaskManager">
|
||||
<task active="true" id="Default" summary="Default task">
|
||||
<changelist id="093b0649-4999-4ce7-a733-d62e04356272" name="Default Changelist" comment="" />
|
||||
<created>1591555872631</created>
|
||||
<option name="number" value="Default" />
|
||||
<option name="presentableId" value="Default" />
|
||||
<updated>1591555872631</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00001" summary="Initial commit">
|
||||
<created>1591556039536</created>
|
||||
<option name="number" value="00001" />
|
||||
<option name="presentableId" value="LOCAL-00001" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1591556039536</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00002" summary="Baked lighting + Updated Hex shader">
|
||||
<created>1591565757829</created>
|
||||
<option name="number" value="00002" />
|
||||
<option name="presentableId" value="LOCAL-00002" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1591565757829</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00003" summary="Added TextMeshPro">
|
||||
<created>1592162795800</created>
|
||||
<option name="number" value="00003" />
|
||||
<option name="presentableId" value="LOCAL-00003" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1592162795800</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00004" summary="Added TextMeshPro">
|
||||
<created>1592162818475</created>
|
||||
<option name="number" value="00004" />
|
||||
<option name="presentableId" value="LOCAL-00004" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1592162818475</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00005" summary="Added fixed movement angles">
|
||||
<created>1592162843238</created>
|
||||
<option name="number" value="00005" />
|
||||
<option name="presentableId" value="LOCAL-00005" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1592162843238</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00006" summary="Added MapData.cs">
|
||||
<created>1592167255759</created>
|
||||
<option name="number" value="00006" />
|
||||
<option name="presentableId" value="LOCAL-00006" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1592167255759</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00007" summary="Added MapData.cs">
|
||||
<created>1592167284769</created>
|
||||
<option name="number" value="00007" />
|
||||
<option name="presentableId" value="LOCAL-00007" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1592167284769</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00008" summary="Added Place button (temp?)">
|
||||
<created>1592175422622</created>
|
||||
<option name="number" value="00008" />
|
||||
<option name="presentableId" value="LOCAL-00008" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1592175422622</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00009" summary="Set tiling option back to 2d">
|
||||
<created>1592175437287</created>
|
||||
<option name="number" value="00009" />
|
||||
<option name="presentableId" value="LOCAL-00009" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1592175437287</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00010" summary="Added helpers to back and forth axial to world">
|
||||
<created>1592175500345</created>
|
||||
<option name="number" value="00010" />
|
||||
<option name="presentableId" value="LOCAL-00010" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1592175500345</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00011" summary="Constrained movement to tiles">
|
||||
<created>1592175523239</created>
|
||||
<option name="number" value="00011" />
|
||||
<option name="presentableId" value="LOCAL-00011" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1592175523239</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="12" />
|
||||
<servers />
|
||||
</component>
|
||||
<component name="UnityProjectConfiguration" hasMinimizedUI="true" />
|
||||
<component name="UnityUnitTestConfiguration" currentTestLauncher="EditMode" />
|
||||
<component name="Vcs.Log.Tabs.Properties">
|
||||
<option name="TAB_STATES">
|
||||
<map>
|
||||
<entry key="MAIN">
|
||||
<value>
|
||||
<State />
|
||||
</value>
|
||||
</entry>
|
||||
</map>
|
||||
</option>
|
||||
<option name="oldMeFiltersMigrated" value="true" />
|
||||
</component>
|
||||
<component name="VcsManagerConfiguration">
|
||||
<option name="CLEAR_INITIAL_COMMIT_MESSAGE" value="true" />
|
||||
<MESSAGE value="Initial commit" />
|
||||
<MESSAGE value="Baked lighting + Updated Hex shader" />
|
||||
<MESSAGE value="Added TextMeshPro" />
|
||||
<MESSAGE value="Added fixed movement angles" />
|
||||
<MESSAGE value="Added MapData.cs" />
|
||||
<MESSAGE value="Added Place button (temp?)" />
|
||||
<MESSAGE value="Set tiling option back to 2d" />
|
||||
<MESSAGE value="Added helpers to back and forth axial to world" />
|
||||
<MESSAGE value="Constrained movement to tiles" />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="Constrained movement to tiles" />
|
||||
</component>
|
||||
<component name="WindowStateProjectService">
|
||||
<state x="938" y="326" key="RollbackChangesDialog" timestamp="1591564630636">
|
||||
<screen x="0" y="0" width="2560" height="1400" />
|
||||
</state>
|
||||
<state x="938" y="326" key="RollbackChangesDialog/0.0.2560.1400/2560.0.2560.1400/3215.1440.1920.1040@0.0.2560.1400" timestamp="1591564630636" />
|
||||
<state x="872" y="429" key="Vcs.Push.Dialog.v2" timestamp="1591565765038">
|
||||
<screen x="0" y="0" width="2560" height="1400" />
|
||||
</state>
|
||||
<state x="872" y="429" key="Vcs.Push.Dialog.v2/0.0.2560.1400/2560.0.2560.1400/3215.1440.1920.1040@0.0.2560.1400" timestamp="1591565765038" />
|
||||
<state x="921" y="426" width="700" height="530" key="recent.locations.popup" timestamp="1591562240397">
|
||||
<screen x="0" y="0" width="2560" height="1400" />
|
||||
</state>
|
||||
<state x="921" y="426" width="700" height="530" key="recent.locations.popup/0.0.2560.1400/2560.0.2560.1400/3215.1440.1920.1040@0.0.2560.1400" timestamp="1591562240397" />
|
||||
</component>
|
||||
</project>
|
||||
7
.idea/.idea.Bomberman/riderModule.iml
generated
7
.idea/.idea.Bomberman/riderModule.iml
generated
@ -1,7 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module type="RIDER_MODULE" version="4">
|
||||
<component name="NewModuleRootManager">
|
||||
<content url="file://$MODULE_DIR$/../.." />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
</component>
|
||||
</module>
|
||||
Loading…
x
Reference in New Issue
Block a user