• R/O
  • SSH

OMP: Commit

Multiplayer platform


Commit MetaInfo

Revision8e815e0a3972a87b399069f7f5fb0d77885fa617 (tree)
Time2012-02-06 04:50:41
AuthorFace
CommiterFace

Log Message

Packaging: compiled version 0.6

Change Summary

Incremental Difference

diff -r 4df8628ee56b -r 8e815e0a3972 Modules/Plugin/DotNET/Orbiter.Multiplayer.Client.dll
Binary file Modules/Plugin/DotNET/Orbiter.Multiplayer.Client.dll has changed
diff -r 4df8628ee56b -r 8e815e0a3972 Modules/Plugin/DotNET/Orbiter.Multiplayer.dll
Binary file Modules/Plugin/DotNET/Orbiter.Multiplayer.dll has changed
diff -r 4df8628ee56b -r 8e815e0a3972 Modules/Plugin/OMPClient.cfg
--- a/Modules/Plugin/OMPClient.cfg Sun Feb 05 20:35:00 2012 +0100
+++ b/Modules/Plugin/OMPClient.cfg Sun Feb 05 20:50:41 2012 +0100
@@ -8,7 +8,7 @@
88
99 # ip <IP-address>
1010 # ... <IP-address> is the IP-address of the server
11-ip localhost
11+ip omp.dyndns-server.com
1212
1313 # tcp <portnr>
1414 # ... The server can be reached via telnet on port <portnr>
@@ -29,7 +29,7 @@
2929 # user <name> <password>
3030 # ... <name> is the user name to be used for server login
3131 # ... <password> is the password used for server login
32-user "Face" "drewsfaster"
32+user "Nobody" "drewsfaster"
3333
3434 #---------------------
3535 # Client configuration
@@ -41,75 +41,3 @@
4141 # character '$' to ensure it is the first entry in Orbiter's scenario
4242 # selection tree.
4343 scenario "Multiplayer Session"
44-
45-#****************************************************************
46-#* OBSOLETE CONFIGURATION ENTRIES - TRANSFERED TO OMPClient.xml *
47-#****************************************************************
48-#-------------------
49-# SNTP configuration
50-#-------------------
51-# sntp <server> <max_misses> <delay> <alarm_misses>
52-# ... <server> is a url, adressing an SNTP server. There may be multiple servers,
53-# synchronisation is performed randomly on each one.
54-# ... <max_misses> is the maximum amount of consecutive misses to retrieve data
55-# from the server before it is delayed.
56-# ... <delay> is the delay in hits (="would have been choosen") for the server
57-# ... <alarm_misses> is the amount (in multipliers of <delay>) of consecutive misses
58-# to retrieve data from the server before it is blocked permanently.
59-#//NIST
60-#sntp "time-a.nist.gov" 2 2 3
61-#sntp "time-b.nist.gov" 2 2 3
62-#//US
63-#sntp "tock.usno.navy.mil" 1 5 2
64-#sntp "tick.usno.navy.mil" 1 5 2
65-#//EU
66-#sntp "Time2.Stupi.SE" 2 2 3
67-#sntp "ntps1-0.cs.tu-berlin.de" 2 2 3
68-#sntp "ntps1-1.cs.tu-berlin.de" 2 2 3
69-#//FAREAST
70-#sntp "clock.nc.fukuoka-u.ac.jp" 3 3 3
71-#sntp "clock.tl.fukuoka-u.ac.jp" 3 3 3
72-#//AUSTRALIA
73-#sntp "ntp.cs.mu.OZ.AU" 1 5 2
74-#//Pool servers
75-#sntp "pool.ntp.org" 2 2 3
76-#sntp "asia.pool.ntp.org" 2 2 3
77-#sntp "europe.pool.ntp.org" 2 2 3
78-#sntp "north-america.pool.ntp.org" 2 2 3
79-#sntp "oceania.pool.ntp.org" 2 2 3
80-#sntp "south-america.pool.ntp.org" 2 2 3
81-#sntp "at.pool.ntp.org" 2 2 3
82-#sntp "au.pool.ntp.org" 2 2 3
83-#sntp "be.pool.ntp.org" 2 2 3
84-#sntp "br.pool.ntp.org" 2 2 3
85-#sntp "ca.pool.ntp.org" 2 2 3
86-#sntp "ch.pool.ntp.org" 2 2 3
87-#sntp "cl.pool.ntp.org" 2 2 3
88-#sntp "de.pool.ntp.org" 2 2 3
89-#sntp "dk.pool.ntp.org" 2 2 3
90-#sntp "es.pool.ntp.org" 2 2 3
91-#sntp "fi.pool.ntp.org" 2 2 3
92-#sntp "fr.pool.ntp.org" 2 2 3
93-#sntp "gt.pool.ntp.org" 2 2 3
94-#sntp "ie.pool.ntp.org" 2 2 3
95-#sntp "il.pool.ntp.org" 2 2 3
96-#sntp "it.pool.ntp.org" 2 2 3
97-#sntp "jp.pool.ntp.org" 2 2 3
98-#sntp "mx.pool.ntp.org" 2 2 3
99-#sntp "my.pool.ntp.org" 2 2 3
100-#sntp "nl.pool.ntp.org" 2 2 3
101-#sntp "no.pool.ntp.org" 2 2 3
102-#sntp "nz.pool.ntp.org" 2 2 3
103-#sntp "ph.pool.ntp.org" 2 2 3
104-#sntp "pl.pool.ntp.org" 2 2 3
105-#sntp "pt.pool.ntp.org" 2 2 3
106-#sntp "ru.pool.ntp.org" 2 2 3
107-#sntp "se.pool.ntp.org" 2 2 3
108-#sntp "sg.pool.ntp.org" 2 2 3
109-#sntp "si.pool.ntp.org" 2 2 3
110-#sntp "tr.pool.ntp.org" 2 2 3
111-#sntp "uk.pool.ntp.org" 2 2 3
112-#sntp "us.pool.ntp.org" 2 2 3
113-# preset <skew>
114-# ... Presets all precision history tables with the given <skew> in µs/s
115-#preset 22
diff -r 4df8628ee56b -r 8e815e0a3972 Modules/Plugin/OMPClient.dll
Binary file Modules/Plugin/OMPClient.dll has changed
diff -r 4df8628ee56b -r 8e815e0a3972 Server/Linux/Orbiter.Interfaces.dll
Binary file Server/Linux/Orbiter.Interfaces.dll has changed
diff -r 4df8628ee56b -r 8e815e0a3972 Server/Linux/Orbiter.Multiplayer.Server.dll
Binary file Server/Linux/Orbiter.Multiplayer.Server.dll has changed
diff -r 4df8628ee56b -r 8e815e0a3972 Server/Linux/Orbiter.Multiplayer.dll
Binary file Server/Linux/Orbiter.Multiplayer.dll has changed
diff -r 4df8628ee56b -r 8e815e0a3972 Server/Linux/ServerConsole.exe
Binary file Server/Linux/ServerConsole.exe has changed
diff -r 4df8628ee56b -r 8e815e0a3972 Server/Linux/server.log4net
--- a/Server/Linux/server.log4net Sun Feb 05 20:35:00 2012 +0100
+++ b/Server/Linux/server.log4net Sun Feb 05 20:50:41 2012 +0100
@@ -63,7 +63,7 @@
6363 <appender name="Synclog" type="log4net.Appender.ColoredConsoleAppender">
6464 <mapping>
6565 <level value="INFO" />
66- <foreColor value="Yellow" />
66+ <foreColor value="Yellow, HighIntensity" />
6767 </mapping>
6868 <mapping>
6969 <level value="ERROR" />
@@ -226,4 +226,8 @@
226226 <level value="INFO" />
227227 <appender-ref ref="ANSIVISIlog" />
228228 </logger>
229-</log4net>
229+ <logger name=" WEB">
230+ <level value="INFO" />
231+ <appender-ref ref="ANSIStandardlog" />
232+ </logger>
233+</log4net>
\ No newline at end of file
diff -r 4df8628ee56b -r 8e815e0a3972 Server/Linux/server.xml
--- a/Server/Linux/server.xml Sun Feb 05 20:35:00 2012 +0100
+++ b/Server/Linux/server.xml Sun Feb 05 20:50:41 2012 +0100
@@ -1,78 +1,34 @@
1-<?xml version="1.0" encoding="utf-8"?>
2-<OMPServerConfiguration xmlns="http://Orbiter.Multiplayer.Server" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Name="RacingServer" xsi:schemaLocation="http://Orbiter.Multiplayer.Server ..\Orbiter.Multiplayer.Server\Configuration.xsd" OrbiterRoot="..\.." SubvisualDistance="1000000000" PromptFormat="({1:HH:mm:ss}) {0}">
3- <Network IP="92.62.16.99" TCP="1515" UDP="3000" Count="500" Web="1580"/>
4- <NTP Samples="10">
5- <Server IP="time-a.nist.gov"/>
6- <Server IP="time-b.nist.gov"/>
7- <Server IP="tock.usno.navy.mil"/>
8- <Server IP="tick.usno.navy.mil"/>
9- <Server IP="Time2.Stupi.SE"/>
10- <Server IP="ntps1-0.cs.tu-berlin.de"/>
11- <Server IP="ntps1-1.cs.tu-berlin.de"/>
12- <Server IP="clock.nc.fukuoka-u.ac.jp"/>
13- <Server IP="clock.tl.fukuoka-u.ac.jp"/>
14- <Server IP="ntp.cs.mu.OZ.AU"/>
15- <Server IP="pool.ntp.org"/>
16- </NTP>
17- <Password Admin="testpass"/>
18- <Messages>
19- <Welcome>
20- <Line> ##################</Line>
21- <Line> ###########################</Line>
22- <Line> ########## ############</Line>
23- <Line> ######## ########</Line>
24- <Line> ####### O R B I T E R #######</Line>
25- <Line> ####### #######</Line>
26- <Line> ###### ## ######</Line>
27- <Line> ##### ##### #####</Line>
28- <Line> ##### ######### #####</Line>
29- <Line> ##### ## # # # ## #####</Line>
30- <Line> ##### ####### # # ####### #####</Line>
31- <Line> ##### ## ## ## ## ####</Line>
32- <Line> #### #### ## ## ## ### # #####</Line>
33- <Line> #### # ## ## ## ## ### ## ####</Line>
34- <Line>##### # ## ## ## ## ## ## ####</Line>
35- <Line>#### # ######### ######### # #####</Line>
36- <Line>#### # ## ### ## ## ### ## ####</Line>
37- <Line>#### # ## ### ## ## ### ## # ####</Line>
38- <Line>#### ####### ## ## ## ### ####### ####</Line>
39- <Line>##### #### ### ## ## ### ##### ####</Line>
40- <Line> #### ## ##### ## ## ##### ### ####</Line>
41- <Line> #### ## ##### ##### # #####</Line>
42- <Line> #### R ### ### E ####</Line>
43- <Line> ##### O ### ### U #####</Line>
44- <Line> ##### C ## ## G #####</Line>
45- <Line> ##### K # # A #####</Line>
46- <Line> ##### E # # E #####</Line>
47- <Line> ###### T L ######</Line>
48- <Line> ###### ######</Line>
49- <Line> ######## R A C I N G #######</Line>
50- <Line> ######### #########</Line>
51- <Line> ########## # # ##########</Line>
52- <Line> #########################</Line>
53- <Line> #########</Line>
54- <Line></Line>
55- <Line> brought to you by a barrell full of monkeys...</Line>
56- </Welcome>
57- <Farwell>
58- <Line>----------------------------------------------------------</Line>
59- <Line> Have a nice day! </Line>
60- </Farwell>
61- <Shutdown>
62- <Line>----------------------------------------------------------</Line>
63- <Line>Server is shutting down...</Line>
64- </Shutdown>
65- </Messages>
66- <Timing Transmitter="200" SNTP="2000" Resync="600000"/>
67- <Support>
68- <System Name="Sol">
69- <Class Name="*"/>
70- <Class Name="ORRL_CHKPT" Redirect="#"/>
71- <Class Name="ORRL_Finish" Redirect="#"/>
72- <Class Name="ORRL_Start" Redirect="#"/>
73- <Class Name="OMPDefault" Redirect="#"/>
74- <Location>
75- <![CDATA[BEGIN_FOCUS
1+<?xml version="1.0"?>
2+<OMPServerConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" Name="RacingServer" OrbiterRoot="..\.." SubvisualDistance="1000000000" PromptFormat="({1:HH:mm:ss}){0}" xmlns="http://Orbiter.Multiplayer.Server">
3+ <Network IP="localhost" TCP="1515" UDP="3000" Count="500" Web="1580" />
4+ <NTP Samples="10">
5+ <Server Address="pool.ntp.org" />
6+ </NTP>
7+ <Password Admin="testpass" />
8+ <Messages>
9+ <Welcome>
10+ <Line> ORRL - Orbiter Rocket Racing League</Line>
11+ <Line />
12+ <Line> brought to you by a barrell full of monkeys...</Line>
13+ </Welcome>
14+ <Farwell>
15+ <Line>----------------------------------------------------------</Line>
16+ <Line> Have a nice day! </Line>
17+ </Farwell>
18+ <Shutdown>
19+ <Line>----------------------------------------------------------</Line>
20+ <Line> Server is shutting down...</Line>
21+ </Shutdown>
22+ </Messages>
23+ <Timing Transmitter="200" SNTP="2000" Resync="60000" />
24+ <Support>
25+ <System Name="Sol">
26+ <Class Name="*" />
27+ <Class Name="ORRL_CHKPT" Redirect="#" />
28+ <Class Name="ORRL_Finish" Redirect="#" />
29+ <Class Name="ORRL_Start" Redirect="#" />
30+ <Class Name="OMPDefault" Redirect="#" />
31+ <Location>BEGIN_FOCUS
7632 Ship ${NAME}
7733 END_FOCUS
7834
@@ -106,375 +62,13 @@
10662 XPDR 0
10763 GEAR 1 1.0000
10864 END
109-${IF 1}${DESC}XR1 at KSC
110-${NAME}:DeltaGliderXR1
111- STATUS Landed Earth
112- POS -80.5747260 28.4650640
113- HEADING 128.00
114- RCSMODE 0
115- PRPLEVEL 0:1.000 1:1.000 2:1.000
116- IDS 0:199 100
117- NAVFREQ 94 524 84 114
118- XPDR 193
119- SECONDARY_HUD 3
120- LAST_ACTIVE_SECONDARY_HUD 0
121- ADCTRL_MODE 7
122- TAKEOFF_LANDING_CALLOUTS 0.000000 0.000000 0.000000 0.000000
123- APU_FUEL_QTY 0.988
124- LOX_QTY 0.999972
125- CABIN_O2_LEVEL 0.209
126- CREW_STATE 0
127- INTERNAL_SYSTEMS_FAILURE 0
128- MWS_ACTIVE 0
129- COOLANT_TEMP 32.435
130- DMG_0 1.000000 Left Wing
131- DMG_1 1.000000 Right Wing
132- DMG_2 1.000000 Left Aileron
133- DMG_3 1.000000 Right Aileron
134- DMG_4 1.000000 Landing Gear
135- DMG_5 1.000000 Nosecone
136- DMG_6 1.000000 Retro Doors
137- DMG_7 1.000000 Top Hatch
138- DMG_8 1.000000 Radiator
139- DMG_9 1.000000 Airbrake
140- DMG_10 1.000000 Left Main Engine
141- DMG_11 1.000000 Right Main Engine
142- DMG_12 1.000000 Left SCRAM Engine
143- DMG_13 1.000000 Right SCRAM Engine
144- DMG_14 1.000000 Fore Hover Engine
145- DMG_15 1.000000 Aft Hover Engine
146- DMG_16 1.000000 Left Retro Engine
147- DMG_17 1.000000 Right Retro Engine
148- DMG_18 1.000000 Forward Lower RCS
149- DMG_19 1.000000 Aft Upper RCS
150- DMG_20 1.000000 Forward Upper RCS
151- DMG_21 1.000000 Aft Lower RCS
152- DMG_22 1.000000 Forward Star. RCS
153- DMG_23 1.000000 Aft Port RCS
154- DMG_24 1.000000 Forward Port RCS
155- DMG_25 1.000000 Aft Star. RCS
156- DMG_26 1.000000 Outboard Upper Port RCS
157- DMG_27 1.000000 Outboard Lower Star. RCS
158- DMG_28 1.000000 Outboard Upper Star. RCS
159- DMG_29 1.000000 Outboard Lower Port RCS
160- DMG_30 1.000000 Aft RCS
161- DMG_31 1.000000 Forward RCS
162- IS_CRASHED 0
163- MET_STARTING_MJD -1.000000
164- INTERVAL1_ELAPSED_TIME -1.000000
165- INTERVAL2_ELAPSED_TIME -1.000000
166- MET_RUNNING 0
167- INTERVAL1_RUNNING 0
168- INTERVAL2_RUNNING 0
169- ACTIVE_MDM 3
170- TEMP_SCALE 2
171- CUSTOM_AUTOPILOT_MODE 0
172- AIRSPEED_HOLD_ENGAGED 0
173- ATTITUDE_HOLD_DATA 0.000000 0.000000 0 0
174- DESCENT_HOLD_DATA 0.000000 -3.000000 0
175- AIRSPEED_HOLD_DATA 0.000000
176- ARM_DOORS 0 0
177- TERTIARY_HUD_ON 1
178- GEAR 1 1.0000
179- APU_STATUS 1
180- XR1UMMU_CREW_DATA_VALID 1
181- UMMUCREW XI0-Michael_Samuel-37-72-68
182- UMMUCREW XI1-Nikita_Simone-29-72-68
183-END
184-${IF 2}${DESC}XR2 at KSC
185-${NAME}:XR2Ravenstar
186- STATUS Landed Earth
187- POS -80.5747260 28.4650640
188- HEADING 128.00
189- RCSMODE 0
190- PRPLEVEL 0:1.000 1:1.000 2:1.000
191- IDS 0:199 100
192- NAVFREQ 588 466 84 114
193- XPDR 193
194- SECONDARY_HUD 3
195- LAST_ACTIVE_SECONDARY_HUD 0
196- ADCTRL_MODE 7
197- TAKEOFF_LANDING_CALLOUTS 0.000000 0.000000 0.000000 0.000000 0.000000
198- APU_FUEL_QTY 0.972
199- LOX_QTY 0.999553
200- CABIN_O2_LEVEL 0.209
201- CREW_STATE 0
202- INTERNAL_SYSTEMS_FAILURE 0
203- COGSHIFT_MODES 0 0 0
204- MWS_ACTIVE 0
205- COOLANT_TEMP 34.161
206- DMG_0 1.000000 Left Wing
207- DMG_1 1.000000 Right Wing
208- DMG_2 1.000000 Left Aileron
209- DMG_3 1.000000 Right Aileron
210- DMG_4 1.000000 Landing Gear
211- DMG_5 1.000000 Nosecone
212- DMG_6 1.000000 Retro Doors
213- DMG_7 1.000000 Top Hatch
214- DMG_8 1.000000 Radiator
215- DMG_9 1.000000 Airbrake
216- DMG_10 1.000000 Left Main Engine
217- DMG_11 1.000000 Right Main Engine
218- DMG_12 1.000000 Left SCRAM Engine
219- DMG_13 1.000000 Right SCRAM Engine
220- DMG_14 1.000000 Fore Hover Engine
221- DMG_15 1.000000 Aft Hover Engine
222- DMG_16 1.000000 Left Retro Engine
223- DMG_17 1.000000 Right Retro Engine
224- DMG_18 1.000000 Forward Lower RCS
225- DMG_19 1.000000 Aft Upper RCS
226- DMG_20 1.000000 Forward Upper RCS
227- DMG_21 1.000000 Aft Lower RCS
228- DMG_22 1.000000 Forward Star. RCS
229- DMG_23 1.000000 Aft Port RCS
230- DMG_24 1.000000 Forward Port RCS
231- DMG_25 1.000000 Aft Star. RCS
232- DMG_26 1.000000 Outboard Upper Port RCS
233- DMG_27 1.000000 Outboard Lower Star. RCS
234- DMG_28 1.000000 Outboard Upper Star. RCS
235- DMG_29 1.000000 Outboard Lower Port RCS
236- DMG_30 1.000000 Aft RCS
237- DMG_31 1.000000 Forward RCS
238- DMG_32 1.000000 Bay Doors
239- IS_CRASHED 0
240- MET_STARTING_MJD -1.000000
241- INTERVAL1_ELAPSED_TIME -1.000000
242- INTERVAL2_ELAPSED_TIME -1.000000
243- MET_RUNNING 0
244- INTERVAL1_RUNNING 0
245- INTERVAL2_RUNNING 0
246- ACTIVE_MDM 3
247- TEMP_SCALE 2
248- CUSTOM_AUTOPILOT_MODE 0
249- AIRSPEED_HOLD_ENGAGED 0
250- SCRAM0DIR 0.000000 0.000000 1.000000
251- SCRAM1DIR 0.000000 0.000000 1.000000
252- HOVER_BALANCE 0.000
253- MAIN0DIR 0.000000 0.000000 1.000000
254- MAIN1DIR 0.000000 0.000000 1.000000
255- GIMBAL_BUTTON_STATES 0 0 0 0 0 0
256- ATTITUDE_HOLD_DATA 0.000000 0.000000 0 0 0.000000
257- DESCENT_HOLD_DATA 0.000000 -3.000000 0
258- AIRSPEED_HOLD_DATA 0.000000
259- OVERRIDE_INTERLOCKS 0 0
260- TERTIARY_HUD_ON 1
261- CREW_DISPLAY_INDEX 0
262- GEAR 1 1.0000
263- RCOVER 0 0.0000
264- NOSECONE 0 0.0000
265- AIRLOCK 0 0.0000
266- IAIRLOCK 0 0.0000
267- CHAMBER 0 0.0000
268- AIRBRAKE 0 0.0000
269- RADIATOR 0 0.0000
270- HATCH 0 0.0000
271- SCRAM_DOORS 0 0.0000
272- HOVER_DOORS 0 0.0000
273- BAY_DOORS 0 0.0000
274- APU_STATUS 1
275- EXTCOOLING_STATUS 0
276- TRIM 0.000
277- LIGHTS 1 0 1
278- XRUMMU_CREW_DATA_VALID 1
279- UMMUCREW XI0-Lee_Nash-39-65-78
280- UMMUCREW XI1-Kara_Miller-32-65-58
281- PAYLOAD_SCREENS_DATA 0.2 0 1 1
282-END
283-${IF 3}${DESC}DG at WIN
284-${NAME}:DG-S
285- STATUS Landed Earth
286- POS -14.4263140 -7.9744415
287- HEADING 118.00
288- RCSMODE 0
289- PRPLEVEL 0:1.000 1:1.000
290- NAVFREQ 0 0 0 0
291- XPDR 0
292- GEAR 1 1.0000
293- PSNGR 2 3 4
294- TANKCONFIG 1
295-END
296-${IF 4}${DESC}XR1 at WIN
297-${NAME}:DeltaGliderXR1
298- STATUS Landed Earth
299- POS -14.4263140 -7.9744415
300- HEADING 118.00
301- RCSMODE 0
302- PRPLEVEL 0:1.000 1:1.000 2:1.000
303- IDS 0:199 100
304- NAVFREQ 94 524 84 114
305- XPDR 193
306- SECONDARY_HUD 3
307- LAST_ACTIVE_SECONDARY_HUD 0
308- ADCTRL_MODE 7
309- TAKEOFF_LANDING_CALLOUTS 0.000000 0.000000 0.000000 0.000000
310- APU_FUEL_QTY 0.988
311- LOX_QTY 0.999972
312- CABIN_O2_LEVEL 0.209
313- CREW_STATE 0
314- INTERNAL_SYSTEMS_FAILURE 0
315- MWS_ACTIVE 0
316- COOLANT_TEMP 32.435
317- DMG_0 1.000000 Left Wing
318- DMG_1 1.000000 Right Wing
319- DMG_2 1.000000 Left Aileron
320- DMG_3 1.000000 Right Aileron
321- DMG_4 1.000000 Landing Gear
322- DMG_5 1.000000 Nosecone
323- DMG_6 1.000000 Retro Doors
324- DMG_7 1.000000 Top Hatch
325- DMG_8 1.000000 Radiator
326- DMG_9 1.000000 Airbrake
327- DMG_10 1.000000 Left Main Engine
328- DMG_11 1.000000 Right Main Engine
329- DMG_12 1.000000 Left SCRAM Engine
330- DMG_13 1.000000 Right SCRAM Engine
331- DMG_14 1.000000 Fore Hover Engine
332- DMG_15 1.000000 Aft Hover Engine
333- DMG_16 1.000000 Left Retro Engine
334- DMG_17 1.000000 Right Retro Engine
335- DMG_18 1.000000 Forward Lower RCS
336- DMG_19 1.000000 Aft Upper RCS
337- DMG_20 1.000000 Forward Upper RCS
338- DMG_21 1.000000 Aft Lower RCS
339- DMG_22 1.000000 Forward Star. RCS
340- DMG_23 1.000000 Aft Port RCS
341- DMG_24 1.000000 Forward Port RCS
342- DMG_25 1.000000 Aft Star. RCS
343- DMG_26 1.000000 Outboard Upper Port RCS
344- DMG_27 1.000000 Outboard Lower Star. RCS
345- DMG_28 1.000000 Outboard Upper Star. RCS
346- DMG_29 1.000000 Outboard Lower Port RCS
347- DMG_30 1.000000 Aft RCS
348- DMG_31 1.000000 Forward RCS
349- IS_CRASHED 0
350- MET_STARTING_MJD -1.000000
351- INTERVAL1_ELAPSED_TIME -1.000000
352- INTERVAL2_ELAPSED_TIME -1.000000
353- MET_RUNNING 0
354- INTERVAL1_RUNNING 0
355- INTERVAL2_RUNNING 0
356- ACTIVE_MDM 3
357- TEMP_SCALE 2
358- CUSTOM_AUTOPILOT_MODE 0
359- AIRSPEED_HOLD_ENGAGED 0
360- ATTITUDE_HOLD_DATA 0.000000 0.000000 0 0
361- DESCENT_HOLD_DATA 0.000000 -3.000000 0
362- AIRSPEED_HOLD_DATA 0.000000
363- ARM_DOORS 0 0
364- TERTIARY_HUD_ON 1
365- GEAR 1 1.0000
366- APU_STATUS 1
367- XR1UMMU_CREW_DATA_VALID 1
368- UMMUCREW XI0-Michael_Samuel-37-72-68
369- UMMUCREW XI1-Nikita_Simone-29-72-68
370-END
371-${IF 5}${DESC}XR2 at WIN
372-${NAME}:XR2Ravenstar
373- STATUS Landed Earth
374- POS -14.4263140 -7.9744415
375- HEADING 118.00
376- RCSMODE 0
377- PRPLEVEL 0:1.000 1:1.000 2:1.000
378- IDS 0:199 100
379- NAVFREQ 588 466 84 114
380- XPDR 193
381- SECONDARY_HUD 3
382- LAST_ACTIVE_SECONDARY_HUD 0
383- ADCTRL_MODE 7
384- TAKEOFF_LANDING_CALLOUTS 0.000000 0.000000 0.000000 0.000000 0.000000
385- APU_FUEL_QTY 0.972
386- LOX_QTY 0.999553
387- CABIN_O2_LEVEL 0.209
388- CREW_STATE 0
389- INTERNAL_SYSTEMS_FAILURE 0
390- COGSHIFT_MODES 0 0 0
391- MWS_ACTIVE 0
392- COOLANT_TEMP 34.161
393- DMG_0 1.000000 Left Wing
394- DMG_1 1.000000 Right Wing
395- DMG_2 1.000000 Left Aileron
396- DMG_3 1.000000 Right Aileron
397- DMG_4 1.000000 Landing Gear
398- DMG_5 1.000000 Nosecone
399- DMG_6 1.000000 Retro Doors
400- DMG_7 1.000000 Top Hatch
401- DMG_8 1.000000 Radiator
402- DMG_9 1.000000 Airbrake
403- DMG_10 1.000000 Left Main Engine
404- DMG_11 1.000000 Right Main Engine
405- DMG_12 1.000000 Left SCRAM Engine
406- DMG_13 1.000000 Right SCRAM Engine
407- DMG_14 1.000000 Fore Hover Engine
408- DMG_15 1.000000 Aft Hover Engine
409- DMG_16 1.000000 Left Retro Engine
410- DMG_17 1.000000 Right Retro Engine
411- DMG_18 1.000000 Forward Lower RCS
412- DMG_19 1.000000 Aft Upper RCS
413- DMG_20 1.000000 Forward Upper RCS
414- DMG_21 1.000000 Aft Lower RCS
415- DMG_22 1.000000 Forward Star. RCS
416- DMG_23 1.000000 Aft Port RCS
417- DMG_24 1.000000 Forward Port RCS
418- DMG_25 1.000000 Aft Star. RCS
419- DMG_26 1.000000 Outboard Upper Port RCS
420- DMG_27 1.000000 Outboard Lower Star. RCS
421- DMG_28 1.000000 Outboard Upper Star. RCS
422- DMG_29 1.000000 Outboard Lower Port RCS
423- DMG_30 1.000000 Aft RCS
424- DMG_31 1.000000 Forward RCS
425- DMG_32 1.000000 Bay Doors
426- IS_CRASHED 0
427- MET_STARTING_MJD -1.000000
428- INTERVAL1_ELAPSED_TIME -1.000000
429- INTERVAL2_ELAPSED_TIME -1.000000
430- MET_RUNNING 0
431- INTERVAL1_RUNNING 0
432- INTERVAL2_RUNNING 0
433- ACTIVE_MDM 3
434- TEMP_SCALE 2
435- CUSTOM_AUTOPILOT_MODE 0
436- AIRSPEED_HOLD_ENGAGED 0
437- SCRAM0DIR 0.000000 0.000000 1.000000
438- SCRAM1DIR 0.000000 0.000000 1.000000
439- HOVER_BALANCE 0.000
440- MAIN0DIR 0.000000 0.000000 1.000000
441- MAIN1DIR 0.000000 0.000000 1.000000
442- GIMBAL_BUTTON_STATES 0 0 0 0 0 0
443- ATTITUDE_HOLD_DATA 0.000000 0.000000 0 0 0.000000
444- DESCENT_HOLD_DATA 0.000000 -3.000000 0
445- AIRSPEED_HOLD_DATA 0.000000
446- OVERRIDE_INTERLOCKS 0 0
447- TERTIARY_HUD_ON 1
448- CREW_DISPLAY_INDEX 0
449- GEAR 1 1.0000
450- RCOVER 0 0.0000
451- NOSECONE 0 0.0000
452- AIRLOCK 0 0.0000
453- IAIRLOCK 0 0.0000
454- CHAMBER 0 0.0000
455- AIRBRAKE 0 0.0000
456- RADIATOR 0 0.0000
457- HATCH 0 0.0000
458- SCRAM_DOORS 0 0.0000
459- HOVER_DOORS 0 0.0000
460- BAY_DOORS 0 0.0000
461- APU_STATUS 1
462- EXTCOOLING_STATUS 0
463- TRIM 0.000
464- LIGHTS 1 0 1
465- XRUMMU_CREW_DATA_VALID 1
466- UMMUCREW XI0-Lee_Nash-39-65-78
467- UMMUCREW XI1-Kara_Miller-32-65-58
468- PAYLOAD_SCREENS_DATA 0.2 0 1 1
469-END
47065 ${IF 6}${DESC}Observer only
47166 ${NAME}:OMPDefault
47267 STATUS Landed Earth
47368 POS -80.6858943 28.5906644
47469 HEADING 330.01
47570 END
476-${FI}END_SHIPS]]>
477- </Location>
478- </System>
479- </Support>
480-</OMPServerConfiguration>
71+${FI}END_SHIPS</Location>
72+ </System>
73+ </Support>
74+</OMPServerConfiguration>
\ No newline at end of file
diff -r 4df8628ee56b -r 8e815e0a3972 Server/Windows/Orbiter.Interfaces.dll
Binary file Server/Windows/Orbiter.Interfaces.dll has changed
diff -r 4df8628ee56b -r 8e815e0a3972 Server/Windows/Orbiter.Multiplayer.Server.dll
Binary file Server/Windows/Orbiter.Multiplayer.Server.dll has changed
diff -r 4df8628ee56b -r 8e815e0a3972 Server/Windows/Orbiter.Multiplayer.dll
Binary file Server/Windows/Orbiter.Multiplayer.dll has changed
diff -r 4df8628ee56b -r 8e815e0a3972 Server/Windows/ServerConsole.exe
Binary file Server/Windows/ServerConsole.exe has changed
diff -r 4df8628ee56b -r 8e815e0a3972 Server/Windows/server.log4net
--- a/Server/Windows/server.log4net Sun Feb 05 20:35:00 2012 +0100
+++ b/Server/Windows/server.log4net Sun Feb 05 20:50:41 2012 +0100
@@ -123,6 +123,7 @@
123123 <appender-ref ref="Streamer"/>
124124 </appender>
125125 <appender name="ANSITCPlog" type="log4net.Appender.AnsiColorForwardingAppender">
126+ <threshold value="INFO"/>
126127 <mapping>
127128 <level value="INFO" />
128129 <foreColor value="Yellow" />
@@ -139,6 +140,7 @@
139140 <appender-ref ref="Streamer"/>
140141 </appender>
141142 <appender name="ANSIUDPlog" type="log4net.Appender.AnsiColorForwardingAppender">
143+ <threshold value="DEBUG"/>
142144 <mapping>
143145 <level value="INFO" />
144146 <foreColor value="White" />
diff -r 4df8628ee56b -r 8e815e0a3972 Server/Windows/server.xml
--- a/Server/Windows/server.xml Sun Feb 05 20:35:00 2012 +0100
+++ b/Server/Windows/server.xml Sun Feb 05 20:50:41 2012 +0100
@@ -1,74 +1,74 @@
1-<?xml version="1.0"?>
2-<OMPServerConfiguration xmlns="http://Orbiter.Multiplayer.Server" Name="RacingServer" OrbiterRoot="..\.." SubvisualDistance="1000000000" PromptFormat="({1:HH:mm:ss}){0}">
3- <Network IP="localhost" TCP="1515" UDP="3000" Count="500" Web="1580" />
4- <NTP>
5- <Server Address="pool.ntp.org" />
6- </NTP>
7- <Password Admin="testpass" />
8- <Messages>
9- <Welcome>
10- <Line> ORRL - Orbiter Rocket Racing League</Line>
11- <Line />
12- <Line> brought to you by a barrell full of monkeys...</Line>
13- </Welcome>
14- <Farwell>
15- <Line>----------------------------------------------------------</Line>
16- <Line> Have a nice day! </Line>
17- </Farwell>
18- <Shutdown>
19- <Line>----------------------------------------------------------</Line>
20- <Line> Server is shutting down...</Line>
21- </Shutdown>
22- </Messages>
23- <Timing Transmitter="200" SNTP="2000" Resync="20000" />
24- <Support>
25- <System Name="Sol">
26- <Class Name="*" />
27- <Class Name="ORRL_CHKPT" Redirect="#" />
28- <Class Name="ORRL_Finish" Redirect="#" />
29- <Class Name="ORRL_Start" Redirect="#" />
30- <Class Name="OMPDefault" Redirect="#" />
31- <Location>BEGIN_FOCUS
32- Ship ${NAME}
33-END_FOCUS
34-
35-BEGIN_CAMERA
36- TARGET ${NAME}
37- MODE Cockpit
38- FOV 60.00
39-END_CAMERA
40-
41-BEGIN_MFD Left
42- TYPE Surface
43-END_MFD
44-
45-BEGIN_MFD Right
46- TYPE User
47- MODE Racer Checkpoint MFD
48-END_MFD
49-
50-BEGIN_PANEL
51-END_PANEL
52-
53-BEGIN_SHIPS
54-${IF 0}${DESC}DG at KSC
55-${NAME}:DeltaGlider
56- STATUS Landed Earth
57- BASE Cape Canaveral:1
58- POS -80.5747260 28.4650640
59- HEADING 128.00
60- PRPLEVEL 0:1.000 1:1.000
61- NAVFREQ 402 94 0 0
62- XPDR 0
63- GEAR 1 1.0000
64-END
65-${IF 6}${DESC}Observer only
66-${NAME}:OMPDefault
67- STATUS Landed Earth
68- POS -80.6858943 28.5906644
69- HEADING 330.01
70-END
71-${FI}END_SHIPS</Location>
72- </System>
73- </Support>
1+<?xml version="1.0"?>
2+<OMPServerConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" Name="RacingServer" OrbiterRoot="..\.." SubvisualDistance="1000000000" PromptFormat="({1:HH:mm:ss}){0}" xmlns="http://Orbiter.Multiplayer.Server">
3+ <Network IP="localhost" TCP="1515" UDP="3000" Count="500" Web="1580" />
4+ <NTP Samples="10">
5+ <Server Address="pool.ntp.org" />
6+ </NTP>
7+ <Password Admin="testpass" />
8+ <Messages>
9+ <Welcome>
10+ <Line> ORRL - Orbiter Rocket Racing League</Line>
11+ <Line />
12+ <Line> brought to you by a barrell full of monkeys...</Line>
13+ </Welcome>
14+ <Farwell>
15+ <Line>----------------------------------------------------------</Line>
16+ <Line> Have a nice day! </Line>
17+ </Farwell>
18+ <Shutdown>
19+ <Line>----------------------------------------------------------</Line>
20+ <Line> Server is shutting down...</Line>
21+ </Shutdown>
22+ </Messages>
23+ <Timing Transmitter="200" SNTP="2000" Resync="60000" />
24+ <Support>
25+ <System Name="Sol">
26+ <Class Name="*" />
27+ <Class Name="ORRL_CHKPT" Redirect="#" />
28+ <Class Name="ORRL_Finish" Redirect="#" />
29+ <Class Name="ORRL_Start" Redirect="#" />
30+ <Class Name="OMPDefault" Redirect="#" />
31+ <Location>BEGIN_FOCUS
32+ Ship ${NAME}
33+END_FOCUS
34+
35+BEGIN_CAMERA
36+ TARGET ${NAME}
37+ MODE Cockpit
38+ FOV 60.00
39+END_CAMERA
40+
41+BEGIN_MFD Left
42+ TYPE Surface
43+END_MFD
44+
45+BEGIN_MFD Right
46+ TYPE User
47+ MODE Racer Checkpoint MFD
48+END_MFD
49+
50+BEGIN_PANEL
51+END_PANEL
52+
53+BEGIN_SHIPS
54+${IF 0}${DESC}DG at KSC
55+${NAME}:DeltaGlider
56+ STATUS Landed Earth
57+ BASE Cape Canaveral:1
58+ POS -80.5747260 28.4650640
59+ HEADING 128.00
60+ PRPLEVEL 0:1.000 1:1.000
61+ NAVFREQ 402 94 0 0
62+ XPDR 0
63+ GEAR 1 1.0000
64+END
65+${IF 6}${DESC}Observer only
66+${NAME}:OMPDefault
67+ STATUS Landed Earth
68+ POS -80.6858943 28.5906644
69+ HEADING 330.01
70+END
71+${FI}END_SHIPS</Location>
72+ </System>
73+ </Support>
7474 </OMPServerConfiguration>
\ No newline at end of file
Show on old repository browser