]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/log
xonotic/xonotic-data.pk3dir.git
8 years agoAdd new Luma menu background image 304/head
Severin Meyer [Sun, 3 Apr 2016 22:23:48 +0000 (00:23 +0200)]
Add new Luma menu background image

8 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

8 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

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

8 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

8 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

8 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`

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

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

8 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

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

8 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

8 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

8 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

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

matrix.org integration

8 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

8 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

8 years agoMake the detailed crosshairs (last row) slightly less obtrusive. Increase alpha value...
Severin Meyer [Wed, 30 Mar 2016 10:00:22 +0000 (12:00 +0200)]
Make the detailed crosshairs (last row) slightly less obtrusive. Increase alpha values and simplify some of the shapes

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

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

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

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

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

8 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)

8 years agoRevise buff images
Severin Meyer [Mon, 28 Mar 2016 23:10:42 +0000 (01:10 +0200)]
Revise buff images

8 years agoRemove background from luma menu gametype icons
Severin Meyer [Mon, 28 Mar 2016 23:09:09 +0000 (01:09 +0200)]
Remove background from luma menu gametype icons

8 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

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

8 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)

8 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)

8 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'

8 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

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

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

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

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

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

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

8 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

8 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

8 years ago#define use use1
TimePath [Mon, 28 Mar 2016 03:05:09 +0000 (14:05 +1100)]
#define use use1

8 years agoMerge branch 'master' into terencehill/translate_colors_2
terencehill [Sun, 27 Mar 2016 17:43:20 +0000 (19:43 +0200)]
Merge branch 'master' into terencehill/translate_colors_2

8 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

8 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

8 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

8 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

8 years agoHopefully fix compilation tests
Mario [Sun, 27 Mar 2016 12:15:00 +0000 (22:15 +1000)]
Hopefully fix compilation tests

8 years agoFix compile
Mario [Sun, 27 Mar 2016 12:08:17 +0000 (22:08 +1000)]
Fix compile

8 years agoMerge branch 'master' into Mario/use1
Mario [Sun, 27 Mar 2016 11:53:07 +0000 (21:53 +1000)]
Merge branch 'master' into Mario/use1

# Conflicts:
# qcsrc/common/gamemodes/gamemode/onslaught/onslaught.qc
# qcsrc/common/triggers/target/spawn.qc
# qcsrc/common/triggers/trigger/gamestart.qc
# qcsrc/lib/defer.qh
# qcsrc/server/mutators/mutator/gamemode_assault.qc

8 years agoMove use1 definition to util (should fix compilation test unit)
Mario [Sun, 27 Mar 2016 11:44:25 +0000 (21:44 +1000)]
Move use1 definition to util (should fix compilation test unit)

8 years agoFinish off activator (it's unused, so using it doesn't make sense)
Mario [Sun, 27 Mar 2016 11:32:48 +0000 (21:32 +1000)]
Finish off activator (it's unused, so using it doesn't make sense)

8 years agoFix warpzones
Mario [Sun, 27 Mar 2016 11:26:11 +0000 (21:26 +1000)]
Fix warpzones

8 years agoFix the use of self, activator and other globals in .use
Mario [Sun, 27 Mar 2016 11:07:57 +0000 (21:07 +1000)]
Fix the use of self, activator and other globals in .use

8 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

8 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

8 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

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

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

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

8 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

8 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)

8 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)

8 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)

8 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

8 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

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

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

8 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

8 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)

8 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)

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

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

8 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

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

Fixes #1688

8 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

8 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

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

Closes #1712
Closes #1715

8 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

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

8 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)

8 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

8 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

8 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)

8 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

8 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)

8 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

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

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

8 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

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

8 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

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

8 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