xonotic/xonotic-data.pk3dir.git
5 years agoMerge branch 'Mario/nade_updates'
Mario [Thu, 13 Nov 2014 16:48:46 +0000 (03:48 +1100)]
Merge branch 'Mario/nade_updates'

5 years agoAdd some French keybind translations by Calinou
Mario [Thu, 13 Nov 2014 16:47:00 +0000 (03:47 +1100)]
Add some French keybind translations by Calinou

5 years agoFix nades and clips
Mario [Thu, 13 Nov 2014 16:28:55 +0000 (03:28 +1100)]
Fix nades and clips

5 years agoFix healing nade
Mario [Thu, 13 Nov 2014 16:17:13 +0000 (03:17 +1100)]
Fix healing nade

5 years agoAttempt to prevent nades from entering clips
Mario [Thu, 13 Nov 2014 15:50:48 +0000 (02:50 +1100)]
Attempt to prevent nades from entering clips

5 years agoIncrease pokenade lifetime and add an option for infinite lifetime
Mario [Thu, 13 Nov 2014 15:37:36 +0000 (02:37 +1100)]
Increase pokenade lifetime and add an option for infinite lifetime

5 years agoDo a trace before teleporting player, to make sure we're not putting them into a...
Mario [Thu, 13 Nov 2014 15:34:11 +0000 (02:34 +1100)]
Do a trace before teleporting player, to make sure we're not putting them into a wall

5 years agoMerge branch 'master' into Mario/nade_updates
Mario [Thu, 13 Nov 2014 14:52:28 +0000 (01:52 +1100)]
Merge branch 'master' into Mario/nade_updates

Conflicts:
qcsrc/client/progs.src
qcsrc/common/constants.qh
qcsrc/common/monsters/sv_monsters.qc
qcsrc/server/cl_physics.qc
qcsrc/server/command/cmd.qc
qcsrc/server/g_damage.qc
qcsrc/server/mutators/gamemode_freezetag.qc
qcsrc/server/progs.src

5 years agoMerge branch 'Mario/race_cts_mutators'
Mario [Thu, 13 Nov 2014 14:39:17 +0000 (01:39 +1100)]
Merge branch 'Mario/race_cts_mutators'

Conflicts:
qcsrc/server/progs.src

5 years agoAdd an event log print to replace player place message in console
Mario [Thu, 13 Nov 2014 14:35:30 +0000 (01:35 +1100)]
Add an event log print to replace player place message in console

5 years agoFix cloaked mode not getting forced enabled in CTS
Mario [Thu, 13 Nov 2014 14:28:33 +0000 (01:28 +1100)]
Fix cloaked mode not getting forced enabled in CTS

5 years agoMerge patch 1356 by It'sMe
Mario [Thu, 13 Nov 2014 14:16:19 +0000 (01:16 +1100)]
Merge patch 1356 by It'sMe

5 years agoMerge branch 'Mario/mutators2'
Mario [Thu, 13 Nov 2014 14:09:32 +0000 (01:09 +1100)]
Merge branch 'Mario/mutators2'

5 years agoMerge branch 'Mario/config_updates'
Mario [Thu, 13 Nov 2014 14:08:26 +0000 (01:08 +1100)]
Merge branch 'Mario/config_updates'

5 years agoMerge branch 'master' into Mario/race_cts_mutators
Mario [Thu, 13 Nov 2014 14:02:30 +0000 (01:02 +1100)]
Merge branch 'master' into Mario/race_cts_mutators

5 years agoMerge branch 'master' into Mario/mutators2
Mario [Thu, 13 Nov 2014 13:55:46 +0000 (00:55 +1100)]
Merge branch 'master' into Mario/mutators2

Conflicts:
qcsrc/server/miscfunctions.qc
qcsrc/server/progs.src

5 years agoMerge branch 'Mario/gametype_votes'
Mario [Thu, 13 Nov 2014 13:41:03 +0000 (00:41 +1100)]
Merge branch 'Mario/gametype_votes'

5 years agoFix a double if check for gametypevote
Mario [Thu, 13 Nov 2014 11:20:33 +0000 (22:20 +1100)]
Fix a double if check for gametypevote

5 years agoMerge branch 'master' into Mario/gametype_votes
Mario [Thu, 13 Nov 2014 11:19:00 +0000 (22:19 +1100)]
Merge branch 'master' into Mario/gametype_votes

5 years agoUse spaces
Mario [Thu, 13 Nov 2014 11:11:08 +0000 (22:11 +1100)]
Use spaces

