From: Lyberta Date: Sat, 3 Jun 2017 13:14:39 +0000 (+0300) Subject: Merged master into Lyberta/StandaloneOverkillWeapons. X-Git-Tag: xonotic-v0.8.5~2119^2~67 X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=238d04f302418c0b644c68d45e64eb05b3583f09;hp=8a336668045070d910c34b62f80a16c2042a1a7b Merged master into Lyberta/StandaloneOverkillWeapons. --- diff --git a/.tx/merge-base b/.tx/merge-base index 894318d8c2..a73edd9b09 100644 --- a/.tx/merge-base +++ b/.tx/merge-base @@ -1 +1 @@ -Wed May 31 07:24:24 CEST 2017 +Sat Jun 3 07:23:47 CEST 2017 diff --git a/bal-wep-mario.cfg b/bal-wep-mario.cfg index d3b106640d..57d5d745df 100644 --- a/bal-wep-mario.cfg +++ b/bal-wep-mario.cfg @@ -779,15 +779,15 @@ set g_balance_arc_weaponthrowable 1 // }}} // {{{ #21: Heavy Machine Gun set g_balance_hmg_ammo 1 -set g_balance_hmg_damage 10 -set g_balance_hmg_force 5 +set g_balance_hmg_damage 30 +set g_balance_hmg_force 10 set g_balance_hmg_refire 0.05 set g_balance_hmg_reload_ammo 120 set g_balance_hmg_reload_time 1 set g_balance_hmg_solidpenetration 32 -set g_balance_hmg_spread_add 0.01 -set g_balance_hmg_spread_max 0.05 -set g_balance_hmg_spread_min 0.02 +set g_balance_hmg_spread_add 0.005 +set g_balance_hmg_spread_max 0.06 +set g_balance_hmg_spread_min 0.01 set g_balance_hmg_switchdelay_drop 0.2 set g_balance_hmg_switchdelay_raise 0.2 set g_balance_hmg_weaponreplace "" @@ -809,7 +809,7 @@ set g_balance_rpc_radius 300 set g_balance_rpc_refire 1 set g_balance_rpc_reload_ammo 10 set g_balance_rpc_reload_time 1 -set g_balance_rpc_speed 1250 +set g_balance_rpc_speed 2500 set g_balance_rpc_speedaccel 5000 set g_balance_rpc_switchdelay_drop 0.2 set g_balance_rpc_switchdelay_raise 0.2 diff --git a/bal-wep-nexuiz25.cfg b/bal-wep-nexuiz25.cfg index 41c9081b92..f7d912ca77 100644 --- a/bal-wep-nexuiz25.cfg +++ b/bal-wep-nexuiz25.cfg @@ -779,15 +779,15 @@ set g_balance_arc_weaponthrowable 1 // }}} // {{{ #21: Heavy Machine Gun set g_balance_hmg_ammo 1 -set g_balance_hmg_damage 10 -set g_balance_hmg_force 5 +set g_balance_hmg_damage 30 +set g_balance_hmg_force 10 set g_balance_hmg_refire 0.05 set g_balance_hmg_reload_ammo 120 set g_balance_hmg_reload_time 1 set g_balance_hmg_solidpenetration 32 -set g_balance_hmg_spread_add 0.01 -set g_balance_hmg_spread_max 0.05 -set g_balance_hmg_spread_min 0.02 +set g_balance_hmg_spread_add 0.005 +set g_balance_hmg_spread_max 0.06 +set g_balance_hmg_spread_min 0.01 set g_balance_hmg_switchdelay_drop 0.2 set g_balance_hmg_switchdelay_raise 0.2 set g_balance_hmg_weaponreplace "" @@ -809,7 +809,7 @@ set g_balance_rpc_radius 300 set g_balance_rpc_refire 1 set g_balance_rpc_reload_ammo 10 set g_balance_rpc_reload_time 1 -set g_balance_rpc_speed 1250 +set g_balance_rpc_speed 2500 set g_balance_rpc_speedaccel 5000 set g_balance_rpc_switchdelay_drop 0.2 set g_balance_rpc_switchdelay_raise 0.2 diff --git a/bal-wep-samual.cfg b/bal-wep-samual.cfg index 99edec78b8..b3ec457a8a 100644 --- a/bal-wep-samual.cfg +++ b/bal-wep-samual.cfg @@ -777,15 +777,15 @@ set g_balance_shotgun_weaponthrowable 1 // }}} // {{{ #21: Heavy Machine Gun set g_balance_hmg_ammo 1 -set g_balance_hmg_damage 10 -set g_balance_hmg_force 5 +set g_balance_hmg_damage 30 +set g_balance_hmg_force 10 set g_balance_hmg_refire 0.05 set g_balance_hmg_reload_ammo 120 set g_balance_hmg_reload_time 1 set g_balance_hmg_solidpenetration 32 -set g_balance_hmg_spread_add 0.01 -set g_balance_hmg_spread_max 0.05 -set g_balance_hmg_spread_min 0.02 +set g_balance_hmg_spread_add 0.005 +set g_balance_hmg_spread_max 0.06 +set g_balance_hmg_spread_min 0.01 set g_balance_hmg_switchdelay_drop 0.2 set g_balance_hmg_switchdelay_raise 0.2 set g_balance_hmg_weaponreplace "" @@ -807,7 +807,7 @@ set g_balance_rpc_radius 300 set g_balance_rpc_refire 1 set g_balance_rpc_reload_ammo 10 set g_balance_rpc_reload_time 1 -set g_balance_rpc_speed 1250 +set g_balance_rpc_speed 2500 set g_balance_rpc_speedaccel 5000 set g_balance_rpc_switchdelay_drop 0.2 set g_balance_rpc_switchdelay_raise 0.2 diff --git a/bal-wep-xdf.cfg b/bal-wep-xdf.cfg index a7b90c7d6f..cc8936c338 100644 --- a/bal-wep-xdf.cfg +++ b/bal-wep-xdf.cfg @@ -779,15 +779,15 @@ set g_balance_arc_weaponthrowable 1 // }}} // {{{ #21: Heavy Machine Gun set g_balance_hmg_ammo 1 -set g_balance_hmg_damage 10 -set g_balance_hmg_force 5 +set g_balance_hmg_damage 30 +set g_balance_hmg_force 10 set g_balance_hmg_refire 0.05 set g_balance_hmg_reload_ammo 120 set g_balance_hmg_reload_time 1 set g_balance_hmg_solidpenetration 32 -set g_balance_hmg_spread_add 0.01 -set g_balance_hmg_spread_max 0.05 -set g_balance_hmg_spread_min 0.02 +set g_balance_hmg_spread_add 0.005 +set g_balance_hmg_spread_max 0.06 +set g_balance_hmg_spread_min 0.01 set g_balance_hmg_switchdelay_drop 0.2 set g_balance_hmg_switchdelay_raise 0.2 set g_balance_hmg_weaponreplace "" @@ -809,7 +809,7 @@ set g_balance_rpc_radius 300 set g_balance_rpc_refire 1 set g_balance_rpc_reload_ammo 10 set g_balance_rpc_reload_time 1 -set g_balance_rpc_speed 1250 +set g_balance_rpc_speed 2500 set g_balance_rpc_speedaccel 5000 set g_balance_rpc_switchdelay_drop 0.2 set g_balance_rpc_switchdelay_raise 0.2 diff --git a/bal-wep-xonotic.cfg b/bal-wep-xonotic.cfg index 7686ad2f4b..0d3ed46013 100644 --- a/bal-wep-xonotic.cfg +++ b/bal-wep-xonotic.cfg @@ -779,13 +779,13 @@ set g_balance_arc_weaponthrowable 1 // }}} // {{{ #21: Heavy Machine Gun set g_balance_hmg_primary_ammo 1 -set g_balance_hmg_primary_damage 10 -set g_balance_hmg_primary_force 5 +set g_balance_hmg_primary_damage 30 +set g_balance_hmg_primary_force 10 set g_balance_hmg_primary_refire 0.05 set g_balance_hmg_primary_solidpenetration 32 -set g_balance_hmg_primary_spread_add 0.01 -set g_balance_hmg_primary_spread_max 0.05 -set g_balance_hmg_primary_spread_min 0.02 +set g_balance_hmg_primary_spread_add 0.005 +set g_balance_hmg_primary_spread_max 0.06 +set g_balance_hmg_primary_spread_min 0.01 set g_balance_hmg_reload_ammo 120 set g_balance_hmg_reload_time 1 set g_balance_hmg_secondary_ammo 0 @@ -820,7 +820,7 @@ set g_balance_rpc_primary_health 25 set g_balance_rpc_primary_lifetime 30 set g_balance_rpc_primary_radius 300 set g_balance_rpc_primary_refire 1 -set g_balance_rpc_primary_speed 1250 +set g_balance_rpc_primary_speed 2500 set g_balance_rpc_primary_speedaccel 5000 set g_balance_rpc_reload_ammo 10 set g_balance_rpc_reload_time 1 diff --git a/bal-wep-xpm.cfg b/bal-wep-xpm.cfg index 7d94daada4..ac5be34f37 100644 --- a/bal-wep-xpm.cfg +++ b/bal-wep-xpm.cfg @@ -779,15 +779,15 @@ set g_balance_arc_weaponthrowable 1 // }}} // {{{ #21: Heavy Machine Gun set g_balance_hmg_ammo 1 -set g_balance_hmg_damage 10 -set g_balance_hmg_force 5 +set g_balance_hmg_damage 30 +set g_balance_hmg_force 10 set g_balance_hmg_refire 0.05 set g_balance_hmg_reload_ammo 120 set g_balance_hmg_reload_time 1 set g_balance_hmg_solidpenetration 32 -set g_balance_hmg_spread_add 0.01 -set g_balance_hmg_spread_max 0.05 -set g_balance_hmg_spread_min 0.02 +set g_balance_hmg_spread_add 0.005 +set g_balance_hmg_spread_max 0.06 +set g_balance_hmg_spread_min 0.01 set g_balance_hmg_switchdelay_drop 0.2 set g_balance_hmg_switchdelay_raise 0.2 set g_balance_hmg_weaponreplace "" @@ -809,7 +809,7 @@ set g_balance_rpc_radius 300 set g_balance_rpc_refire 1 set g_balance_rpc_reload_ammo 10 set g_balance_rpc_reload_time 1 -set g_balance_rpc_speed 1250 +set g_balance_rpc_speed 2500 set g_balance_rpc_speedaccel 5000 set g_balance_rpc_switchdelay_drop 0.2 set g_balance_rpc_switchdelay_raise 0.2 diff --git a/common.gd.po b/common.gd.po index 2c1c25bea1..83f0313e49 100644 --- a/common.gd.po +++ b/common.gd.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-03-30 07:23+0200\n" -"PO-Revision-Date: 2017-05-16 11:11+0000\n" +"PO-Revision-Date: 2017-06-01 21:16+0000\n" "Last-Translator: GunChleoc\n" "Language-Team: Gaelic, Scottish (http://www.transifex.com/team-xonotic/" "xonotic/language/gd/)\n" @@ -933,36 +933,36 @@ msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:1600 #, c-format msgid "Spectators" -msgstr "" +msgstr "Amhairc" #: qcsrc/client/hud/panel/scoreboard.qc:1615 #, c-format msgid "playing ^3%s^7 on ^2%s^7" -msgstr "" +msgstr "a' cluich ^3%s^7 air ^2%s^7" #: qcsrc/client/hud/panel/scoreboard.qc:1622 #: qcsrc/client/hud/panel/scoreboard.qc:1627 #, c-format msgid " for up to ^1%1.0f minutes^7" -msgstr "" +msgstr " fad suas ri ^1%1.0f mionaid(ean)^7" #: qcsrc/client/hud/panel/scoreboard.qc:1631 #: qcsrc/client/hud/panel/scoreboard.qc:1650 msgid " or" -msgstr "" +msgstr "no" #: qcsrc/client/hud/panel/scoreboard.qc:1634 #: qcsrc/client/hud/panel/scoreboard.qc:1641 #, c-format msgid " until ^3%s %s^7" -msgstr "" +msgstr " gu ruige ^3%s %s^7" #: qcsrc/client/hud/panel/scoreboard.qc:1635 #: qcsrc/client/hud/panel/scoreboard.qc:1642 #: qcsrc/client/hud/panel/scoreboard.qc:1654 #: qcsrc/client/hud/panel/scoreboard.qc:1661 msgid "SCO^points" -msgstr "" +msgstr "puingean" #: qcsrc/client/hud/panel/scoreboard.qc:1636 #: qcsrc/client/hud/panel/scoreboard.qc:1643 @@ -1034,7 +1034,7 @@ msgstr "Chan eil" #: qcsrc/client/hud/panel/weapons.qc:530 msgid "Out of ammo" -msgstr "" +msgstr "Dh'fhalbh an connadh ort" #: qcsrc/client/hud/panel/weapons.qc:534 msgid "Don't have" @@ -1071,12 +1071,12 @@ msgstr "" #: qcsrc/client/mapvoting.qc:49 msgid " (1 vote)" -msgstr "" +msgstr " (Bhòtaichean: 1)" #: qcsrc/client/mapvoting.qc:51 #, c-format msgid " (%d votes)" -msgstr "" +msgstr " (Bhòtaichean: %d)" #: qcsrc/client/mapvoting.qc:271 msgid "Don't care" @@ -1306,15 +1306,15 @@ msgstr "" #: qcsrc/common/minigames/cl_minigames_hud.qc:331 #: qcsrc/menu/xonotic/dialog_quit.qh:6 msgid "Quit" -msgstr "" +msgstr "Fàg an-seo" #: qcsrc/common/minigames/cl_minigames_hud.qc:336 msgid "Invite" -msgstr "" +msgstr "Thoir cuireadh" #: qcsrc/common/minigames/cl_minigames_hud.qc:378 msgid "Current Game" -msgstr "" +msgstr "An geama làithreach" #: qcsrc/common/minigames/cl_minigames_hud.qc:403 msgid "Exit Menu" @@ -1323,19 +1323,19 @@ msgstr "" #: qcsrc/common/minigames/cl_minigames_hud.qc:415 #: qcsrc/menu/xonotic/dialog_multiplayer.qc:16 msgid "Create" -msgstr "" +msgstr "Cruthaich" #: qcsrc/common/minigames/cl_minigames_hud.qc:418 msgid "Join" -msgstr "" +msgstr "Gabh pàirt ann" #: qcsrc/common/minigames/cl_minigames_hud.qc:489 msgid "Minigames" -msgstr "" +msgstr "Meanbh-gheamannan" #: qcsrc/common/minigames/minigame/bd.qc:1168 msgid "Better luck next time!" -msgstr "" +msgstr "Gun rachadh nas fhearr leat an t-ath-thuras!" #: qcsrc/common/minigames/minigame/bd.qc:1172 msgid "Tubular! Press \"Next Level\" to continue!" @@ -1355,84 +1355,88 @@ msgstr "" #: qcsrc/common/minigames/minigame/bd.qc:1404 msgid "Next Level" -msgstr "" +msgstr "An t-ath-leibheil" #: qcsrc/common/minigames/minigame/bd.qc:1405 msgid "Restart" -msgstr "" +msgstr "Ath-thòisich" #: qcsrc/common/minigames/minigame/bd.qc:1406 msgid "Editor" -msgstr "" +msgstr "Deasaiche" #: qcsrc/common/minigames/minigame/bd.qc:1407 #: qcsrc/menu/xonotic/dialog_settings_input_userbind.qc:37 msgid "Save" -msgstr "" +msgstr "Sàbhail" #: qcsrc/common/minigames/minigame/c4.qc:373 #: qcsrc/common/minigames/minigame/pp.qc:438 #: qcsrc/common/minigames/minigame/ttt.qc:319 msgid "Draw" -msgstr "" +msgstr "Co-ionnann" #: qcsrc/common/minigames/minigame/c4.qc:378 #: qcsrc/common/minigames/minigame/nmm.qc:601 msgid "You lost the game!" -msgstr "" +msgstr "Chaill thu an geama!" #: qcsrc/common/minigames/minigame/c4.qc:379 #: qcsrc/common/minigames/minigame/nmm.qc:602 msgid "You win!" -msgstr "" +msgstr "Bhuannaich thu!" #: qcsrc/common/minigames/minigame/c4.qc:383 #: qcsrc/common/minigames/minigame/nmm.qc:606 #: qcsrc/common/minigames/minigame/pp.qc:455 #: qcsrc/common/minigames/minigame/ttt.qc:336 msgid "Wait for your opponent to make their move" -msgstr "" +msgstr "Fuirich gus an gluais an nàmhaid" #: qcsrc/common/minigames/minigame/c4.qc:386 #: qcsrc/common/minigames/minigame/nmm.qc:608 #: qcsrc/common/minigames/minigame/pp.qc:458 #: qcsrc/common/minigames/minigame/ttt.qc:339 msgid "Click on the game board to place your piece" -msgstr "" +msgstr "Briog air bòrd a' gheama gus am fear agad a chur ann" #: qcsrc/common/minigames/minigame/nmm.qc:610 msgid "" "You can select one of your pieces to move it in one of the surrounding places" msgstr "" +"'S urrainn dhut fear a thaghadh gus a ghluasad sna h-ionadan timcheall air" #: qcsrc/common/minigames/minigame/nmm.qc:612 msgid "You can select one of your pieces to move it anywhere on the board" msgstr "" +"'S urrainn dhut fear a thaghadh gus a ghluasad àite sam bith air a' bhòrd" #: qcsrc/common/minigames/minigame/nmm.qc:614 msgid "You can take one of the opponent's pieces" -msgstr "" +msgstr "'S urrainn dhut fear an nàmhad a ghabhail" #: qcsrc/common/minigames/minigame/pong.qc:570 #: qcsrc/common/minigames/minigame/ttt.qc:299 msgid "AI" -msgstr "" +msgstr "IF" #: qcsrc/common/minigames/minigame/pong.qc:587 msgid "Press ^1Start Match^7 to start the match with the current players" msgstr "" +"Brùth air ^1Tòisich maidse^7 gus a' mhaidse a thòiseachadh leis na " +"cluicheadairean làithreach" #: qcsrc/common/minigames/minigame/pong.qc:651 msgid "Start Match" -msgstr "" +msgstr "Tòisich maidse" #: qcsrc/common/minigames/minigame/pong.qc:652 msgid "Add AI player" -msgstr "" +msgstr "Cuir cluicheadair IF ris" #: qcsrc/common/minigames/minigame/pong.qc:653 msgid "Remove AI player" -msgstr "" +msgstr "Thoir cluicheadair IF air falbh" #: qcsrc/common/minigames/minigame/pp.qc:443 #: qcsrc/common/minigames/minigame/ttt.qc:324 @@ -1466,23 +1470,23 @@ msgstr "" #: qcsrc/common/minigames/minigame/ps.qc:478 #, c-format msgid "Pieces left: %s" -msgstr "" +msgstr "Fir air am fàgail: %s" #: qcsrc/common/minigames/minigame/ps.qc:488 msgid "No more valid moves" -msgstr "" +msgstr "Chan eil gluasad dligheach ann tuilleadh" #: qcsrc/common/minigames/minigame/ps.qc:491 msgid "Well done, you win!" -msgstr "" +msgstr "Sin thu fhèin, bhuannaich thu!" #: qcsrc/common/minigames/minigame/ps.qc:494 msgid "Jump a piece over another to capture it" -msgstr "" +msgstr "Gearr leum le fear thar fir eile gus a ghabhail" #: qcsrc/common/minigames/minigame/ttt.qc:666 msgid "Single Player" -msgstr "" +msgstr "Aon-chluicheadair" #: qcsrc/common/monsters/monster/mage.qh:17 #: qcsrc/menu/xonotic/dialog_monstertools.qc:18 @@ -1523,7 +1527,7 @@ msgstr "" #: qcsrc/common/mutators/mutator/buffs/all.inc:15 msgid "Ammo" -msgstr "" +msgstr "Connadh" #: qcsrc/common/mutators/mutator/buffs/all.inc:24 msgid "Resistance" @@ -1688,15 +1692,15 @@ msgstr "" #: qcsrc/common/mutators/mutator/waypoints/all.inc:6 msgid "DANGER" -msgstr "" +msgstr "CUNNART" #: qcsrc/common/mutators/mutator/waypoints/all.inc:8 msgid "Frozen!" -msgstr "" +msgstr "Reòite!" #: qcsrc/common/mutators/mutator/waypoints/all.inc:10 msgid "Item" -msgstr "" +msgstr "Nì" #: qcsrc/common/mutators/mutator/waypoints/all.inc:12 msgid "Checkpoint" diff --git a/common.pl.po b/common.pl.po index dbb977da2d..9361db6d4b 100644 --- a/common.pl.po +++ b/common.pl.po @@ -7,7 +7,8 @@ # alex progger , 2015 # Amadeusz Sławiński , 2015-2017 # Artur Motyka , 2016 -# Jakub Pędziszewski , 2015 +# Jakub P. , 2015 +# Jakub P. , 2015 # John Smith , 2016 # Kriss Chr , 2017 # Piotr Kozica , 2016 diff --git a/qcsrc/common/notifications/all.qh b/qcsrc/common/notifications/all.qh index 31119e2594..4bd827a6e8 100644 --- a/qcsrc/common/notifications/all.qh +++ b/qcsrc/common/notifications/all.qh @@ -409,7 +409,7 @@ string BUFF_NAME(int i); ARG_CASE(ARG_CS, "f1secs", count_seconds(f1)) \ ARG_CASE(ARG_CS, "f1points", (f1 == 1 ? _("point") : _("points"))) \ ARG_CASE(ARG_CS_SV, "f1ord", count_ordinal(f1)) \ - ARG_CASE(ARG_CS, "f1time", process_time(2, f1)) \ + ARG_CASE(ARG_CS_SV, "f1time", process_time(2, f1)) \ ARG_CASE(ARG_CS_SV_HA, "f1race_time", mmssss(f1)) \ ARG_CASE(ARG_CS_SV_HA, "f2race_time", mmssss(f2)) \ ARG_CASE(ARG_CS_SV_HA, "f3race_time", mmssss(f3)) \ diff --git a/qcsrc/server/race.qc b/qcsrc/server/race.qc index 31edbc3f0d..ef82cc3d60 100644 --- a/qcsrc/server/race.qc +++ b/qcsrc/server/race.qc @@ -548,30 +548,6 @@ void race_ClearTime(entity e) }); } -void dumpsurface(entity e) -{ - float n, si, ni; - vector norm, vec; - LOG_INFO("Surfaces of ", etos(e), ":\n"); - - LOG_INFO("TEST = ", ftos(getsurfacenearpoint(e, '0 0 0')), "\n"); - - for(si = 0; ; ++si) - { - n = getsurfacenumpoints(e, si); - if(n <= 0) - break; - LOG_INFO(" Surface ", ftos(si), ":\n"); - norm = getsurfacenormal(e, si); - LOG_INFO(" Normal = ", vtos(norm), "\n"); - for(ni = 0; ni < n; ++ni) - { - vec = getsurfacepoint(e, si, ni); - LOG_INFO(" Point ", ftos(ni), " = ", vtos(vec), " (", ftos(norm * vec), ")\n"); - } - } -} - void checkpoint_passed(entity this, entity player) { if(player.personal && autocvar_g_allow_checkpoints)