Commit c0718da8 by Raphael

Merged

parents 098493c6 9b3a280d
...@@ -18,7 +18,7 @@ ExportedObj/ ...@@ -18,7 +18,7 @@ ExportedObj/
*.pidb *.pidb
*.booproj *.booproj
*.svd *.svd
.idea/
# Unity3D generated meta files # Unity3D generated meta files
*.pidb.meta *.pidb.meta
...@@ -32,3 +32,6 @@ sysinfo.txt ...@@ -32,3 +32,6 @@ sysinfo.txt
Quantifly.x86_64 Quantifly.x86_64
Quantifly_Data Quantifly_Data
# MacOS files
.DS_Store
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
<list default="true" id="5ae8e509-4645-4305-8aec-662b1997deba" name="Default" comment=""> <list default="true" id="5ae8e509-4645-4305-8aec-662b1997deba" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/../Assets/Materials/Ground - Block.mat" afterPath="$PROJECT_DIR$/../Assets/Materials/Ground - Block.mat" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../Assets/Materials/Ground - Block.mat" afterPath="$PROJECT_DIR$/../Assets/Materials/Ground - Block.mat" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/../Assets/Scenes/Main.unity" afterPath="$PROJECT_DIR$/../Assets/Scenes/Main.unity" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../Assets/Scenes/Main.unity" afterPath="$PROJECT_DIR$/../Assets/Scenes/Main.unity" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/../Assets/Scripts/MapGeneration/CellularAutomaton.cs" afterPath="$PROJECT_DIR$/../Assets/Scripts/MapGeneration/CellularAutomaton.cs" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../Assets/Scripts/MapGeneration/CellularAutomaton.cs" afterPath="$PROJECT_DIR$/../Assets/Scripts/MapGeneration/CellularAutomaton.cs" />
</list> </list>
<ignored path="igem-quantifly.iws" /> <ignored path="igem-quantifly.iws" />
...@@ -89,18 +90,18 @@ ...@@ -89,18 +90,18 @@
<option value="$PROJECT_DIR$/../Assets/Scripts/GameManager.cs" /> <option value="$PROJECT_DIR$/../Assets/Scripts/GameManager.cs" />
<option value="$PROJECT_DIR$/../Assets/Scripts/Player.cs" /> <option value="$PROJECT_DIR$/../Assets/Scripts/Player.cs" />
<option value="$PROJECT_DIR$/../Assets/Scripts/MapGeneration/Cell.cs" /> <option value="$PROJECT_DIR$/../Assets/Scripts/MapGeneration/Cell.cs" />
<option value="$PROJECT_DIR$/../Assets/Scripts/Utils/Map.cs" />
<option value="$PROJECT_DIR$/../Assets/Scripts/GameController.cs" /> <option value="$PROJECT_DIR$/../Assets/Scripts/GameController.cs" />
<option value="$PROJECT_DIR$/../Assets/Scripts/Utils/ObjectPool.cs" /> <option value="$PROJECT_DIR$/../Assets/Scripts/Utils/ObjectPool.cs" />
<option value="$PROJECT_DIR$/../Assets/Scripts/Utils/Map.cs" />
<option value="$PROJECT_DIR$/../Assets/Scripts/MapGeneration/CellularAutomaton.cs" /> <option value="$PROJECT_DIR$/../Assets/Scripts/MapGeneration/CellularAutomaton.cs" />
</list> </list>
</option> </option>
</component> </component>
<component name="ProjectFrameBounds"> <component name="ProjectFrameBounds">
<option name="x" value="-8" /> <option name="x" value="-1" />
<option name="y" value="-8" /> <option name="y" value="-33" />
<option name="width" value="1936" /> <option name="width" value="1922" />
<option name="height" value="1056" /> <option name="height" value="1114" />
</component> </component>
<component name="ProjectInspectionProfilesVisibleTreeState"> <component name="ProjectInspectionProfilesVisibleTreeState">
<entry key="Project Default"> <entry key="Project Default">
...@@ -132,7 +133,7 @@ ...@@ -132,7 +133,7 @@
<ConfirmationsSetting value="0" id="Remove" /> <ConfirmationsSetting value="0" id="Remove" />
</component> </component>
<component name="ProjectView"> <component name="ProjectView">
<navigator currentView="SolutionExplorer" proportions="" version="1"> <navigator proportions="" version="1">
<flattenPackages /> <flattenPackages />
<showMembers /> <showMembers />
<showModules /> <showModules />
...@@ -145,101 +146,7 @@ ...@@ -145,101 +146,7 @@
<manualOrder /> <manualOrder />
<foldersAlwaysOnTop value="true" /> <foldersAlwaysOnTop value="true" />
</navigator> </navigator>
<panes> <panes />
<pane id="SolutionExplorer">
<subPane>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" />
<option name="myItemType" value="com.jetbrains.resharper.projectView.solutionExplorer.SolutionExplorerViewPane$ProjectViewPaneTreeStructure$createRoot$1" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="igem-quantifly" />
<option name="myItemType" value="com.jetbrains.resharper.projectView.solutionExplorer.SolutionExplorerNodeRider" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="Assembly-CSharp" />
<option name="myItemType" value="com.jetbrains.resharper.projectView.solutionExplorer.SolutionExplorerNodeRider" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="Assets" />
<option name="myItemType" value="com.jetbrains.resharper.projectView.solutionExplorer.SolutionExplorerNodeRider" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="Scripts" />
<option name="myItemType" value="com.jetbrains.resharper.projectView.solutionExplorer.SolutionExplorerNodeRider" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" />
<option name="myItemType" value="com.jetbrains.resharper.projectView.solutionExplorer.SolutionExplorerViewPane$ProjectViewPaneTreeStructure$createRoot$1" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="igem-quantifly" />
<option name="myItemType" value="com.jetbrains.resharper.projectView.solutionExplorer.SolutionExplorerNodeRider" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="Assembly-CSharp" />
<option name="myItemType" value="com.jetbrains.resharper.projectView.solutionExplorer.SolutionExplorerNodeRider" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="Assets" />
<option name="myItemType" value="com.jetbrains.resharper.projectView.solutionExplorer.SolutionExplorerNodeRider" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="Scripts" />
<option name="myItemType" value="com.jetbrains.resharper.projectView.solutionExplorer.SolutionExplorerNodeRider" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="Utils" />
<option name="myItemType" value="com.jetbrains.resharper.projectView.solutionExplorer.SolutionExplorerNodeRider" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" />
<option name="myItemType" value="com.jetbrains.resharper.projectView.solutionExplorer.SolutionExplorerViewPane$ProjectViewPaneTreeStructure$createRoot$1" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="igem-quantifly" />
<option name="myItemType" value="com.jetbrains.resharper.projectView.solutionExplorer.SolutionExplorerNodeRider" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="Assembly-CSharp" />
<option name="myItemType" value="com.jetbrains.resharper.projectView.solutionExplorer.SolutionExplorerNodeRider" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="Assets" />
<option name="myItemType" value="com.jetbrains.resharper.projectView.solutionExplorer.SolutionExplorerNodeRider" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="Scripts" />
<option name="myItemType" value="com.jetbrains.resharper.projectView.solutionExplorer.SolutionExplorerNodeRider" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="MapGeneration" />
<option name="myItemType" value="com.jetbrains.resharper.projectView.solutionExplorer.SolutionExplorerNodeRider" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" />
<option name="myItemType" value="com.jetbrains.resharper.projectView.solutionExplorer.SolutionExplorerViewPane$ProjectViewPaneTreeStructure$createRoot$1" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="igem-quantifly" />
<option name="myItemType" value="com.jetbrains.resharper.projectView.solutionExplorer.SolutionExplorerNodeRider" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="Assembly-CSharp" />
<option name="myItemType" value="com.jetbrains.resharper.projectView.solutionExplorer.SolutionExplorerNodeRider" />
</PATH_ELEMENT>
</PATH>
</subPane>
<option name="show-file-system" value="false" />
</pane>
</panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
<property name="last_opened_file_path" value="$PROJECT_DIR$/../igem-quantifly.sln" /> <property name="last_opened_file_path" value="$PROJECT_DIR$/../igem-quantifly.sln" />
...@@ -287,11 +194,14 @@ ...@@ -287,11 +194,14 @@
<workItem from="1469994566860" duration="8371000" /> <workItem from="1469994566860" duration="8371000" />
<workItem from="1470317006204" duration="284000" /> <workItem from="1470317006204" duration="284000" />
<workItem from="1470317331087" duration="17767000" /> <workItem from="1470317331087" duration="17767000" />
<workItem from="1470317331087" duration="15978000" />
<workItem from="1470584265227" duration="1323000" />
<workItem from="1470849012191" duration="745000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="29169000" /> <option name="totallyTimeSpent" value="29448000" />
</component> </component>
<component name="TodoView"> <component name="TodoView">
<todo-panel id="selected-file"> <todo-panel id="selected-file">
...@@ -303,29 +213,29 @@ ...@@ -303,29 +213,29 @@
</todo-panel> </todo-panel>
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> <frame x="-1" y="-33" width="1922" height="1114" extended-state="0" />
<editor active="true" /> <editor active="false" />
<layout> <layout>
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.1515625" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Errors in solution" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Errors in solution" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Build" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32980973" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" /> <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32980973" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="UnitTesting" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="UnitTesting" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="NuGet" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32997987" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" /> <window_info id="NuGet" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32997987" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.1515625" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Build" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
</layout> </layout>
<layout-to-restore> <layout-to-restore>
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
...@@ -339,8 +249,8 @@ ...@@ -339,8 +249,8 @@
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="UnitTesting" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" /> <window_info id="UnitTesting" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" /> <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
<window_info id="NuGet" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="11" side_tool="true" content_ui="tabs" /> <window_info id="NuGet" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32997987" sideWeight="0.5" order="11" side_tool="true" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.1515625" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.1515625" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
<window_info id="Build" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" /> <window_info id="Build" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
...@@ -370,6 +280,86 @@ ...@@ -370,6 +280,86 @@
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/../Assets/Scripts/MapGeneration/CellularAutomaton.cs"> <entry file="file://$PROJECT_DIR$/../Assets/Scripts/MapGeneration/CellularAutomaton.cs">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="90">
<caret line="6" column="0" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
<folding>
<marker date="1470584414490" expanded="true" signature="6:139" ph="..." />
<marker date="1470584414490" expanded="true" signature="179:3180" ph="{...}" />
<marker date="1470584414490" expanded="true" signature="221:600" ph="{...}" />
<marker date="1470584414490" expanded="true" signature="280:325" ph="{...}" />
<marker date="1470584414490" expanded="true" signature="380:425" ph="{...}" />
<marker date="1470584414490" expanded="true" signature="493:594" ph="{...}" />
<marker date="1470584414490" expanded="true" signature="636:3178" ph="{...}" />
<marker date="1470584414490" expanded="false" signature="651:913" ph="Delegates" />
<marker date="1470584414490" expanded="false" signature="923:1185" ph="Fields" />
<marker date="1470584414490" expanded="false" signature="1195:1688" ph="Ctors" />
<marker date="1470584414490" expanded="true" signature="1304:1668" ph="{...}" />
<marker date="1470584414490" expanded="true" signature="1698:3172" ph="Methods" />
<marker date="1470584414490" expanded="true" signature="1741:2113" ph="{...}" />
<marker date="1470584414490" expanded="true" signature="2189:2846" ph="{...}" />
<marker date="1470584414490" expanded="true" signature="2911:2973" ph="{...}" />
<marker date="1470584414490" expanded="true" signature="3038:3152" ph="{...}" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../Assets/Scripts/Utils/Map.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330">
<caret line="22" column="29" selection-start-line="22" selection-start-column="29" selection-end-line="22" selection-end-column="29" />
<folding>
<marker date="1470578416943" expanded="true" signature="30:899" ph="{...}" />
<marker date="1470578416943" expanded="true" signature="57:119" ph="{...}" />
<marker date="1470578416943" expanded="true" signature="141:897" ph="{...}" />
<marker date="1470578416943" expanded="true" signature="156:307" ph="Fields" />
<marker date="1470578416943" expanded="true" signature="317:746" ph="Ctors" />
<marker date="1470578416943" expanded="true" signature="372:726" ph="{...}" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../Assets/Scripts/MapGeneration/CellularAutomaton.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="345">
<caret line="23" column="1" selection-start-line="23" selection-start-column="1" selection-end-line="23" selection-end-column="1" />
<folding>
<marker date="1470584414490" expanded="true" signature="6:139" ph="..." />
<marker date="1470584414490" expanded="true" signature="179:3180" ph="{...}" />
<marker date="1470584414490" expanded="true" signature="221:600" ph="{...}" />
<marker date="1470584414490" expanded="true" signature="280:325" ph="{...}" />
<marker date="1470584414490" expanded="true" signature="380:425" ph="{...}" />
<marker date="1470584414490" expanded="true" signature="493:594" ph="{...}" />
<marker date="1470584414490" expanded="true" signature="636:3178" ph="{...}" />
<marker date="1470584414490" expanded="false" signature="651:913" ph="Delegates" />
<marker date="1470584414490" expanded="false" signature="923:1185" ph="Fields" />
<marker date="1470584414490" expanded="false" signature="1195:1688" ph="Ctors" />
<marker date="1470584414490" expanded="true" signature="1304:1668" ph="{...}" />
<marker date="1470584414490" expanded="true" signature="1698:3172" ph="Methods" />
<marker date="1470584414490" expanded="true" signature="1741:2113" ph="{...}" />
<marker date="1470584414490" expanded="true" signature="2189:2846" ph="{...}" />
<marker date="1470584414490" expanded="true" signature="2911:2973" ph="{...}" />
<marker date="1470584414490" expanded="true" signature="3038:3152" ph="{...}" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../Assets/Scripts/Utils/Map.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding>
<marker date="1470578416943" expanded="true" signature="30:899" ph="{...}" />
<marker date="1470578416943" expanded="true" signature="57:119" ph="{...}" />
<marker date="1470578416943" expanded="true" signature="141:897" ph="{...}" />
<marker date="1470578416943" expanded="true" signature="156:307" ph="Fields" />
<marker date="1470578416943" expanded="true" signature="317:746" ph="Ctors" />
<marker date="1470578416943" expanded="true" signature="372:726" ph="{...}" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../Assets/Scripts/MapGeneration/CellularAutomaton.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="238"> <state relative-caret-position="238">
<caret line="14" column="0" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" /> <caret line="14" column="0" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" />
<folding> <folding>
...@@ -398,14 +388,6 @@ ...@@ -398,14 +388,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="408"> <state relative-caret-position="408">
<caret line="24" column="0" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" /> <caret line="24" column="0" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
<folding>
<marker date="1470317011486" expanded="true" signature="6:46" ph="..." />
<marker date="1470317011486" expanded="true" signature="86:437" ph="{...}" />
<marker date="1470317011486" expanded="true" signature="110:435" ph="{...}" />
<marker date="1470317011486" expanded="true" signature="125:249" ph="Fields" />
<marker date="1470317011486" expanded="true" signature="259:429" ph="Ctors" />
<marker date="1470317011486" expanded="true" signature="322:409" ph="{...}" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -414,7 +396,6 @@ ...@@ -414,7 +396,6 @@
<state relative-caret-position="136"> <state relative-caret-position="136">
<caret line="8" column="16" selection-start-line="8" selection-start-column="16" selection-end-line="8" selection-end-column="16" /> <caret line="8" column="16" selection-start-line="8" selection-start-column="16" selection-end-line="8" selection-end-column="16" />
<folding> <folding>
<marker date="1470408547196" expanded="true" signature="6:120" ph="..." />
<marker date="1470408547196" expanded="true" signature="6:139" ph="..." /> <marker date="1470408547196" expanded="true" signature="6:139" ph="..." />
<marker date="1470408547196" expanded="true" signature="179:3180" ph="{...}" /> <marker date="1470408547196" expanded="true" signature="179:3180" ph="{...}" />
<marker date="1470408547196" expanded="false" signature="221:600" ph="{...}" /> <marker date="1470408547196" expanded="false" signature="221:600" ph="{...}" />
...@@ -439,14 +420,6 @@ ...@@ -439,14 +420,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="374"> <state relative-caret-position="374">
<caret line="22" column="17" selection-start-line="22" selection-start-column="17" selection-end-line="22" selection-end-column="17" /> <caret line="22" column="17" selection-start-line="22" selection-start-column="17" selection-end-line="22" selection-end-column="17" />
<folding>
<marker date="1470317011486" expanded="true" signature="6:46" ph="..." />
<marker date="1470317011486" expanded="true" signature="86:437" ph="{...}" />
<marker date="1470317011486" expanded="true" signature="110:435" ph="{...}" />
<marker date="1470317011486" expanded="true" signature="125:249" ph="Fields" />
<marker date="1470317011486" expanded="true" signature="259:429" ph="Ctors" />
<marker date="1470317011486" expanded="true" signature="322:409" ph="{...}" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -475,26 +448,11 @@ ...@@ -475,26 +448,11 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$USER_HOME$/AppData/Local/JetBrains/Shared/v06/DecompilerCache/decompiler/F6949EC5-53D4-4DE3-9F54-5BAB8EBF397B/bf/c7df5298/Vector2.cs"> <entry file="file://$USER_HOME$/AppData/Local/JetBrains/Shared/v06/DecompilerCache/decompiler/F6949EC5-53D4-4DE3-9F54-5BAB8EBF397B/bf/c7df5298/Vector2.cs" />
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="442">
<caret line="62" column="4" selection-start-line="62" selection-start-column="4" selection-end-line="62" selection-end-column="4" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../Assets/Scripts/MapGeneration/Cell.cs"> <entry file="file://$PROJECT_DIR$/../Assets/Scripts/MapGeneration/Cell.cs">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="357"> <state relative-caret-position="357">
<caret line="21" column="0" selection-start-line="21" selection-start-column="0" selection-end-line="21" selection-end-column="0" /> <caret line="21" column="0" selection-start-line="21" selection-start-column="0" selection-end-line="21" selection-end-column="0" />
<folding>
<marker date="1470317011486" expanded="true" signature="6:46" ph="..." />
<marker date="1470317011486" expanded="true" signature="86:437" ph="{...}" />
<marker date="1470317011486" expanded="true" signature="110:435" ph="{...}" />
<marker date="1470317011486" expanded="true" signature="125:249" ph="Fields" />
<marker date="1470317011486" expanded="true" signature="259:429" ph="Ctors" />
<marker date="1470317011486" expanded="true" signature="322:409" ph="{...}" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -502,13 +460,6 @@ ...@@ -502,13 +460,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="374"> <state relative-caret-position="374">
<caret line="22" column="37" selection-start-line="22" selection-start-column="37" selection-end-line="22" selection-end-column="37" /> <caret line="22" column="37" selection-start-line="22" selection-start-column="37" selection-end-line="22" selection-end-column="37" />
<folding>
<marker date="1470399191660" expanded="true" signature="6:82" ph="..." />
<marker date="1470399191660" expanded="true" signature="108:791" ph="{...}" />
<marker date="1470399191660" expanded="true" signature="158:789" ph="{...}" />
<marker date="1470399191660" expanded="true" signature="426:716" ph="{...}" />
<marker date="1470399191660" expanded="true" signature="739:783" ph="{...}" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -516,13 +467,6 @@ ...@@ -516,13 +467,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="238"> <state relative-caret-position="238">
<caret line="14" column="8" selection-start-line="14" selection-start-column="8" selection-end-line="14" selection-end-column="8" /> <caret line="14" column="8" selection-start-line="14" selection-start-column="8" selection-end-line="14" selection-end-column="8" />
<folding>
<marker date="1470399191626" expanded="true" signature="6:71" ph="..." />
<marker date="1470399191626" expanded="true" signature="103:924" ph="{...}" />
<marker date="1470399191626" expanded="true" signature="133:922" ph="{...}" />
<marker date="1470399191626" expanded="true" signature="309:605" ph="{...}" />
<marker date="1470399191626" expanded="true" signature="650:916" ph="{...}" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
......
igem-quantifly
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/riderModule.iml" filepath="$PROJECT_DIR$/riderModule.iml" />
</modules>
</component>
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$/../.." vcs="Git" />
</component>
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<module type="RIDER_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$/../..">
<sourceFolder url="file://$MODULE_DIR$/../.." isTestSource="false" />
<excludeFolder url="file://$MODULE_DIR$/../../Temp/bin" />
<excludeFolder url="file://$MODULE_DIR$/../../obj" />
</content>
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment