修訂 | e94bba547e5439e3662f8b7ee5d83391b260c0e0 (tree) |
---|---|
時間 | 2018-10-19 05:25:05 |
作者 | sebastian_bugiu <sebastian_ <bugiu@head...> |
Commiter | sebastian_bugiu <sebastian_ |
Increased end level end time for testing.
@@ -2,13 +2,8 @@ | ||
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 beforePath="$PROJECT_DIR$/.idea/modules/BlackholeDarksunServer2_main.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules/BlackholeDarksunServer2_main.iml" afterDir="false" /> | |
6 | - <change beforePath="$PROJECT_DIR$/.idea/modules/BlackholeDarksunServer2_test.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules/BlackholeDarksunServer2_test.iml" afterDir="false" /> | |
7 | 5 | <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> |
8 | - <change beforePath="$PROJECT_DIR$/raw/dejavu.gorilla" beforeDir="false" afterPath="$PROJECT_DIR$/raw/dejavu.gorilla" afterDir="false" /> | |
9 | - <change beforePath="$PROJECT_DIR$/raw/nine_patch_test.gorilla" beforeDir="false" afterPath="$PROJECT_DIR$/raw/nine_patch_test.gorilla" afterDir="false" /> | |
10 | - <change beforePath="$PROJECT_DIR$/raw/panel_programs.txt" beforeDir="false" afterPath="$PROJECT_DIR$/raw/panel_programs.txt" afterDir="false" /> | |
11 | - <change beforePath="$PROJECT_DIR$/raw/sh_panel_fs.txt" beforeDir="false" afterPath="$PROJECT_DIR$/raw/sh_panel_fs.txt" afterDir="false" /> | |
6 | + <change beforePath="$PROJECT_DIR$/raw/hotshot_gamedata/level_multiplayer_map0.txt" beforeDir="false" afterPath="$PROJECT_DIR$/raw/hotshot_gamedata/level_multiplayer_map0.txt" afterDir="false" /> | |
12 | 7 | </list> |
13 | 8 | <ignored path="BlackholeDarksunServer2.iws" /> |
14 | 9 | <ignored path=".idea/workspace.xml" /> |
@@ -69,12 +64,14 @@ | ||
69 | 64 | <usages-collector id="statistics.js.language.service.starts" /> |
70 | 65 | <usages-collector id="statistics.file.types.open"> |
71 | 66 | <counts> |
72 | - <entry key="JAVA" value="14" /> | |
67 | + <entry key="CLASS" value="4" /> | |
68 | + <entry key="JAVA" value="17" /> | |
73 | 69 | </counts> |
74 | 70 | </usages-collector> |
75 | 71 | <usages-collector id="statistics.file.extensions.open"> |
76 | 72 | <counts> |
77 | - <entry key="java" value="14" /> | |
73 | + <entry key="class" value="4" /> | |
74 | + <entry key="java" value="17" /> | |
78 | 75 | </counts> |
79 | 76 | </usages-collector> |
80 | 77 | <usages-collector id="statistics.spring.boot.mvc.usages" /> |
@@ -93,41 +90,19 @@ | ||
93 | 90 | <component name="FileEditorManager"> |
94 | 91 | <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> |
95 | 92 | <file pinned="false" current-in-tab="false"> |
96 | - <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/hotshotengine/renderer/ENG_RenderRoot.java"> | |
93 | + <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/APP_MultiPlayerGame.java"> | |
97 | 94 | <provider selected="true" editor-type-id="text-editor"> |
98 | 95 | <state relative-caret-position="178"> |
99 | - <caret line="138" selection-start-line="138" selection-end-line="138" /> | |
100 | - <folding> | |
101 | - <element signature="e#5805#5806#0" expanded="true" /> | |
102 | - <element signature="e#5872#5873#0" expanded="true" /> | |
103 | - </folding> | |
96 | + <caret line="91" selection-start-line="91" selection-end-line="91" /> | |
104 | 97 | </state> |
105 | 98 | </provider> |
106 | 99 | </entry> |
107 | 100 | </file> |
108 | 101 | <file pinned="false" current-in-tab="false"> |
109 | - <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/ServerVirtualizationService.java"> | |
110 | - <provider selected="true" editor-type-id="text-editor"> | |
111 | - <state relative-caret-position="286"> | |
112 | - <caret line="98" selection-start-line="98" selection-end-line="98" /> | |
113 | - </state> | |
114 | - </provider> | |
115 | - </entry> | |
116 | - </file> | |
117 | - <file pinned="false" current-in-tab="false"> | |
118 | - <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/APP_MultiPlayerGame.java"> | |
119 | - <provider selected="true" editor-type-id="text-editor"> | |
120 | - <state relative-caret-position="167"> | |
121 | - <caret line="136" selection-start-line="136" selection-end-line="136" /> | |
122 | - </state> | |
123 | - </provider> | |
124 | - </entry> | |
125 | - </file> | |
126 | - <file pinned="false" current-in-tab="true"> | |
127 | 102 | <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/world/WorldManagerServerSide.java"> |
128 | 103 | <provider selected="true" editor-type-id="text-editor"> |
129 | - <state relative-caret-position="167"> | |
130 | - <caret line="1433" selection-start-line="1433" selection-end-line="1433" /> | |
104 | + <state relative-caret-position="178"> | |
105 | + <caret line="1411" selection-start-line="1411" selection-end-line="1411" /> | |
131 | 106 | <folding> |
132 | 107 | <element signature="e#8610#8611#0" expanded="true" /> |
133 | 108 | <element signature="e#8647#8648#0" expanded="true" /> |
@@ -143,6 +118,67 @@ | ||
143 | 118 | <element signature="e#23708#23709#0" expanded="true" /> |
144 | 119 | <element signature="e#24925#24926#0" expanded="true" /> |
145 | 120 | <element signature="e#24961#24962#0" expanded="true" /> |
121 | + <element signature="e#48077#48078#0" expanded="true" /> | |
122 | + <element signature="e#48129#48130#0" expanded="true" /> | |
123 | + </folding> | |
124 | + </state> | |
125 | + </provider> | |
126 | + </entry> | |
127 | + </file> | |
128 | + <file pinned="false" current-in-tab="false"> | |
129 | + <entry file="jar://$PROJECT_DIR$/lib/kryonet.jar!/com/esotericsoftware/kryonet/TcpConnection.class"> | |
130 | + <provider selected="true" editor-type-id="text-editor"> | |
131 | + <state relative-caret-position="186"> | |
132 | + <caret line="206" selection-start-line="206" selection-end-line="206" /> | |
133 | + </state> | |
134 | + </provider> | |
135 | + </entry> | |
136 | + </file> | |
137 | + <file pinned="false" current-in-tab="false"> | |
138 | + <entry file="jar://$PROJECT_DIR$/lib/kryonet.jar!/com/esotericsoftware/kryonet/Server.class"> | |
139 | + <provider selected="true" editor-type-id="text-editor"> | |
140 | + <state relative-caret-position="186"> | |
141 | + <caret line="436" selection-start-line="436" selection-end-line="436" /> | |
142 | + </state> | |
143 | + </provider> | |
144 | + </entry> | |
145 | + </file> | |
146 | + <file pinned="false" current-in-tab="false"> | |
147 | + <entry file="jar://$PROJECT_DIR$/lib/kryonet.jar!/com/esotericsoftware/kryo/Kryo.class"> | |
148 | + <provider selected="true" editor-type-id="text-editor"> | |
149 | + <state relative-caret-position="186"> | |
150 | + <caret line="370" selection-start-line="370" selection-end-line="370" /> | |
151 | + </state> | |
152 | + </provider> | |
153 | + </entry> | |
154 | + </file> | |
155 | + <file pinned="false" current-in-tab="false"> | |
156 | + <entry file="jar://$PROJECT_DIR$/lib/kryonet.jar!/com/esotericsoftware/kryonet/Connection.class"> | |
157 | + <provider selected="true" editor-type-id="text-editor"> | |
158 | + <state relative-caret-position="186"> | |
159 | + <caret line="55" selection-start-line="55" selection-end-line="55" /> | |
160 | + </state> | |
161 | + </provider> | |
162 | + </entry> | |
163 | + </file> | |
164 | + <file pinned="false" current-in-tab="false"> | |
165 | + <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/multiplayer/systems/DataSenderSystem.java"> | |
166 | + <provider selected="true" editor-type-id="text-editor"> | |
167 | + <state relative-caret-position="383"> | |
168 | + <caret line="365" selection-start-line="365" selection-end-line="365" /> | |
169 | + </state> | |
170 | + </provider> | |
171 | + </entry> | |
172 | + </file> | |
173 | + <file pinned="false" current-in-tab="true"> | |
174 | + <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/net/NetManager.java"> | |
175 | + <provider selected="true" editor-type-id="text-editor"> | |
176 | + <state relative-caret-position="371"> | |
177 | + <caret line="178" selection-start-line="178" selection-end-line="178" /> | |
178 | + <folding> | |
179 | + <element signature="e#6350#6351#0" expanded="true" /> | |
180 | + <element signature="e#6546#6547#0" expanded="true" /> | |
181 | + <element signature="e#6602#6603#0" expanded="true" /> | |
146 | 182 | </folding> |
147 | 183 | </state> |
148 | 184 | </provider> |
@@ -158,55 +194,10 @@ | ||
158 | 194 | </entry> |
159 | 195 | </file> |
160 | 196 | <file pinned="false" current-in-tab="false"> |
161 | - <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/net/NetManager.java"> | |
162 | - <provider selected="true" editor-type-id="text-editor"> | |
163 | - <state relative-caret-position="371"> | |
164 | - <caret line="186" selection-start-line="186" selection-end-line="186" /> | |
165 | - <folding> | |
166 | - <element signature="e#6312#6313#0" expanded="true" /> | |
167 | - <element signature="e#6350#6351#0" expanded="true" /> | |
168 | - <element signature="e#6602#6603#0" expanded="true" /> | |
169 | - </folding> | |
170 | - </state> | |
171 | - </provider> | |
172 | - </entry> | |
173 | - </file> | |
174 | - <file pinned="false" current-in-tab="false"> | |
175 | - <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/com/artemis/systems/IntervalEntityProcessingSystem.java"> | |
197 | + <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/multiplayer/systems/UserStatsUpdaterSystem.java"> | |
176 | 198 | <provider selected="true" editor-type-id="text-editor"> |
177 | - <state relative-caret-position="349"> | |
178 | - <caret line="46" selection-start-line="46" selection-end-line="46" /> | |
179 | - <folding> | |
180 | - <element signature="e#954#955#0" expanded="true" /> | |
181 | - <element signature="e#991#992#0" expanded="true" /> | |
182 | - </folding> | |
183 | - </state> | |
184 | - </provider> | |
185 | - </entry> | |
186 | - </file> | |
187 | - <file pinned="false" current-in-tab="false"> | |
188 | - <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/multiplayer/systems/DataSenderSystem.java"> | |
189 | - <provider selected="true" editor-type-id="text-editor"> | |
190 | - <state relative-caret-position="167"> | |
191 | - <caret line="190" selection-start-line="190" selection-end-line="190" /> | |
192 | - </state> | |
193 | - </provider> | |
194 | - </entry> | |
195 | - </file> | |
196 | - <file pinned="false" current-in-tab="false"> | |
197 | - <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/com/artemis/BaseSystem.java"> | |
198 | - <provider selected="true" editor-type-id="text-editor"> | |
199 | - <state relative-caret-position="178"> | |
200 | - <caret line="45" selection-start-line="45" selection-end-line="45" /> | |
201 | - </state> | |
202 | - </provider> | |
203 | - </entry> | |
204 | - </file> | |
205 | - <file pinned="false" current-in-tab="false"> | |
206 | - <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/components/EntityProperties.java"> | |
207 | - <provider selected="true" editor-type-id="text-editor"> | |
208 | - <state relative-caret-position="14127"> | |
209 | - <caret line="1064" column="13" selection-start-line="1064" selection-start-column="13" selection-end-line="1064" selection-end-column="13" /> | |
199 | + <state relative-caret-position="119"> | |
200 | + <caret line="29" selection-start-line="29" selection-end-line="29" /> | |
210 | 201 | </state> |
211 | 202 | </provider> |
212 | 203 | </entry> |
@@ -216,6 +207,7 @@ | ||
216 | 207 | <component name="FindInProjectRecents"> |
217 | 208 | <findStrings> |
218 | 209 | <find>Missing ser</find> |
210 | + <find>Created entity:</find> | |
219 | 211 | </findStrings> |
220 | 212 | </component> |
221 | 213 | <component name="GradleLocalSettings"> |
@@ -919,15 +911,16 @@ | ||
919 | 911 | <workItem from="1539375163137" duration="3143000" /> |
920 | 912 | <workItem from="1539514815394" duration="74000" /> |
921 | 913 | <workItem from="1539514967406" duration="9626000" /> |
922 | - <workItem from="1539717897560" duration="3557000" /> | |
914 | + <workItem from="1539717897560" duration="22477000" /> | |
923 | 915 | </task> |
924 | 916 | <servers /> |
925 | 917 | </component> |
926 | 918 | <component name="TimeTrackingManager"> |
927 | - <option name="totallyTimeSpent" value="107754000" /> | |
919 | + <option name="totallyTimeSpent" value="126674000" /> | |
928 | 920 | </component> |
929 | 921 | <component name="ToolWindowManager"> |
930 | 922 | <frame x="-8" y="-8" width="1936" height="1066" extended-state="6" /> |
923 | + <editor active="true" /> | |
931 | 924 | <layout> |
932 | 925 | <window_info id="UI Designer" order="0" /> |
933 | 926 | <window_info id="Palette	" order="1" /> |
@@ -939,7 +932,7 @@ | ||
939 | 932 | <window_info content_ui="combo" id="Project" order="7" sideWeight="0.4940171" visible="true" weight="0.19722815" /> |
940 | 933 | <window_info anchor="bottom" id="Message" order="0" /> |
941 | 934 | <window_info anchor="bottom" id="Find" order="1" sideWeight="0.46801707" weight="0.31538463" /> |
942 | - <window_info anchor="bottom" id="Run" order="2" weight="0.32929516" /> | |
935 | + <window_info anchor="bottom" id="Run" order="2" weight="0.32857144" /> | |
943 | 936 | <window_info active="true" anchor="bottom" id="Debug" order="3" sideWeight="0.47867805" visible="true" weight="0.35494506" /> |
944 | 937 | <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" /> |
945 | 938 | <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> |
@@ -1002,13 +995,13 @@ | ||
1002 | 995 | </line-breakpoint> |
1003 | 996 | <line-breakpoint enabled="true" type="java-line"> |
1004 | 997 | <url>jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/world/WorldManagerServerSide.java</url> |
1005 | - <line>1433</line> | |
998 | + <line>1445</line> | |
1006 | 999 | <properties /> |
1007 | 1000 | <option name="timeStamp" value="33" /> |
1008 | 1001 | </line-breakpoint> |
1009 | 1002 | <line-breakpoint enabled="true" type="java-line"> |
1010 | 1003 | <url>jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/world/WorldManagerServerSide.java</url> |
1011 | - <line>1268</line> | |
1004 | + <line>1280</line> | |
1012 | 1005 | <properties /> |
1013 | 1006 | <option name="timeStamp" value="34" /> |
1014 | 1007 | </line-breakpoint> |
@@ -1054,36 +1047,6 @@ | ||
1054 | 1047 | <properties /> |
1055 | 1048 | <option name="timeStamp" value="50" /> |
1056 | 1049 | </line-breakpoint> |
1057 | - <line-breakpoint enabled="true" type="java-line"> | |
1058 | - <url>jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/MainActivity.java</url> | |
1059 | - <line>113</line> | |
1060 | - <properties /> | |
1061 | - <option name="timeStamp" value="56" /> | |
1062 | - </line-breakpoint> | |
1063 | - <line-breakpoint enabled="true" type="java-line"> | |
1064 | - <url>jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/hotshotengine/renderer/ENG_RenderRoot.java</url> | |
1065 | - <line>138</line> | |
1066 | - <properties /> | |
1067 | - <option name="timeStamp" value="59" /> | |
1068 | - </line-breakpoint> | |
1069 | - <line-breakpoint enabled="true" type="java-line"> | |
1070 | - <url>jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/APP_MultiPlayerGame.java</url> | |
1071 | - <line>136</line> | |
1072 | - <properties /> | |
1073 | - <option name="timeStamp" value="61" /> | |
1074 | - </line-breakpoint> | |
1075 | - <line-breakpoint enabled="true" type="java-line"> | |
1076 | - <url>jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/APP_MultiPlayerGame.java</url> | |
1077 | - <line>91</line> | |
1078 | - <properties /> | |
1079 | - <option name="timeStamp" value="62" /> | |
1080 | - </line-breakpoint> | |
1081 | - <line-breakpoint enabled="true" type="java-line"> | |
1082 | - <url>jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/world/WorldManagerServerSide.java</url> | |
1083 | - <line>1399</line> | |
1084 | - <properties /> | |
1085 | - <option name="timeStamp" value="64" /> | |
1086 | - </line-breakpoint> | |
1087 | 1050 | </breakpoints> |
1088 | 1051 | <breakpoints-dialog> |
1089 | 1052 | <breakpoints-dialog /> |
@@ -1095,41 +1058,6 @@ | ||
1095 | 1058 | <option name="FILTER_TARGETS" value="false" /> |
1096 | 1059 | </component> |
1097 | 1060 | <component name="editorHistoryManager"> |
1098 | - <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/animations/PortalEnteringWithoutRenderingAnimation.java"> | |
1099 | - <provider selected="true" editor-type-id="text-editor"> | |
1100 | - <state> | |
1101 | - <caret line="67" selection-start-line="67" selection-end-line="67" /> | |
1102 | - </state> | |
1103 | - </provider> | |
1104 | - </entry> | |
1105 | - <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/systems/CollisionDetectionSystem.java"> | |
1106 | - <provider selected="true" editor-type-id="text-editor"> | |
1107 | - <state> | |
1108 | - <caret line="333" column="66" selection-start-line="333" selection-start-column="66" selection-end-line="333" selection-end-column="66" /> | |
1109 | - </state> | |
1110 | - </provider> | |
1111 | - </entry> | |
1112 | - <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/world/LevelEntity.java"> | |
1113 | - <provider selected="true" editor-type-id="text-editor"> | |
1114 | - <state> | |
1115 | - <caret line="26" column="26" selection-start-line="26" selection-start-column="26" selection-end-line="26" selection-end-column="26" /> | |
1116 | - </state> | |
1117 | - </provider> | |
1118 | - </entry> | |
1119 | - <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/world/WorldManagerSP.java"> | |
1120 | - <provider selected="true" editor-type-id="text-editor"> | |
1121 | - <state> | |
1122 | - <caret line="595" column="60" selection-start-line="595" selection-start-column="60" selection-end-line="595" selection-end-column="60" /> | |
1123 | - </state> | |
1124 | - </provider> | |
1125 | - </entry> | |
1126 | - <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/systems/EntityRemoverSystem.java"> | |
1127 | - <provider selected="true" editor-type-id="text-editor"> | |
1128 | - <state> | |
1129 | - <caret line="58" selection-start-line="58" selection-end-line="58" /> | |
1130 | - </state> | |
1131 | - </provider> | |
1132 | - </entry> | |
1133 | 1061 | <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/multiplayer/systems/EntityRemoverServerSideSystem.java"> |
1134 | 1062 | <provider selected="true" editor-type-id="text-editor"> |
1135 | 1063 | <state> |
@@ -1400,13 +1328,6 @@ | ||
1400 | 1328 | </state> |
1401 | 1329 | </provider> |
1402 | 1330 | </entry> |
1403 | - <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/MainActivity.java"> | |
1404 | - <provider selected="true" editor-type-id="text-editor"> | |
1405 | - <state relative-caret-position="167"> | |
1406 | - <caret line="113" selection-start-line="113" selection-end-line="113" /> | |
1407 | - </state> | |
1408 | - </provider> | |
1409 | - </entry> | |
1410 | 1331 | <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/com/artemis/BaseSystem.java"> |
1411 | 1332 | <provider selected="true" editor-type-id="text-editor"> |
1412 | 1333 | <state relative-caret-position="178"> |
@@ -1425,13 +1346,6 @@ | ||
1425 | 1346 | </state> |
1426 | 1347 | </provider> |
1427 | 1348 | </entry> |
1428 | - <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/multiplayer/systems/DataSenderSystem.java"> | |
1429 | - <provider selected="true" editor-type-id="text-editor"> | |
1430 | - <state relative-caret-position="167"> | |
1431 | - <caret line="190" selection-start-line="190" selection-end-line="190" /> | |
1432 | - </state> | |
1433 | - </provider> | |
1434 | - </entry> | |
1435 | 1349 | <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/hotshotengine/renderer/ENG_RenderRoot.java"> |
1436 | 1350 | <provider selected="true" editor-type-id="text-editor"> |
1437 | 1351 | <state relative-caret-position="178"> |
@@ -1445,27 +1359,15 @@ | ||
1445 | 1359 | </entry> |
1446 | 1360 | <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/APP_MultiPlayerGame.java"> |
1447 | 1361 | <provider selected="true" editor-type-id="text-editor"> |
1448 | - <state relative-caret-position="167"> | |
1449 | - <caret line="136" selection-start-line="136" selection-end-line="136" /> | |
1450 | - </state> | |
1451 | - </provider> | |
1452 | - </entry> | |
1453 | - <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/net/NetManager.java"> | |
1454 | - <provider selected="true" editor-type-id="text-editor"> | |
1455 | - <state relative-caret-position="371"> | |
1456 | - <caret line="186" selection-start-line="186" selection-end-line="186" /> | |
1457 | - <folding> | |
1458 | - <element signature="e#6312#6313#0" expanded="true" /> | |
1459 | - <element signature="e#6350#6351#0" expanded="true" /> | |
1460 | - <element signature="e#6602#6603#0" expanded="true" /> | |
1461 | - </folding> | |
1362 | + <state relative-caret-position="178"> | |
1363 | + <caret line="91" selection-start-line="91" selection-end-line="91" /> | |
1462 | 1364 | </state> |
1463 | 1365 | </provider> |
1464 | 1366 | </entry> |
1465 | 1367 | <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/world/WorldManagerServerSide.java"> |
1466 | 1368 | <provider selected="true" editor-type-id="text-editor"> |
1467 | - <state relative-caret-position="167"> | |
1468 | - <caret line="1433" selection-start-line="1433" selection-end-line="1433" /> | |
1369 | + <state relative-caret-position="178"> | |
1370 | + <caret line="1411" selection-start-line="1411" selection-end-line="1411" /> | |
1469 | 1371 | <folding> |
1470 | 1372 | <element signature="e#8610#8611#0" expanded="true" /> |
1471 | 1373 | <element signature="e#8647#8648#0" expanded="true" /> |
@@ -1481,6 +1383,69 @@ | ||
1481 | 1383 | <element signature="e#23708#23709#0" expanded="true" /> |
1482 | 1384 | <element signature="e#24925#24926#0" expanded="true" /> |
1483 | 1385 | <element signature="e#24961#24962#0" expanded="true" /> |
1386 | + <element signature="e#48077#48078#0" expanded="true" /> | |
1387 | + <element signature="e#48129#48130#0" expanded="true" /> | |
1388 | + </folding> | |
1389 | + </state> | |
1390 | + </provider> | |
1391 | + </entry> | |
1392 | + <entry file="jar://$PROJECT_DIR$/lib/kryonet.jar!/com/esotericsoftware/kryonet/TcpConnection.class"> | |
1393 | + <provider selected="true" editor-type-id="text-editor"> | |
1394 | + <state relative-caret-position="186"> | |
1395 | + <caret line="206" selection-start-line="206" selection-end-line="206" /> | |
1396 | + </state> | |
1397 | + </provider> | |
1398 | + </entry> | |
1399 | + <entry file="jar://$PROJECT_DIR$/lib/kryonet.jar!/com/esotericsoftware/kryonet/Server.class"> | |
1400 | + <provider selected="true" editor-type-id="text-editor"> | |
1401 | + <state relative-caret-position="186"> | |
1402 | + <caret line="436" selection-start-line="436" selection-end-line="436" /> | |
1403 | + </state> | |
1404 | + </provider> | |
1405 | + </entry> | |
1406 | + <entry file="jar://$PROJECT_DIR$/lib/kryonet.jar!/com/esotericsoftware/kryo/Kryo.class"> | |
1407 | + <provider selected="true" editor-type-id="text-editor"> | |
1408 | + <state relative-caret-position="186"> | |
1409 | + <caret line="370" selection-start-line="370" selection-end-line="370" /> | |
1410 | + </state> | |
1411 | + </provider> | |
1412 | + </entry> | |
1413 | + <entry file="jar://$PROJECT_DIR$/lib/kryonet.jar!/com/esotericsoftware/kryonet/Connection.class"> | |
1414 | + <provider selected="true" editor-type-id="text-editor"> | |
1415 | + <state relative-caret-position="186"> | |
1416 | + <caret line="55" selection-start-line="55" selection-end-line="55" /> | |
1417 | + </state> | |
1418 | + </provider> | |
1419 | + </entry> | |
1420 | + <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/multiplayer/systems/DataSenderSystem.java"> | |
1421 | + <provider selected="true" editor-type-id="text-editor"> | |
1422 | + <state relative-caret-position="383"> | |
1423 | + <caret line="365" selection-start-line="365" selection-end-line="365" /> | |
1424 | + </state> | |
1425 | + </provider> | |
1426 | + </entry> | |
1427 | + <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/MainActivity.java"> | |
1428 | + <provider selected="true" editor-type-id="text-editor"> | |
1429 | + <state relative-caret-position="167"> | |
1430 | + <caret line="113" selection-start-line="113" selection-end-line="113" /> | |
1431 | + </state> | |
1432 | + </provider> | |
1433 | + </entry> | |
1434 | + <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/multiplayer/systems/UserStatsUpdaterSystem.java"> | |
1435 | + <provider selected="true" editor-type-id="text-editor"> | |
1436 | + <state relative-caret-position="119"> | |
1437 | + <caret line="29" selection-start-line="29" selection-end-line="29" /> | |
1438 | + </state> | |
1439 | + </provider> | |
1440 | + </entry> | |
1441 | + <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/net/NetManager.java"> | |
1442 | + <provider selected="true" editor-type-id="text-editor"> | |
1443 | + <state relative-caret-position="371"> | |
1444 | + <caret line="178" selection-start-line="178" selection-end-line="178" /> | |
1445 | + <folding> | |
1446 | + <element signature="e#6350#6351#0" expanded="true" /> | |
1447 | + <element signature="e#6546#6547#0" expanded="true" /> | |
1448 | + <element signature="e#6602#6603#0" expanded="true" /> | |
1484 | 1449 | </folding> |
1485 | 1450 | </state> |
1486 | 1451 | </provider> |
@@ -221,7 +221,7 @@ | ||
221 | 221 | cond loss_cond1 |
222 | 222 | { |
223 | 223 | type time_elapsed |
224 | - secs 600 | |
224 | + secs 60000 | |
225 | 225 | } |
226 | 226 | comparator ( or loss_cond0 loss_cond1 ) |
227 | 227 | } |