Changeset 8163 for code/branches/masterserver2
- Timestamp:
- Mar 31, 2011, 3:35:59 PM (14 years ago)
- Location:
- code/branches/masterserver2
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/masterserver2/data/levels/templates/spaceshipAssff.oxt
r7845 r8163 8 8 explosionchunks = 6 9 9 10 health = 100 11 maxhealth = 200 12 initialhealth = 100 10 health = 100000 11 maxhealth = 200000 12 initialhealth = 100000 13 13 14 primaryThrust = 100 ;15 auxilaryThrust = 30 ;14 primaryThrust = 10000; 15 auxilaryThrust = 3000; 16 16 rotationThrust = 25; 17 17 … … 57 57 <Template name=spaceshipassffengine baseclass=MultiStateEngine> 58 58 <MultiStateEngine 59 boostfactor = 2 59 boostfactor = 20 60 60 61 61 speedfront = 150 … … 67 67 defEngineSndBoost = "sounds/Engine_high.ogg" 68 68 69 accelerationfront = 50070 accelerationbrake = 50069 accelerationfront = 200 70 accelerationbrake = 200 71 71 accelerationback = 125 72 72 accelerationleftright = 125 -
code/branches/masterserver2/data/levels/tutorial.oxw
r7679 r8163 30 30 <Drone name="meineDrohne" primarythrust="80" auxilarythrust="10" rotationthrust="10" mass= "50" linearDamping = "0.9" angularDamping = "0.7"> 31 31 <attached> 32 <Model scale="1 " mesh="drone.mesh"/>32 <Model scale="10" mesh="drone.mesh"/> 33 33 </attached> 34 34 <collisionShapes> 35 <BoxCollisionShape position=" 0,0,0" halfExtents="10, 10, 10" />35 <BoxCollisionShape position="10,10,0" halfExtents="10, 10, 10" /> 36 36 </collisionShapes> 37 37 </Drone> … … 39 39 <Drone name="meineDrohne" primarythrust="80" auxilarythrust="10" rotationthrust="10" mass= "50" linearDamping = "0.9" angularDamping = "0.7"> 40 40 <attached> 41 <Model scale="1" mesh=" rocket.mesh"/>41 <Model scale="1" mesh="drone.mesh"/> 42 42 </attached> 43 43 <collisionShapes> 44 <BoxCollisionShape position="0, 0,0" halfExtents="10, 10, 10" />44 <BoxCollisionShape position="0,10,0" halfExtents="10, 10, 10" /> 45 45 </collisionShapes> 46 46 </Drone> -
code/branches/masterserver2/src/libraries/network/MasterServer.cc
r7801 r8163 99 99 } 100 100 101 /* maybe the two methods below can be merged into one and 102 * made to use ENet's RTT functionality to check for disconnected 103 * servers. 104 */ 105 void 106 MasterServer::helper_pingServers( void ) 107 { 108 /* get an iterator */ 109 std::list<packet::ServerInformation>::iterator i; 110 /* loop through list elements */ 111 for( i = mainlist.serverlist.begin(); i 112 != mainlist.serverlist.end(); ++i ) 113 { 114 /* to be implemented, waiting for Oli to reply to my email - sandro */ 115 116 } 117 118 } 119 120 void 121 MasterServer::helper_cleanupServers() 122 { 123 /* same as above. */ 124 125 } 126 101 127 102 128 … … 235 261 236 262 /* TODO schedule pings for servers somewhere here */ 263 /* Iterate through servers and send pings */ 264 helper_pingServers(); 237 265 266 /* check for timed out pings and remove those guys from 267 * the server list 268 */ 269 helper_cleanupServers(); 270 271 238 272 /* create an iterator for the loop */ 239 273 enet_host_service( this->server, event, 100 ); -
code/branches/masterserver2/src/libraries/network/MasterServer.h
r7801 r8163 69 69 /* helpers */ 70 70 void helper_sendlist( ENetEvent *event ); 71 void helper_pingServers( void ); 72 void helper_cleanupServers(); 71 73 72 74 /* members */
Note: See TracChangeset
for help on using the changeset viewer.