]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
xonotic/xonotic-data.pk3dir.git
10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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.

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 years agoMerge remote-tracking branch 'origin/terencehill/keys_fixes'
Rudolf Polzer [Wed, 4 Jun 2014 09:06:03 +0000 (11:06 +0200)]
Merge remote-tracking branch 'origin/terencehill/keys_fixes'

* origin/terencehill/keys_fixes:
  Forbid capslock and numlock from being bound in the menu

10 years agoanticheat: use servertime where appropriate (but AFAIK these don't
Rudolf Polzer [Wed, 4 Jun 2014 07:41:29 +0000 (09:41 +0200)]
anticheat: use servertime where appropriate (but AFAIK these don't
differ any more anyway)

10 years agoAdd a note about known inaccuracy. Should still be very fine.
Rudolf Polzer [Tue, 3 Jun 2014 20:09:32 +0000 (22:09 +0200)]
Add a note about known inaccuracy. Should still be very fine.

10 years agoFix typo.
Rudolf Polzer [Tue, 3 Jun 2014 19:57:45 +0000 (21:57 +0200)]
Fix typo.

10 years agoFix a small math error.
Rudolf Polzer [Tue, 3 Jun 2014 19:57:09 +0000 (21:57 +0200)]
Fix a small math error.

10 years agoAdd some more experimental anticheat data collection for snap-aim and
Rudolf Polzer [Tue, 3 Jun 2014 19:54:10 +0000 (21:54 +0200)]
Add some more experimental anticheat data collection for snap-aim and
speedhacks.

10 years agoDisable jumping while player is blocked, they can't move so jumping is weird and...
Mario [Fri, 30 May 2014 16:14:47 +0000 (02:14 +1000)]
Disable jumping while player is blocked, they can't move so jumping is weird and unpredicted

10 years agoAnticheat improvements.
Rudolf Polzer [Mon, 26 May 2014 10:06:19 +0000 (12:06 +0200)]
Anticheat improvements.

10 years agoForbid capslock and numlock from being bound in the menu
terencehill [Fri, 23 May 2014 20:50:59 +0000 (22:50 +0200)]
Forbid capslock and numlock from being bound in the menu

10 years agoHide accuracy while spectating or playing nexball, show current gametype in the ...
Mario [Fri, 23 May 2014 13:53:38 +0000 (23:53 +1000)]
Hide accuracy while spectating or playing nexball, show current gametype in the "playing on" scoreboard info string, hide respawn countdown after match has ended

10 years agoShow number of maps in lsmaps reply
Mario [Fri, 23 May 2014 13:48:40 +0000 (23:48 +1000)]
Show number of maps in lsmaps reply

10 years agoTeleport the ball to a spawnpoint if random location failed (fixes a crash), show...
Mario [Fri, 23 May 2014 10:57:19 +0000 (20:57 +1000)]
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

10 years agoDetonate mines if owner becomes frozen, don't auto detonate mines if the enemy is...
Mario [Thu, 22 May 2014 16:13:30 +0000 (02:13 +1000)]
Detonate mines if owner becomes frozen, don't auto detonate mines if the enemy is frozen

10 years agoOops, better add braces there to avoid possible spurious warning if
Rudolf Polzer [Sat, 17 May 2014 09:00:44 +0000 (11:00 +0200)]
Oops, better add braces there to avoid possible spurious warning if
someone adds an else.

10 years agoAs agreed on poll #246, drop race game type from the menu.
Rudolf Polzer [Sat, 17 May 2014 08:42:09 +0000 (10:42 +0200)]
As agreed on poll #246, drop race game type from the menu.

To activate it, either use the cvars manually, or do

developer 1
menu_restart

10 years agoFix a minor typo reported in #1949
Mario [Thu, 8 May 2014 22:44:06 +0000 (08:44 +1000)]
Fix a minor typo reported in #1949

10 years agoMinimum delay to fire is not needed, and normalizing the navigation route does not...
Mario [Thu, 8 May 2014 19:38:01 +0000 (05:38 +1000)]
Minimum delay to fire is not needed, and normalizing the navigation route does not fix the error

10 years agoCheck for any value below 0
Mario [Thu, 8 May 2014 19:23:56 +0000 (05:23 +1000)]
Check for any value below 0

10 years agoMerge remote-tracking branch 'origin/Mario/hook_color'
Rudolf Polzer [Thu, 8 May 2014 17:08:12 +0000 (19:08 +0200)]
Merge remote-tracking branch 'origin/Mario/hook_color'

* origin/Mario/hook_color:
  Player colored hooks, also show hook coming from player in 3rd person mode

10 years agoMerge remote-tracking branch 'origin/Mario/music_fix'
Rudolf Polzer [Thu, 8 May 2014 16:58:19 +0000 (18:58 +0200)]
Merge remote-tracking branch 'origin/Mario/music_fix'

* origin/Mario/music_fix:
  Don't send target_music to bots, also send it to the spectators of the player who triggered it

10 years agoMerge remote-tracking branch 'origin/Mario/teamswitch_spam_fix'
Rudolf Polzer [Thu, 8 May 2014 16:56:34 +0000 (18:56 +0200)]
Merge remote-tracking branch 'origin/Mario/teamswitch_spam_fix'

* origin/Mario/teamswitch_spam_fix:
  Also don't translate the error
  Don't print CSQC team switch to team 0 failed messages to the client's normal console

10 years agoMerge remote-tracking branch 'origin/Mario/jetpack_endmatch_fix'
Rudolf Polzer [Thu, 8 May 2014 16:45:11 +0000 (18:45 +0200)]
Merge remote-tracking branch 'origin/Mario/jetpack_endmatch_fix'

* origin/Mario/jetpack_endmatch_fix:
  Don't keep spamming jetpack effect/sound after the match ends

10 years agoMerge remote-tracking branch 'origin/Mario/nexball_updates'
Rudolf Polzer [Thu, 8 May 2014 16:44:19 +0000 (18:44 +0200)]
Merge remote-tracking branch 'origin/Mario/nexball_updates'

* origin/Mario/nexball_updates:
  Add an option to always show 3rd person view in nexball while not carrying weapons, show a waypoint at the enemy's goal so players know where to take the ball, fix nexball showing up as a modification rather than a gamemode

10 years agoImprove trace debug code.
Rudolf Polzer [Thu, 8 May 2014 11:38:17 +0000 (13:38 +0200)]
Improve trace debug code.

10 years agoAlso don't translate the error
Mario [Thu, 8 May 2014 07:40:00 +0000 (17:40 +1000)]
Also don't translate the error

10 years agoSet aim bones for the overkill models
Mario [Wed, 7 May 2014 21:32:10 +0000 (07:32 +1000)]
Set aim bones for the overkill models

10 years agoSome improvements to invasion (allow team based invasion if map specifies, allow...
Mario [Wed, 7 May 2014 20:27:09 +0000 (06:27 +1000)]
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)

10 years agoFix a bug that would crash the server if too many bots were near fire
Mario [Wed, 7 May 2014 19:36:01 +0000 (05:36 +1000)]
Fix a bug that would crash the server if too many bots were near fire

10 years agoDon't send target_music to bots, also send it to the spectators of the player who...
Mario [Wed, 7 May 2014 19:31:41 +0000 (05:31 +1000)]
Don't send target_music to bots, also send it to the spectators of the player who triggered it

10 years agoDon't keep spamming jetpack effect/sound after the match ends
Mario [Wed, 7 May 2014 19:24:04 +0000 (05:24 +1000)]
Don't keep spamming jetpack effect/sound after the match ends

10 years agoSome minor monster improvements (antilag, precaching on spawn rather than on world...
Mario [Wed, 7 May 2014 19:21:06 +0000 (05:21 +1000)]
Some minor monster improvements (antilag, precaching on spawn rather than on world init)

10 years agotimelimit_overtimes -1 = infinite overtimes
Mario [Wed, 7 May 2014 19:08:00 +0000 (05:08 +1000)]
timelimit_overtimes -1 = infinite overtimes

10 years agoDon't print CSQC team switch to team 0 failed messages to the client's normal console
Mario [Wed, 7 May 2014 19:03:44 +0000 (05:03 +1000)]
Don't print CSQC team switch to team 0 failed messages to the client's normal console

10 years agoPlayer colored hooks, also show hook coming from player in 3rd person mode
Mario [Wed, 7 May 2014 18:53:16 +0000 (04:53 +1000)]
Player colored hooks, also show hook coming from player in 3rd person mode

10 years agoAdd an option to always show 3rd person view in nexball while not carrying weapons...
Mario [Wed, 7 May 2014 17:40:42 +0000 (03:40 +1000)]
Add an option to always show 3rd person view in nexball while not carrying weapons, show a waypoint at the enemy's goal so players know where to take the ball, fix nexball showing up as a modification rather than a gamemode

10 years agoSome minor improvements to monsters (auto precache default model, use monster kills...
Mario [Sat, 12 Apr 2014 05:27:13 +0000 (15:27 +1000)]
Some minor improvements to monsters (auto precache default model, use monster kills as main point limit in invasion)

10 years agoSlightly improve the Makefile.
Rudolf Polzer [Thu, 10 Apr 2014 10:28:46 +0000 (12:28 +0200)]
Slightly improve the Makefile.

10 years agoFix wrong use of ##.
Rudolf Polzer [Mon, 7 Apr 2014 09:24:03 +0000 (11:24 +0200)]
Fix wrong use of ##.

10 years agoFix flag getting stuck on maps like tron with spawn in the ground and noalign key...
Mario [Thu, 20 Mar 2014 02:23:25 +0000 (13:23 +1100)]
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

10 years agoAdd a monsters mapinfo feature
Mario [Tue, 18 Mar 2014 05:16:53 +0000 (16:16 +1100)]
Add a monsters mapinfo feature

10 years agoFix invasion monster spawn counts, fix spawning random monsters, clean up monster...
Mario [Tue, 18 Mar 2014 05:13:47 +0000 (16:13 +1100)]
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

10 years agoAccess sv_defaultplayer* cvars appending the untranslated team color string to them
terencehill [Sat, 15 Mar 2014 23:00:33 +0000 (00:00 +0100)]
Access sv_defaultplayer* cvars appending the untranslated team color string to them

10 years agoGet rid of a stupid dummy forced-saved-cvars cvar.
Rudolf Polzer [Mon, 10 Mar 2014 10:13:11 +0000 (11:13 +0100)]
Get rid of a stupid dummy forced-saved-cvars cvar.

10 years agoApply the selected language, restarting the menu, only if it's different from the...
terencehill [Mon, 3 Mar 2014 22:12:08 +0000 (23:12 +0100)]
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

10 years agoMerge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
Rudolf Polzer [Sat, 1 Mar 2014 11:39:26 +0000 (12:39 +0100)]
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir

10 years agoFor convenience, provide bezier curve functions globally.
Rudolf Polzer [Sat, 1 Mar 2014 11:32:37 +0000 (12:32 +0100)]
For convenience, provide bezier curve functions globally.

10 years agoMerge remote-tracking branch 'origin/Mario/train_fix'
Samual Lenks [Wed, 26 Feb 2014 20:46:01 +0000 (15:46 -0500)]
Merge remote-tracking branch 'origin/Mario/train_fix'

# By Mario
# Via Mario
* origin/Mario/train_fix:
  Set view_ofs after initializing the brush, so mins is the correct value

10 years agoMerge remote-tracking branch 'origin/terencehill/hud_code_cleanup'
Samual Lenks [Wed, 26 Feb 2014 20:42:56 +0000 (15:42 -0500)]
Merge remote-tracking branch 'origin/terencehill/hud_code_cleanup'

10 years agoMerge remote-tracking branch 'origin/Mario/teams_override'
Samual Lenks [Wed, 26 Feb 2014 20:38:55 +0000 (15:38 -0500)]
Merge remote-tracking branch 'origin/Mario/teams_override'

# By Mario
# Via Mario
* origin/Mario/teams_override:
  Remove keepaway team cvars from config

10 years agoMerge remote-tracking branch 'origin/Mario/nade_drop'
Samual Lenks [Wed, 26 Feb 2014 20:34:31 +0000 (15:34 -0500)]
Merge remote-tracking branch 'origin/Mario/nade_drop'

# By Mario
# Via Mario
* origin/Mario/nade_drop:
  Remove an old comment
  Limit max angle so player can look backwards & throw nade
  Drop nade if the player is looking down when they toss, rather than crouching

10 years agoMerge remote-tracking branch 'origin/Mario/spawnsystem_mutator'
Samual Lenks [Wed, 26 Feb 2014 20:33:35 +0000 (15:33 -0500)]
Merge remote-tracking branch 'origin/Mario/spawnsystem_mutator'

# By Mario
# Via Mario
* origin/Mario/spawnsystem_mutator:
  Fix compile error
  Merge spawnsystem into the existing mutator
  Move overkill's spawn system into a separate mutator

10 years agoMerge remote-tracking branch 'origin/sev/waypointarrow'
Samual Lenks [Wed, 26 Feb 2014 20:30:28 +0000 (15:30 -0500)]
Merge remote-tracking branch 'origin/sev/waypointarrow'

# By Severin Meyer
# Via Severin Meyer
* origin/sev/waypointarrow:
  Change waypoint arrow to a clean triangle shape. Prevent shadow from overshooting the origin and getting cut off at screen edge

10 years agoMerge remote-tracking branch 'origin/terencehill/hud_fixes'
Samual Lenks [Wed, 26 Feb 2014 20:28:44 +0000 (15:28 -0500)]
Merge remote-tracking branch 'origin/terencehill/hud_fixes'

# By terencehill
# Via terencehill
* origin/terencehill/hud_fixes:
  HUD config: release mouse buttons and reset modifier keys on menu open
  HUD config: when a menu dialog is opened don't block mousepos read as it leads to cursor jumps in the interaction with the menu
  Weapons panel in onlyowned mode: enlarge weapon_size to match desired aspect ratio (hud_panel_weapons_aspect) in order to capitalize on panel space

10 years agoMerge remote-tracking branch 'origin/terencehill/moveplayer_fix'
Samual Lenks [Wed, 26 Feb 2014 20:27:08 +0000 (15:27 -0500)]
Merge remote-tracking branch 'origin/terencehill/moveplayer_fix'

# By terencehill
# Via terencehill
* origin/terencehill/moveplayer_fix:
  CheckAllowedTeams must be called before FindSmallestTeam

10 years agoCheckAllowedTeams must be called before FindSmallestTeam
terencehill [Thu, 20 Feb 2014 23:22:13 +0000 (00:22 +0100)]
CheckAllowedTeams must be called before FindSmallestTeam

10 years agocomments
Rudolf Polzer [Mon, 17 Feb 2014 09:37:10 +0000 (10:37 +0100)]
comments

10 years agoFix "low gravity" check
Samual Lenks [Mon, 17 Feb 2014 03:33:27 +0000 (22:33 -0500)]
Fix "low gravity" check

10 years agoIncrease gravity slightly
Samual Lenks [Mon, 17 Feb 2014 03:28:42 +0000 (22:28 -0500)]
Increase gravity slightly

10 years agoFinally merged them all.
Rudolf Polzer [Fri, 14 Feb 2014 12:27:03 +0000 (13:27 +0100)]
Finally merged them all.

10 years agoKill polish dupe.
Rudolf Polzer [Fri, 14 Feb 2014 12:17:16 +0000 (13:17 +0100)]
Kill polish dupe.

10 years agoMore transifex.
Rudolf Polzer [Fri, 14 Feb 2014 12:16:47 +0000 (13:16 +0100)]
More transifex.

10 years agoBeginning of useless WP detection.
Rudolf Polzer [Fri, 14 Feb 2014 12:04:47 +0000 (13:04 +0100)]
Beginning of useless WP detection.

10 years agoRename polish. Step 1.
Rudolf Polzer [Fri, 14 Feb 2014 12:03:37 +0000 (13:03 +0100)]
Rename polish. Step 1.

10 years agoTransifex merge.
Rudolf Polzer [Fri, 14 Feb 2014 12:03:14 +0000 (13:03 +0100)]
Transifex merge.

10 years agoImplement vote 215. Fixes #1895.
Rudolf Polzer [Tue, 4 Feb 2014 16:19:19 +0000 (17:19 +0100)]
Implement vote 215. Fixes #1895.

10 years agoRefactor respawn delay logic in preparation for implementing vote #215.
Rudolf Polzer [Tue, 4 Feb 2014 16:17:34 +0000 (17:17 +0100)]
Refactor respawn delay logic in preparation for implementing vote #215.

10 years agoWhen editing nonsaved cvars in the cvar list editor, they become saved now. Revert...
Rudolf Polzer [Thu, 30 Jan 2014 18:07:18 +0000 (19:07 +0100)]
When editing nonsaved cvars in the cvar list editor, they become saved now. Revert button undoes this.

10 years agoQuick visual fix for long cvar descriptions.
Rudolf Polzer [Thu, 30 Jan 2014 17:41:29 +0000 (18:41 +0100)]
Quick visual fix for long cvar descriptions.

10 years agoAdd a facility to FORCE cvars to be saved, EVEN if non-saved in our config and in...
Rudolf Polzer [Thu, 30 Jan 2014 17:38:38 +0000 (18:38 +0100)]
Add a facility to FORCE cvars to be saved, EVEN if non-saved in our config and in the engine.

10 years agoMerge branch 'master' into terencehill/hud_code_cleanup
terencehill [Thu, 30 Jan 2014 00:59:33 +0000 (01:59 +0100)]
Merge branch 'master' into terencehill/hud_code_cleanup

10 years agoMerge branch 'master' into terencehill/hud_fixes
terencehill [Thu, 30 Jan 2014 00:59:07 +0000 (01:59 +0100)]
Merge branch 'master' into terencehill/hud_fixes

10 years agoMerge branch 'master' into Mario/spawnsystem_mutator
Mario [Tue, 28 Jan 2014 06:16:50 +0000 (17:16 +1100)]
Merge branch 'master' into Mario/spawnsystem_mutator

10 years agoMerge branch 'master' into Mario/nade_drop
Mario [Tue, 28 Jan 2014 05:45:43 +0000 (16:45 +1100)]
Merge branch 'master' into Mario/nade_drop

10 years agoCheck allowed teams before counting them
Mario [Tue, 28 Jan 2014 05:33:39 +0000 (16:33 +1100)]
Check allowed teams before counting them

10 years agoMerge branch 'master' into Mario/teamswitch_fix2
Mario [Tue, 28 Jan 2014 05:32:56 +0000 (16:32 +1100)]
Merge branch 'master' into Mario/teamswitch_fix2

10 years agoFix error handling in "gametype" keyword parsing, fixes #1884.
Rudolf Polzer [Sun, 26 Jan 2014 13:28:53 +0000 (14:28 +0100)]
Fix error handling in "gametype" keyword parsing, fixes #1884.

10 years agoTeam counting requires numbers instead of team IDs
Mario [Sun, 26 Jan 2014 06:57:51 +0000 (17:57 +1100)]
Team counting requires numbers instead of team IDs

10 years agoMerge remote-tracking branch 'origin/samual/splashing'
Samual Lenks [Sat, 25 Jan 2014 22:22:58 +0000 (17:22 -0500)]
Merge remote-tracking branch 'origin/samual/splashing'

* origin/samual/splashing:
  Move the supercontents/nativecontents functions to util.qc
  Add proper cvar for the gameplayfix setting
  Final cleanup for now
  Remove some debug prints
  Need advice: Add TODO comment for the gameplayfix cvar
  cleanup comments, some debug, add .contentstransition func support
  Aaaaand it works.
  Working on adding CheckContentsTransition to CSQC movetypes
  Begin messing around with contents transition

10 years agoMove the supercontents/nativecontents functions to util.qc
Samual Lenks [Sat, 25 Jan 2014 22:21:36 +0000 (17:21 -0500)]
Move the supercontents/nativecontents functions to util.qc

10 years agoAdd proper cvar for the gameplayfix setting
Samual Lenks [Sat, 25 Jan 2014 22:17:34 +0000 (17:17 -0500)]
Add proper cvar for the gameplayfix setting

10 years agoMerge remote-tracking branch 'origin/master' into samual/splashing
Samual Lenks [Sat, 25 Jan 2014 22:12:10 +0000 (17:12 -0500)]
Merge remote-tracking branch 'origin/master' into samual/splashing

10 years agoMerge remote-tracking branch 'origin/Mario/teamswitch_fix'
Samual Lenks [Sat, 25 Jan 2014 22:05:36 +0000 (17:05 -0500)]
Merge remote-tracking branch 'origin/Mario/teamswitch_fix'

# By Mario
# Via Mario
* origin/Mario/teamswitch_fix:
  Check if the team is available before killing the player

10 years agoCheck if the team is available before killing the player
Mario [Sat, 25 Jan 2014 21:15:27 +0000 (08:15 +1100)]
Check if the team is available before killing the player

10 years agoFix ordering of readyrestart with warmup and add gameover check
Samual Lenks [Tue, 21 Jan 2014 19:00:09 +0000 (14:00 -0500)]
Fix ordering of readyrestart with warmup and add gameover check

10 years agoIncrease fov from 90 to 100
Samual Lenks [Mon, 20 Jan 2014 23:00:31 +0000 (18:00 -0500)]
Increase fov from 90 to 100