5 years agoMerge remote-tracking branch 'origin/master' into Mario/buffs
Mario [Thu, 13 Nov 2014 11:10:16 +0000 (22:10 +1100)]
Merge remote-tracking branch 'origin/master' into Mario/buffs

5 years agoMerge branch 'Mario/buffs'
Mario [Thu, 13 Nov 2014 11:07:45 +0000 (22:07 +1100)]
Merge branch 'Mario/buffs'

5 years agoMerge remote-tracking branch 'origin/master' into Mario/buffs
Mario [Thu, 13 Nov 2014 11:06:07 +0000 (22:06 +1100)]
Merge remote-tracking branch 'origin/master' into Mario/buffs

5 years agoUse spaces
Mario [Thu, 13 Nov 2014 11:01:21 +0000 (22:01 +1100)]
Use spaces

5 years agoUse old flight (jetpack) if buffs are disabled
Mario [Thu, 13 Nov 2014 11:00:01 +0000 (22:00 +1100)]
Use old flight (jetpack) if buffs are disabled

5 years agoUpdate stat for jumpheight in the jumpheight mutator hook (perhaps this should be...
Mario [Thu, 13 Nov 2014 10:51:23 +0000 (21:51 +1100)]
Update stat for jumpheight in the jumpheight mutator hook (perhaps this should be a global thing...)

5 years agoFix some cases of division by 0
Mario [Thu, 13 Nov 2014 10:40:03 +0000 (21:40 +1100)]
Fix some cases of division by 0

5 years agoRemove a duplicate stat definition
Mario [Thu, 13 Nov 2014 10:08:05 +0000 (21:08 +1100)]
Remove a duplicate stat definition

5 years agoMove all stats definitions into a single file, for easy reference
Mario [Thu, 13 Nov 2014 09:55:52 +0000 (20:55 +1100)]
Move all stats definitions into a single file, for easy reference

5 years agoMerge branch 'Mario/menu_modelupdate'
Mario [Thu, 13 Nov 2014 09:32:59 +0000 (20:32 +1100)]
Merge branch 'Mario/menu_modelupdate'

5 years agoMerge remote-tracking branch 'origin/sev/menu_skinlist_titles'
Mario [Thu, 13 Nov 2014 09:11:32 +0000 (20:11 +1100)]
Merge remote-tracking branch 'origin/sev/menu_skinlist_titles'

5 years agoUpdate player model list when menu is opened (no noticeable performance difference...
Mario [Thu, 13 Nov 2014 08:47:36 +0000 (19:47 +1100)]
Update player model list when menu is opened (no noticeable performance difference, fixes clients needing to menu_restart to load custom server's models)

5 years agoTranslate sprite names on the client
Mario [Tue, 11 Nov 2014 11:37:56 +0000 (22:37 +1100)]
Translate sprite names on the client

5 years agoAdd 3rd person view toggle to the userbinds menu
Mario [Tue, 11 Nov 2014 09:33:24 +0000 (20:33 +1100)]
Add 3rd person view toggle to the userbinds menu

5 years agoEnable cl_projectiles_sloppy by default (no noticeable changes, suposedly increases...
Mario [Tue, 11 Nov 2014 09:27:16 +0000 (20:27 +1100)]
Enable cl_projectiles_sloppy by default (no noticeable changes, suposedly increases performance)

5 years agoIncrease water distortion, as per suggestion
Mario [Tue, 11 Nov 2014 09:25:25 +0000 (20:25 +1100)]
Increase water distortion, as per suggestion

5 years agoSet default gibs lifetime to 2 (less distractions)
Mario [Tue, 11 Nov 2014 09:22:49 +0000 (20:22 +1100)]
Set default gibs lifetime to 2 (less distractions)

5 years agoDefault player LOD to 4 (no visible difference, big performance increase)
Mario [Tue, 11 Nov 2014 09:21:47 +0000 (20:21 +1100)]
Default player LOD to 4 (no visible difference, big performance increase)

5 years agoAdd Mac .DS_Store files to gitignore
Mario [Tue, 11 Nov 2014 09:16:43 +0000 (20:16 +1100)]
Add Mac .DS_Store files to gitignore

5 years agoSet decal time to 1 and use fadetime in configs
Mario [Tue, 11 Nov 2014 09:15:43 +0000 (20:15 +1100)]
Set decal time to 1 and use fadetime in configs

5 years agoIncrease invisibility buff visibility to 0.4 (0.1 is a bit too invisible on dark...
Mario [Tue, 4 Nov 2014 13:02:23 +0000 (00:02 +1100)]
Increase invisibility buff visibility to 0.4 (0.1 is a bit too invisible on dark screens)

5 years agoAdd support for Quake 3 buffs
Mario [Tue, 4 Nov 2014 06:38:05 +0000 (17:38 +1100)]
Add support for Quake 3 buffs

5 years agoMerge branch 'master' into Mario/buffs
Mario [Tue, 4 Nov 2014 06:33:23 +0000 (17:33 +1100)]
Merge branch 'master' into Mario/buffs

5 years agoAdd new changes by Melanosuchus
Mario [Tue, 4 Nov 2014 06:14:24 +0000 (17:14 +1100)]
Add new changes by Melanosuchus

5 years agoMerge branch 'master' into Mario/gametype_votes
Mario [Tue, 4 Nov 2014 06:09:45 +0000 (17:09 +1100)]
Merge branch 'master' into Mario/gametype_votes

6 years agoCut off CH_PLAYER_SINGLE sounds (i.e. lava and slime) when respawning.
Rudolf Polzer [Wed, 22 Oct 2014 09:43:52 +0000 (11:43 +0200)]
Cut off CH_PLAYER_SINGLE sounds (i.e. lava and slime) when respawning.

6 years agoRename CH_TUBA to CH_TUBA_SINGLE. It already was a single-channel.
Rudolf Polzer [Wed, 22 Oct 2014 09:43:37 +0000 (11:43 +0200)]
Rename CH_TUBA to CH_TUBA_SINGLE. It already was a single-channel.

6 years agoAdd the ability to cut off slime/lava sounds.
Rudolf Polzer [Wed, 22 Oct 2014 09:40:19 +0000 (11:40 +0200)]
Add the ability to cut off slime/lava sounds.

6 years agoRemove COMPAT_XON010_CHANNELS.
Rudolf Polzer [Wed, 22 Oct 2014 09:37:36 +0000 (11:37 +0200)]
Remove COMPAT_XON010_CHANNELS.

6 years agoRemove redundancy in the menu skinlist by only showing the skin title, without the...
Severin Meyer [Fri, 10 Oct 2014 21:18:16 +0000 (23:18 +0200)]
Remove redundancy in the menu skinlist by only showing the skin title, without the directory name

6 years agoMerge remote-tracking branch 'origin/sev/hud_panel_notify'
Rudolf Polzer [Sat, 4 Oct 2014 20:23:10 +0000 (22:23 +0200)]
Merge remote-tracking branch 'origin/sev/hud_panel_notify'

6 years agoMerge branch 'sev/menu_colorbutton_clean'
Rudolf Polzer [Wed, 24 Sep 2014 10:26:01 +0000 (12:26 +0200)]
Merge branch 'sev/menu_colorbutton_clean'

6 years agoAdd new cvar hud_panel_notify_icon_aspect, to choose the aspect ratio of the total...
Severin Meyer [Mon, 22 Sep 2014 08:47:59 +0000 (10:47 +0200)]
Add new cvar hud_panel_notify_icon_aspect, to choose the aspect ratio of the total drawing area per icon

6 years agoOptimize HUD_Notify() by adding a counter for a quick-return conditional. Also simpli...
Severin Meyer [Sun, 21 Sep 2014 12:48:06 +0000 (14:48 +0200)]
Optimize HUD_Notify() by adding a counter for a quick-return conditional. Also simplify the HUD editor representation.

6 years agoRewrite HUD_Notify() to align messages by their icon, establishing a neat column...
Severin Meyer [Sun, 21 Sep 2014 12:44:07 +0000 (14:44 +0200)]
Rewrite HUD_Notify() to align messages by their icon, establishing a neat column. Also move calculations out of the for-loop.

6 years agoAdjust existing menu skins for the new colorbutton
Severin Meyer [Sat, 20 Sep 2014 17:55:08 +0000 (19:55 +0200)]
Adjust existing menu skins for the new colorbutton

6 years agoRemove the colorbutton overlay image (gfx/menu/*/color) and directly colorize the...
Severin Meyer [Sat, 20 Sep 2014 17:47:13 +0000 (19:47 +0200)]
Remove the colorbutton overlay image (gfx/menu/*/color) and directly colorize the button images (gfx/menu/*/colorbutton_*)

6 years agoMerge remote-tracking branch 'origin/Mario/ignore_files'
Rudolf Polzer [Thu, 18 Sep 2014 14:34:43 +0000 (16:34 +0200)]
Merge remote-tracking branch 'origin/Mario/ignore_files'

* origin/Mario/ignore_files:
  Ignore some compiler files

6 years agoMerge remote-tracking branch 'origin/sev/menu_text_colors'
Rudolf Polzer [Mon, 15 Sep 2014 19:17:14 +0000 (21:17 +0200)]
Merge remote-tracking branch 'origin/sev/menu_text_colors'

6 years agoAdd new menu skin variables to existing skinfiles, using default values
Severin Meyer [Sun, 14 Sep 2014 23:43:39 +0000 (01:43 +0200)]
Add new menu skin variables to existing skinfiles, using default values

6 years agoMake the main text color editable in menu skins
Severin Meyer [Fri, 12 Sep 2014 14:15:24 +0000 (16:15 +0200)]
Make the main text color editable in menu skins

6 years agoMake the tooltip text color editable in menu skins
Severin Meyer [Fri, 12 Sep 2014 02:37:14 +0000 (04:37 +0200)]
Make the tooltip text color editable in menu skins

6 years agoMake the server category text color editable in menu skins
Severin Meyer [Fri, 12 Sep 2014 02:35:34 +0000 (04:35 +0200)]
Make the server category text color editable in menu skins

6 years agoMerge remote-tracking branch 'origin/sev/simpleitems_postfix'
Rudolf Polzer [Tue, 9 Sep 2014 11:51:34 +0000 (13:51 +0200)]
Merge remote-tracking branch 'origin/sev/simpleitems_postfix'

6 years agoFix a typo spotted by MrBougo which prevents cl_simpleitems_postfix from working...
Severin Meyer [Tue, 9 Sep 2014 00:46:58 +0000 (02:46 +0200)]
Fix a typo spotted by MrBougo which prevents cl_simpleitems_postfix from working correctly

6 years agoIgnore some compiler files
Mario [Fri, 20 Jun 2014 08:03:08 +0000 (18:03 +1000)]
Ignore some compiler files

6 years agoRename the "sum"/"diff" score field alias from "f-d" to "k-d" as it's
Rudolf Polzer [Tue, 17 Jun 2014 12:34:46 +0000 (14:34 +0200)]
Rename the "sum"/"diff" score field alias from "f-d" to "k-d" as it's
actually kills-deaths, not frags-deaths.

6 years agoFix some issues mentioned by divVerent and add Melanosuchus to credits
Mario [Tue, 17 Jun 2014 06:05:37 +0000 (16:05 +1000)]
Fix some issues mentioned by divVerent and add Melanosuchus to credits

6 years agoFix nade sound not following the player
Mario [Thu, 12 Jun 2014 11:29:41 +0000 (21:29 +1000)]
Fix nade sound not following the player

6 years agoTimer turns red as it's about to explode
Mario [Thu, 12 Jun 2014 10:09:19 +0000 (20:09 +1000)]
Timer turns red as it's about to explode

6 years agoShow a visual nade timer, hide nade trail from owner and spectators (fixes 1st person...
Mario [Thu, 12 Jun 2014 09:53:15 +0000 (19:53 +1000)]
Show a visual nade timer, hide nade trail from owner and spectators (fixes 1st person trail covering view, but also hides it in 3rd person mode), fix nade pushing owner back when tossed

6 years agoApply a patch by Melanosuchus, fixing issues noted in http://dev.xonotic.org/issues...
Mario [Wed, 11 Jun 2014 09:59:40 +0000 (19:59 +1000)]
Apply a patch by Melanosuchus, fixing issues noted in dev.xonotic.org/issues/1936#note-3

6 years agoUse default path if menu skin does not have the gametype icon
Mario [Wed, 11 Jun 2014 05:09:06 +0000 (15:09 +1000)]
Use default path if menu skin does not have the gametype icon

6 years agoMore stuff.
Rudolf Polzer [Fri, 6 Jun 2014 15:00:58 +0000 (17:00 +0200)]
More stuff.

6 years agoAdd anticheat thresholds. Gamelog now contains the anticheat's "opinion" about a...
Rudolf Polzer [Fri, 6 Jun 2014 14:59:58 +0000 (16:59 +0200)]
Add anticheat thresholds. Gamelog now contains the anticheat's "opinion" about a player.

6 years agoProperly report anticheat values if a player reconnected.
Rudolf Polzer [Fri, 6 Jun 2014 09:05:14 +0000 (11:05 +0200)]
Properly report anticheat values if a player reconnected.

6 years agoDon't send awards to bots
Mario [Wed, 4 Jun 2014 23:05:32 +0000 (09:05 +1000)]
Don't send awards to bots

6 years agoMerge branch 'master' into Mario/race_cts_mutators
Mario [Wed, 4 Jun 2014 23:00:11 +0000 (09:00 +1000)]
Merge branch 'master' into Mario/race_cts_mutators

6 years agoMerge branch 'master' into Mario/mutators2
Mario [Wed, 4 Jun 2014 21:29:11 +0000 (07:29 +1000)]
Merge branch 'master' into Mario/mutators2

6 years agoAnother transifex sync.
Rudolf Polzer [Wed, 4 Jun 2014 14:12:21 +0000 (16:12 +0200)]
Another transifex sync.

6 years agoTransifex sync.
Rudolf Polzer [Wed, 4 Jun 2014 14:04:12 +0000 (16:04 +0200)]
Transifex sync.

6 years agoNew .pot.
Rudolf Polzer [Wed, 4 Jun 2014 13:59:15 +0000 (15:59 +0200)]
New .pot.

6 years agoMerge remote-tracking branch 'origin/Mario/hook_refire'
Rudolf Polzer [Wed, 4 Jun 2014 09:32:05 +0000 (11:32 +0200)]
Merge remote-tracking branch 'origin/Mario/hook_refire'

* origin/Mario/hook_refire:
  Add a new cvar for offhand hook refire
  Obey refire delay in offhand hook mode
  Also add delay to Nexuiz balance
  Add a 0.2 second delay on grappling hook to prevent spam

6 years agoMerge remote-tracking branch 'origin/Mario/hook_typo_fix'
Rudolf Polzer [Wed, 4 Jun 2014 09:30:49 +0000 (11:30 +0200)]
Merge remote-tracking branch 'origin/Mario/hook_typo_fix'

* origin/Mario/hook_typo_fix:
  Fix a typo in the bot role mutator hook

6 years agoMerge remote-tracking branch 'origin/terencehill/menu_translation_percentage'
Rudolf Polzer [Wed, 4 Jun 2014 09:30:13 +0000 (11:30 +0200)]
Merge remote-tracking branch 'origin/terencehill/menu_translation_percentage'

* origin/terencehill/menu_translation_percentage:
  Split the Text Language listbox into two separate columns: name on the left, percentage on the right

6 years agoMerge remote-tracking branch 'origin/terencehill/menu_langwarning'
Rudolf Polzer [Wed, 4 Jun 2014 09:29:43 +0000 (11:29 +0200)]
Merge remote-tracking branch 'origin/terencehill/menu_langwarning'

* origin/terencehill/menu_langwarning:
  Apply the selected language, restarting the menu, only if it's different from the current one; display a warning dialog when switching language while connected

6 years agoMerge remote-tracking branch 'origin/terencehill/sv_defaultcharacter_fix', fixes...
Rudolf Polzer [Wed, 4 Jun 2014 09:28:19 +0000 (11:28 +0200)]
Merge remote-tracking branch 'origin/terencehill/sv_defaultcharacter_fix', fixes #1934

* origin/terencehill/sv_defaultcharacter_fix:
  Access sv_defaultplayer* cvars appending the untranslated team color string to them

6 years agoMerge commit '40b7b8b8f77676', fixes #1937
Rudolf Polzer [Wed, 4 Jun 2014 09:27:34 +0000 (11:27 +0200)]
Merge commit '40b7b8b8f77676', fixes #1937

* commit '40b7b8b8f77676':
  Some improvements to invasion (allow team based invasion if map specifies, allow more monsters to spawn at the same time, precache monsters only if they're used)
  Some minor improvements to monsters (auto precache default model, use monster kills as main point limit in invasion)
  Add a monsters mapinfo feature
  Fix invasion monster spawn counts, fix spawning random monsters, clean up monster spawn system to no longer abuse target_spawn_edit_entity, allow monsters to chase targets through warpzones, fix shambler stomping while in the air, add a new "invincible" spawnflag which prevents monster from taking damage, allow dragging monsters around in edit mode and fix monster count off when monster is gibbed

6 years agoMerge remote-tracking branch 'origin/Mario/teamswitch_fix2'
Rudolf Polzer [Wed, 4 Jun 2014 09:23:04 +0000 (11:23 +0200)]
Merge remote-tracking branch 'origin/Mario/teamswitch_fix2'

* origin/Mario/teamswitch_fix2:
  Check allowed teams before counting them
  Team counting requires numbers instead of team IDs

6 years agoMerge remote-tracking branch 'origin/Mario/flag_stuck_fix'
Rudolf Polzer [Wed, 4 Jun 2014 09:22:30 +0000 (11:22 +0200)]
Merge remote-tracking branch 'origin/Mario/flag_stuck_fix'

* origin/Mario/flag_stuck_fix:
  Fix flag getting stuck on maps like tron with spawn in the ground and noalign key set, fix unmanned vehicles crashing the server in CTF

6 years agoMerge remote-tracking branch 'origin/Mario/name_colors'
Rudolf Polzer [Wed, 4 Jun 2014 09:21:21 +0000 (11:21 +0200)]
Merge remote-tracking branch 'origin/Mario/name_colors'

* origin/Mario/name_colors:
  Use white color prefix in chat on names with any color in them

6 years agoMerge remote-tracking branch 'origin/Mario/ok_model_fixes'
Rudolf Polzer [Wed, 4 Jun 2014 09:18:54 +0000 (11:18 +0200)]
Merge remote-tracking branch 'origin/Mario/ok_model_fixes'

* origin/Mario/ok_model_fixes:
  Set aim bones for the overkill models

6 years agoMerge remote-tracking branch 'origin/Mario/bot_fire_fix', fixes #1955
Rudolf Polzer [Wed, 4 Jun 2014 09:18:01 +0000 (11:18 +0200)]
Merge remote-tracking branch 'origin/Mario/bot_fire_fix', fixes #1955

* origin/Mario/bot_fire_fix:
  Frozen players shouldn't be able to burn.

6 years agoMerge remote-tracking branch 'origin/Mario/infinite_overtimes'
Rudolf Polzer [Wed, 4 Jun 2014 09:16:32 +0000 (11:16 +0200)]
Merge remote-tracking branch 'origin/Mario/infinite_overtimes'

* origin/Mario/infinite_overtimes:
  Check for any value below 0
  timelimit_overtimes -1 = infinite overtimes

6 years agoMerge remote-tracking branch 'origin/Mario/typo_fix', fixes #1963
Rudolf Polzer [Wed, 4 Jun 2014 09:15:00 +0000 (11:15 +0200)]
Merge remote-tracking branch 'origin/Mario/typo_fix', fixes #1963

* origin/Mario/typo_fix:
  Fix a minor typo reported in #1949

6 years agoMerge remote-tracking branch 'origin/Mario/lsmaps_count'
Rudolf Polzer [Wed, 4 Jun 2014 09:14:38 +0000 (11:14 +0200)]
Merge remote-tracking branch 'origin/Mario/lsmaps_count'

* origin/Mario/lsmaps_count:
  Show number of maps in lsmaps reply

6 years agoMerge remote-tracking branch 'origin/Mario/scoreboard_fixes', fixes #1974.
Rudolf Polzer [Wed, 4 Jun 2014 09:13:06 +0000 (11:13 +0200)]
Merge remote-tracking branch 'origin/Mario/scoreboard_fixes', fixes #1974.

* origin/Mario/scoreboard_fixes:
  Hide accuracy while spectating or playing nexball, show current gametype in the "playing on" scoreboard info string, hide respawn countdown after match has ended

6 years agoMerge remote-tracking branch 'origin/Mario/ka_fixes'
Rudolf Polzer [Wed, 4 Jun 2014 09:11:45 +0000 (11:11 +0200)]
Merge remote-tracking branch 'origin/Mario/ka_fixes'

* origin/Mario/ka_fixes:
  Teleport the ball to a spawnpoint if random location failed (fixes a crash), show a different centerprint notification to the player who picked up the ball

6 years agoMerge remote-tracking branch 'origin/Mario/frozen_mines'
Rudolf Polzer [Wed, 4 Jun 2014 09:10:35 +0000 (11:10 +0200)]
Merge remote-tracking branch 'origin/Mario/frozen_mines'

* origin/Mario/frozen_mines:
  Detonate mines if owner becomes frozen, don't auto detonate mines if the enemy is frozen

6 years agoMerge remote-tracking branch 'origin/Mario/round_jump_fix'
Rudolf Polzer [Wed, 4 Jun 2014 09:09:24 +0000 (11:09 +0200)]
Merge remote-tracking branch 'origin/Mario/round_jump_fix'

* origin/Mario/round_jump_fix:
  Disable jumping while player is blocked, they can't move so jumping is weird and unpredicted