xonotic/xonotic-data.pk3dir.git
7 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

7 years agoMerge remote-tracking branch 'origin/Mario/melee_only_fix'
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

7 years agoMerge remote-tracking branch 'origin/Mario/vote_change_fix'
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

7 years agoDisable weapon dropping in melee only mutator
Mario [Mon, 20 Jan 2014 04:14:47 +0000 (15:14 +1100)]
Disable weapon dropping in melee only mutator

7 years agoMove the warning to whenever someone starts spectating, also add another
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

7 years agoMerge remote-tracking branch 'origin/Mario/nospectators_message'
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

7 years agoUpdate the message a little bit
Samual Lenks [Sun, 19 Jan 2014 18:18:46 +0000 (13:18 -0500)]
Update the message a little bit

7 years agoShow a message in the chat box if g_chat_nospectators is enabled
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

7 years agoFix vyes not working with sv_vote_change enabled
Mario [Sun, 19 Jan 2014 17:15:21 +0000 (04:15 +1100)]
Fix vyes not working with sv_vote_change enabled

7 years agoMerge branch 'master' of git://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir
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

7 years agoMore Transifex.
Rudolf Polzer [Sat, 18 Jan 2014 13:57:02 +0000 (14:57 +0100)]
More Transifex.

7 years agoMerge remote-tracking branch 'origin/Mario/monsters'
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
  ...

7 years agoClean up monster commands a bit more
Mario [Mon, 6 Jan 2014 21:39:48 +0000 (08:39 +1100)]
Clean up monster commands a bit more

7 years agoUpdate command aliases to match code
Mario [Mon, 6 Jan 2014 21:30:41 +0000 (08:30 +1100)]
Update command aliases to match code

7 years agoClean up mobspawn command a little bit
Mario [Mon, 6 Jan 2014 21:16:50 +0000 (08:16 +1100)]
Clean up mobspawn command a little bit

7 years agoClean up invasion global functions a bit
Mario [Mon, 6 Jan 2014 20:40:42 +0000 (07:40 +1100)]
Clean up invasion global functions a bit

7 years agoMerge branch 'master' of git://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir
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

7 years agoMerge branch 'master' into Mario/monsters
Mario [Mon, 6 Jan 2014 03:05:51 +0000 (14:05 +1100)]
Merge branch 'master' into Mario/monsters

7 years agoMerge remote-tracking branch 'origin/terencehill/vehicles_fixes'
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])

7 years agoMerge remote-tracking branch 'origin/terencehill/ca_ft_fixes'
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

7 years agoMerge branch 'master' into terencehill/ca_ft_fixes
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

7 years agoMerge branch 'master' into terencehill/vehicles_fixes
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

7 years agoAdd race times to hud_notify with notification system
Samual Lenks [Sat, 4 Jan 2014 17:41:20 +0000 (12:41 -0500)]
Add race times to hud_notify with notification system

7 years agoAlways ensure pixel accuracy instead of manually setting it
Samual Lenks [Sat, 4 Jan 2014 01:37:04 +0000 (20:37 -0500)]
Always ensure pixel accuracy instead of manually setting it

7 years agouse cvar_settemp for orthoview settings
Samual Lenks [Sat, 4 Jan 2014 01:23:24 +0000 (20:23 -0500)]
use cvar_settemp for orthoview settings

7 years agoFix mobbutcher command description
Mario [Fri, 3 Jan 2014 09:40:53 +0000 (20:40 +1100)]
Fix mobbutcher command description

7 years agoUse printf macro
Mario [Fri, 3 Jan 2014 08:55:54 +0000 (19:55 +1100)]
Use printf macro

7 years agoEmpty commit so we can test merge request submission again
Samual Lenks [Wed, 1 Jan 2014 16:45:29 +0000 (11:45 -0500)]
Empty commit so we can test merge request submission again

7 years agoMerge remote-tracking branch 'origin/master' into Mario/monsters
Samual Lenks [Wed, 1 Jan 2014 14:17:02 +0000 (09:17 -0500)]
Merge remote-tracking branch 'origin/master' into Mario/monsters

7 years agoMerge remote-tracking branch 'origin/divVerent/ballistic2'
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

7 years agoOops. Fix rifle config.
Rudolf Polzer [Wed, 1 Jan 2014 09:55:58 +0000 (10:55 +0100)]
Oops. Fix rifle config.

7 years agoMerge branch 'master' into divVerent/ballistic2
Rudolf Polzer [Wed, 1 Jan 2014 09:49:30 +0000 (10:49 +0100)]
Merge branch 'master' into divVerent/ballistic2

