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
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.
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
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
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
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
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
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
Rudolf Polzer [Thu, 8 May 2014 11:38:17 +0000 (13:38 +0200)]
Improve trace debug code.
Mario [Thu, 8 May 2014 07:40:00 +0000 (17:40 +1000)]
Also don't translate the error
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
Mario [Wed, 7 May 2014 19:24:04 +0000 (05:24 +1000)]
Don't keep spamming jetpack effect/sound after the match ends
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
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
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
Rudolf Polzer [Thu, 10 Apr 2014 10:28:46 +0000 (12:28 +0200)]
Slightly improve the Makefile.
Rudolf Polzer [Mon, 7 Apr 2014 09:24:03 +0000 (11:24 +0200)]
Fix wrong use of ##.
Rudolf Polzer [Mon, 10 Mar 2014 10:13:11 +0000 (11:13 +0100)]
Get rid of a stupid dummy forced-saved-cvars cvar.
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
Rudolf Polzer [Sat, 1 Mar 2014 11:32:37 +0000 (12:32 +0100)]
For convenience, provide bezier curve functions globally.
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
Samual Lenks [Wed, 26 Feb 2014 20:42:56 +0000 (15:42 -0500)]
Merge remote-tracking branch 'origin/terencehill/hud_code_cleanup'
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
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
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
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
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
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
terencehill [Thu, 20 Feb 2014 23:22:13 +0000 (00:22 +0100)]
CheckAllowedTeams must be called before FindSmallestTeam
Rudolf Polzer [Mon, 17 Feb 2014 09:37:10 +0000 (10:37 +0100)]
comments
Samual Lenks [Mon, 17 Feb 2014 03:33:27 +0000 (22:33 -0500)]
Fix "low gravity" check
Samual Lenks [Mon, 17 Feb 2014 03:28:42 +0000 (22:28 -0500)]
Increase gravity slightly
Rudolf Polzer [Fri, 14 Feb 2014 12:27:03 +0000 (13:27 +0100)]
Finally merged them all.
Rudolf Polzer [Fri, 14 Feb 2014 12:17:16 +0000 (13:17 +0100)]
Kill polish dupe.
Rudolf Polzer [Fri, 14 Feb 2014 12:16:47 +0000 (13:16 +0100)]
More transifex.
Rudolf Polzer [Fri, 14 Feb 2014 12:04:47 +0000 (13:04 +0100)]
Beginning of useless WP detection.
Rudolf Polzer [Fri, 14 Feb 2014 12:03:37 +0000 (13:03 +0100)]
Rename polish. Step 1.
Rudolf Polzer [Fri, 14 Feb 2014 12:03:14 +0000 (13:03 +0100)]
Transifex merge.
Rudolf Polzer [Tue, 4 Feb 2014 16:19:19 +0000 (17:19 +0100)]
Implement vote 215. Fixes #1895.
Rudolf Polzer [Tue, 4 Feb 2014 16:17:34 +0000 (17:17 +0100)]
Refactor respawn delay logic in preparation for implementing vote #215.
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.
Rudolf Polzer [Thu, 30 Jan 2014 17:41:29 +0000 (18:41 +0100)]
Quick visual fix for long cvar descriptions.
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.
terencehill [Thu, 30 Jan 2014 00:59:33 +0000 (01:59 +0100)]
Merge branch 'master' into terencehill/hud_code_cleanup
terencehill [Thu, 30 Jan 2014 00:59:07 +0000 (01:59 +0100)]
Merge branch 'master' into terencehill/hud_fixes
Mario [Tue, 28 Jan 2014 06:16:50 +0000 (17:16 +1100)]
Merge branch 'master' into Mario/spawnsystem_mutator
Mario [Tue, 28 Jan 2014 05:45:43 +0000 (16:45 +1100)]
Merge branch 'master' into Mario/nade_drop
Rudolf Polzer [Sun, 26 Jan 2014 13:28:53 +0000 (14:28 +0100)]
Fix error handling in "gametype" keyword parsing, fixes #1884.
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
Samual Lenks [Sat, 25 Jan 2014 22:21:36 +0000 (17:21 -0500)]
Move the supercontents/nativecontents functions to util.qc
Samual Lenks [Sat, 25 Jan 2014 22:17:34 +0000 (17:17 -0500)]
Add proper cvar for the gameplayfix setting
Samual Lenks [Sat, 25 Jan 2014 22:12:10 +0000 (17:12 -0500)]
Merge remote-tracking branch 'origin/master' into samual/splashing
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
Mario [Sat, 25 Jan 2014 21:15:27 +0000 (08:15 +1100)]
Check if the team is available before killing the player
Samual Lenks [Tue, 21 Jan 2014 19:00:09 +0000 (14:00 -0500)]
Fix ordering of readyrestart with warmup and add gameover check
Samual Lenks [Mon, 20 Jan 2014 23:00:31 +0000 (18:00 -0500)]
Increase fov from 90 to 100
Samual Lenks [Mon, 20 Jan 2014 19:32:11 +0000 (14:32 -0500)]
Merge remote-tracking branch 'origin/Mario/melee_only_fix'
# By Mario
# Via Mario
* origin/Mario/melee_only_fix:
Disable weapon dropping in melee only mutator
Samual Lenks [Mon, 20 Jan 2014 19:30:05 +0000 (14:30 -0500)]
Merge remote-tracking branch 'origin/Mario/vote_change_fix'
# By Mario
# Via Mario
* origin/Mario/vote_change_fix:
Fix vyes not working with sv_vote_change enabled
Mario [Mon, 20 Jan 2014 04:14:47 +0000 (15:14 +1100)]
Disable weapon dropping in melee only mutator
Samual Lenks [Sun, 19 Jan 2014 18:50:36 +0000 (13:50 -0500)]
Move the warning to whenever someone starts spectating, also add another
check which confirms that the cvar is enabled
Samual Lenks [Sun, 19 Jan 2014 18:21:03 +0000 (13:21 -0500)]
Merge remote-tracking branch 'origin/Mario/nospectators_message'
# By Mario (1) and Samual Lenks (1)
* origin/Mario/nospectators_message:
Update the message a little bit
Show a message in the chat box if g_chat_nospectators is enabled
Samual Lenks [Sun, 19 Jan 2014 18:18:46 +0000 (13:18 -0500)]
Update the message a little bit
Mario [Sun, 19 Jan 2014 17:47:49 +0000 (04:47 +1100)]
Show a message in the chat box if g_chat_nospectators is enabled
Mario [Sun, 19 Jan 2014 17:15:21 +0000 (04:15 +1100)]
Fix vyes not working with sv_vote_change enabled
Rudolf Polzer [Sat, 18 Jan 2014 13:57:19 +0000 (14:57 +0100)]
Merge branch 'master' of git://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir
Rudolf Polzer [Sat, 18 Jan 2014 13:57:02 +0000 (14:57 +0100)]
More Transifex.
terencehill [Wed, 15 Jan 2014 22:24:11 +0000 (23:24 +0100)]
Immediately restore normal radar and chat background after maximization
terencehill [Wed, 8 Jan 2014 17:57:57 +0000 (18:57 +0100)]
HUD config: release mouse buttons and reset modifier keys on menu open
terencehill [Tue, 7 Jan 2014 23:40:52 +0000 (00:40 +0100)]
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
terencehill [Tue, 7 Jan 2014 23:33:01 +0000 (00:33 +0100)]
Weapons panel in onlyowned mode: enlarge weapon_size to match desired aspect ratio (hud_panel_weapons_aspect) in order to capitalize on panel space
Samual Lenks [Mon, 6 Jan 2014 22:06:50 +0000 (17:06 -0500)]
Merge remote-tracking branch 'origin/Mario/monsters'
# By Mario (531) and Samual Lenks (1)
# Via Mario (52) and Samual Lenks (1)
* origin/Mario/monsters: (532 commits)
Clean up monster commands a bit more
Update command aliases to match code
Clean up mobspawn command a little bit
Clean up invasion global functions a bit
Fix mobbutcher command description
Use printf macro
Empty commit so we can test merge request submission again
Don't check if monster has re-spawned when lowering counts
Replace tabs with spaces in REGISTER_MONSTER lists
Fix some invalid cvars
Add some mutator hooks for regen & mob spawning
Clean up CTF monster checks a little
Attempt to clean up commands a bit
Add a mutator hook for accuracy checking & fix notification typo
Show icon for monster deaths
Don't network monsterid
Use spaces in command aliases
Remove some now unused textures
Remove an alias for a no longer valid command
Remove freeze code, monsters no longer use freeze attacks
...
Mario [Mon, 6 Jan 2014 21:39:48 +0000 (08:39 +1100)]
Clean up monster commands a bit more
Mario [Mon, 6 Jan 2014 21:30:41 +0000 (08:30 +1100)]
Update command aliases to match code
Mario [Mon, 6 Jan 2014 21:16:50 +0000 (08:16 +1100)]
Clean up mobspawn command a little bit
Mario [Mon, 6 Jan 2014 20:40:42 +0000 (07:40 +1100)]
Clean up invasion global functions a bit
Rudolf Polzer [Mon, 6 Jan 2014 09:58:53 +0000 (10:58 +0100)]
Merge branch 'master' of git://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir
Mario [Mon, 6 Jan 2014 03:05:51 +0000 (14:05 +1100)]
Merge branch 'master' into Mario/monsters
terencehill [Mon, 6 Jan 2014 00:53:05 +0000 (01:53 +0100)]
Merge branch 'master' into terencehill/hud_code_cleanup
terencehill [Mon, 6 Jan 2014 00:07:02 +0000 (01:07 +0100)]
Merge branch 'master' into terencehill/hud_code_cleanup
Conflicts:
qcsrc/client/hud.qc
qcsrc/client/hud.qh
qcsrc/common/items.qh
Samual Lenks [Sun, 5 Jan 2014 22:11:37 +0000 (17:11 -0500)]
Merge remote-tracking branch 'origin/terencehill/vehicles_fixes'
# By terencehill
# Via terencehill
* origin/terencehill/vehicles_fixes:
Improve calculation of vehicle respawn delay
Reset vehicles in reset_map (thanks to the new vehicles_reset function), not just in assault_new_round
Fix serious bug when the map is reset (ready-restart) and a player is on a vehicle: player can't exit from the vehicle anymore
If the spiderbot is blown up don't show the teleport effect where the spiderbot was
Add blowup cvars for raptor and spiderbot
Make racer_blowup() similar to raptor_blowup(): don't override respawn time (already correctly calculated in vehicles.qc) and don't call racer_spawn as it isn't necessary.
Fix a few typos in function names
Spawn vehicles according to g_start_delay and make work better g_vehicles_delayspawn_jitter (jitter 10 is now a random number in the interval [-5,+5] instead of [0,+10])
Samual Lenks [Sun, 5 Jan 2014 22:07:09 +0000 (17:07 -0500)]
Merge remote-tracking branch 'origin/terencehill/ca_ft_fixes'
# By terencehill
# Via terencehill
* origin/terencehill/ca_ft_fixes:
Fix compilation. It seems that Samual renamed inWarmupStage to warmup_stage in the commit
6c4446c0a7 with the very explicative description "I'm a goddamn genius, IT WORKS!".
Add cvars g_freezetag_team_spawns and g_ca_team_spawns: when 1, players spawn from the team spawnpoints of the map, if any
CheckAllowedTeams isn't needed in these cases
Add description to g_*_round_timelimit cvars
Since CA and LMS have special values for starting ammo, health and armor, let's use them in warmup too
Allow weapon change impulses when not in round time
Fix bug where just connected players are forced to join the game the next round
Fix this Freezetag bug: If you try to revive a player after a round ends the "Revive progress" centerprint will be stuck until a new one appears
Freezetag: use warmup_start_health in warmup stage
Reset kill count when a new round starts
Make work the "3/2/1 frags left" announcer messages in Freezetag
ScoreRules_freezetag should know the number of available teams this way (like CA and KH)
Fix implementation of CA score rules
terencehill [Sun, 5 Jan 2014 18:00:43 +0000 (19:00 +0100)]
Merge branch 'master' into terencehill/ca_ft_fixes
Conflicts:
gamemodes.cfg
qcsrc/server/g_world.qc
qcsrc/server/mutators/gamemode_arena.qc
qcsrc/server/mutators/gamemode_ca.qc
terencehill [Sat, 4 Jan 2014 18:48:00 +0000 (19:48 +0100)]
Merge branch 'master' into terencehill/vehicles_fixes
Conflicts:
qcsrc/server/vehicles/bumblebee.qc
qcsrc/server/vehicles/raptor.qc
qcsrc/server/vehicles/spiderbot.qc
Samual Lenks [Sat, 4 Jan 2014 17:41:20 +0000 (12:41 -0500)]
Add race times to hud_notify with notification system
Samual Lenks [Sat, 4 Jan 2014 01:37:04 +0000 (20:37 -0500)]
Always ensure pixel accuracy instead of manually setting it
Samual Lenks [Sat, 4 Jan 2014 01:23:24 +0000 (20:23 -0500)]
use cvar_settemp for orthoview settings
Mario [Fri, 3 Jan 2014 09:40:53 +0000 (20:40 +1100)]
Fix mobbutcher command description
Mario [Fri, 3 Jan 2014 08:55:54 +0000 (19:55 +1100)]
Use printf macro
Samual Lenks [Wed, 1 Jan 2014 16:45:29 +0000 (11:45 -0500)]
Empty commit so we can test merge request submission again
Samual Lenks [Wed, 1 Jan 2014 14:17:02 +0000 (09:17 -0500)]
Merge remote-tracking branch 'origin/master' into Mario/monsters
Rudolf Polzer [Wed, 1 Jan 2014 10:14:00 +0000 (11:14 +0100)]
Merge remote-tracking branch 'origin/divVerent/ballistic2'
* origin/divVerent/ballistic2:
Oops. Fix rifle config.
We DO need to detect double-hits, due to the weird engine tracing that happens sometimes at low angles.
Always show DamageInfo, even when hitting the same player twice.
Fix use of "self".
fix some bugs
Kill some cvars I forgot.
cvar cleanup
Kill zcurveparticles due to 0 users.
Simplify a LOT.
work on restructuring fireBallisticBullet
Rudolf Polzer [Wed, 1 Jan 2014 09:55:58 +0000 (10:55 +0100)]
Oops. Fix rifle config.
Rudolf Polzer [Wed, 1 Jan 2014 09:49:30 +0000 (10:49 +0100)]
Merge branch 'master' into divVerent/ballistic2
Rudolf Polzer [Wed, 1 Jan 2014 09:47:38 +0000 (10:47 +0100)]
Add the most obvious __VA_ARGS__ macro of all.
Rudolf Polzer [Wed, 1 Jan 2014 09:37:49 +0000 (10:37 +0100)]
Fix terencehill's variable abuse. Unbreaks centerprint.
WHY DID I LET THIS GO WHEN REVIEWING THIS STUFF.
Rudolf Polzer [Wed, 1 Jan 2014 07:23:02 +0000 (08:23 +0100)]
transifex
Samual Lenks [Mon, 30 Dec 2013 19:01:18 +0000 (14:01 -0500)]
Actually, use a more simple comparison (looks cleaner, easier to understand)
Samual Lenks [Mon, 30 Dec 2013 18:51:18 +0000 (13:51 -0500)]
Merge remote-tracking branch 'origin/samual/makemulti_inverse'
* origin/samual/makemulti_inverse:
Remove r_hidewater changes from this branch
Add ability for makeMulti inverse cvars (for r_water_hideplayer switching)
Samual Lenks [Mon, 30 Dec 2013 18:48:32 +0000 (13:48 -0500)]
Remove r_hidewater changes from this branch
Samual Lenks [Mon, 30 Dec 2013 18:34:55 +0000 (13:34 -0500)]
Merge remote-tracking branch 'origin/master' into samual/makemulti_inverse