Merge remote-tracking branch 'origin/master' (20b5c85e) · Commits · 钟慕尧 / Pyengin

.idea/vcs.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -2,5 +2,6 @@
		<project version="4">
		<component name="VcsDirectoryMappings">
		<mapping directory="" vcs="CVS" />
		<mapping directory="$PROJECT_DIR$/.." vcs="Git" />
		</component>
		</project>
		No newline at end of file

.idea/workspace.xml

+21 −30

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="UTF-8"?>
		<project version="4">
		<component name="ChangeListManager">
		<list default="true" id="cf5ee9ef-17ce-4737-b895-ac880f50218c" name="Default Changelist" comment="" />
		<list default="true" id="cf5ee9ef-17ce-4737-b895-ac880f50218c" name="Default Changelist" comment="">
		<change beforePath="$PROJECT_DIR$/../GameEngin/Player.py" beforeDir="false" />
		<change beforePath="$PROJECT_DIR$/../GameEngin/__init__.py" beforeDir="false" />
		<change beforePath="$PROJECT_DIR$/../README.md" beforeDir="false" />
		</list>
		<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
		<option name="SHOW_DIALOG" value="false" />
		<option name="HIGHLIGHT_CONFLICTS" value="true" />
		@@ -25,49 +29,31 @@
		<usages-collector id="statistics.file.extensions.open">
		<counts>
		<entry key="md" value="2" />
		<entry key="py" value="6" />
		<entry key="py" value="7" />
		</counts>
		</usages-collector>
		<usages-collector id="statistics.file.types.open">
		<counts>
		<entry key="Markdown" value="2" />
		<entry key="Python" value="6" />
		<entry key="Python" value="7" />
		</counts>
		</usages-collector>
		<usages-collector id="statistics.file.extensions.edit">
		<counts>
		<entry key="md" value="1282" />
		<entry key="md" value="1339" />
		<entry key="py" value="916" />
		</counts>
		</usages-collector>
		<usages-collector id="statistics.file.types.edit">
		<counts>
		<entry key="Markdown" value="1282" />
		<entry key="Markdown" value="1339" />
		<entry key="Python" value="916" />
		</counts>
		</usages-collector>
		</session>
		</component>
		<component name="FileEditorManager">
		<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
		<file pinned="false" current-in-tab="true">
		<entry file="file://$PROJECT_DIR$/GameEngin/__init__.py">
		<provider selected="true" editor-type-id="text-editor" />
		</entry>
		</file>
		<file pinned="false" current-in-tab="false">
		<entry file="file://$PROJECT_DIR$/README.md">
		<provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
		<state split_layout="SPLIT">
		<first_editor relative-caret-position="840">
		<caret line="56" column="1" selection-start-line="56" selection-start-column="1" selection-end-line="56" selection-end-column="1" />
		</first_editor>
		<second_editor />
		</state>
		</provider>
		</entry>
		</file>
		</leaf>
		<leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
		</component>
		<component name="FileTemplateManagerImpl">
		<option name="RECENT_TEMPLATES">
		@@ -76,13 +62,16 @@
		</list>
		</option>
		</component>
		<component name="Git.Settings">
		<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
		</component>
		<component name="IdeDocumentHistory">
		<option name="CHANGED_PATHS">
		<list>
		<option value="$PROJECT_DIR$/GameEngin/Game.py" />
		<option value="$PROJECT_DIR$/GameEngin/Player.py" />
		<option value="$PROJECT_DIR$/Test.py" />
		<option value="$PROJECT_DIR$/GameEngin/__init__.py" />
		<option value="$PROJECT_DIR$/GameEngin/Player.py" />
		<option value="$PROJECT_DIR$/README.md" />
		</list>
		</option>
		@@ -119,7 +108,7 @@
		</panes>
		</component>
		<component name="PropertiesComponent">
		<property name="settings.editor.selected.configurable" value="settings.github" />
		<property name="settings.editor.selected.configurable" value="vcs.Mercurial" />
		</component>
		<component name="RecentsManager">
		<key name="MoveFile.RECENT_KEYS">
		@@ -211,7 +200,7 @@
		<component name="ToolWindowManager">
		<frame x="1523" y="92" width="1550" height="1259" extended-state="0" />
		<layout>
		<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.4532374" />
		<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.13865271" />
		<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
		<window_info id="Favorites" order="2" side_tool="true" />
		<window_info anchor="bottom" id="Message" order="0" />
		@@ -243,16 +232,18 @@
		</component>
		<component name="editorHistoryManager">
		<entry file="file://$PROJECT_DIR$/GameEngin/Game.py" />
		<entry file="file://$PROJECT_DIR$/GameEngin/Player.py" />
		<entry file="file://$PROJECT_DIR$/Test.py" />
		<entry file="file://$PROJECT_DIR$/GameEngin/__init__.py">
		<provider selected="true" editor-type-id="text-editor" />
		</entry>
		<entry file="file://$PROJECT_DIR$/GameEngin/Player.py">
		<provider selected="true" editor-type-id="text-editor" />
		</entry>
		<entry file="file://$PROJECT_DIR$/README.md">
		<provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
		<state split_layout="SPLIT">
		<first_editor relative-caret-position="840">
		<caret line="56" column="1" selection-start-line="56" selection-start-column="1" selection-end-line="56" selection-end-column="1" />
		<first_editor relative-caret-position="328">
		<caret line="26" column="1" lean-forward="true" selection-start-line="26" selection-start-column="1" selection-end-line="26" selection-end-column="1" />
		</first_editor>
		<second_editor />
		</state>

Admin message