7 years agoAdd the most obvious __VA_ARGS__ macro of all.
Rudolf Polzer [Wed, 1 Jan 2014 09:47:38 +0000 (10:47 +0100)]
Add the most obvious __VA_ARGS__ macro of all.

7 years agoFix terencehill's variable abuse. Unbreaks centerprint.
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.

7 years agotransifex
Rudolf Polzer [Wed, 1 Jan 2014 07:23:02 +0000 (08:23 +0100)]
transifex

7 years agoActually, use a more simple comparison (looks cleaner, easier to understand)
Samual Lenks [Mon, 30 Dec 2013 19:01:18 +0000 (14:01 -0500)]
Actually, use a more simple comparison (looks cleaner, easier to understand)

7 years agoMerge remote-tracking branch 'origin/samual/makemulti_inverse'
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)

7 years agoRemove r_hidewater changes from this branch
Samual Lenks [Mon, 30 Dec 2013 18:48:32 +0000 (13:48 -0500)]
Remove r_hidewater changes from this branch

7 years agoMerge remote-tracking branch 'origin/master' into samual/makemulti_inverse
Samual Lenks [Mon, 30 Dec 2013 18:34:55 +0000 (13:34 -0500)]
Merge remote-tracking branch 'origin/master' into samual/makemulti_inverse

7 years agoMerge remote-tracking branch 'origin/samual/orthoview'
Samual Lenks [Mon, 30 Dec 2013 17:54:49 +0000 (12:54 -0500)]
Merge remote-tracking branch 'origin/samual/orthoview'

* origin/samual/orthoview:
  Use vec3 and get rid of FL2VEC -- This function didn't exist when I first made orthoview :)
  Lets just set resolution via a cvar
  Fix issues with FL2VEC
  Fix remaining known issue with orthoview (on abyss, techassault)
  Add definition for orthoview accuracy, plus some final cleanup
  Clean up debug stuff
  Add "set" for orthoview cvars
  Add cvars to defaultXonotic.cfg
  Use r_drawfog 0 while in orthoview
  Fix center of map and distance setting
  On second thought, keep the override cvar
  Use center of world bbox instead of '0 0 0' origin, solves a bug :D
  Fix it so that fov adjusts properly too
  Clean up orthoview maths, add logic for handling r_nearclip and r_farclip
  Working on adding orthoview feature for map screenshots from above

7 years agoMerge remote-tracking branch 'origin/samual/fix_crosshair_hittest'
Samual Lenks [Mon, 30 Dec 2013 17:53:26 +0000 (12:53 -0500)]
Merge remote-tracking branch 'origin/samual/fix_crosshair_hittest'

* origin/samual/fix_crosshair_hittest:
  Fix spectating
  Fix crosshair_hittest_showimpact by using proper loc instead of vieworigin

7 years agoMerge remote-tracking branch 'origin/Mario/shownames_minalpha'
Samual Lenks [Mon, 30 Dec 2013 17:52:06 +0000 (12:52 -0500)]
Merge remote-tracking branch 'origin/Mario/shownames_minalpha'

# By Samual Lenks (3) and Mario (1)
* origin/Mario/shownames_minalpha:
  Multiply shownames alpha by player alpha
  Allow shownames to be seen with low alpha if they're the same team
  Clean some things up
  Hide player name if their alpha is below a limit

7 years agoTry fixing centerprint expiring.
Rudolf Polzer [Mon, 30 Dec 2013 13:29:36 +0000 (14:29 +0100)]
Try fixing centerprint expiring.

- Avoid drawing stuff at alpha 0.
- Simplify alpha calculation.

7 years agoMerge remote-tracking branch 'origin/terencehill/color_picker_carets'
Samual Lenks [Sun, 29 Dec 2013 10:29:16 +0000 (05:29 -0500)]
Merge remote-tracking branch 'origin/terencehill/color_picker_carets'

# By terencehill
# Via terencehill
* origin/terencehill/color_picker_carets:
  Optimize a check
  If there's a caret before the cursor in the input box when clicking on the color picker, escape the caret so we can add a valid color code
  Improve detection of color codes when dragging the mouse in the color picker: color code isn't valid if caret is escaped (e.g. ^^x123)

7 years agoMultiply shownames alpha by player alpha
Samual Lenks [Sun, 29 Dec 2013 09:14:32 +0000 (04:14 -0500)]
Multiply shownames alpha by player alpha

