修订版 | fe78647e503975d266ca07bbb46408afa6f95012 (tree) |
---|---|
时间 | 2018-10-12 04:25:12 |
作者 | sebastian_bugiu <sebastian_ <bugiu@head...> |
Commiter | sebastian_bugiu <sebastian_ |
Added okhttp.
@@ -0,0 +1,11 @@ | ||
1 | +<component name="libraryTable"> | |
2 | + <library name="Gradle: com.squareup.okhttp3:okhttp:3.11.0"> | |
3 | + <CLASSES> | |
4 | + <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/3.11.0/75966e05a49046ca2ae734e5626f28837a8d1e82/okhttp-3.11.0.jar!/" /> | |
5 | + </CLASSES> | |
6 | + <JAVADOC /> | |
7 | + <SOURCES> | |
8 | + <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/3.11.0/cf16b99519850b1adc3b259c90fd8566a0f592f3/okhttp-3.11.0-sources.jar!/" /> | |
9 | + </SOURCES> | |
10 | + </library> | |
11 | +</component> | |
\ No newline at end of file |
@@ -0,0 +1,11 @@ | ||
1 | +<component name="libraryTable"> | |
2 | + <library name="Gradle: com.squareup.okio:okio:1.14.0"> | |
3 | + <CLASSES> | |
4 | + <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/1.14.0/102d7be47241d781ef95f1581d414b0943053130/okio-1.14.0.jar!/" /> | |
5 | + </CLASSES> | |
6 | + <JAVADOC /> | |
7 | + <SOURCES> | |
8 | + <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/1.14.0/e7c96b4fe5651490d8f3c022042940d743a3bdd9/okio-1.14.0-sources.jar!/" /> | |
9 | + </SOURCES> | |
10 | + </library> | |
11 | +</component> | |
\ No newline at end of file |
@@ -26,16 +26,9 @@ | ||
26 | 26 | <root url="jar://$MODULE_DIR$/../../lib/core-1.0.jar!/" /> |
27 | 27 | </CLASSES> |
28 | 28 | <JAVADOC /> |
29 | - <SOURCES /> | |
30 | - </library> | |
31 | - </orderEntry> | |
32 | - <orderEntry type="module-library"> | |
33 | - <library> | |
34 | - <CLASSES> | |
35 | - <root url="jar://$MODULE_DIR$/../../lib/FlurryAgent.jar!/" /> | |
36 | - </CLASSES> | |
37 | - <JAVADOC /> | |
38 | - <SOURCES /> | |
29 | + <SOURCES> | |
30 | + <root url="jar://$MODULE_DIR$/../../lib/core-1.0-sources.jar!/" /> | |
31 | + </SOURCES> | |
39 | 32 | </library> |
40 | 33 | </orderEntry> |
41 | 34 | <orderEntry type="module-library"> |
@@ -50,6 +43,15 @@ | ||
50 | 43 | <orderEntry type="module-library"> |
51 | 44 | <library> |
52 | 45 | <CLASSES> |
46 | + <root url="jar://$MODULE_DIR$/../../lib/sensorsimulator-lib-2.0-rc1.jar!/" /> | |
47 | + </CLASSES> | |
48 | + <JAVADOC /> | |
49 | + <SOURCES /> | |
50 | + </library> | |
51 | + </orderEntry> | |
52 | + <orderEntry type="module-library"> | |
53 | + <library> | |
54 | + <CLASSES> | |
53 | 55 | <root url="jar://$MODULE_DIR$/../../lib/jsr305-1.3.9.jar!/" /> |
54 | 56 | </CLASSES> |
55 | 57 | <JAVADOC /> |
@@ -59,6 +61,15 @@ | ||
59 | 61 | <orderEntry type="module-library"> |
60 | 62 | <library> |
61 | 63 | <CLASSES> |
64 | + <root url="jar://$MODULE_DIR$/../../lib/FlurryAgent.jar!/" /> | |
65 | + </CLASSES> | |
66 | + <JAVADOC /> | |
67 | + <SOURCES /> | |
68 | + </library> | |
69 | + </orderEntry> | |
70 | + <orderEntry type="module-library"> | |
71 | + <library> | |
72 | + <CLASSES> | |
62 | 73 | <root url="jar://$MODULE_DIR$/../../lib/kryonet.jar!/" /> |
63 | 74 | </CLASSES> |
64 | 75 | <JAVADOC /> |
@@ -77,7 +88,7 @@ | ||
77 | 88 | <orderEntry type="module-library"> |
78 | 89 | <library> |
79 | 90 | <CLASSES> |
80 | - <root url="jar://$MODULE_DIR$/../../lib/sensorsimulator-lib-2.0-rc1.jar!/" /> | |
91 | + <root url="jar://$MODULE_DIR$/../../lib/okhttp-3.11.0.jar!/" /> | |
81 | 92 | </CLASSES> |
82 | 93 | <JAVADOC /> |
83 | 94 | <SOURCES /> |
@@ -105,12 +116,14 @@ | ||
105 | 116 | <orderEntry type="library" name="Gradle: junit:junit:4.12" level="project" /> |
106 | 117 | <orderEntry type="library" name="Gradle: commons-io:commons-io:2.4" level="project" /> |
107 | 118 | <orderEntry type="library" name="Gradle: org.apache.commons:commons-lang3:3.4" level="project" /> |
119 | + <orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:3.11.0" level="project" /> | |
108 | 120 | <orderEntry type="library" name="Gradle: org.lwjgl.lwjgl:lwjgl_util:2.9.2" level="project" /> |
109 | 121 | <orderEntry type="library" name="Gradle: org.lwjgl.lwjgl:lwjgl:2.9.2" level="project" /> |
110 | 122 | <orderEntry type="library" name="Gradle: com.badlogicgames.jlayer:jlayer:1.0.1-gdx" level="project" /> |
111 | 123 | <orderEntry type="library" name="Gradle: org.jcraft:jorbis:0.0.17" level="project" /> |
112 | 124 | <orderEntry type="library" name="Gradle: org.apache.httpcomponents:httpclient:4.4.1" level="project" /> |
113 | 125 | <orderEntry type="library" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" /> |
126 | + <orderEntry type="library" name="Gradle: com.squareup.okio:okio:1.14.0" level="project" /> | |
114 | 127 | <orderEntry type="library" name="Gradle: org.lwjgl.lwjgl:lwjgl-platform:natives-windows:2.9.2" level="project" /> |
115 | 128 | <orderEntry type="library" name="Gradle: org.lwjgl.lwjgl:lwjgl-platform:natives-linux:2.9.2" level="project" /> |
116 | 129 | <orderEntry type="library" name="Gradle: org.lwjgl.lwjgl:lwjgl-platform:natives-osx:2.9.2" level="project" /> |
@@ -120,6 +133,33 @@ | ||
120 | 133 | <orderEntry type="library" name="Gradle: commons-codec:commons-codec:1.9" level="project" /> |
121 | 134 | <orderEntry type="library" name="Gradle: net.java.jutils:jutils:1.0.0" level="project" /> |
122 | 135 | <orderEntry type="library" name="Gradle: net.java.jinput:jinput-platform:natives-linux:2.0.5" level="project" /> |
136 | + <orderEntry type="module-library"> | |
137 | + <library> | |
138 | + <CLASSES> | |
139 | + <root url="jar://$MODULE_DIR$/../../lib/okio-2.1.0.jar!/" /> | |
140 | + </CLASSES> | |
141 | + <JAVADOC /> | |
142 | + <SOURCES /> | |
143 | + </library> | |
144 | + </orderEntry> | |
145 | + <orderEntry type="module-library"> | |
146 | + <library> | |
147 | + <CLASSES> | |
148 | + <root url="jar://$MODULE_DIR$/../../lib/_core-1.0-sources.jar!/" /> | |
149 | + </CLASSES> | |
150 | + <JAVADOC /> | |
151 | + <SOURCES /> | |
152 | + </library> | |
153 | + </orderEntry> | |
154 | + <orderEntry type="module-library"> | |
155 | + <library> | |
156 | + <CLASSES> | |
157 | + <root url="jar://$MODULE_DIR$/../../lib/_core-1.0.jar!/" /> | |
158 | + </CLASSES> | |
159 | + <JAVADOC /> | |
160 | + <SOURCES /> | |
161 | + </library> | |
162 | + </orderEntry> | |
123 | 163 | <orderEntry type="library" name="Gradle: net.java.jinput:jinput-platform:natives-windows:2.0.5" level="project" /> |
124 | 164 | <orderEntry type="library" name="Gradle: net.java.jinput:jinput-platform:natives-osx:2.0.5" level="project" /> |
125 | 165 | </component> |
@@ -19,15 +19,6 @@ | ||
19 | 19 | <orderEntry type="module-library"> |
20 | 20 | <library> |
21 | 21 | <CLASSES> |
22 | - <root url="jar://$MODULE_DIR$/../../lib/core-1.0.jar!/" /> | |
23 | - </CLASSES> | |
24 | - <JAVADOC /> | |
25 | - <SOURCES /> | |
26 | - </library> | |
27 | - </orderEntry> | |
28 | - <orderEntry type="module-library"> | |
29 | - <library> | |
30 | - <CLASSES> | |
31 | 22 | <root url="jar://$MODULE_DIR$/../../lib/FlurryAgent.jar!/" /> |
32 | 23 | </CLASSES> |
33 | 24 | <JAVADOC /> |
@@ -37,6 +28,24 @@ | ||
37 | 28 | <orderEntry type="module-library"> |
38 | 29 | <library> |
39 | 30 | <CLASSES> |
31 | + <root url="jar://$MODULE_DIR$/../../lib/mchange-commons-java-0.2.8.jar!/" /> | |
32 | + </CLASSES> | |
33 | + <JAVADOC /> | |
34 | + <SOURCES /> | |
35 | + </library> | |
36 | + </orderEntry> | |
37 | + <orderEntry type="module-library"> | |
38 | + <library> | |
39 | + <CLASSES> | |
40 | + <root url="jar://$MODULE_DIR$/../../lib/sensorsimulator-lib-2.0-rc1.jar!/" /> | |
41 | + </CLASSES> | |
42 | + <JAVADOC /> | |
43 | + <SOURCES /> | |
44 | + </library> | |
45 | + </orderEntry> | |
46 | + <orderEntry type="module-library"> | |
47 | + <library> | |
48 | + <CLASSES> | |
40 | 49 | <root url="jar://$MODULE_DIR$/../../lib/GoogleAdMobAdsSdk-6.2.1.jar!/" /> |
41 | 50 | </CLASSES> |
42 | 51 | <JAVADOC /> |
@@ -46,6 +55,15 @@ | ||
46 | 55 | <orderEntry type="module-library"> |
47 | 56 | <library> |
48 | 57 | <CLASSES> |
58 | + <root url="jar://$MODULE_DIR$/../../lib/core-1.0.jar!/" /> | |
59 | + </CLASSES> | |
60 | + <JAVADOC /> | |
61 | + <SOURCES /> | |
62 | + </library> | |
63 | + </orderEntry> | |
64 | + <orderEntry type="module-library"> | |
65 | + <library> | |
66 | + <CLASSES> | |
49 | 67 | <root url="jar://$MODULE_DIR$/../../lib/jsr305-1.3.9.jar!/" /> |
50 | 68 | </CLASSES> |
51 | 69 | <JAVADOC /> |
@@ -64,16 +82,7 @@ | ||
64 | 82 | <orderEntry type="module-library"> |
65 | 83 | <library> |
66 | 84 | <CLASSES> |
67 | - <root url="jar://$MODULE_DIR$/../../lib/mchange-commons-java-0.2.8.jar!/" /> | |
68 | - </CLASSES> | |
69 | - <JAVADOC /> | |
70 | - <SOURCES /> | |
71 | - </library> | |
72 | - </orderEntry> | |
73 | - <orderEntry type="module-library"> | |
74 | - <library> | |
75 | - <CLASSES> | |
76 | - <root url="jar://$MODULE_DIR$/../../lib/sensorsimulator-lib-2.0-rc1.jar!/" /> | |
85 | + <root url="jar://$MODULE_DIR$/../../lib/okhttp-3.11.0.jar!/" /> | |
77 | 86 | </CLASSES> |
78 | 87 | <JAVADOC /> |
79 | 88 | <SOURCES /> |
@@ -101,12 +110,14 @@ | ||
101 | 110 | <orderEntry type="library" name="Gradle: junit:junit:4.12" level="project" /> |
102 | 111 | <orderEntry type="library" name="Gradle: commons-io:commons-io:2.4" level="project" /> |
103 | 112 | <orderEntry type="library" name="Gradle: org.apache.commons:commons-lang3:3.4" level="project" /> |
113 | + <orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:3.11.0" level="project" /> | |
104 | 114 | <orderEntry type="library" name="Gradle: org.lwjgl.lwjgl:lwjgl_util:2.9.2" level="project" /> |
105 | 115 | <orderEntry type="library" name="Gradle: org.lwjgl.lwjgl:lwjgl:2.9.2" level="project" /> |
106 | 116 | <orderEntry type="library" name="Gradle: com.badlogicgames.jlayer:jlayer:1.0.1-gdx" level="project" /> |
107 | 117 | <orderEntry type="library" name="Gradle: org.jcraft:jorbis:0.0.17" level="project" /> |
108 | 118 | <orderEntry type="library" name="Gradle: org.apache.httpcomponents:httpclient:4.4.1" level="project" /> |
109 | 119 | <orderEntry type="library" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" /> |
120 | + <orderEntry type="library" name="Gradle: com.squareup.okio:okio:1.14.0" level="project" /> | |
110 | 121 | <orderEntry type="library" name="Gradle: org.lwjgl.lwjgl:lwjgl-platform:natives-windows:2.9.2" level="project" /> |
111 | 122 | <orderEntry type="library" name="Gradle: org.lwjgl.lwjgl:lwjgl-platform:natives-linux:2.9.2" level="project" /> |
112 | 123 | <orderEntry type="library" name="Gradle: org.lwjgl.lwjgl:lwjgl-platform:natives-osx:2.9.2" level="project" /> |
@@ -116,6 +127,33 @@ | ||
116 | 127 | <orderEntry type="library" name="Gradle: commons-codec:commons-codec:1.9" level="project" /> |
117 | 128 | <orderEntry type="library" name="Gradle: net.java.jutils:jutils:1.0.0" level="project" /> |
118 | 129 | <orderEntry type="library" name="Gradle: net.java.jinput:jinput-platform:natives-linux:2.0.5" level="project" /> |
130 | + <orderEntry type="module-library"> | |
131 | + <library> | |
132 | + <CLASSES> | |
133 | + <root url="jar://$MODULE_DIR$/../../lib/okio-2.1.0.jar!/" /> | |
134 | + </CLASSES> | |
135 | + <JAVADOC /> | |
136 | + <SOURCES /> | |
137 | + </library> | |
138 | + </orderEntry> | |
139 | + <orderEntry type="module-library"> | |
140 | + <library> | |
141 | + <CLASSES> | |
142 | + <root url="jar://$MODULE_DIR$/../../lib/_core-1.0-sources.jar!/" /> | |
143 | + </CLASSES> | |
144 | + <JAVADOC /> | |
145 | + <SOURCES /> | |
146 | + </library> | |
147 | + </orderEntry> | |
148 | + <orderEntry type="module-library"> | |
149 | + <library> | |
150 | + <CLASSES> | |
151 | + <root url="jar://$MODULE_DIR$/../../lib/_core-1.0.jar!/" /> | |
152 | + </CLASSES> | |
153 | + <JAVADOC /> | |
154 | + <SOURCES /> | |
155 | + </library> | |
156 | + </orderEntry> | |
119 | 157 | <orderEntry type="library" name="Gradle: net.java.jinput:jinput-platform:natives-windows:2.0.5" level="project" /> |
120 | 158 | <orderEntry type="library" name="Gradle: net.java.jinput:jinput-platform:natives-osx:2.0.5" level="project" /> |
121 | 159 | </component> |
@@ -2,8 +2,14 @@ | ||
2 | 2 | <project version="4"> |
3 | 3 | <component name="ChangeListManager"> |
4 | 4 | <list default="true" id="7105e4c6-0867-4f2c-a066-e5ce5581c80a" name="Default" comment=""> |
5 | + <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_squareup_okhttp3_okhttp_3_11_0.xml" afterDir="false" /> | |
6 | + <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_squareup_okio_okio_1_14_0.xml" afterDir="false" /> | |
7 | + <change afterPath="$PROJECT_DIR$/lib/okhttp-3.11.0.jar" afterDir="false" /> | |
8 | + <change afterPath="$PROJECT_DIR$/lib/okio-2.1.0.jar" afterDir="false" /> | |
9 | + <change beforePath="$PROJECT_DIR$/.idea/modules/BlackholeDarksunServer2_main.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules/BlackholeDarksunServer2_main.iml" afterDir="false" /> | |
10 | + <change beforePath="$PROJECT_DIR$/.idea/modules/BlackholeDarksunServer2_test.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules/BlackholeDarksunServer2_test.iml" afterDir="false" /> | |
5 | 11 | <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> |
6 | - <change beforePath="$PROJECT_DIR$/src/headwayEnt/BlackholeDarksunOnline/Server/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/headwayEnt/BlackholeDarksunOnline/Server/Main.java" afterDir="false" /> | |
12 | + <change beforePath="$PROJECT_DIR$/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/build.gradle" afterDir="false" /> | |
7 | 13 | </list> |
8 | 14 | <ignored path="BlackholeDarksunServer2.iws" /> |
9 | 15 | <ignored path=".idea/workspace.xml" /> |
@@ -51,74 +57,75 @@ | ||
51 | 57 | </component> |
52 | 58 | <component name="FileEditorManager"> |
53 | 59 | <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> |
54 | - <file leaf-file-name="Controller.java" pinned="false" current-in-tab="false"> | |
55 | - <entry file="file://$PROJECT_DIR$/src/headwayEnt/BlackholeDarksunOnline/Server/Controller.java"> | |
60 | + <file leaf-file-name="MainActivity.java" pinned="false" current-in-tab="false"> | |
61 | + <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/MainActivity.java"> | |
56 | 62 | <provider selected="true" editor-type-id="text-editor"> |
57 | - <state relative-caret-position="382"> | |
58 | - <caret line="117" column="16" selection-start-line="117" selection-start-column="16" selection-end-line="117" selection-end-column="16" /> | |
63 | + <state relative-caret-position="144"> | |
64 | + <caret line="56" selection-start-line="56" selection-end-line="56" /> | |
59 | 65 | </state> |
60 | 66 | </provider> |
61 | 67 | </entry> |
62 | 68 | </file> |
63 | - <file leaf-file-name="build.gradle" pinned="false" current-in-tab="false"> | |
64 | - <entry file="file://$PROJECT_DIR$/build.gradle"> | |
69 | + <file leaf-file-name="ENG_RenderRoot.java" pinned="false" current-in-tab="false"> | |
70 | + <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/hotshotengine/renderer/ENG_RenderRoot.java"> | |
65 | 71 | <provider selected="true" editor-type-id="text-editor"> |
66 | - <state relative-caret-position="288"> | |
72 | + <state relative-caret-position="337"> | |
73 | + <caret line="138" selection-start-line="138" selection-end-line="138" /> | |
74 | + <folding> | |
75 | + <element signature="e#5805#5806#0" expanded="true" /> | |
76 | + <element signature="e#5872#5873#0" expanded="true" /> | |
77 | + <element signature="e#10555#10556#0" expanded="true" /> | |
78 | + <element signature="e#10594#10595#0" expanded="true" /> | |
79 | + </folding> | |
80 | + </state> | |
81 | + </provider> | |
82 | + </entry> | |
83 | + </file> | |
84 | + <file leaf-file-name="ENG_ControllerManager.java" pinned="false" current-in-tab="false"> | |
85 | + <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/hotshotengine/renderer/ENG_ControllerManager.java"> | |
86 | + <provider selected="true" editor-type-id="text-editor"> | |
87 | + <state relative-caret-position="323"> | |
67 | 88 | <caret line="29" selection-start-line="29" selection-end-line="29" /> |
68 | 89 | </state> |
69 | 90 | </provider> |
70 | 91 | </entry> |
71 | 92 | </file> |
72 | - <file leaf-file-name="Main.java" pinned="false" current-in-tab="true"> | |
73 | - <entry file="file://$PROJECT_DIR$/src/headwayEnt/BlackholeDarksunOnline/Server/Main.java"> | |
93 | + <file leaf-file-name="ENG_RootNativeWrapper.java" pinned="false" current-in-tab="false"> | |
94 | + <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/hotshotengine/renderer/nativeinterface/classwrappers/ENG_RootNativeWrapper.java"> | |
74 | 95 | <provider selected="true" editor-type-id="text-editor"> |
75 | - <state relative-caret-position="255"> | |
76 | - <caret line="23" column="45" lean-forward="true" selection-start-line="23" selection-start-column="45" selection-end-line="23" selection-end-column="45" /> | |
77 | - </state> | |
78 | - </provider> | |
79 | - </entry> | |
80 | - </file> | |
81 | - <file leaf-file-name="ServerEndPoint.java" pinned="false" current-in-tab="false"> | |
82 | - <entry file="file://$PROJECT_DIR$/src/headwayEnt/Blackhole_Darksun/Net/ClientAPI/ServerEndPoint.java"> | |
83 | - <provider selected="true" editor-type-id="text-editor"> | |
84 | - <state relative-caret-position="119"> | |
85 | - <caret line="8" column="41" selection-start-line="8" selection-start-column="41" selection-end-line="8" selection-end-column="41" /> | |
96 | + <state relative-caret-position="238"> | |
97 | + <caret line="19" selection-start-line="19" selection-end-line="19" /> | |
86 | 98 | </state> |
87 | 99 | </provider> |
88 | 100 | </entry> |
89 | 101 | </file> |
90 | - <file leaf-file-name="APP_Game.java" pinned="false" current-in-tab="false"> | |
91 | - <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/APP_Game.java"> | |
102 | + <file leaf-file-name="ENG_SlowCall.java" pinned="false" current-in-tab="false"> | |
103 | + <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/hotshotengine/renderer/nativeinterface/pipeline/ENG_SlowCall.java"> | |
92 | 104 | <provider selected="true" editor-type-id="text-editor"> |
93 | - <state relative-caret-position="1394"> | |
94 | - <caret line="149" column="31" selection-start-line="149" selection-start-column="31" selection-end-line="149" selection-end-column="31" /> | |
105 | + <state relative-caret-position="442"> | |
106 | + <caret line="28" selection-start-line="28" selection-end-line="28" /> | |
95 | 107 | </state> |
96 | 108 | </provider> |
97 | 109 | </entry> |
98 | 110 | </file> |
99 | - <file leaf-file-name="ClientAPI.java" pinned="false" current-in-tab="false"> | |
100 | - <entry file="file://$PROJECT_DIR$/src/headwayEnt/Blackhole_Darksun/Net/ClientAPI/ClientAPI.java"> | |
111 | + <file leaf-file-name="ENG_RenderingThread.java" pinned="false" current-in-tab="false"> | |
112 | + <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/hotshotengine/renderer/nativeinterface/pipeline/ENG_RenderingThread.java"> | |
101 | 113 | <provider selected="true" editor-type-id="text-editor"> |
102 | - <state relative-caret-position="442"> | |
103 | - <caret line="29" column="42" selection-start-line="29" selection-start-column="42" selection-end-line="29" selection-end-column="42" /> | |
114 | + <state relative-caret-position="388"> | |
115 | + <caret line="784" selection-start-line="784" selection-end-line="784" /> | |
104 | 116 | </state> |
105 | 117 | </provider> |
106 | 118 | </entry> |
107 | 119 | </file> |
108 | - <file leaf-file-name="ServerTable.java" pinned="false" current-in-tab="false"> | |
109 | - <entry file="file://$PROJECT_DIR$/src/headwayEnt/Blackhole_Darksun/Net/ClientAPI/Tables/ServerTable.java"> | |
120 | + <file leaf-file-name="BlackholeDarksunMain.java" pinned="false" current-in-tab="true"> | |
121 | + <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/BlackholeDarksunMain.java"> | |
110 | 122 | <provider selected="true" editor-type-id="text-editor"> |
111 | - <state relative-caret-position="119"> | |
112 | - <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" /> | |
113 | - </state> | |
114 | - </provider> | |
115 | - </entry> | |
116 | - </file> | |
117 | - <file leaf-file-name="GameServer.java" pinned="false" current-in-tab="false"> | |
118 | - <entry file="file://$PROJECT_DIR$/src/headwayEnt/BlackholeDarksunOnline/Server/GameServer.java"> | |
119 | - <provider selected="true" editor-type-id="text-editor"> | |
120 | - <state relative-caret-position="1581"> | |
121 | - <caret line="114" column="12" selection-start-line="114" selection-start-column="12" selection-end-line="114" selection-end-column="12" /> | |
123 | + <state relative-caret-position="575"> | |
124 | + <caret line="103" selection-start-line="103" selection-end-line="103" /> | |
125 | + <folding> | |
126 | + <element signature="e#1372#1373#0" expanded="true" /> | |
127 | + <element signature="e#1425#1426#0" expanded="true" /> | |
128 | + </folding> | |
122 | 129 | </state> |
123 | 130 | </provider> |
124 | 131 | </entry> |
@@ -126,8 +133,17 @@ | ||
126 | 133 | <file leaf-file-name="ServerVirtualizationService.java" pinned="false" current-in-tab="false"> |
127 | 134 | <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/ServerVirtualizationService.java"> |
128 | 135 | <provider selected="true" editor-type-id="text-editor"> |
129 | - <state relative-caret-position="850"> | |
130 | - <caret line="63" column="8" selection-start-line="63" selection-start-column="8" selection-end-line="63" selection-end-column="8" /> | |
136 | + <state relative-caret-position="280"> | |
137 | + <caret line="85" selection-start-line="85" selection-end-line="85" /> | |
138 | + </state> | |
139 | + </provider> | |
140 | + </entry> | |
141 | + </file> | |
142 | + <file leaf-file-name="APP_MultiPlayerGame.java" pinned="false" current-in-tab="false"> | |
143 | + <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/APP_MultiPlayerGame.java"> | |
144 | + <provider selected="true" editor-type-id="text-editor"> | |
145 | + <state relative-caret-position="178"> | |
146 | + <caret line="84" selection-start-line="84" selection-end-line="84" /> | |
131 | 147 | </state> |
132 | 148 | </provider> |
133 | 149 | </entry> |
@@ -135,8 +151,8 @@ | ||
135 | 151 | <file leaf-file-name="ClientListener.java" pinned="false" current-in-tab="false"> |
136 | 152 | <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/net/ClientListener.java"> |
137 | 153 | <provider selected="true" editor-type-id="text-editor"> |
138 | - <state relative-caret-position="578"> | |
139 | - <caret line="48" column="24" selection-start-line="48" selection-start-column="24" selection-end-line="48" selection-end-column="24" /> | |
154 | + <state relative-caret-position="255"> | |
155 | + <caret line="44" selection-start-line="44" selection-end-line="44" /> | |
140 | 156 | </state> |
141 | 157 | </provider> |
142 | 158 | </entry> |
@@ -328,9 +344,9 @@ | ||
328 | 344 | <map> |
329 | 345 | <entry key="$PROJECT_DIR$/../BlackholeDarksunOnline2" value="10023978603435" /> |
330 | 346 | <entry key="$PROJECT_DIR$/../BlackholeDarksunOnline3" value="10093996214324" /> |
331 | - <entry key="$PROJECT_DIR$" value="3007211935580" /> | |
347 | + <entry key="$PROJECT_DIR$" value="3078306166975" /> | |
332 | 348 | <entry key="$PROJECT_DIR$/.gradle" value="0" /> |
333 | - <entry key="$PROJECT_DIR$/build.gradle" value="886612688" /> | |
349 | + <entry key="$PROJECT_DIR$/build.gradle" value="2800981609" /> | |
334 | 350 | </map> |
335 | 351 | </option> |
336 | 352 | <option name="projectBuildClasspath"> |
@@ -373,12 +389,12 @@ | ||
373 | 389 | <option value="$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/APP_MultiPlayerGame.java" /> |
374 | 390 | <option value="$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/animations/PortalExitingWithoutRenderingAnimation.java" /> |
375 | 391 | <option value="$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/multiplayer/systems/DataSenderSystem.java" /> |
376 | - <option value="$PROJECT_DIR$/build.gradle" /> | |
377 | 392 | <option value="$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/systems/MovementSystem.java" /> |
378 | 393 | <option value="$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/world/WorldManagerServerSide.java" /> |
379 | 394 | <option value="$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/APP_Game.java" /> |
380 | 395 | <option value="$PROJECT_DIR$/src/headwayEnt/Blackhole_Darksun/Net/ClientAPI/ServerEndPoint.java" /> |
381 | 396 | <option value="$PROJECT_DIR$/src/headwayEnt/BlackholeDarksunOnline/Server/Main.java" /> |
397 | + <option value="$PROJECT_DIR$/build.gradle" /> | |
382 | 398 | </list> |
383 | 399 | </option> |
384 | 400 | </component> |
@@ -414,6 +430,16 @@ | ||
414 | 430 | <path> |
415 | 431 | <item name="BlackholeDarksunServer2" type="b2602c69:ProjectViewProjectNode" /> |
416 | 432 | <item name="BlackholeDarksunServer2" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" /> |
433 | + <item name="lib" type="462c0819:PsiDirectoryNode" /> | |
434 | + </path> | |
435 | + <path> | |
436 | + <item name="BlackholeDarksunServer2" type="b2602c69:ProjectViewProjectNode" /> | |
437 | + <item name="BlackholeDarksunServer2" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" /> | |
438 | + <item name="res" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" /> | |
439 | + </path> | |
440 | + <path> | |
441 | + <item name="BlackholeDarksunServer2" type="b2602c69:ProjectViewProjectNode" /> | |
442 | + <item name="BlackholeDarksunServer2" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" /> | |
417 | 443 | <item name="Sebi" type="462c0819:PsiDirectoryNode" /> |
418 | 444 | </path> |
419 | 445 | <path> |
@@ -501,7 +527,7 @@ | ||
501 | 527 | <property name="options.lastSelected" value="preferences.pluginManager" /> |
502 | 528 | <property name="options.splitter.details.proportions" value="0.2" /> |
503 | 529 | <property name="options.splitter.main.proportions" value="0.3" /> |
504 | - <property name="project.structure.last.edited" value="Project" /> | |
530 | + <property name="project.structure.last.edited" value="Libraries" /> | |
505 | 531 | <property name="project.structure.proportion" value="0.15" /> |
506 | 532 | <property name="project.structure.side.proportion" value="0.43908045" /> |
507 | 533 | <property name="recentsLimit" value="5" /> |
@@ -854,53 +880,53 @@ | ||
854 | 880 | <workItem from="1472052583402" duration="6106000" /> |
855 | 881 | <workItem from="1492885488854" duration="60000" /> |
856 | 882 | <workItem from="1539022539750" duration="4663000" /> |
857 | - <workItem from="1539191537027" duration="3768000" /> | |
883 | + <workItem from="1539191537027" duration="7913000" /> | |
858 | 884 | </task> |
859 | 885 | <servers /> |
860 | 886 | </component> |
861 | 887 | <component name="TimeTrackingManager"> |
862 | - <option name="totallyTimeSpent" value="85094000" /> | |
888 | + <option name="totallyTimeSpent" value="89239000" /> | |
863 | 889 | </component> |
864 | 890 | <component name="ToolWindowManager"> |
865 | 891 | <frame x="-8" y="-8" width="1936" height="1066" extended-state="6" /> |
866 | 892 | <editor active="true" /> |
867 | 893 | <layout> |
868 | 894 | <window_info anchor="right" id="Palette" order="3" /> |
895 | + <window_info anchor="bottom" id="Event Log" order="16" sideWeight="0.53198296" side_tool="true" weight="0.32405347" /> | |
896 | + <window_info anchor="right" id="Maven Projects" order="6" /> | |
897 | + <window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" /> | |
898 | + <window_info id="Capture Tool" order="2" /> | |
899 | + <window_info anchor="right" id="Designer" order="2" /> | |
900 | + <window_info anchor="right" content_ui="combo" id="Hierarchy" order="9" visible="true" weight="0.17110874" /> | |
901 | + <window_info anchor="bottom" id="Build" order="17" weight="0.32930845" /> | |
902 | + <window_info anchor="right" id="Database" order="0" weight="0.32995737" /> | |
903 | + <window_info anchor="right" id="Structure" order="10" sideWeight="0.5008518" side_tool="true" weight="0.17110874" /> | |
904 | + <window_info anchor="right" id="Ant Build" order="8" weight="0.25" /> | |
905 | + <window_info id="UI Designer" order="0" /> | |
906 | + <window_info active="true" anchor="bottom" id="Debug" order="3" sideWeight="0.47867805" visible="true" weight="0.35565314" /> | |
869 | 907 | <window_info anchor="bottom" id="TODO" order="6" sideWeight="0.4978678" weight="0.32962137" /> |
870 | 908 | <window_info anchor="bottom" id="Messages" order="14" sideWeight="0.47654584" weight="0.3270925" /> |
871 | 909 | <window_info id="Palette	" order="1" /> |
872 | 910 | <window_info id="Image Layers" order="2" /> |
873 | 911 | <window_info anchor="right" id="Capture Analysis" order="7" /> |
874 | - <window_info anchor="bottom" id="Event Log" order="16" sideWeight="0.53198296" side_tool="true" weight="0.32405347" /> | |
875 | - <window_info anchor="right" id="Maven Projects" order="6" /> | |
876 | - <window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" /> | |
877 | 912 | <window_info anchor="bottom" id="Run" order="2" weight="0.32929516" /> |
878 | 913 | <window_info anchor="bottom" id="Version Control" order="10" weight="0.32929516" /> |
879 | 914 | <window_info anchor="bottom" id="Terminal" order="13" weight="0.32929516" /> |
880 | - <window_info id="Capture Tool" order="2" /> | |
881 | - <window_info anchor="right" id="Designer" order="2" /> | |
882 | 915 | <window_info content_ui="combo" id="Project" order="5" sideWeight="0.4940171" visible="true" weight="0.18869936" /> |
883 | - <window_info anchor="right" id="Database" order="0" weight="0.32995737" /> | |
916 | + <window_info anchor="bottom" id="Find" order="1" sideWeight="0.46801707" weight="0.31613612" /> | |
884 | 917 | <window_info anchor="right" id="Gradle" order="1" weight="0.19189766" /> |
885 | - <window_info anchor="right" id="Structure" order="10" sideWeight="0.5008518" side_tool="true" weight="0.17110874" /> | |
886 | - <window_info anchor="right" id="Ant Build" order="8" weight="0.25" /> | |
887 | - <window_info id="UI Designer" order="0" /> | |
888 | 918 | <window_info anchor="right" id="Theme Preview" order="7" /> |
889 | - <window_info active="true" anchor="bottom" id="Debug" order="3" sideWeight="0.47867805" visible="true" weight="0.35565314" /> | |
890 | 919 | <window_info id="Favorites" order="3" side_tool="true" /> |
891 | 920 | <window_info id="Build Variants" order="2" sideWeight="0.50598294" side_tool="true" weight="0.19029851" /> |
892 | - <window_info anchor="bottom" id="Find" order="1" sideWeight="0.46801707" weight="0.31613612" /> | |
893 | 921 | <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" /> |
894 | 922 | <window_info anchor="right" id="Bean Validation" order="5" /> |
895 | 923 | <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> |
896 | 924 | <window_info anchor="bottom" id="Changes" order="7" /> |
897 | 925 | <window_info anchor="bottom" id="Java Enterprise" order="8" /> |
898 | - <window_info active="true" anchor="right" content_ui="combo" id="Hierarchy" order="9" visible="true" weight="0.17110874" /> | |
899 | 926 | <window_info anchor="right" id="IDEtalk" order="4" /> |
900 | 927 | <window_info anchor="bottom" id="Android" order="15" weight="0.32929516" /> |
901 | 928 | <window_info anchor="bottom" id="Application Servers" order="11" /> |
902 | 929 | <window_info anchor="bottom" id="Memory Monitor" order="12" side_tool="true" /> |
903 | - <window_info anchor="bottom" id="Build" order="17" weight="0.32930845" /> | |
904 | 930 | <window_info anchor="right" id="Commander" internal_type="SLIDING" order="7" type="SLIDING" weight="0.4" /> |
905 | 931 | <window_info id="Web" order="4" side_tool="true" /> |
906 | 932 | <window_info anchor="bottom" id="Message" order="0" /> |
@@ -990,11 +1016,47 @@ | ||
990 | 1016 | <properties /> |
991 | 1017 | <option name="timeStamp" value="50" /> |
992 | 1018 | </line-breakpoint> |
1019 | + <line-breakpoint enabled="true" type="java-line"> | |
1020 | + <url>jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/ServerVirtualizationService.java</url> | |
1021 | + <line>85</line> | |
1022 | + <properties /> | |
1023 | + <option name="timeStamp" value="53" /> | |
1024 | + </line-breakpoint> | |
1025 | + <line-breakpoint enabled="true" type="java-line"> | |
1026 | + <url>jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/BlackholeDarksunMain.java</url> | |
1027 | + <line>43</line> | |
1028 | + <properties /> | |
1029 | + <option name="timeStamp" value="55" /> | |
1030 | + </line-breakpoint> | |
1031 | + <line-breakpoint enabled="true" type="java-line"> | |
1032 | + <url>jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/MainActivity.java</url> | |
1033 | + <line>113</line> | |
1034 | + <properties /> | |
1035 | + <option name="timeStamp" value="56" /> | |
1036 | + </line-breakpoint> | |
1037 | + <line-breakpoint enabled="true" type="java-line"> | |
1038 | + <url>jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/hotshotengine/renderer/nativeinterface/classwrappers/ENG_RootNativeWrapper.java</url> | |
1039 | + <line>15</line> | |
1040 | + <properties /> | |
1041 | + <option name="timeStamp" value="58" /> | |
1042 | + </line-breakpoint> | |
1043 | + <line-breakpoint enabled="true" type="java-line"> | |
1044 | + <url>jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/hotshotengine/renderer/ENG_RenderRoot.java</url> | |
1045 | + <line>138</line> | |
1046 | + <properties /> | |
1047 | + <option name="timeStamp" value="59" /> | |
1048 | + </line-breakpoint> | |
1049 | + <line-breakpoint enabled="true" type="java-line"> | |
1050 | + <url>jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/hotshotengine/renderer/nativeinterface/classwrappers/ENG_RootNativeWrapper.java</url> | |
1051 | + <line>18</line> | |
1052 | + <properties /> | |
1053 | + <option name="timeStamp" value="60" /> | |
1054 | + </line-breakpoint> | |
993 | 1055 | </breakpoints> |
994 | 1056 | <breakpoints-dialog> |
995 | 1057 | <breakpoints-dialog /> |
996 | 1058 | </breakpoints-dialog> |
997 | - <option name="time" value="53" /> | |
1059 | + <option name="time" value="61" /> | |
998 | 1060 | </breakpoint-manager> |
999 | 1061 | </component> |
1000 | 1062 | <component name="antWorkspaceConfiguration"> |
@@ -1002,105 +1064,6 @@ | ||
1002 | 1064 | <option name="FILTER_TARGETS" value="false" /> |
1003 | 1065 | </component> |
1004 | 1066 | <component name="editorHistoryManager"> |
1005 | - <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/APP_MultiPlayerGame.java"> | |
1006 | - <provider selected="true" editor-type-id="text-editor"> | |
1007 | - <state> | |
1008 | - <caret line="82" column="85" selection-start-line="82" selection-start-column="85" selection-end-line="82" selection-end-column="85" /> | |
1009 | - </state> | |
1010 | - </provider> | |
1011 | - </entry> | |
1012 | - <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/net/ClientListener.java"> | |
1013 | - <provider selected="true" editor-type-id="text-editor"> | |
1014 | - <state> | |
1015 | - <caret line="98" column="48" selection-start-line="98" selection-start-column="48" selection-end-line="98" selection-end-column="48" /> | |
1016 | - </state> | |
1017 | - </provider> | |
1018 | - </entry> | |
1019 | - <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/net/registeredclasses/ServerRespawnRequest.java"> | |
1020 | - <provider selected="true" editor-type-id="text-editor"> | |
1021 | - <state> | |
1022 | - <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" /> | |
1023 | - </state> | |
1024 | - </provider> | |
1025 | - </entry> | |
1026 | - <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/multiplayer/systems/DataSenderSystem.java"> | |
1027 | - <provider selected="true" editor-type-id="text-editor"> | |
1028 | - <state> | |
1029 | - <caret line="152" column="59" selection-start-line="152" selection-start-column="59" selection-end-line="152" selection-end-column="59" /> | |
1030 | - </state> | |
1031 | - </provider> | |
1032 | - </entry> | |
1033 | - <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/multiplayer/components/PlayerState.java"> | |
1034 | - <provider selected="true" editor-type-id="text-editor"> | |
1035 | - <state> | |
1036 | - <caret line="97" column="24" selection-start-line="97" selection-start-column="24" selection-end-line="97" selection-end-column="24" /> | |
1037 | - </state> | |
1038 | - </provider> | |
1039 | - </entry> | |
1040 | - <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/world/WorldManagerServerSide.java"> | |
1041 | - <provider selected="true" editor-type-id="text-editor"> | |
1042 | - <state> | |
1043 | - <folding> | |
1044 | - <element signature="imports" /> | |
1045 | - <element signature="e#8267#8268#0" /> | |
1046 | - <element signature="e#8304#8305#0" /> | |
1047 | - <element signature="e#8377#8378#0" /> | |
1048 | - <element signature="e#8420#8421#0" /> | |
1049 | - <element signature="e#8471#8472#0" /> | |
1050 | - <element signature="e#8507#8508#0" /> | |
1051 | - <element signature="e#8567#8568#0" /> | |
1052 | - <element signature="e#8616#8617#0" /> | |
1053 | - <element signature="e#13246#13247#0" /> | |
1054 | - <element signature="e#13300#13301#0" /> | |
1055 | - <element signature="e#23310#23311#0" /> | |
1056 | - <element signature="e#23365#23366#0" /> | |
1057 | - <element signature="e#24580#24581#0" /> | |
1058 | - <element signature="e#24616#24617#0" /> | |
1059 | - <element signature="e#44920#44921#0" /> | |
1060 | - <element signature="e#44972#44973#0" /> | |
1061 | - <element signature="e#65511#65512#0" /> | |
1062 | - <element signature="e#65552#65553#0" /> | |
1063 | - <element signature="e#65593#65594#0" /> | |
1064 | - <element signature="e#65632#65633#0" /> | |
1065 | - </folding> | |
1066 | - </state> | |
1067 | - </provider> | |
1068 | - </entry> | |
1069 | - <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/animations/PortalEnteringWithoutRenderingAnimation.java"> | |
1070 | - <provider selected="true" editor-type-id="text-editor"> | |
1071 | - <state> | |
1072 | - <caret line="67" selection-start-line="67" selection-end-line="67" /> | |
1073 | - </state> | |
1074 | - </provider> | |
1075 | - </entry> | |
1076 | - <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/systems/CollisionDetectionSystem.java"> | |
1077 | - <provider selected="true" editor-type-id="text-editor"> | |
1078 | - <state> | |
1079 | - <caret line="333" column="66" selection-start-line="333" selection-start-column="66" selection-end-line="333" selection-end-column="66" /> | |
1080 | - </state> | |
1081 | - </provider> | |
1082 | - </entry> | |
1083 | - <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/world/WorldManagerBase.java"> | |
1084 | - <provider selected="true" editor-type-id="text-editor"> | |
1085 | - <state> | |
1086 | - <caret line="260" column="43" selection-start-line="260" selection-start-column="43" selection-end-line="260" selection-end-column="43" /> | |
1087 | - </state> | |
1088 | - </provider> | |
1089 | - </entry> | |
1090 | - <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/hotshotengine/renderer/plugins/particlefx/ParticleFXPlugin.java"> | |
1091 | - <provider selected="true" editor-type-id="text-editor"> | |
1092 | - <state> | |
1093 | - <caret line="9" selection-start-line="9" selection-end-line="9" /> | |
1094 | - </state> | |
1095 | - </provider> | |
1096 | - </entry> | |
1097 | - <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/APP_MultiPlayerGame.java"> | |
1098 | - <provider selected="true" editor-type-id="text-editor"> | |
1099 | - <state> | |
1100 | - <caret line="82" column="85" selection-start-line="82" selection-start-column="85" selection-end-line="82" selection-end-column="85" /> | |
1101 | - </state> | |
1102 | - </provider> | |
1103 | - </entry> | |
1104 | 1067 | <entry file="jar://$PROJECT_DIR$/lib/core-1.0.jar!/headwayent/blackholedarksun/net/ClientListener.class"> |
1105 | 1068 | <provider selected="true" editor-type-id="text-editor"> |
1106 | 1069 | <state> |
@@ -1220,13 +1183,6 @@ | ||
1220 | 1183 | </state> |
1221 | 1184 | </provider> |
1222 | 1185 | </entry> |
1223 | - <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/APP_MultiPlayerGame.java"> | |
1224 | - <provider selected="true" editor-type-id="text-editor"> | |
1225 | - <state> | |
1226 | - <caret line="112" selection-start-line="112" selection-end-line="112" /> | |
1227 | - </state> | |
1228 | - </provider> | |
1229 | - </entry> | |
1230 | 1186 | <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/systems/MovementSystem.java"> |
1231 | 1187 | <provider selected="true" editor-type-id="text-editor"> |
1232 | 1188 | <state> |
@@ -1366,45 +1322,139 @@ | ||
1366 | 1322 | </state> |
1367 | 1323 | </provider> |
1368 | 1324 | </entry> |
1369 | - <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/net/ClientListener.java"> | |
1325 | + <entry file="jar://$PROJECT_DIR$/lib/core-1.0.jar!/headwayent/blackholedarksun/MainActivity.class"> | |
1370 | 1326 | <provider selected="true" editor-type-id="text-editor"> |
1371 | - <state relative-caret-position="578"> | |
1372 | - <caret line="48" column="24" selection-start-line="48" selection-start-column="24" selection-end-line="48" selection-end-column="24" /> | |
1373 | - </state> | |
1374 | - </provider> | |
1375 | - </entry> | |
1376 | - <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/ServerVirtualizationService.java"> | |
1377 | - <provider selected="true" editor-type-id="text-editor"> | |
1378 | - <state relative-caret-position="850"> | |
1379 | - <caret line="63" column="8" selection-start-line="63" selection-start-column="8" selection-end-line="63" selection-end-column="8" /> | |
1327 | + <state relative-caret-position="288"> | |
1328 | + <caret line="66" selection-start-line="66" selection-end-line="66" /> | |
1380 | 1329 | </state> |
1381 | 1330 | </provider> |
1382 | 1331 | </entry> |
1383 | 1332 | <entry file="file://$PROJECT_DIR$/src/headwayEnt/BlackholeDarksunOnline/Server/GameServer.java"> |
1384 | 1333 | <provider selected="true" editor-type-id="text-editor"> |
1385 | - <state relative-caret-position="1581"> | |
1386 | - <caret line="114" column="12" selection-start-line="114" selection-start-column="12" selection-end-line="114" selection-end-column="12" /> | |
1334 | + <state relative-caret-position="706"> | |
1335 | + <caret line="114" column="82" selection-start-line="114" selection-start-column="82" selection-end-line="114" selection-end-column="82" /> | |
1387 | 1336 | </state> |
1388 | 1337 | </provider> |
1389 | 1338 | </entry> |
1390 | 1339 | <entry file="file://$PROJECT_DIR$/src/headwayEnt/BlackholeDarksunOnline/Server/Controller.java"> |
1391 | 1340 | <provider selected="true" editor-type-id="text-editor"> |
1392 | - <state relative-caret-position="382"> | |
1393 | - <caret line="117" column="16" selection-start-line="117" selection-start-column="16" selection-end-line="117" selection-end-column="16" /> | |
1341 | + <state relative-caret-position="241"> | |
1342 | + <caret line="53" column="19" selection-start-line="53" selection-start-column="19" selection-end-line="53" selection-end-column="19" /> | |
1343 | + </state> | |
1344 | + </provider> | |
1345 | + </entry> | |
1346 | + <entry file="file://$PROJECT_DIR$/src/headwayEnt/BlackholeDarksunOnline/Server/Main.java"> | |
1347 | + <provider selected="true" editor-type-id="text-editor"> | |
1348 | + <state relative-caret-position="298"> | |
1349 | + <caret line="48" column="8" selection-start-line="48" selection-start-column="8" selection-end-line="48" selection-end-column="8" /> | |
1350 | + </state> | |
1351 | + </provider> | |
1352 | + </entry> | |
1353 | + <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/ServerApplication.java"> | |
1354 | + <provider selected="true" editor-type-id="text-editor"> | |
1355 | + <state relative-caret-position="178"> | |
1356 | + <caret line="53" selection-start-line="53" selection-end-line="53" /> | |
1357 | + </state> | |
1358 | + </provider> | |
1359 | + </entry> | |
1360 | + <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/hotshotengine/networking/ENG_NetUtility.java"> | |
1361 | + <provider selected="true" editor-type-id="text-editor"> | |
1362 | + <state relative-caret-position="102"> | |
1363 | + <caret line="36" column="38" selection-start-line="36" selection-start-column="38" selection-end-line="36" selection-end-column="38" /> | |
1364 | + </state> | |
1365 | + </provider> | |
1366 | + </entry> | |
1367 | + <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/hotshotengine/networking/ENG_NetworkChecker.java"> | |
1368 | + <provider selected="true" editor-type-id="text-editor"> | |
1369 | + <state relative-caret-position="-85"> | |
1370 | + <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" /> | |
1394 | 1371 | </state> |
1395 | 1372 | </provider> |
1396 | 1373 | </entry> |
1397 | 1374 | <entry file="file://$PROJECT_DIR$/build.gradle"> |
1398 | 1375 | <provider selected="true" editor-type-id="text-editor"> |
1399 | - <state relative-caret-position="288"> | |
1376 | + <state relative-caret-position="264"> | |
1377 | + <caret line="49" column="18" selection-start-line="49" selection-start-column="4" selection-end-line="49" selection-end-column="18" /> | |
1378 | + </state> | |
1379 | + </provider> | |
1380 | + </entry> | |
1381 | + <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/MainActivity.java"> | |
1382 | + <provider selected="true" editor-type-id="text-editor"> | |
1383 | + <state relative-caret-position="144"> | |
1384 | + <caret line="56" selection-start-line="56" selection-end-line="56" /> | |
1385 | + </state> | |
1386 | + </provider> | |
1387 | + </entry> | |
1388 | + <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/net/ClientListener.java"> | |
1389 | + <provider selected="true" editor-type-id="text-editor"> | |
1390 | + <state relative-caret-position="255"> | |
1391 | + <caret line="44" selection-start-line="44" selection-end-line="44" /> | |
1392 | + </state> | |
1393 | + </provider> | |
1394 | + </entry> | |
1395 | + <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/APP_MultiPlayerGame.java"> | |
1396 | + <provider selected="true" editor-type-id="text-editor"> | |
1397 | + <state relative-caret-position="178"> | |
1398 | + <caret line="84" selection-start-line="84" selection-end-line="84" /> | |
1399 | + </state> | |
1400 | + </provider> | |
1401 | + </entry> | |
1402 | + <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/hotshotengine/renderer/ENG_ControllerManager.java"> | |
1403 | + <provider selected="true" editor-type-id="text-editor"> | |
1404 | + <state relative-caret-position="323"> | |
1400 | 1405 | <caret line="29" selection-start-line="29" selection-end-line="29" /> |
1401 | 1406 | </state> |
1402 | 1407 | </provider> |
1403 | 1408 | </entry> |
1404 | - <entry file="file://$PROJECT_DIR$/src/headwayEnt/BlackholeDarksunOnline/Server/Main.java"> | |
1409 | + <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/ServerVirtualizationService.java"> | |
1405 | 1410 | <provider selected="true" editor-type-id="text-editor"> |
1406 | - <state relative-caret-position="255"> | |
1407 | - <caret line="23" column="45" lean-forward="true" selection-start-line="23" selection-start-column="45" selection-end-line="23" selection-end-column="45" /> | |
1411 | + <state relative-caret-position="280"> | |
1412 | + <caret line="85" selection-start-line="85" selection-end-line="85" /> | |
1413 | + </state> | |
1414 | + </provider> | |
1415 | + </entry> | |
1416 | + <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/hotshotengine/renderer/ENG_RenderRoot.java"> | |
1417 | + <provider selected="true" editor-type-id="text-editor"> | |
1418 | + <state relative-caret-position="337"> | |
1419 | + <caret line="138" selection-start-line="138" selection-end-line="138" /> | |
1420 | + <folding> | |
1421 | + <element signature="e#5805#5806#0" expanded="true" /> | |
1422 | + <element signature="e#5872#5873#0" expanded="true" /> | |
1423 | + <element signature="e#10555#10556#0" expanded="true" /> | |
1424 | + <element signature="e#10594#10595#0" expanded="true" /> | |
1425 | + </folding> | |
1426 | + </state> | |
1427 | + </provider> | |
1428 | + </entry> | |
1429 | + <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/hotshotengine/renderer/nativeinterface/classwrappers/ENG_RootNativeWrapper.java"> | |
1430 | + <provider selected="true" editor-type-id="text-editor"> | |
1431 | + <state relative-caret-position="238"> | |
1432 | + <caret line="19" selection-start-line="19" selection-end-line="19" /> | |
1433 | + </state> | |
1434 | + </provider> | |
1435 | + </entry> | |
1436 | + <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/hotshotengine/renderer/nativeinterface/pipeline/ENG_SlowCall.java"> | |
1437 | + <provider selected="true" editor-type-id="text-editor"> | |
1438 | + <state relative-caret-position="442"> | |
1439 | + <caret line="28" selection-start-line="28" selection-end-line="28" /> | |
1440 | + </state> | |
1441 | + </provider> | |
1442 | + </entry> | |
1443 | + <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/hotshotengine/renderer/nativeinterface/pipeline/ENG_RenderingThread.java"> | |
1444 | + <provider selected="true" editor-type-id="text-editor"> | |
1445 | + <state relative-caret-position="388"> | |
1446 | + <caret line="784" selection-start-line="784" selection-end-line="784" /> | |
1447 | + </state> | |
1448 | + </provider> | |
1449 | + </entry> | |
1450 | + <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/BlackholeDarksunMain.java"> | |
1451 | + <provider selected="true" editor-type-id="text-editor"> | |
1452 | + <state relative-caret-position="575"> | |
1453 | + <caret line="103" selection-start-line="103" selection-end-line="103" /> | |
1454 | + <folding> | |
1455 | + <element signature="e#1372#1373#0" expanded="true" /> | |
1456 | + <element signature="e#1425#1426#0" expanded="true" /> | |
1457 | + </folding> | |
1408 | 1458 | </state> |
1409 | 1459 | </provider> |
1410 | 1460 | </entry> |
@@ -1453,7 +1503,7 @@ | ||
1453 | 1503 | </state> |
1454 | 1504 | <state key="JdkListConfigurable.UI"> |
1455 | 1505 | <settings> |
1456 | - <last-edited>Android API 19 Platform</last-edited> | |
1506 | + <last-edited>1.8</last-edited> | |
1457 | 1507 | <splitter-proportions> |
1458 | 1508 | <option name="proportions"> |
1459 | 1509 | <list> |
@@ -1470,7 +1520,6 @@ | ||
1470 | 1520 | <option name="proportions"> |
1471 | 1521 | <list> |
1472 | 1522 | <option value="0.43908045" /> |
1473 | - <option value="0.6" /> | |
1474 | 1523 | </list> |
1475 | 1524 | </option> |
1476 | 1525 | </splitter-proportions> |
@@ -47,6 +47,7 @@ | ||
47 | 47 | compile 'com.google.code.gson:gson:2.4' |
48 | 48 | compile 'com.google.inject:guice-parent:3.0' |
49 | 49 | compile 'com.google.guava:guava:18.0' |
50 | + implementation 'com.squareup.okhttp3:okhttp:3.11.0' | |
50 | 51 | |
51 | 52 | compile 'com.google.auto.value:auto-value:1.0' |
52 | 53 | compile 'org.apache.httpcomponents:httpmime:4.4.1' |