xonotic/xonotic-data.pk3dir.git
4 years agoMerge branch 'master' into Mario/hagar_notfixed 297/head
Mario [Tue, 5 Apr 2016 22:55:40 +0000 (08:55 +1000)]
Merge branch 'master' into Mario/hagar_notfixed

4 years agoMerge branch 'terencehill/hud_skin_updates' into 'master'
Mario [Tue, 5 Apr 2016 22:50:43 +0000 (22:50 +0000)]
Merge branch 'terencehill/hud_skin_updates' into 'master'

Hud skin updates

* Remove all the main panel cvars from the hud skin settings so that hud skins never ever enable/disable any panel
* hud_panel_healtharmor_combined
* Fix wrong bg image references in a few panels

See merge request !307

4 years agoMerge branch 'terencehill/modified_default_cvars' into 'master'
Mario [Tue, 5 Apr 2016 22:42:58 +0000 (22:42 +0000)]
Merge branch 'terencehill/modified_default_cvars' into 'master'

Fix for menu modifying default cvar values (float numbers)

Remove trailing 0s before saving float numbers into cvars in the menu.  Reason: with a fresh config a few cvars were considered modified because on menu start sliders rewrite the current cvar values adding trailing 0s

These are the cvars that were added in config.cfg on menu start after having pressed save setting in the first run dialog:
```
seta "crosshair_alpha" "0.800000"
seta "crosshair_dot_size" "0.600000"
seta "crosshair_ring_alpha" "0.200000"
"crosshair_size" "0.400000"
seta "hud_panel_centerprint_fade_out" "0.500000"
```

See merge request !299

4 years agoMerge branch 'terencehill/timelimit_override_fix' into 'master'
Mario [Tue, 5 Apr 2016 22:38:21 +0000 (22:38 +0000)]
Merge branch 'terencehill/timelimit_override_fix' into 'master'

timelimit_override fix

Fix timelimit_override and similar cvars not being properly read in many game modes. Fixes #1723

See merge request !308

4 years agoAdd the new option to config
Mario [Tue, 5 Apr 2016 16:06:40 +0000 (02:06 +1000)]
Add the new option to config

4 years agoAdd a cvar to allow overriding the default/player chosen skin
Mario [Tue, 5 Apr 2016 15:47:03 +0000 (01:47 +1000)]
Add a cvar to allow overriding the default/player chosen skin

4 years agoFix timelimit_override and similar cvars not being properly read in many game modes... 308/head
terencehill [Mon, 4 Apr 2016 01:41:54 +0000 (03:41 +0200)]
Fix timelimit_override and similar cvars not being properly read in many game modes. Fixes #1723

4 years agoMerge branch 'master' into terencehill/modified_default_cvars 299/head
terencehill [Sun, 3 Apr 2016 12:22:12 +0000 (14:22 +0200)]
Merge branch 'master' into terencehill/modified_default_cvars

4 years agoAdd cl_damagetext cvars to defaultXonotic.cfg
terencehill [Sun, 3 Apr 2016 12:21:41 +0000 (14:21 +0200)]
Add cl_damagetext cvars to defaultXonotic.cfg

4 years agoXonstat: uri_escape thrice
TimePath [Sun, 3 Apr 2016 02:58:29 +0000 (12:58 +1000)]
Xonstat: uri_escape thrice

4 years agoFix wrong bg image references in a few panels 307/head
terencehill [Sat, 2 Apr 2016 21:33:47 +0000 (23:33 +0200)]
Fix wrong bg image references in a few panels

4 years agoRemove all the main panel cvars from the hud skin settings so that hud skins never...
terencehill [Sat, 2 Apr 2016 21:02:02 +0000 (23:02 +0200)]
Remove all the main panel cvars from the hud skin settings so that hud skins never ever enable/disable any panel

4 years agodedicated_print: switch from `LOG_INFO` to `print`
TimePath [Sat, 2 Apr 2016 06:21:14 +0000 (17:21 +1100)]
dedicated_print: switch from `LOG_INFO` to `print`

4 years agomxlib: Return early
TimePath [Thu, 31 Mar 2016 12:38:36 +0000 (23:38 +1100)]
mxlib: Return early

4 years agoWorld chat != spectator chat
TimePath [Thu, 31 Mar 2016 12:04:36 +0000 (23:04 +1100)]
World chat != spectator chat

4 years agoDon't call sv_hook_gamestart if we want to restart
TimePath [Thu, 31 Mar 2016 11:55:37 +0000 (22:55 +1100)]
Don't call sv_hook_gamestart if we want to restart

4 years agoFix IRC bot double chat
TimePath [Thu, 31 Mar 2016 07:47:39 +0000 (18:47 +1100)]
Fix IRC bot double chat

4 years agoMerge branch 'terencehill/warmup_limit_fix' into 'master'
Mario [Thu, 31 Mar 2016 06:06:37 +0000 (06:06 +0000)]
Merge branch 'terencehill/warmup_limit_fix' into 'master'

Warmup limit fix

See merge request !301

4 years agoMerge branch 'terencehill/scoreboard_columns_fix' into 'master'
Mario [Thu, 31 Mar 2016 06:06:06 +0000 (06:06 +0000)]
Merge branch 'terencehill/scoreboard_columns_fix' into 'master'

Scoreboard columns fix

Fix various warnings starting race, cts and invasion (some score types are optional in those game modes)

See merge request !302

4 years agoMerge branch 'terencehill/more_apply_button_settings' into 'master'
Mario [Thu, 31 Mar 2016 06:05:46 +0000 (06:05 +0000)]
Merge branch 'terencehill/more_apply_button_settings' into 'master'

Link more settings to the Apply button

See merge request !303

4 years agojson: fix array parsing
TimePath [Thu, 31 Mar 2016 03:53:13 +0000 (14:53 +1100)]
json: fix array parsing

matrix.org integration

4 years agoAdd dedicated cvar (hud_panel_healtharmor_combined) for combining health and armor...
terencehill [Wed, 30 Mar 2016 22:48:38 +0000 (00:48 +0200)]
Add dedicated cvar (hud_panel_healtharmor_combined) for combining health and armor instead of using the main panel cvar; add a checkbox for enabling it in the menu

4 years agoReimplement ftos_mindecimals in a simpler and more correct way
terencehill [Wed, 30 Mar 2016 12:23:25 +0000 (14:23 +0200)]
Reimplement ftos_mindecimals in a simpler and more correct way

4 years agoFor some reason the game that's being played on Gitlab CI still differs from the...
Rudolf Polzer [Tue, 29 Mar 2016 20:53:08 +0000 (16:53 -0400)]
For some reason the game that's being played on Gitlab CI still differs from the local one. Will fix this later.

4 years agoFix missing g-23 bot waypoint in the Gitlab project.
Rudolf Polzer [Tue, 29 Mar 2016 20:43:38 +0000 (16:43 -0400)]
Fix missing g-23 bot waypoint in the Gitlab project.

4 years agoServerbench: stop sending a log to a HTTP server.
Rudolf Polzer [Tue, 29 Mar 2016 20:12:32 +0000 (16:12 -0400)]
Serverbench: stop sending a log to a HTTP server.

This finally explains the discrepancy of the :anticheat: log lines.

4 years agoStop conveyors from moving a player after respawning elsewhere.
Rudolf Polzer [Tue, 29 Mar 2016 19:29:25 +0000 (15:29 -0400)]
Stop conveyors from moving a player after respawning elsewhere.

4 years agoFix bots with sv_gameplayfix_blowupfallenzombies 0.
Rudolf Polzer [Tue, 29 Mar 2016 18:31:05 +0000 (14:31 -0400)]
Fix bots with sv_gameplayfix_blowupfallenzombies 0.

4 years agoWhen picking up a powerup, don't keep playing the old pickup sound (hopefully fixes...
Mario [Tue, 29 Mar 2016 17:22:31 +0000 (03:22 +1000)]
When picking up a powerup, don't keep playing the old pickup sound (hopefully fixes intense spam when picking up a load of random powerups quickly)

4 years agoLink more settings to the Apply button 303/head
terencehill [Mon, 28 Mar 2016 21:43:54 +0000 (23:43 +0200)]
Link more settings to the Apply button

4 years agoFix warmup limit 301/head
terencehill [Mon, 28 Mar 2016 18:39:56 +0000 (20:39 +0200)]
Fix warmup limit

4 years agoPut pure entities in the very center of the map (corner has issues on some of the...
Mario [Mon, 28 Mar 2016 18:19:08 +0000 (04:19 +1000)]
Put pure entities in the very center of the map (corner has issues on some of the larger maps)

4 years agoCleanup: further split default columns layout and move the space separator to the... 302/head
terencehill [Mon, 28 Mar 2016 17:11:59 +0000 (19:11 +0200)]
Cleanup: further split default columns layout and move the space separator to the beginning (so one never forgets it when adding another row)

4 years agoFix various warnings starting race, cts and invasion (some score types are optional...
terencehill [Mon, 28 Mar 2016 16:30:32 +0000 (18:30 +0200)]
Fix various warnings starting race, cts and invasion (some score types are optional in those game modes)

race: Error: Unknown score field: 'kills'

cts: Error: Unknown score field: 'suicides'
cts: Error: Unknown score field: 'score'
cts: fixed missing field 'fastest'

inv: Error: Unknown score field: 'kills'
inv: Error: Unknown score field: 'suicides'
inv: Error: Unknown score field: 'score'

4 years agoPut pure entities in the corners of the map instead of out of bounds, fixes heavy...
Mario [Mon, 28 Mar 2016 14:08:47 +0000 (00:08 +1000)]
Put pure entities in the corners of the map instead of out of bounds, fixes heavy FPS loss at world origin

4 years agoMerge branch 'TimePath/json'
TimePath [Mon, 28 Mar 2016 11:12:49 +0000 (22:12 +1100)]
Merge branch 'TimePath/json'

4 years agojson: property accessor
TimePath [Mon, 28 Mar 2016 11:00:09 +0000 (22:00 +1100)]
json: property accessor

4 years agojson: support root arrays
TimePath [Mon, 28 Mar 2016 10:47:37 +0000 (21:47 +1100)]
json: support root arrays

4 years agojson: strip insignificant whitespace
TimePath [Mon, 28 Mar 2016 08:33:22 +0000 (19:33 +1100)]
json: strip insignificant whitespace

4 years agojson: return a stringbuffer
TimePath [Mon, 28 Mar 2016 06:07:07 +0000 (17:07 +1100)]
json: return a stringbuffer

4 years agoBasic JSON parser
TimePath [Tue, 8 Mar 2016 10:59:34 +0000 (21:59 +1100)]
Basic JSON parser

4 years agoMerge branch 'terencehill/race_fix' into 'master'
Mario [Mon, 28 Mar 2016 03:50:29 +0000 (03:50 +0000)]
Merge branch 'terencehill/race_fix' into 'master'

Fix for broken race not starting after the qualifying session

Fix race not starting (game ends) when the qualifying session ends (everyone readied up): the cause was timelimit being set to -1. Also fix timelimit_override and g_race_qualifying_timelimit_override not working.

See merge request !296

4 years agoMerge branch 'terencehill/ca_msg_fix' into 'master'
Mario [Mon, 28 Mar 2016 03:17:22 +0000 (03:17 +0000)]
Merge branch 'terencehill/ca_msg_fix' into 'master'

CA: fix "You are now alone!" message displayed twice

See merge request !300

4 years agoAdd g_race_qualifying_timelimit_override description 296/head
terencehill [Sun, 27 Mar 2016 16:41:56 +0000 (18:41 +0200)]
Add g_race_qualifying_timelimit_override description

4 years agoMerge branch 'master' into terencehill/race_fix
terencehill [Sun, 27 Mar 2016 16:20:20 +0000 (18:20 +0200)]
Merge branch 'master' into terencehill/race_fix

4 years agoRemove padding from many hud cvar values
terencehill [Sun, 27 Mar 2016 15:19:01 +0000 (17:19 +0200)]
Remove padding from many hud cvar values

4 years agoRemove trailing 0s before saving float numbers into cvars in the menu. Reason: with...
terencehill [Sun, 27 Mar 2016 14:10:27 +0000 (16:10 +0200)]
Remove trailing 0s before saving float numbers into cvars in the menu. Reason: with a fresh config a few cvars were considered modified because on menu start sliders rewrite the current cvar values adding trailing 0s

4 years agoCA: fix "You are now alone!" message displayed twice 300/head
terencehill [Sun, 27 Mar 2016 09:11:09 +0000 (11:11 +0200)]
CA: fix "You are now alone!" message displayed twice

4 years agohud: correctly identify icon_right_align as an int
TimePath [Sun, 27 Mar 2016 09:05:18 +0000 (20:05 +1100)]
hud: correctly identify icon_right_align as an int

4 years agoRace: don't spawn a fake player
TimePath [Sun, 27 Mar 2016 09:04:22 +0000 (20:04 +1100)]
Race: don't spawn a fake player

Fixes #1717

4 years agoOops
TimePath [Sun, 27 Mar 2016 08:32:44 +0000 (19:32 +1100)]
Oops

4 years agoPropagate this
TimePath [Sun, 27 Mar 2016 08:22:43 +0000 (19:22 +1100)]
Propagate this

4 years agoMerge branch 'Mario/warpzone_self'
Mario [Sun, 27 Mar 2016 05:14:45 +0000 (15:14 +1000)]
Merge branch 'Mario/warpzone_self'

4 years agoFix more self uses in warpzone lib
Mario [Sun, 27 Mar 2016 05:12:07 +0000 (15:12 +1000)]
Fix more self uses in warpzone lib

4 years agoUndo last commit (result is used much later to get the target lock)
Mario [Sat, 26 Mar 2016 19:21:54 +0000 (05:21 +1000)]
Undo last commit (result is used much later to get the target lock)

4 years agoDon't call crosshair_trace on racer (results appear to be unused, reduces load)
Mario [Sat, 26 Mar 2016 19:17:22 +0000 (05:17 +1000)]
Don't call crosshair_trace on racer (results appear to be unused, reduces load)

4 years agoBring back the precache hook (abused by mods)
Mario [Sat, 26 Mar 2016 17:50:14 +0000 (03:50 +1000)]
Bring back the precache hook (abused by mods)

4 years agoDon't store vehicle's antilag data to the player's clientstate entity, fixes breakage...
Mario [Sat, 26 Mar 2016 16:47:57 +0000 (02:47 +1000)]
Don't store vehicle's antilag data to the player's clientstate entity, fixes breakage with vehicles

4 years agoAlways disable self damage from the blaster in instagib
Mario [Sat, 26 Mar 2016 16:07:27 +0000 (02:07 +1000)]
Always disable self damage from the blaster in instagib

4 years agoSelf removal kit: update plan
TimePath [Sat, 26 Mar 2016 15:13:13 +0000 (02:13 +1100)]
Self removal kit: update plan

4 years agoPropagate this
TimePath [Sat, 26 Mar 2016 14:12:30 +0000 (01:12 +1100)]
Propagate this

4 years agoPurge self from most of the warpzone lib
Mario [Sat, 26 Mar 2016 14:53:36 +0000 (00:53 +1000)]
Purge self from most of the warpzone lib

4 years agoAdd a low attenuation for turret/vehicle projectile explosions (bit higher than the...
Mario [Sat, 26 Mar 2016 13:59:51 +0000 (23:59 +1000)]
Add a low attenuation for turret/vehicle projectile explosions (bit higher than the minimum global, but lower than normal attenuation, should be a good enough distance)

4 years agoFix vehicle alarms to only play to the driver (yay for no more random alarms)
Mario [Sat, 26 Mar 2016 13:37:31 +0000 (23:37 +1000)]
Fix vehicle alarms to only play to the driver (yay for no more random alarms)

4 years agoHopefully fix silly compilation test unit
Mario [Sat, 26 Mar 2016 13:15:31 +0000 (23:15 +1000)]
Hopefully fix silly compilation test unit

4 years agoClean up some more self uses
Mario [Sat, 26 Mar 2016 13:09:12 +0000 (23:09 +1000)]
Clean up some more self uses

4 years agoClean out some more self uses from vehicle code
Mario [Sat, 26 Mar 2016 12:19:34 +0000 (22:19 +1000)]
Clean out some more self uses from vehicle code

4 years agoIf the monster is a client, don't attempt to remove it
Mario [Sat, 26 Mar 2016 10:40:04 +0000 (20:40 +1000)]
If the monster is a client, don't attempt to remove it

4 years agoSet self in vehicle frames as before (until we can purify weapon functions), fixes...
Mario [Sat, 26 Mar 2016 07:58:37 +0000 (17:58 +1000)]
Set self in vehicle frames as before (until we can purify weapon functions), fixes infinite vehicle ammo

4 years agoMerge branch 'terencehill/hud_fixes' into 'master'
TimePath [Sat, 26 Mar 2016 00:51:56 +0000 (00:51 +0000)]
Merge branch 'terencehill/hud_fixes' into 'master'

hud fixes

* Fix typo causing misalignment of an expanding string ("Personal best")
* A few minor cleanups

See merge request !294

4 years agoMerge branch 'master' into terencehill/hud_fixes 294/head
terencehill [Sat, 26 Mar 2016 00:08:01 +0000 (01:08 +0100)]
Merge branch 'master' into terencehill/hud_fixes

# Conflicts:
# qcsrc/client/hud/hud.qc

4 years agoSet vehic velocity, not self.vehicle
Mario [Fri, 25 Mar 2016 07:20:56 +0000 (17:20 +1000)]
Set vehic velocity, not self.vehicle

4 years agoIter.qh: refactor
TimePath [Fri, 25 Mar 2016 07:12:25 +0000 (18:12 +1100)]
Iter.qh: refactor

4 years agoMenu: force visible when not connected
TimePath [Fri, 25 Mar 2016 05:33:08 +0000 (16:33 +1100)]
Menu: force visible when not connected

4 years agoInventory: check for null
TimePath [Fri, 25 Mar 2016 05:05:24 +0000 (16:05 +1100)]
Inventory: check for null

Fixes #1688

4 years agoAntilag: pass correct storage entity when vehicles are involved
TimePath [Fri, 25 Mar 2016 04:51:07 +0000 (15:51 +1100)]
Antilag: pass correct storage entity when vehicles are involved

Fixes #1707

4 years agoAccept hash change in aa3e381, a new class was added
TimePath [Fri, 25 Mar 2016 04:40:23 +0000 (15:40 +1100)]
Accept hash change in aa3e381, a new class was added

4 years agoFix PlayerState ownership
TimePath [Fri, 25 Mar 2016 04:05:27 +0000 (15:05 +1100)]
Fix PlayerState ownership

Closes #1712
Closes #1715

4 years agoMerge branch 'master' into Mario/hagar_notfixed
Mario [Thu, 24 Mar 2016 20:08:41 +0000 (06:08 +1000)]
Merge branch 'master' into Mario/hagar_notfixed

# Conflicts:
# qcsrc/common/weapons/weapon/hagar.qc

4 years agoMake hagar animation loop
Mario [Thu, 24 Mar 2016 19:51:54 +0000 (05:51 +1000)]
Make hagar animation loop

4 years agoAdjust the shotgun secondary animtime slightly in all balance configs (doesn't affect...
Mario [Thu, 24 Mar 2016 19:08:35 +0000 (05:08 +1000)]
Adjust the shotgun secondary animtime slightly in all balance configs (doesn't affect anything, since refire is longer than the animtime, fixes an animation glitch with the shotgun melee)

4 years agoHack to fix crouch prediction and hook/melee/frozen
Mario [Thu, 24 Mar 2016 19:00:07 +0000 (05:00 +1000)]
Hack to fix crouch prediction and hook/melee/frozen

4 years agoGreatly reduce console spam between map changes
Mario [Thu, 24 Mar 2016 18:00:00 +0000 (04:00 +1000)]
Greatly reduce console spam between map changes

4 years agoColorize vehicle's crosshair (optional, cl_vehicles_crosshair_colorize 0 to use old...
Mario [Thu, 24 Mar 2016 17:50:37 +0000 (03:50 +1000)]
Colorize vehicle's crosshair (optional, cl_vehicles_crosshair_colorize 0 to use old white color)

4 years agoFix teleporters resetting player's view when inside a vehicle despite not teleporting
Mario [Thu, 24 Mar 2016 17:32:06 +0000 (03:32 +1000)]
Fix teleporters resetting player's view when inside a vehicle despite not teleporting

4 years agoAdd a magic fallback number incase scoreboard_bg_scale is 0 or lower (fixes a crash)
Mario [Thu, 24 Mar 2016 17:17:22 +0000 (03:17 +1000)]
Add a magic fallback number incase scoreboard_bg_scale is 0 or lower (fixes a crash)

4 years agoUpdate the player stats uri in config
Mario [Thu, 24 Mar 2016 16:52:30 +0000 (02:52 +1000)]
Update the player stats uri in config

4 years agoSuppress warning in overkill+lms
TimePath [Thu, 24 Mar 2016 01:32:52 +0000 (12:32 +1100)]
Suppress warning in overkill+lms

4 years agoBumblebee spawn test
TimePath [Thu, 24 Mar 2016 01:04:38 +0000 (12:04 +1100)]
Bumblebee spawn test

4 years agoDon't call wr_gonethink without a weapon
TimePath [Thu, 24 Mar 2016 00:12:27 +0000 (11:12 +1100)]
Don't call wr_gonethink without a weapon

4 years agoSimplify progs.inc
TimePath [Thu, 24 Mar 2016 00:01:48 +0000 (11:01 +1100)]
Simplify progs.inc

4 years agoMark dirty csprogs pk3 with ~, * is a reserved character on some filesystems
TimePath [Wed, 23 Mar 2016 22:16:17 +0000 (09:16 +1100)]
Mark dirty csprogs pk3 with ~, * is a reserved character on some filesystems

4 years agoTypecheck weaponframe
TimePath [Wed, 23 Mar 2016 21:28:46 +0000 (08:28 +1100)]
Typecheck weaponframe

4 years agoMerge branch 'terencehill/warmup_limit' into 'master'
TimePath [Wed, 23 Mar 2016 20:30:57 +0000 (20:30 +0000)]
Merge branch 'terencehill/warmup_limit' into 'master'

Warmup limit stat

Add a stat for warmup limit so the hud timer can show decreasing time and announcer can properly announce left minutes in warmup stage (it was improperly reading the server's cvar g_warmup_limit)

See merge request !295

4 years agoCompact Announcer_Time code 295/head
terencehill [Wed, 23 Mar 2016 18:31:46 +0000 (19:31 +0100)]
Compact Announcer_Time code

4 years agoClean up vehicle physics plugin a bit
Mario [Wed, 23 Mar 2016 17:56:11 +0000 (03:56 +1000)]
Clean up vehicle physics plugin a bit

4 years agoAdd a stat for warmup limit so the hud timer can show decreasing time and announcer...
terencehill [Wed, 23 Mar 2016 15:36:44 +0000 (16:36 +0100)]
Add a stat for warmup limit so the hud timer can show decreasing time and announcer can properly announce left minutes in warmup stage (it was improperly reading the server's cvar g_warmup_limit)

4 years agoRestore the forward declaration of ActivateTeamplay()
terencehill [Wed, 23 Mar 2016 15:09:43 +0000 (16:09 +0100)]
Restore the forward declaration of ActivateTeamplay()

4 years agoProvisions for unit testing
TimePath [Wed, 23 Mar 2016 11:17:59 +0000 (22:17 +1100)]
Provisions for unit testing

4 years agoFix regressions in 911f8048
TimePath [Wed, 23 Mar 2016 03:54:26 +0000 (14:54 +1100)]
Fix regressions in 911f8048