7 years agoAllow shownames to be seen with low alpha if they're the same team
Samual Lenks [Sat, 28 Dec 2013 19:11:12 +0000 (14:11 -0500)]
Allow shownames to be seen with low alpha if they're the same team

7 years agoClean some things up
Samual Lenks [Sat, 28 Dec 2013 19:09:26 +0000 (14:09 -0500)]
Clean some things up

7 years agoMerge remote-tracking branch 'origin/master' into Mario/shownames_minalpha
Samual Lenks [Sat, 28 Dec 2013 19:00:11 +0000 (14:00 -0500)]
Merge remote-tracking branch 'origin/master' into Mario/shownames_minalpha

7 years agoUse vec3 and get rid of FL2VEC -- This function didn't exist when I first
Samual Lenks [Sat, 28 Dec 2013 18:50:06 +0000 (13:50 -0500)]
Use vec3 and get rid of FL2VEC -- This function didn't exist when I first
made orthoview :)

7 years agoFix spectating
Samual Lenks [Sat, 28 Dec 2013 18:23:20 +0000 (13:23 -0500)]
Fix spectating

7 years agoFix crosshair_hittest_showimpact by using proper loc instead of vieworigin
Samual Lenks [Sat, 28 Dec 2013 18:02:30 +0000 (13:02 -0500)]
Fix crosshair_hittest_showimpact by using proper loc instead of vieworigin

7 years agoAdd ability for makeMulti inverse cvars (for r_water_hideplayer switching)
Samual Lenks [Fri, 27 Dec 2013 04:01:54 +0000 (23:01 -0500)]
Add ability for makeMulti inverse cvars (for r_water_hideplayer switching)

7 years agoLets just set resolution via a cvar
Samual Lenks [Fri, 27 Dec 2013 01:32:10 +0000 (20:32 -0500)]
Lets just set resolution via a cvar

7 years agoFix issues with FL2VEC
Samual Lenks [Fri, 27 Dec 2013 01:28:13 +0000 (20:28 -0500)]
Fix issues with FL2VEC

7 years agoFix remaining known issue with orthoview (on abyss, techassault)
Samual Lenks [Thu, 26 Dec 2013 09:54:59 +0000 (04:54 -0500)]
Fix remaining known issue with orthoview (on abyss, techassault)

7 years agoAdd definition for orthoview accuracy, plus some final cleanup
Samual Lenks [Thu, 26 Dec 2013 08:23:02 +0000 (03:23 -0500)]
Add definition for orthoview accuracy, plus some final cleanup

7 years agoClean up debug stuff
Samual Lenks [Thu, 26 Dec 2013 08:11:34 +0000 (03:11 -0500)]
Clean up debug stuff

7 years agoMerge remote-tracking branch 'origin/master' into samual/orthoview
Samual Lenks [Thu, 26 Dec 2013 07:23:54 +0000 (02:23 -0500)]
Merge remote-tracking branch 'origin/master' into samual/orthoview

7 years agoDon't check if monster has re-spawned when lowering counts
Mario [Thu, 26 Dec 2013 06:39:51 +0000 (17:39 +1100)]
Don't check if monster has re-spawned when lowering counts

7 years agoReplace tabs with spaces in REGISTER_MONSTER lists
Mario [Thu, 26 Dec 2013 06:14:18 +0000 (17:14 +1100)]
Replace tabs with spaces in REGISTER_MONSTER lists

7 years agoFix some invalid cvars
Mario [Thu, 26 Dec 2013 06:06:12 +0000 (17:06 +1100)]
Fix some invalid cvars

7 years agoAdd some mutator hooks for regen & mob spawning
Mario [Thu, 26 Dec 2013 06:05:03 +0000 (17:05 +1100)]
Add some mutator hooks for regen & mob spawning

7 years agoClean up CTF monster checks a little
Mario [Thu, 26 Dec 2013 05:38:53 +0000 (16:38 +1100)]
Clean up CTF monster checks a little

7 years agoAttempt to clean up commands a bit
Mario [Thu, 26 Dec 2013 05:28:44 +0000 (16:28 +1100)]
Attempt to clean up commands a bit

7 years agoAdd a mutator hook for accuracy checking & fix notification typo
Mario [Thu, 26 Dec 2013 05:11:16 +0000 (16:11 +1100)]
Add a mutator hook for accuracy checking & fix notification typo

7 years agoShow icon for monster deaths
Mario [Thu, 26 Dec 2013 04:53:22 +0000 (15:53 +1100)]
Show icon for monster deaths

7 years agoDon't network monsterid
Mario [Thu, 26 Dec 2013 04:45:24 +0000 (15:45 +1100)]
Don't network monsterid

7 years agoUse spaces in command aliases
Mario [Thu, 26 Dec 2013 04:34:29 +0000 (15:34 +1100)]
Use spaces in command aliases

7 years agoRemove some now unused textures
Mario [Thu, 26 Dec 2013 04:27:58 +0000 (15:27 +1100)]
Remove some now unused textures

7 years agoRemove an alias for a no longer valid command
Mario [Wed, 25 Dec 2013 01:21:00 +0000 (12:21 +1100)]
Remove an alias for a no longer valid command

7 years agoRemove freeze code, monsters no longer use freeze attacks
Mario [Tue, 24 Dec 2013 23:12:05 +0000 (10:12 +1100)]
Remove freeze code, monsters no longer use freeze attacks

7 years agoRemove some leftovers from the old random monster spawn code
Mario [Fri, 20 Dec 2013 18:47:02 +0000 (05:47 +1100)]
Remove some leftovers from the old random monster spawn code

7 years agoFix another bad thing
Mario [Fri, 20 Dec 2013 18:34:43 +0000 (05:34 +1100)]
Fix another bad thing

7 years agoFix something bad
Mario [Fri, 20 Dec 2013 18:22:35 +0000 (05:22 +1100)]
Fix something bad

7 years agoAdd some mapinfo support to invasion
Mario [Fri, 20 Dec 2013 18:20:44 +0000 (05:20 +1100)]
Add some mapinfo support to invasion

7 years agoMake some constants constant
Mario [Fri, 20 Dec 2013 18:18:20 +0000 (05:18 +1100)]
Make some constants constant

7 years agoMerge branch 'master' into Mario/monsters
Mario [Fri, 20 Dec 2013 18:02:41 +0000 (05:02 +1100)]
Merge branch 'master' into Mario/monsters

7 years agoFix csqcmodel display for cloned/dead players. Also clone aiming direction :)
Rudolf Polzer [Fri, 20 Dec 2013 10:44:45 +0000 (11:44 +0100)]
Fix csqcmodel display for cloned/dead players. Also clone aiming direction :)

7 years agoup sendflags to 3 bytes in csqcmodel. Fixes accidentally double-sent
Rudolf Polzer [Thu, 19 Dec 2013 12:49:22 +0000 (13:49 +0100)]
up sendflags to 3 bytes in csqcmodel. Fixes accidentally double-sent
data.

7 years agoWe DO need to detect double-hits, due to the weird engine tracing that
Rudolf Polzer [Wed, 11 Dec 2013 10:12:07 +0000 (11:12 +0100)]
We DO need to detect double-hits, due to the weird engine tracing that
happens sometimes at low angles.

7 years agoAlways show DamageInfo, even when hitting the same player twice.
Rudolf Polzer [Wed, 11 Dec 2013 08:48:12 +0000 (09:48 +0100)]
Always show DamageInfo, even when hitting the same player twice.

Also, prevention of hitting the same player twice SHOULD be no longer
necessary (but let's keep a big warning for this anwyay for now), as
this could only really happen due to curved projectile movement.

7 years agoMerge branch 'master' into divVerent/ballistic2
Rudolf Polzer [Wed, 11 Dec 2013 08:42:25 +0000 (09:42 +0100)]
Merge branch 'master' into divVerent/ballistic2

7 years agoFix use of "self".
Rudolf Polzer [Wed, 11 Dec 2013 08:42:13 +0000 (09:42 +0100)]
Fix use of "self".

7 years agoUse a spawnflag to check if the monster has re-spawned
Mario [Tue, 3 Dec 2013 14:14:34 +0000 (01:14 +1100)]
Use a spawnflag to check if the monster has re-spawned

7 years agoMerge branch 'master' into Mario/monsters
Mario [Tue, 3 Dec 2013 13:12:20 +0000 (00:12 +1100)]
Merge branch 'master' into Mario/monsters

7 years agoHide player name if their alpha is below a limit
Mario [Mon, 25 Nov 2013 02:25:29 +0000 (13:25 +1100)]
Hide player name if their alpha is below a limit

7 years agofix scale networking
Rudolf Polzer [Sun, 24 Nov 2013 09:03:31 +0000 (10:03 +0100)]
fix scale networking

7 years agoFix "scale" networking. Sorry for that.
Rudolf Polzer [Sun, 24 Nov 2013 08:44:45 +0000 (09:44 +0100)]
Fix "scale" networking. Sorry for that.

7 years agoMerge remote-tracking branch 'origin/samual/serverlist'
Samual Lenks [Sun, 24 Nov 2013 04:55:13 +0000 (23:55 -0500)]
Merge remote-tracking branch 'origin/samual/serverlist'

* origin/samual/serverlist: (63 commits)
  Use new cvar check URL; kill CVAR_POPCON.
  Show recommended servers when categories are disabled too
  Add a compatibility stop date to the update notification info.
  Fix my breaking of emergency pk3's :D
  ARGH, that really was a STUPID bug.
  Make APPEND_STRING behave "sane".
  Some cleanup
  Properly handle the cvars for serverlist categories now
  Support promoted servers in the recommendations
  Switch to new format for updatenotification
  Switch to recommendation mode 3
  Rename "Bookmark" button to "Favorite" button (it's called favorites...)
  Adjustments to category rendering- left align with colon over servername
  Simplify a LOT.
  Refactor item position code. Should be easier to adapt to new category handling.
  ONE BYTE.
  Fix bug in begin handling.
  Bottom align the headings.
  Give the headings 1.5 rows height.
  use a proper binary search
  ...

Conflicts:
qcsrc/menu/xonotic/serverlist.c
qcsrc/menu/xonotic/util.qc

7 years agoMerge remote-tracking branch 'origin/Mario/csqc_models'
Samual Lenks [Sun, 24 Nov 2013 04:37:50 +0000 (23:37 -0500)]
Merge remote-tracking branch 'origin/Mario/csqc_models'

# By Mario
# Via Mario
* origin/Mario/csqc_models:
  Use WriteShort for mins/maxs linking
  Comment out size reset (can cause crashes with some models on first load)
  Use WriteChar for mins/maxs linking & WriteByte for scale linking
  Network colormod to fix sandbox object colors
  Add func_breakable CSQC model linking again
  Remove func_breakable CSQC model linking
  Allow larger model scale
  Roughly link onslaught control points
  Network model scale, mins & maxs, link sandbox & breakable models with CSQC

7 years agoMerge remote-tracking branch 'origin/Mario/respawn_delays'
Samual Lenks [Sun, 24 Nov 2013 04:36:52 +0000 (23:36 -0500)]
Merge remote-tracking branch 'origin/Mario/respawn_delays'

# By Mario
# Via Mario
* origin/Mario/respawn_delays:
  Fix some issues brought up in the tracker
  Only use g_respawn_delay_max if it's higher than normal respawn delay
  Add a new option for forced respawn: g_respawn_delay_max. Forces players to spawn after this many seconds or optionally respawn after normal delay

7 years agoMerge remote-tracking branch 'origin/Mario/arena_nuke'
Samual Lenks [Sun, 24 Nov 2013 04:33:51 +0000 (23:33 -0500)]
Merge remote-tracking branch 'origin/Mario/arena_nuke'

* origin/Mario/arena_nuke:
  Remove arena gamemode

Conflicts:
qcsrc/server/command/cmd.qc
qcsrc/server/mutators/gamemode_arena.qc

7 years agofix some bugs
Rudolf Polzer [Tue, 19 Nov 2013 18:44:03 +0000 (19:44 +0100)]
fix some bugs

7 years agoKill some cvars I forgot.
Rudolf Polzer [Tue, 19 Nov 2013 13:21:56 +0000 (14:21 +0100)]
Kill some cvars I forgot.

7 years agocvar cleanup
Rudolf Polzer [Tue, 19 Nov 2013 10:39:59 +0000 (11:39 +0100)]
cvar cleanup

7 years agoKill zcurveparticles due to 0 users.
Rudolf Polzer [Tue, 19 Nov 2013 10:18:27 +0000 (11:18 +0100)]
Kill zcurveparticles due to 0 users.

7 years agoSimplify a LOT.
Rudolf Polzer [Tue, 19 Nov 2013 10:16:41 +0000 (11:16 +0100)]
Simplify a LOT.

7 years agowork on restructuring fireBallisticBullet
Rudolf Polzer [Mon, 18 Nov 2013 18:56:50 +0000 (19:56 +0100)]
work on restructuring fireBallisticBullet

7 years agoFrench tooltips update by Spike29.
Rudolf Polzer [Fri, 15 Nov 2013 10:02:30 +0000 (11:02 +0100)]
French tooltips update by Spike29.

7 years agoKill g_antilag_bullets (always assume 1); kill bullet gravity.
Rudolf Polzer [Mon, 11 Nov 2013 16:18:58 +0000 (17:18 +0100)]
Kill g_antilag_bullets (always assume 1); kill bullet gravity.

Real code simplification to be done later.