From: <z-...@us...> - 2010-01-21 20:14:36
|
Revision: 9319 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9319&view=rev Author: z-man Date: 2010-01-21 20:14:30 +0000 (Thu, 21 Jan 2010) Log Message: ----------- Merging bugfixes from 0.2.8: ------------------------------------------------------------------------ r9316 | bazaarmagetron | 2010-01-20 23:13:21 +0100 (Wed, 20 Jan 2010) | 1 line Manuel Moos: Fixed typos. ------------------------------------------------------------------------ r9315 | bazaarmagetron | 2010-01-20 22:16:30 +0100 (Wed, 20 Jan 2010) | 2 lines Manuel Moos: Added shuffle suppression texts. ------------------------------------------------------------------------ r9314 | bazaarmagetron | 2010-01-19 02:28:41 +0100 (Tue, 19 Jan 2010) | 2 lines Manuel Moos: Sound no longer stops for entire rounds if you alt-tab away. ------------------------------------------------------------------------ r9309 | bazaarmagetron | 2010-01-16 19:01:46 +0100 (Sat, 16 Jan 2010) | 2 lines Manuel Moos: Made GCC (4.1, with --pedantic) happy, again. Modified Paths: -------------- armagetronad/branches/0.2.8.3/armagetronad/language/deutsch.txt armagetronad/branches/0.2.8.3/armagetronad/language/english_base.txt armagetronad/branches/0.2.8.3/armagetronad/src/tron/gGame.cpp armagetronad/branches/0.2.8.3/armagetronad/src/tron/gServerBrowser.cpp Property Changed: ---------------- armagetronad/branches/0.2.8.3/ Property changes on: armagetronad/branches/0.2.8.3 ___________________________________________________________________ Added: svn:mergeinfo + /armagetronad/branches/0.2.8:9309,9314-9316 Modified: armagetronad/branches/0.2.8.3/armagetronad/language/deutsch.txt =================================================================== --- armagetronad/branches/0.2.8.3/armagetronad/language/deutsch.txt 2010-01-21 19:15:24 UTC (rev 9318) +++ armagetronad/branches/0.2.8.3/armagetronad/language/deutsch.txt 2010-01-21 20:14:30 UTC (rev 9319) @@ -390,6 +390,7 @@ ping_flood_time_100_help K\xFCrzeste tolerierte Zeit, w\xE4hrend der 10 Pings von einer Maschine kommen d\xFCrfen. ping_flood_global_help Die Zeiten, die bei PING_FLOOD_TIME_X angegeben sind, z\xE4hlen, mit diesem Faktor multipliziert, auch f\xFCr Pings von allen Maschinen zusammengenommen. Ein negativer Wert schaltet dieses Feature ab. +shuffle_spam_messages_per_round_help Maximale Zahl an Positions\xE4nderungsnachrichten, die pro Spieler und pro Runde gezeigt werden. Null bedeutet keine Grenze. spam_protection_repeat_help Mindestzeit, die zwischen gleichlautenden Chat-Nachrichten liegen muss. spam_protection_help Sch\xE4rfe des Spamschutzes; der Kehrwert bestimmt die minimale Zeit zwischen zwei Nachrichten. spam_protection_vote_help Extrafaktor auf SPAM_PROTECTION f\xFCr das er\xF6ffnen von Abstimmungen. @@ -2320,6 +2321,7 @@ player_topologypolice Die Topologiepolizei befiehlt: \1 team_shuffle \1 wird von Position \2 auf \3 verschoben. +team_shuffle_suppress Diese Runde werden keine weiteren Verschiebenachrichten f\xFCr diesen Spieler mehr gezeigt.\n player_noshuffleup Du darfst dich hier nicht selbst bef\xF6rdern.\n player_noshuffle Dein Positions\xE4nderungswunsch hat keinen Effekt.\n player_shuffle_error /shuffle erwartet eine Zahl als Argument; mit explizitem Vorzeichen (+/-) wird die Position um die angegebene Zahl an Pl\xE4tzen ver\xE4ndert, ohne Vorzeichen geht es and die angegebene absolute Position.\n Modified: armagetronad/branches/0.2.8.3/armagetronad/language/english_base.txt =================================================================== --- armagetronad/branches/0.2.8.3/armagetronad/language/english_base.txt 2010-01-21 19:15:24 UTC (rev 9318) +++ armagetronad/branches/0.2.8.3/armagetronad/language/english_base.txt 2010-01-21 20:14:30 UTC (rev 9319) @@ -1277,7 +1277,7 @@ game_menu_iq_help Lets you select the average intelligence of the computer controlled players("Artificial Intelligence") in the game. game_menu_minplayers_text Min Players: -game_menu_minplayers_help Selects the minimum nuber of players that will be on the game grid. If not enough humans are present, the empty positions will be filled by AIs. +game_menu_minplayers_help Selects the minimum number of players that will be on the game grid. If not enough humans are present, the empty positions will be filled by AIs. game_menu_speed_text Speed: game_menu_speed_help Speed modifier. Negative values slow the game down, positive values speed it up. An increase of two in this value will double the speed. Reasonable values lie between -2 and +4. @@ -1563,7 +1563,7 @@ language_menu_item_first_help \g will display most text messages in this language. Use Cursor Left/Right to choose. language_menu_item_second Second Language: -language_menu_item_second_help If the fist language is not available for one text item, it will be displayed in the second language (or in english as final fallback). Use Cursor Left/Right to choose. +language_menu_item_second_help If the first language is not available for one text item, it will be displayed in the second language (or in english as final fallback). Use Cursor Left/Right to choose. #************************************* #************************************* Modified: armagetronad/branches/0.2.8.3/armagetronad/src/tron/gGame.cpp =================================================================== --- armagetronad/branches/0.2.8.3/armagetronad/src/tron/gGame.cpp 2010-01-21 19:15:24 UTC (rev 9318) +++ armagetronad/branches/0.2.8.3/armagetronad/src/tron/gGame.cpp 2010-01-21 20:14:30 UTC (rev 9319) @@ -133,7 +133,7 @@ // otherwise, it's from game state changes. static void sg_SoundPause( bool pause, bool fromActivity ) { - bool flags[2]={true, false}; + static bool flags[2]={true, false}; flags[ fromActivity ] = pause; se_SoundPause( flags[0] || flags[1] ); } Modified: armagetronad/branches/0.2.8.3/armagetronad/src/tron/gServerBrowser.cpp =================================================================== --- armagetronad/branches/0.2.8.3/armagetronad/src/tron/gServerBrowser.cpp 2010-01-21 19:15:24 UTC (rev 9318) +++ armagetronad/branches/0.2.8.3/armagetronad/src/tron/gServerBrowser.cpp 2010-01-21 20:14:30 UTC (rev 9319) @@ -297,7 +297,7 @@ // eat excess input the user made while the list was fetched SDL_Event ignore; REAL time; - while(su_GetSDLInput(ignore, time)); + while(su_GetSDLInput(ignore, time)) ; browser.Enter(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <z-...@us...> - 2010-01-30 19:09:17
|
Revision: 9354 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9354&view=rev Author: z-man Date: 2010-01-30 19:09:10 +0000 (Sat, 30 Jan 2010) Log Message: ----------- Merging bugfixes: ------------------------------------------------------------------------ r9353 | bazaarmagetron | 2010-01-30 19:37:31 +0100 (Sat, 30 Jan 2010) | 2 lines Manuel Moos: Blacklisting SiS cards for display lists. ------------------------------------------------------------------------ r9348 | bazaarmagetron | 2010-01-30 12:09:47 +0100 (Sat, 30 Jan 2010) | 2 lines Manuel Moos: Added block about the man in the middle attack prevention settings. ------------------------------------------------------------------------ r9338 | bazaarmagetron | 2010-01-27 15:36:41 +0100 (Wed, 27 Jan 2010) | 2 lines Manuel Moos: Renamed protocol to 0.2.8.3.X to avoid even more confusion down the line :) ------------------------------------------------------------------------ r9332 | bazaarmagetron | 2010-01-26 00:11:01 +0100 (Tue, 26 Jan 2010)| 2 lines Manuel Moos: Renamed 0.2.8.3_beta2 protocol to 0.2.8.3 to avoid confusion. ------------------------------------------------------------------------ r9326 | bazaarmagetron | 2010-01-24 21:40:01 +0100 (Sun, 24 Jan 2010) | 5 lines author: Manuel Moos Don't check whether the selected display mode is valid if desktop resolution was selected. It will always fail and have the color depth be reduced to 16 bit. ------------------------------------------------------------------------ r9322 | z-man | 2010-01-23 10:04:28 +0100 (Sat, 23 Jan 2010) | 3 lines Added subcultures to dedicated installer, too. They're not used, but admins may want to see the list. ------------------------------------------------------------------------ r9321 | z-man | 2010-01-23 10:03:15 +0100 (Sat, 23 Jan 2010) | 2 lines Adding subculture file to installer. ------------------------------------------------------------------------ r9320 | bazaarmagetron | 2010-01-23 02:17:52 +0100 (Sat, 23 Jan 2010) | 2 lines Manuel Moos: Fixing missing distribution of subcultures.srv. Modified Paths: -------------- armagetronad/branches/0.2.8.3/armagetronad/config/Makefile.am armagetronad/branches/0.2.8.3/armagetronad/config/settings_authentication.cfg armagetronad/branches/0.2.8.3/armagetronad/src/network/nConfig.cpp armagetronad/branches/0.2.8.3/armagetronad/src/render/rScreen.cpp armagetronad/branches/0.2.8.3/build_visualc/armagetronad.nsi armagetronad/branches/0.2.8.3/build_visualc/armagetronad_dedicated.nsi Property Changed: ---------------- armagetronad/branches/0.2.8.3/ Property changes on: armagetronad/branches/0.2.8.3 ___________________________________________________________________ Modified: svn:mergeinfo - /armagetronad/branches/0.2.8:9309,9314-9316 + /armagetronad/branches/0.2.8:9309,9314-9316,9320-9322,9326,9332,9338,9348,9353 Modified: armagetronad/branches/0.2.8.3/armagetronad/config/Makefile.am =================================================================== --- armagetronad/branches/0.2.8.3/armagetronad/config/Makefile.am 2010-01-30 18:37:31 UTC (rev 9353) +++ armagetronad/branches/0.2.8.3/armagetronad/config/Makefile.am 2010-01-30 19:09:10 UTC (rev 9354) @@ -4,6 +4,7 @@ configdir=${aa_sysconfdir} nobase_config_DATA=default.cfg master.srv settings.cfg\ + subcultures.srv\ settings_visual.cfg\ settings_dedicated.cfg aiplayers.cfg rc.config\ settings_authentication.cfg\ Modified: armagetronad/branches/0.2.8.3/armagetronad/config/settings_authentication.cfg =================================================================== --- armagetronad/branches/0.2.8.3/armagetronad/config/settings_authentication.cfg 2010-01-30 18:37:31 UTC (rev 9353) +++ armagetronad/branches/0.2.8.3/armagetronad/config/settings_authentication.cfg 2010-01-30 19:09:10 UTC (rev 9354) @@ -391,7 +391,30 @@ # makes your team available for everyone to join again. +######################################################################### +# +# Man in the middle prevention +# +######################################################################### +# when a client authenticates, it sends the IP address and port of the +# server it thinks it is connected to along with the password hash. +# If that IP doesn't match the IP the server thinks it runs under, +# login is denied. Two cases need special attention: + +# If your public server is on a LAN and you expect players to connect over +# that LAN in addition to players coming from the Internet, those clients +# will send the LAN IP of the server, which won't match the public IP, so +# the authentication gets rejected. To allow clients from the LAN to bypass +# the check, set this to 1: + +TRUST_LAN 0 + +# If your server does not talk to the master servers, it never gets told +# what its public IP is. You can set it manually with the following command: + +#SERVER_DNS <your public ip or a DNS name resolving to it> + ######################################################################### # # Various Modified: armagetronad/branches/0.2.8.3/armagetronad/src/network/nConfig.cpp =================================================================== --- armagetronad/branches/0.2.8.3/armagetronad/src/network/nConfig.cpp 2010-01-30 18:37:31 UTC (rev 9353) +++ armagetronad/branches/0.2.8.3/armagetronad/src/network/nConfig.cpp 2010-01-30 19:09:10 UTC (rev 9354) @@ -448,7 +448,7 @@ "0.2.8.2", // 13 "0.2.8.3_alpha", // 14 "0.2.8.3_alpha_auth", // 15 - "0.2.8.3_beta2", // 16 + "0.2.8.3.X", // 16, was: 0.2.8.3_beta2 0 }; Modified: armagetronad/branches/0.2.8.3/armagetronad/src/render/rScreen.cpp =================================================================== --- armagetronad/branches/0.2.8.3/armagetronad/src/render/rScreen.cpp 2010-01-30 18:37:31 UTC (rev 9353) +++ armagetronad/branches/0.2.8.3/armagetronad/src/render/rScreen.cpp 2010-01-30 19:09:10 UTC (rev 9354) @@ -499,7 +499,9 @@ #endif int CD = fullCD; - if (currentScreensetting.checkErrors) + // only check for errors if requested and if we're not about to set the + // desktop resolution, where SDL_VideoModeOK apparently doesn't work. + if (currentScreensetting.checkErrors && sr_screenWidth + sr_screenHeight > 0) { // check if the video mode should be OK: CD = SDL_VideoModeOK @@ -568,8 +570,15 @@ sr_screenWidth = sr_desktopWidth; sr_screenHeight = sr_desktopHeight; } + else + { + // have the screen reinited + sr_screen = NULL; + } - if ( (sr_screen=SDL_SetVideoMode + // only reinit the screen if the desktop res detection hasn't left us + // with a perfectly good one. + if ( !sr_screen && (sr_screen=SDL_SetVideoMode (sr_screenWidth, sr_screenHeight, CD, attrib)) == NULL) @@ -651,6 +660,14 @@ sr_blacklistDisplayLists=true; } + if(strstr(gl_vendor,"SiS")) + { + // almost nobody has those cards/chips, and we have + // at least one bluescreen problem reported. + sr_blacklistDisplayLists=true; + } + + #ifndef WIN32 if(!strstr(gl_renderer,"Voodoo3")) #endif Modified: armagetronad/branches/0.2.8.3/build_visualc/armagetronad.nsi =================================================================== --- armagetronad/branches/0.2.8.3/build_visualc/armagetronad.nsi 2010-01-30 18:37:31 UTC (rev 9353) +++ armagetronad/branches/0.2.8.3/build_visualc/armagetronad.nsi 2010-01-30 19:09:10 UTC (rev 9354) @@ -94,7 +94,7 @@ CreateShortCut "$SMPROGRAMS\Armagetron Advanced\Armagetron Advanced System Data.lnk" "$INSTDIR" SetOutPath "$INSTDIR\config" File ".\config\*.cfg" - File ".\config\master.srv" + File ".\config\*.srv" SetOutPath "$INSTDIR\config\examples" File ".\config\examples\*.cfg" SetOutPath "$INSTDIR\config\examples\cvs_test" Modified: armagetronad/branches/0.2.8.3/build_visualc/armagetronad_dedicated.nsi =================================================================== --- armagetronad/branches/0.2.8.3/build_visualc/armagetronad_dedicated.nsi 2010-01-30 18:37:31 UTC (rev 9353) +++ armagetronad/branches/0.2.8.3/build_visualc/armagetronad_dedicated.nsi 2010-01-30 19:09:10 UTC (rev 9354) @@ -81,7 +81,7 @@ CreateShortCut "$SMPROGRAMS\Armagetron Advanced\Armagetron Advanced Server.lnk" "$INSTDIR\armagetronad_dedicated.exe" SetOutPath "$INSTDIR\config" File ".\config\*.cfg" - File ".\config\master.srv" + File ".\config\*.srv" SetOutPath "$INSTDIR\config\examples" File ".\config\examples\*.cfg" SetOutPath "$INSTDIR\config\examples\cvs_test" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <z-...@us...> - 2010-02-20 17:16:13
|
Revision: 9369 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9369&view=rev Author: z-man Date: 2010-02-20 17:16:01 +0000 (Sat, 20 Feb 2010) Log Message: ----------- Merging luke's spelling fix branch. Modified Paths: -------------- armagetronad/branches/0.2.8.3/armagetronad/language/american.txt armagetronad/branches/0.2.8.3/armagetronad/language/british.txt armagetronad/branches/0.2.8.3/armagetronad/language/english_base.txt armagetronad/branches/0.2.8.3/armagetronad/language/english_base_notranslate.txt Property Changed: ---------------- armagetronad/branches/0.2.8.3/ armagetronad/branches/0.2.8.3/build/ Property changes on: armagetronad/branches/0.2.8.3 ___________________________________________________________________ Modified: svn:mergeinfo - /armagetronad/branches/0.2.8:9309,9314-9316,9320-9322,9326,9332,9338,9348,9353 + /armagetronad/branches/0.2.8:9309,9314-9316,9320-9322,9326,9332,9338,9348,9353,9365 Modified: armagetronad/branches/0.2.8.3/armagetronad/language/american.txt =================================================================== --- armagetronad/branches/0.2.8.3/armagetronad/language/american.txt 2010-02-20 17:08:58 UTC (rev 9368) +++ armagetronad/branches/0.2.8.3/armagetronad/language/american.txt 2010-02-20 17:16:01 UTC (rev 9369) @@ -16,12 +16,12 @@ colordepth_help Color depth to use (0: 16 1: desktop 2: 24) last_colordepth_help Color depth, last successful init zdepth_help z buffer depth to use (0: 16 1: from color depth 2: 32) -failed_attempts_help Number of failed attemts to initialize graphics mode +failed_attempts_help Number of failed attempts to initialize graphics mode player_blue_help Lets you choose the blue component of your color. player_green_help Lets you choose the green component of your color. player_red_help Lets you choose the red component of your color. -player_name_team_help You can set your prefered method for naming your team here: On indicates you want the team to be named after its most senior player, Off means you want a simple color label. -player_num_per_team_help Set your favorite number of players per team here. When you join a game and the smallest team has less players than specified here, you'll join that team. Otherwise, you will create a new team. Only the default behaviour is governed by this setting; you can switch teams later. +player_name_team_help You can set your preferred method for naming your team here: On indicates you want the team to be named after its most senior player, Off means you want a simple color label. +player_num_per_team_help Set your favorite number of players per team here. When you join a game and the smallest team has less players than specified here, you'll join that team. Otherwise, you will create a new team. Only the default behavior is governed by this setting; you can switch teams later. player_camera_initial_help Choose your favorite camera perspective here. player_camera_fov_help Choose your favorite FOV (Field of vision). screen_colordepth_text Color Depth: Modified: armagetronad/branches/0.2.8.3/armagetronad/language/british.txt =================================================================== --- armagetronad/branches/0.2.8.3/armagetronad/language/british.txt 2010-02-20 17:08:58 UTC (rev 9368) +++ armagetronad/branches/0.2.8.3/armagetronad/language/british.txt 2010-02-20 17:16:01 UTC (rev 9369) @@ -16,11 +16,11 @@ colordepth_help colour depth to use (0: 16 1: desktop 2: 24) last_colordepth_help colour depth, last successful init zdepth_help z buffer depth to use (0: 16 1: from colour depth 2: 32) -failed_attempts_help Number of failed attemts to initialise graphics mode +failed_attempts_help Number of failed attempts to initialise graphics mode player_blue_help Lets you choose the blue component of your colour. player_green_help Lets you choose the green component of your colour. player_red_help Lets you choose the red component of your colour. -player_name_team_help You can set your prefered method for naming your team here: On indicates you want the team to be named after its most senior player, Off means you want a simple colour label. +player_name_team_help You can set your preferred method for naming your team here: On indicates you want the team to be named after its most senior player, Off means you want a simple colour label. player_num_per_team_help Set your favourite number of players per team here. When you join a game and the smallest team has less players than specified here, you'll join that team. Otherwise, you will create a new team. Only the default behaviour is governed by this setting; you can switch teams later. player_camera_initial_help Choose your favourite camera perspective here. player_camera_fov_help Choose your favourite FOV (Field of vision). Modified: armagetronad/branches/0.2.8.3/armagetronad/language/english_base.txt =================================================================== --- armagetronad/branches/0.2.8.3/armagetronad/language/english_base.txt 2010-02-20 17:08:58 UTC (rev 9368) +++ armagetronad/branches/0.2.8.3/armagetronad/language/english_base.txt 2010-02-20 17:16:01 UTC (rev 9369) @@ -58,7 +58,7 @@ cycle_accel_help Wall acceleration factor cycle_accel_self_help Multiplicator to CYCLE_ACCEL for your own wall -cycle_accel_team_help Multiplicator to CYCLE_ACCEL for your temmates' walls +cycle_accel_team_help Multiplicator to CYCLE_ACCEL for your teammates' walls cycle_accel_enemy_help Multiplicator to CYCLE_ACCEL for your enemies' walls cycle_accel_rim_help Multiplicator to CYCLE_ACCEL for the rim walls cycle_accel_slingshot_help Multiplicator to the total effect of CYCLE_ACCEL, if the cycle is between its own wall and another wall @@ -100,7 +100,7 @@ cycle_rubber_mindistance_gap_help If > 0, CYCLE_RUBBER_MINDISTANCE effectively is never taken to be bigger than this value times the size of any detected gaps the cylce can squeeze through. For "Open" gameplay. cycle_rubber_mindistance_gap_side_help Gap detection only sees gaps that the cycle may reach in no less than this many seconds. cycle_rubber_mindistance_ratio_help Additional distance to CYCLE_RUBBER_MINDISTANCE for every length unit of the wall you have in front of you -cycle_rubber_mindistance_reservoir_help Addidional distance if you have an empty rubber meter (gets faded out gradually as you use up all your rubber) +cycle_rubber_mindistance_reservoir_help Additional distance if you have an empty rubber meter (gets faded out gradually as you use up all your rubber) cycle_rubber_mindistance_unprepared_help Additional distance for unprepared grinds; it gets applied when the cycle's last turn was just a fraction of a second ago and faded out preparation times larger than CYCLE_RUBBER_MINDISTANCE_PREPARATION. cycle_rubber_mindistance_preparation_help Timescale in seconds a cycle's last turn time is compared with to determine the effect of CYCLE_RUBBER_MINDISTANCE_UNPREPARED. cycle_rubber_mindistance_legacy_help Extra factor for minimal distance to walls enforced by the rubber code, active when peers with the rip bug are connected @@ -296,7 +296,7 @@ sp_size_factor_help Arena size modifier # single player settings (used by dedicated server only) -sp_ais_help nummer of AI Players in Single-Player-mode +sp_ais_help number of AI Players in Single-Player-mode start_new_match_help Initiates a new match @@ -321,9 +321,9 @@ win_zone_deaths_help A value of 1 turns it into a death zone. win_zone_randomness_help Randomness factor of the initial win zone position. 0 fixes it at the arena center, 1 spreads the zone all over it. -game_timeout_help Base timeout for game state synchronisation; gives appoximately the maximum time between rounds. +game_timeout_help Base timeout for game state synchronisation; gives approximately the maximum time between rounds. last_chat_break_time_help Last round time a player in chat mode is able to pause the timer -extra_round_time_help Lenght of an extra pause at the beginning of the round +extra_round_time_help Length of an extra pause at the beginning of the round player_chat_wait_max_help Maximum time in seconds to wait for a single player to stop chatting. player_chat_wait_fraction_help Maximum fraction of time to wait for a single player to stop chatting. player_chat_wait_single_help Set to 1 if only one player should get his chat wait time reduced at any given time. @@ -494,7 +494,7 @@ votes_cancel_help Cancels all running polls. max_votes_per_voter_help The maximum number of votes suggested by each voter that can be active at any given moment. voting_start_decay_help Number of seconds after that the non-voters start to get ignored. -voting_decay_help One non-voter is ignored everytime this many secons pass. +voting_decay_help One non-voter is ignored everytime this many seconds pass. voting_bias_help Add virtual voters that oppose every change. voting_bias_kick_help Add virtual voters that oppose every kick vote. voting_bias_suspend_help Add virtual voters that oppose every suspend vote. @@ -535,7 +535,7 @@ #******************************************** #******************************************** -recording_debuglevel_help Level of additonal information in recording file. +recording_debuglevel_help Level of additional information in recording file. fast_forward_maxstep_help Maximum recording time between rendered frames in fast forward mode fast_forward_maxstep_real_help Maximum real time between rendered frames in fast forward mode fast_forward_maxstep_rel_help Maximum fraction of the time left until the end of FF mode between rendered frames @@ -605,10 +605,10 @@ camera_visibility_recovery_speed_help The speed the external visibility targets recovers from wall hits camera_visibility_wall_distance_help The distance the visibility targets keep from walls -camera_visibility_clip_speed_help Speed with wich the visibility targets is brought into view +camera_visibility_clip_speed_help Speed with which the visibility targets is brought into view camera_visibility_extension_help Distance (measured in seconds, gets multiplied by speed) of the visibility targets from the watched object camera_visibility_sideskew_help Extra forward component of the sideways visibility targets -camera_visibility_lower_wall_help If set to 1, walls are lowerd when they block the view and the camera is not moved +camera_visibility_lower_wall_help If set to 1, walls are lowered when they block the view and the camera is not moved camera_visibility_lower_wall_smart_help Like CAMERA_VISIBILITY_LOWER_WALL, but special setting for the smart camera bug_transparency_help Unsupported: make all rim walls semi-transparent by rendering them without occlusion tests bug_transparency_demand_help Unsupported: use transparency instead of lowering walls @@ -644,7 +644,7 @@ max_clients_same_ip_soft_help Maximum number of network clients to accept from the same IP; more logins will get kicked when the server is full max_clients_same_ip_hard_help Maximum number of network clients to accept from the same IP; more logins will be ignored max_players_same_ip_help maximum number of players from the same IP (note that each client can legally host up to four players) -url_help HTTP URI assiciated with a server +url_help HTTP URI associated with a server # settings compatibility @@ -840,8 +840,8 @@ last_zdepth_help z buffer depth, last successful init use_sdl_help Use SDL to init OpenGL? last_use_sdl_help Use SDL to init OpenGL, last successful init -failed_attempts_help Number of failed attemts to initialise graphics mode -software_renderer_help Is the OpenGL renderer not hadware accelerated? +failed_attempts_help Number of failed attempts to initialise graphics mode +software_renderer_help Is the OpenGL renderer not hardware accelerated? #model use_displaylists_help Use display lists for rendering the cycles? @@ -926,7 +926,7 @@ vote_kick_reason_help Default reason given to players when they're vote-kicked. ban_help Bans the specified player from the server (kicks him first) for a variable time in minutes. -ban_ip_help Bans the spedified IP address from the server for a variable time. +ban_ip_help Bans the specified IP address from the server for a variable time. ban_list_help Prints a list of currently banned IPs. unban_ip_help Revokes the ban of the specified IP address. @@ -954,7 +954,7 @@ console_message_help Prints a message on the console of all connected clients. center_message_help Prints a big message on the screen of all connected clients. fullscreen_message_help Prints a big message all over the screen, interrupting gameplay for a configurable timeout. Use with care. -say_help Dedicated server only: let the server administator say something. +say_help Dedicated server only: let the server administrator say something. rename_help Renames the given player. allow_rename_player_help Gives the given player the ability to rename. disallow_rename_player_help Prevents the given player from renameing. @@ -1020,7 +1020,7 @@ input_toggle_fullscreen_help Toggles windowed and fullscreen mode input_toggle_mousegrab_text Toggle mousegrab -input_toggle_mousegrab_help Frees the mouse pointer or contstrains it to the program window +input_toggle_mousegrab_help Frees the mouse pointer or constrains it to the program window input_reload_textures_text Reload textures input_reload_textures_help Reloads all textures. Useful for content creators. @@ -1169,7 +1169,7 @@ player_mainmenu_help Select player names and control methods. system_settings_menu_text System Setup -system_settings_menu_help Configure sound, graphics and overall appearence of \g +system_settings_menu_help Configure sound, graphics and overall appearance of \g main_menu_about_text About main_menu_about_help Displays information about the version of \g, the location of its config files, sites to visit and the project admins. @@ -1247,10 +1247,10 @@ game_menu_finish_stop_help Abort the game after some seconds. game_menu_finish_fast_text Fast Finish -game_menu_finish_fast_help Let the game continue regularily until there is a winner, but in fast forward mode. +game_menu_finish_fast_help Let the game continue regularly until there is a winner, but in fast forward mode. game_menu_finish_normal_text Normal Finish -game_menu_finish_normal_help Let the game continue regularily until there is a winner. Boooring. +game_menu_finish_normal_help Let the game continue regularly until there is a winner. Boooring. game_menu_mode_text Game Mode: game_menu_mode_help Select the rules you want to play by: @@ -1292,7 +1292,7 @@ game_menu_balance_ais_help Make teams equally strong by adding AIs to the weaker team? game_menu_imb_perm_text Max. permanent imbalance: -game_menu_imb_perm_help Maximum difference in team strengths that is tolerated permanetly; may be violated for short periods of time +game_menu_imb_perm_help Maximum difference in team strengths that is tolerated permanently; may be violated for short periods of time game_menu_imb_text Max. temporary imbalance: game_menu_imb_help Maximum difference in team strengths that is tolerated @@ -1316,28 +1316,28 @@ game_menu_wallstayup_infinite_help Walls stay up forever game_menu_wallstayup_immediate_text immediate -game_menu_wallstayup_immediate_help Walls disapear immediately +game_menu_wallstayup_immediate_help Walls disappear immediately game_menu_wallstayup_halfsecond_text 1/2s -game_menu_wallstayup_halfsecond_help Walls dissapear after half a second +game_menu_wallstayup_halfsecond_help Walls disappear after half a second game_menu_wallstayup_second_text 1s -game_menu_wallstayup_second_help Walls dissapear after one second +game_menu_wallstayup_second_help Walls disappear after one second game_menu_wallstayup_2second_text 2s -game_menu_wallstayup_2second_help Walls dissapear after two seconds +game_menu_wallstayup_2second_help Walls disappear after two seconds game_menu_wallstayup_4second_text 4s -game_menu_wallstayup_4second_help Walls dissapear after 4 seconds +game_menu_wallstayup_4second_help Walls disappear after 4 seconds game_menu_wallstayup_8second_text 8s -game_menu_wallstayup_8second_help Walls dissapear after 8 seconds +game_menu_wallstayup_8second_help Walls disappear after 8 seconds game_menu_wallstayup_16second_text 16s -game_menu_wallstayup_16second_help Walls dissapear after 16 seconds +game_menu_wallstayup_16second_help Walls disappear after 16 seconds game_menu_wallstayup_32second_text 32s -game_menu_wallstayup_32second_help Walls dissapear after 32 seconds +game_menu_wallstayup_32second_help Walls disappear after 32 seconds game_menu_wallslength_text Wall Length: game_menu_wallslength_help Length of the cycle walls in meters @@ -1471,7 +1471,7 @@ network_custjoin_port_help The network port the server listens on; must match the corresponding option set on the server you wish to join. network_custjoin_name_text Server Name: -network_custjoin_name_help The name or IP adress of the server you wish to join +network_custjoin_name_help The name or IP address of the server you wish to join #network host menu network_host_text Host Network Game @@ -1530,7 +1530,7 @@ #******************************************** misc_menu_text Misc Stuff -misc_menu_help Diverse items that had no place elsewere, i.e. global keys. +misc_menu_help Diverse items that had no place elsewhere, i.e. global keys. misc_global_key_text Global Keyboard Configuration misc_global_key_help Some keyboard settings independent of the current player. @@ -1702,7 +1702,7 @@ player_spectator_help In spectator mode, you do not control a cycle; you just watch the game as if you were already dead. The other players will see you on the score table and you can chat with them, but you won't be spawned at the beginng of a round. player_name_team_text Name Team after Player: -player_name_team_help You can set your prefered method for naming your team here: On indicates you want the team to be named after its most senior player, Off means you want a simple colour label. +player_name_team_help You can set your preferred method for naming your team here: On indicates you want the team to be named after its most senior player, Off means you want a simple colour label. player_num_per_team_text Players per Team: player_num_per_team_help Set your favourite number of players per team here. When you join a game and the smallest team has less players than specified here, you'll join that team. Otherwise, you will create a new team. Only the default behaviour is governed by this setting; you can switch teams later. @@ -1767,7 +1767,7 @@ team_menu_help Let the players change their teams or created new teams team_menu_player_title Choose team for \1 -team_menu_player_help Let this player make team related decicions +team_menu_player_help Let this player make team related decisions team_menu_join join \1 team_menu_join_help Let the current player join the specified team @@ -1824,13 +1824,13 @@ sound_menu_buffer_help Selects the size of the sound buffer. sound_menu_buffer_vsmall_text Very Small -sound_menu_buffer_vsmall_help Latency of about 0.02s, but very high probability of artefacts. +sound_menu_buffer_vsmall_help Latency of about 0.02s, but very high probability of artifacts. sound_menu_buffer_small_text Small -sound_menu_buffer_small_help Latency below 0.04s, but high probability of artefacts. +sound_menu_buffer_small_help Latency below 0.04s, but high probability of artifacts. sound_menu_buffer_med_text Normal -sound_menu_buffer_med_help Latency of about 0.1s, and may still produce artefacts. +sound_menu_buffer_med_help Latency of about 0.1s, and may still produce artifacts. sound_menu_buffer_high_text High sound_menu_buffer_high_help Latency of about 0.2s, probably no artifacts. @@ -1864,7 +1864,7 @@ detail_settings_menu_help Allows you to adjust the graphical detail to your system's performance. performance_tweaks_menu Performance Tweaks -performance_tweaks_menu_help Settings that may improve game performace, but do not work on all systems. +performance_tweaks_menu_help Settings that may improve game performance, but do not work on all systems. graphics_load_defaults_text Load Defaults graphics_load_defaults_help This will reset all this options to the ones that suit your system best. (In the opinion of this stupid program...) @@ -1881,7 +1881,7 @@ feature_enabled_help Feature is currently activated. #texture menuitem -texture_menuitem_help Selects the texture mapping mode; note how it affects the menu background. The curent state is: +texture_menuitem_help Selects the texture mapping mode; note how it affects the menu background. The current state is: texture_off_text Off texture_off_help No textures at all @@ -1943,7 +1943,7 @@ screen_check_errors_help Should we listen to the warnings about non-existent video modes during initialisation? Usually, you should leave this option alone. screen_use_sdl_text Use SDL OpenGL: -screen_use_sdl_help Toggles use of the clean OpenGL initialisation routines; if disabled, \g will use the dirty method that was neccesary with SDL 1.0. +screen_use_sdl_help Toggles use of the clean OpenGL initialisation routines; if disabled, \g will use the dirty method that was necessary with SDL 1.0. screen_grab_mouse_text Grab Mouse: screen_grab_mouse_help If activated, the mouse pointer is centered after every move; thus, it is unable to leave the window. This option is only useful when you play \g in a window. @@ -1983,7 +1983,7 @@ detail_floor_grid_help Only a grid of lines is drawn. This option is your choice if you use software rendering. detail_floor_tex_text Textured Plane -detail_floor_tex_help An infinite plane is drawn, with the texture of the grid painted on it. Recomended for all 3D-card owners. Problem: looking at the horizon, the grid will lose its sharpness too fast. +detail_floor_tex_help An infinite plane is drawn, with the texture of the grid painted on it. Recommended for all 3D-card owners. Problem: looking at the horizon, the grid will lose its sharpness too fast. detail_floor_2tex_text Dual Texture Plane detail_floor_2tex_help Just as in "Textured Plane", the floor is an infinite textured plane. But here, the two groups of lines are drawn in two separate rendering steps, resulting in a much sharper image. @@ -2044,13 +2044,13 @@ pref_showbrake_help Shows your brake depletion state in a meter in the HUD (Needs Show HUD = On to work). pref_showspeed_text Show Speed Meter -pref_showspeed_help Shows your speed in a metter in the HUD (Needs Show HUD = On to work). +pref_showspeed_help Shows your speed in a meter in the HUD (Needs Show HUD = On to work). pref_showrubber_text Show Rubber Meter pref_showrubber_help Shows the status of your rubber in a meter in the HUD (Needs Show HUD = On to work). misc_fps_text Show FPS: -misc_fps_help Toggles the display of the current FPS (frames per secon) rate in the upper right corner (Needs Show HUD = On to work). +misc_fps_help Toggles the display of the current FPS (frames per second) rate in the upper right corner (Needs Show HUD = On to work). #tweaks menu tweaks_displaylists_text Display Lists: @@ -2139,7 +2139,7 @@ #******************************************** #******************************************** # -# leaque/highscore messages +# league/highscore messages # #******************************************** #******************************************** @@ -2474,7 +2474,7 @@ network_toomanyservers \n\n\nWarning: too many servers open on this computer.\nLeaving the port range that is scanned by clients with default settings.\n\n\n -network_browser_unidentified Reveived unidentifiable server information from \1 over socket \2.\n +network_browser_unidentified Received unidentifiable server information from \1 over socket \2.\n network_logout_process Logging out...\n network_logout_done Done!\n @@ -2497,9 +2497,9 @@ network_kill_maxidgrabber It ran out of IDs; your client was the one occupying most of them for himself. The reason for this can be a bug. network_kill_maxiduser It ran out of IDs; your client was the one occupying most of them. network_kill_cheater It assumed you are cheating. If that is untrue, it is a bug you should report. -network_kill_error An error occured while processing messages from your client. This usually indicates a client or server bug. +network_kill_error An error occurred while processing messages from your client. This usually indicates a client or server bug. network_kill_timeout You timed out. -network_kill_logout You logged out regularily. +network_kill_logout You logged out regularly. network_kill_incompatible You are running a version incompatible with the server. network_kill_full The server is full. network_kill_shutdown The server was shut down. @@ -2678,7 +2678,7 @@ config_command_unknown Command \1 unknown.\n config_command_other You probably want:\n config_command_more There are more commands containing your search string that were left out to avoid flooding your terminal.\n -config_file_write_error Could not write configuratrion file!\n +config_file_write_error Could not write configuration file!\n config_value_changed \1 changed from \2 to \3.\n config_error_read Input error reading \1: invalid format.\n config_message_info \1 is currently set to \2.\n Modified: armagetronad/branches/0.2.8.3/armagetronad/language/english_base_notranslate.txt =================================================================== --- armagetronad/branches/0.2.8.3/armagetronad/language/english_base_notranslate.txt 2010-02-20 17:08:58 UTC (rev 9368) +++ armagetronad/branches/0.2.8.3/armagetronad/language/english_base_notranslate.txt 2010-02-20 17:16:01 UTC (rev 9369) @@ -110,37 +110,37 @@ fortress_conquest_timeout_help time without enemy contact that makes a fortress zone collapse harmlessly # should not actually be documented, rather hidden -bookmark_0_address_help Server adress of the 1st server bookmark +bookmark_0_address_help Server address of the 1st server bookmark bookmark_0_name_help Name of the 1st server bookmark bookmark_0_port_help Server port of the 1st server bookmark -bookmark_10_address_help Server adress of the 11th server bookmark +bookmark_10_address_help Server address of the 11th server bookmark bookmark_10_name_help Name of the 11th server bookmark bookmark_10_port_help Server port of the 11th server bookmark -bookmark_1_address_help Server adress of the 2nd server bookmark +bookmark_1_address_help Server address of the 2nd server bookmark bookmark_1_name_help Name of the 2nd server bookmark bookmark_1_port_help Server port of the 2nd server bookmark -bookmark_2_address_help Server adress of the 3rd server bookmark +bookmark_2_address_help Server address of the 3rd server bookmark bookmark_2_name_help Name of the 3rd server bookmark bookmark_2_port_help Server port of the 3rd server bookmark -bookmark_3_address_help Server adress of the 4th server bookmark +bookmark_3_address_help Server address of the 4th server bookmark bookmark_3_name_help Name of the 4th server bookmark bookmark_3_port_help Server port of the 4th server bookmark -bookmark_4_address_help Server adress of the 5th server bookmark +bookmark_4_address_help Server address of the 5th server bookmark bookmark_4_name_help Name of the 5th server bookmark bookmark_4_port_help Server port of the 5th server bookmark -bookmark_5_address_help Server adress of the 6th server bookmark +bookmark_5_address_help Server address of the 6th server bookmark bookmark_5_name_help Name of the 6th server bookmark bookmark_5_port_help Server port of the 6th server bookmark -bookmark_6_address_help Server adress of the 7th server bookmark +bookmark_6_address_help Server address of the 7th server bookmark bookmark_6_name_help Name of the 7th server bookmark bookmark_6_port_help Server port of the 7th server bookmark -bookmark_7_address_help Server adress of the 8th server bookmark +bookmark_7_address_help Server address of the 8th server bookmark bookmark_7_name_help Name of the 8th server bookmark bookmark_7_port_help Server port of the 8th server bookmark -bookmark_8_address_help Server adress of the 9th server bookmark +bookmark_8_address_help Server address of the 9th server bookmark bookmark_8_name_help Name of the 9th server bookmark bookmark_8_port_help Server port of the 9th server bookmark -bookmark_9_address_help Server adress of the 10th server bookmark +bookmark_9_address_help Server address of the 10th server bookmark bookmark_9_name_help Name of the 10th server bookmark bookmark_9_port_help Server port of the 10th server bookmark Property changes on: armagetronad/branches/0.2.8.3/build ___________________________________________________________________ Modified: svn:mergeinfo - /armagetronad/branches/0.2.8/build:9309-9354 + /armagetronad/branches/0.2.8/build:9309-9354,9365 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <z-...@us...> - 2011-07-22 10:41:26
|
Revision: 9606 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9606&view=rev Author: z-man Date: 2011-07-22 10:41:20 +0000 (Fri, 22 Jul 2011) Log Message: ----------- Merging fix for infinite loops and crashes when clients send very old-style turn commands. Modified Paths: -------------- armagetronad/branches/0.2.8.3/armagetronad/NEWS armagetronad/branches/0.2.8.3/armagetronad/src/engine/eNetGameObject.cpp armagetronad/branches/0.2.8.3/armagetronad/src/ui/uInput.cpp Property Changed: ---------------- armagetronad/branches/0.2.8.3/ armagetronad/branches/0.2.8.3/build/ Property changes on: armagetronad/branches/0.2.8.3 ___________________________________________________________________ Modified: svn:mergeinfo - /armagetronad/branches/0.2.8:9309,9314-9316,9320-9322,9326,9332,9338,9348,9353,9365 + /armagetronad/branches/0.2.8:9309,9314-9316,9320-9322,9326,9332,9338,9348,9353,9365,9537-9538 Modified: armagetronad/branches/0.2.8.3/armagetronad/NEWS =================================================================== --- armagetronad/branches/0.2.8.3/armagetronad/NEWS 2011-07-22 09:40:26 UTC (rev 9605) +++ armagetronad/branches/0.2.8.3/armagetronad/NEWS 2011-07-22 10:41:20 UTC (rev 9606) @@ -1,4 +1,5 @@ Changes since 0.2.8.3: +- fixed temporary sound disappearance when alt-tabbing away and back - default subcultures are now distributed - enable 32 bit color depth at desktop resolution - no more display lists for SiS cards Modified: armagetronad/branches/0.2.8.3/armagetronad/src/engine/eNetGameObject.cpp =================================================================== --- armagetronad/branches/0.2.8.3/armagetronad/src/engine/eNetGameObject.cpp 2011-07-22 09:40:26 UTC (rev 9605) +++ armagetronad/branches/0.2.8.3/armagetronad/src/engine/eNetGameObject.cpp 2011-07-22 10:41:20 UTC (rev 9606) @@ -198,8 +198,8 @@ time=se_GameTime()+1; uActionPlayer *Act=uActionPlayer::Find(act_id); - - ReceiveControl(time,Act,x); + if ( Act ) + ReceiveControl(time,Act,x); } Modified: armagetronad/branches/0.2.8.3/armagetronad/src/ui/uInput.cpp =================================================================== --- armagetronad/branches/0.2.8.3/armagetronad/src/ui/uInput.cpp 2011-07-22 09:40:26 UTC (rev 9605) +++ armagetronad/branches/0.2.8.3/armagetronad/src/ui/uInput.cpp 2011-07-22 10:41:20 UTC (rev 9606) @@ -171,6 +171,7 @@ while (run){ if (run->ID() == id) return static_cast<uActionPlayer*>(run); + run = run->Next(); } return NULL; Property changes on: armagetronad/branches/0.2.8.3/build ___________________________________________________________________ Modified: svn:mergeinfo - /armagetronad/branches/0.2.8/build:9309-9354,9365 + /armagetronad/branches/0.2.8/build:9309-9354,9365,9537-9538 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <z-...@us...> - 2011-07-22 10:45:10
|
Revision: 9607 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9607&view=rev Author: z-man Date: 2011-07-22 10:45:04 +0000 (Fri, 22 Jul 2011) Log Message: ----------- Merging two pure security fixes from ladle defense branch: Manuel Moos 2011-03-27 Don't process server ping responses in server mode. Unless you're the master server, of course. Manuel Moos 2011-03-26 Previenting crash when receiving a message with descriptor ID 399 with DEBUG enabled. Modified Paths: -------------- armagetronad/branches/0.2.8.3/armagetronad/src/network/nPriorizing.cpp armagetronad/branches/0.2.8.3/armagetronad/src/network/nServerInfo.cpp Property Changed: ---------------- armagetronad/branches/0.2.8.3/ armagetronad/branches/0.2.8.3/build/ Property changes on: armagetronad/branches/0.2.8.3 ___________________________________________________________________ Modified: svn:mergeinfo - /armagetronad/branches/0.2.8:9309,9314-9316,9320-9322,9326,9332,9338,9348,9353,9365,9537-9538 + /armagetronad/branches/0.2.8:9309,9314-9316,9320-9322,9326,9332,9338,9348,9353,9365,9537-9538,9590 Modified: armagetronad/branches/0.2.8.3/armagetronad/src/network/nPriorizing.cpp =================================================================== --- armagetronad/branches/0.2.8.3/armagetronad/src/network/nPriorizing.cpp 2011-07-22 10:41:20 UTC (rev 9606) +++ armagetronad/branches/0.2.8.3/armagetronad/src/network/nPriorizing.cpp 2011-07-22 10:45:04 UTC (rev 9607) @@ -435,7 +435,11 @@ #ifdef DEBUG -static nDescriptor testDescriptor( 399, NULL, NULL, "test" ); +static void test_handler( nMessage & m ) +{ +} + +static nDescriptor testDescriptor( 399, test_handler, "test" ); //static nDescriptor testDescriptor( 399, NULL, NULL, "test" ); #include "nNetObject.h" Modified: armagetronad/branches/0.2.8.3/armagetronad/src/network/nServerInfo.cpp =================================================================== --- armagetronad/branches/0.2.8.3/armagetronad/src/network/nServerInfo.cpp 2011-07-22 10:41:20 UTC (rev 9606) +++ armagetronad/branches/0.2.8.3/armagetronad/src/network/nServerInfo.cpp 2011-07-22 10:45:04 UTC (rev 9607) @@ -1017,6 +1017,9 @@ } void nServerInfo::GetSmallServerInfo(nMessage &m){ + if ( !sn_IsMaster && sn_GetNetState() == nSERVER ) + return; + nServerInfoBase baseInfo; baseInfo.NetRead( m ); @@ -1272,6 +1275,9 @@ void nServerInfo::GetBigServerInfo(nMessage &m) { + if ( !sn_IsMaster && sn_GetNetState() == nSERVER ) + return; + nServerInfo * server = GetBigServerInfoCommon( m ); if (!server) @@ -1321,7 +1327,7 @@ void nServerInfo::GetBigServerInfoMaster(nMessage &m) { - if ( sn_GetNetState() == nSERVER && FloodProtection( m ) ) + if ( sn_GetNetState() == nSERVER ) return; nServerInfo *server = GetBigServerInfoCommon( m ); @@ -1334,10 +1340,10 @@ void nServerInfo::GiveBigServerInfoMaster(nMessage &m) { - if ( FloodProtection( m ) ) + if ( !sn_IsMaster ) return; - if ( !sn_IsMaster ) + if ( FloodProtection( m ) ) return; // read info of desired server from message Property changes on: armagetronad/branches/0.2.8.3/build ___________________________________________________________________ Modified: svn:mergeinfo - /armagetronad/branches/0.2.8/build:9309-9354,9365,9537-9538 + /armagetronad/branches/0.2.8/build:9309-9354,9365,9537-9538,9590 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <z-...@us...> - 2011-07-22 10:47:11
|
Revision: 9608 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9608&view=rev Author: z-man Date: 2011-07-22 10:47:05 +0000 (Fri, 22 Jul 2011) Log Message: ----------- Merging one pure security fix: Manuel Moos 2011-03-29 Correctly ignoring fat packets and checking which clients to kick. Modified Paths: -------------- armagetronad/branches/0.2.8.3/armagetronad/src/network/nNetwork.cpp Property Changed: ---------------- armagetronad/branches/0.2.8.3/ armagetronad/branches/0.2.8.3/build/ Property changes on: armagetronad/branches/0.2.8.3 ___________________________________________________________________ Modified: svn:mergeinfo - /armagetronad/branches/0.2.8:9309,9314-9316,9320-9322,9326,9332,9338,9348,9353,9365,9537-9538,9590 + /armagetronad/branches/0.2.8:9309,9314-9316,9320-9322,9326,9332,9338,9348,9353,9365,9537-9538,9590,9593 Modified: armagetronad/branches/0.2.8.3/armagetronad/src/network/nNetwork.cpp =================================================================== --- armagetronad/branches/0.2.8.3/armagetronad/src/network/nNetwork.cpp 2011-07-22 10:45:04 UTC (rev 9607) +++ armagetronad/branches/0.2.8.3/armagetronad/src/network/nNetwork.cpp 2011-07-22 10:47:05 UTC (rev 9608) @@ -2248,7 +2248,9 @@ static nMessageFifo receivedMessages; // the growing buffer we read messages into +#ifndef DEDICATED const int serverMaxAcceptedSize=2000; +#endif static tArray< unsigned short > storage(2000); int maxrec = 0; maxrec = storage.Len(); unsigned short * buff = 0; buff = &storage[0]; @@ -2265,6 +2267,7 @@ if (len>0){ if ( len >= maxrec*2 ) { +#ifndef DEDICATED // the message was too long to receive. What to do? if ( sn_GetNetState() != nSERVER || len < serverMaxAcceptedSize ) { @@ -2276,16 +2279,55 @@ tERR_WARN( "Oversized network packet received. Read buffer has been enlargened to catch it the next time."); - // no use in processing the truncated packet. Some messages may get lost, - // but that's better than the inevitable network error and connection - // termination that expects us if we go on. - continue; } else +#endif { - // terminate the connection - sn_DisconnectUser( peer, "$network_kill_error" ); + // packet WAAAAY too large. + static float totalFatsoes = 10; // number of oversized packages checked + static float clientFatsoes = 10; // number of oversized pacakges that could be attributed to clients + static float bother = 5; // counter that determines whether we bother to check. + bother+=clientFatsoes; + + // what follows is work, so we only do it if it payed off in the past + // if this block is entered not at all by error, no biggie. The clients + // will time out eventually. + if(bother>totalFatsoes) + { + bother-=totalFatsoes; + + // increase total stat + totalFatsoes++; + + // If it's from a connected client, + // terminate the connection. If not, it's an attack and + // we should rather ignore it. + bool success = false; + for( int id=MAXCLIENTS; id > 0; --id ) + { + if (sn_Connections[id].socket && peers[id] == addrFrom) + { + sn_DisconnectUser( id, "$network_kill_error" ); + success=true; + } + } + + // count the successfully removed client + if( success ) + clientFatsoes++; + + // scale down the stats + const float factor=.99; + totalFatsoes*=factor; + clientFatsoes*=factor; + bother*=factor; + } } + + // no use in processing the truncated packet. Some messages may get lost, + // but that's better than the inevitable network error and connection + // termination that expects us if we go on. + continue; } unsigned short *b=buff; Property changes on: armagetronad/branches/0.2.8.3/build ___________________________________________________________________ Modified: svn:mergeinfo - /armagetronad/branches/0.2.8/build:9309-9354,9365,9537-9538,9590 + /armagetronad/branches/0.2.8/build:9309-9354,9365,9537-9538,9590,9593 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <z-...@us...> - 2011-07-22 10:50:49
|
Revision: 9609 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9609&view=rev Author: z-man Date: 2011-07-22 10:50:43 +0000 (Fri, 22 Jul 2011) Log Message: ----------- Merging security fix: Manuel Moos 2011-03-30 Fixing lenleft checks to avoid reading beyond the end of the message. Modified Paths: -------------- armagetronad/branches/0.2.8.3/armagetronad/src/network/nNetwork.cpp Property Changed: ---------------- armagetronad/branches/0.2.8.3/ armagetronad/branches/0.2.8.3/build/ Property changes on: armagetronad/branches/0.2.8.3 ___________________________________________________________________ Modified: svn:mergeinfo - /armagetronad/branches/0.2.8:9309,9314-9316,9320-9322,9326,9332,9338,9348,9353,9365,9537-9538,9590,9593 + /armagetronad/branches/0.2.8:9309,9314-9316,9320-9322,9326,9332,9338,9348,9353,9365,9537-9538,9590,9593,9598 Modified: armagetronad/branches/0.2.8.3/armagetronad/src/network/nNetwork.cpp =================================================================== --- armagetronad/branches/0.2.8.3/armagetronad/src/network/nNetwork.cpp 2011-07-22 10:47:05 UTC (rev 9608) +++ armagetronad/branches/0.2.8.3/armagetronad/src/network/nNetwork.cpp 2011-07-22 10:50:43 UTC (rev 9609) @@ -936,7 +936,7 @@ tRecorderSync< unsigned short >::Archive( "_MESSAGE_DECL_IN", 3, descriptor ); unsigned short len=ntohs(*(buffer++)); - lenLeft--; + lenLeft-=3; if ( len > lenLeft ) { len = lenLeft; @@ -2372,7 +2372,7 @@ try { #endif - while( lenleft > 0 ){ + while( lenleft >= 3 ){ tJUST_CONTROLLED_PTR< nMessage > pmess; pmess = tNEW( nMessage )(b,id,lenleft); nMessage& mess = *pmess; @@ -2488,7 +2488,7 @@ catch(nKillHim) { - con << "nKillHim signal caught.\n"; + con << "nKillHim signal caught: "; sn_DisconnectUser(peer, "$network_kill_error"); } #endif @@ -2521,7 +2521,7 @@ catch(nKillHim const &) { - con << "nKillHim signal caught.\n"; + con << "nKillHim signal caught: "; sn_DisconnectUser(peer, "$network_kill_error"); } #endif Property changes on: armagetronad/branches/0.2.8.3/build ___________________________________________________________________ Modified: svn:mergeinfo - /armagetronad/branches/0.2.8/build:9309-9354,9365,9537-9538,9590,9593 + /armagetronad/branches/0.2.8/build:9309-9354,9365,9537-9538,9590,9593,9598 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <z-...@us...> - 2011-07-22 11:02:26
|
Revision: 9610 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9610&view=rev Author: z-man Date: 2011-07-22 11:02:15 +0000 (Fri, 22 Jul 2011) Log Message: ----------- Using our COPYING. Modified Paths: -------------- armagetronad/branches/0.2.8.3/armagetronad/bootstrap.sh Property Changed: ---------------- armagetronad/branches/0.2.8.3/ armagetronad/branches/0.2.8.3/build/ Property changes on: armagetronad/branches/0.2.8.3 ___________________________________________________________________ Modified: svn:mergeinfo - /armagetronad/branches/0.2.8:9309,9314-9316,9320-9322,9326,9332,9338,9348,9353,9365,9537-9538,9590,9593,9598 + /armagetronad/branches/0.2.8:9309,9314-9316,9320-9322,9326,9332,9338,9348,9353,9365,9414,9537-9538,9590,9593,9598 Modified: armagetronad/branches/0.2.8.3/armagetronad/bootstrap.sh =================================================================== --- armagetronad/branches/0.2.8.3/armagetronad/bootstrap.sh 2011-07-22 10:50:43 UTC (rev 9609) +++ armagetronad/branches/0.2.8.3/armagetronad/bootstrap.sh 2011-07-22 11:02:15 UTC (rev 9610) @@ -8,6 +8,8 @@ echo "Generating version..." echo "m4_define(AUTOMATIC_VERSION,["`sh batch/make/version $MYDIR`"])" > version || exit 1 fi +echo "Copying license..." +cp COPYING.txt COPYING echo "Running aclocal..." aclocal || { rm aclocal.m4; exit 1; } echo "Running autoheader..." Property changes on: armagetronad/branches/0.2.8.3/build ___________________________________________________________________ Modified: svn:mergeinfo - /armagetronad/branches/0.2.8/build:9309-9354,9365,9537-9538,9590,9593,9598 + /armagetronad/branches/0.2.8/build:9309-9354,9365,9414,9537-9538,9590,9593,9598 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <z-...@us...> - 2015-01-29 23:33:42
|
Revision: 10717 http://sourceforge.net/p/armagetronad/code/10717 Author: z-man Date: 2015-01-29 23:33:35 +0000 (Thu, 29 Jan 2015) Log Message: ----------- merging version script adaptions Modified Paths: -------------- armagetronad/branches/0.2.8.3/armagetronad/batch/make/version Property Changed: ---------------- armagetronad/branches/0.2.8.3/ armagetronad/branches/0.2.8.3/armagetronad/ Index: armagetronad/branches/0.2.8.3 =================================================================== --- armagetronad/branches/0.2.8.3 2015-01-29 23:30:53 UTC (rev 10716) +++ armagetronad/branches/0.2.8.3 2015-01-29 23:33:35 UTC (rev 10717) Property changes on: armagetronad/branches/0.2.8.3 ___________________________________________________________________ Modified: svn:mergeinfo ## -1 +1,2 ## /armagetronad/branches/0.2.8:9309,9314-9316,9320-9322,9326,9332,9338,9348,9353,9365,9414,9537-9538,9590,9593,9598 +/armagetronad/tags/0.2.8.3.3_rc1:10716 \ No newline at end of property Index: armagetronad/branches/0.2.8.3/armagetronad =================================================================== --- armagetronad/branches/0.2.8.3/armagetronad 2015-01-29 23:30:53 UTC (rev 10716) +++ armagetronad/branches/0.2.8.3/armagetronad 2015-01-29 23:33:35 UTC (rev 10717) Property changes on: armagetronad/branches/0.2.8.3/armagetronad ___________________________________________________________________ Modified: svn:mergeinfo ## -1 +1,2 ## /armagetronad/branches/0.2.8/armagetronad:9309,9314-9316,9320-9322,9326,9332,9338,9348-9349,9353,9365,9414,9419,9439,9537-9538,9590,9593,9598 +/armagetronad/tags/0.2.8.3.3_rc1/armagetronad:10716 \ No newline at end of property Modified: armagetronad/branches/0.2.8.3/armagetronad/batch/make/version =================================================================== --- armagetronad/branches/0.2.8.3/armagetronad/batch/make/version 2015-01-29 23:30:53 UTC (rev 10716) +++ armagetronad/branches/0.2.8.3/armagetronad/batch/make/version 2015-01-29 23:33:35 UTC (rev 10717) @@ -41,7 +41,7 @@ fi fi -if test -d "${srcdir}/.svn"; then +if test -d "${srcdir}/.svn" || test -d "${srcdir}/../.svn"; then # get the inter-repository path by parsing the URL URL=`svn info ${srcdir} | grep ^URL | sed -e 's,^URL: ,,'` This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <z-...@us...> - 2015-01-29 23:34:39
|
Revision: 10718 http://sourceforge.net/p/armagetronad/code/10718 Author: z-man Date: 2015-01-29 23:34:31 +0000 (Thu, 29 Jan 2015) Log Message: ----------- merging build system update Modified Paths: -------------- armagetronad/branches/0.2.8.3/build/WorkMakefile Property Changed: ---------------- armagetronad/branches/0.2.8.3/ armagetronad/branches/0.2.8.3/build/ Index: armagetronad/branches/0.2.8.3 =================================================================== --- armagetronad/branches/0.2.8.3 2015-01-29 23:33:35 UTC (rev 10717) +++ armagetronad/branches/0.2.8.3 2015-01-29 23:34:31 UTC (rev 10718) Property changes on: armagetronad/branches/0.2.8.3 ___________________________________________________________________ Modified: svn:mergeinfo ## -1,2 +1,2 ## /armagetronad/branches/0.2.8:9309,9314-9316,9320-9322,9326,9332,9338,9348,9353,9365,9414,9537-9538,9590,9593,9598 -/armagetronad/tags/0.2.8.3.3_rc1:10716 +/armagetronad/tags/0.2.8.3.3_rc1:10715-10716 \ No newline at end of property Index: armagetronad/branches/0.2.8.3/build =================================================================== --- armagetronad/branches/0.2.8.3/build 2015-01-29 23:33:35 UTC (rev 10717) +++ armagetronad/branches/0.2.8.3/build 2015-01-29 23:34:31 UTC (rev 10718) Property changes on: armagetronad/branches/0.2.8.3/build ___________________________________________________________________ Modified: svn:mergeinfo ## -1 +1,2 ## /armagetronad/branches/0.2.8/build:9309-9354,9365,9414,9537-9538,9590,9593,9598 +/armagetronad/tags/0.2.8.3.3_rc1/build:10715 \ No newline at end of property Modified: armagetronad/branches/0.2.8.3/build/WorkMakefile =================================================================== --- armagetronad/branches/0.2.8.3/build/WorkMakefile 2015-01-29 23:33:35 UTC (rev 10717) +++ armagetronad/branches/0.2.8.3/build/WorkMakefile 2015-01-29 23:34:31 UTC (rev 10718) @@ -9,7 +9,7 @@ rpm-mdkded: mandriva-dedicated # everything z-man can build at home and work -z-man-home: tarsource zipsource webdoc windoc autopackage ubuntu-hardy +z-man-home: tarsource zipsource webdoc windoc autopackage z-man-work: autopackage-legacyserver autopackage-client # other builders are invited to add their build sets. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <z-...@us...> - 2015-02-26 19:28:25
|
Revision: 10740 http://sourceforge.net/p/armagetronad/code/10740 Author: z-man Date: 2015-02-26 19:28:18 +0000 (Thu, 26 Feb 2015) Log Message: ----------- Updating NEWS and releasenotes.txt for 0.2.8.3.3 Modified Paths: -------------- armagetronad/branches/0.2.8.3/armagetronad/NEWS armagetronad/branches/0.2.8.3/build/doc/releasenotes.txt Modified: armagetronad/branches/0.2.8.3/armagetronad/NEWS =================================================================== --- armagetronad/branches/0.2.8.3/armagetronad/NEWS 2015-02-24 23:43:09 UTC (rev 10739) +++ armagetronad/branches/0.2.8.3/armagetronad/NEWS 2015-02-26 19:28:18 UTC (rev 10740) @@ -1,3 +1,14 @@ +Changes since 0.2.8.3.2: +- security fix: do not read ahead of the beginning of network buffer. +- security fix: don't attribute network errors from processing random + packets to the connection to the server +- security fix: while at it, don't process random packets unless they + may be important +- fix for potential crash with friend list filtering +- intel driver compatibility +- fix for rare crash with sound lock +- fix for camera turning for bizarre axis configurations + Changes since 0.2.8.3.1: - security fix: old style action commands from clients no loger cause hangs and crashes - security fix: oversized packets are ignored properly Modified: armagetronad/branches/0.2.8.3/build/doc/releasenotes.txt =================================================================== --- armagetronad/branches/0.2.8.3/build/doc/releasenotes.txt 2015-02-24 23:43:09 UTC (rev 10739) +++ armagetronad/branches/0.2.8.3/build/doc/releasenotes.txt 2015-02-26 19:28:18 UTC (rev 10740) @@ -1,6 +1,20 @@ -This is a release candidate for Armagetron Advanced 0.2.8.3, which -is planned to be our final release in the 0.2.8 and 0.2 series, apart -from bugfixes and security updates, of course. 0.2.8.3 rounds the -features of the 0.2 development series off with additions like the -new authentication system for players, rendering performance improvements -and better team management in the game. \ No newline at end of file +Armagetronad 0.2.8.3.3 is a security and crashfix release. + +The practically exploitable bug that was fixed was an error in the +network error handling. In client mode, any received packet that +causes an exception during processing would terminate the connection +to the server. Regular game clients are usually well protected by a +NAT router that would not let such packets from attackers through. +Game servers are only vulnerable during the brief period while they +are communicating with the master servers, and the effect then is that +the server will not advertise itself. + +Another theoretically exploitable bug was that very short UDP packets +would cause a read beyond the input buffer. The same buffer as last +time, embarrasingly, but this time off the other end and with maximum +offset 2. + +Several non-exploitable crash bugs and one pathological camera behavior +were also fixed. + +For details, look into the NEWS file or ChangeLog. \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |