]>
git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/log
Mario [Wed, 13 Apr 2016 03:01:26 +0000 (13:01 +1000)]
Fix pushing teammates in instagib
terencehill [Tue, 12 Apr 2016 14:25:32 +0000 (16:25 +0200)]
Add cvars to enable / disable the dynamic hud effects for each panel
terencehill [Tue, 12 Apr 2016 14:21:12 +0000 (16:21 +0200)]
Disable the dynamic hud effects for the quickmenu panel
terencehill [Wed, 6 Apr 2016 23:09:07 +0000 (01:09 +0200)]
Improve comments
Mario [Mon, 11 Apr 2016 02:26:51 +0000 (12:26 +1000)]
Add an option to not push teammates with the vaporizer in instagib
Mario [Mon, 11 Apr 2016 02:22:10 +0000 (12:22 +1000)]
Add an option to support damage mirroring if desired
Mario [Thu, 7 Apr 2016 19:18:03 +0000 (05:18 +1000)]
Tentatively update the hash
Mario [Thu, 7 Apr 2016 19:04:42 +0000 (19:04 +0000)]
Merge branch 'Mario/hagar_notfixed' into 'master'
Merge branch Mario/hagar_notfixed (M merge request)
Uses manual handling of the hagar's attack refires, fixes looping of the hagar attack animation.
See merge request !297
terencehill [Wed, 6 Apr 2016 23:08:40 +0000 (01:08 +0200)]
Fix hud shake being applied on respawn
terencehill [Wed, 6 Apr 2016 22:15:10 +0000 (00:15 +0200)]
Properly disable hud scaling in the map vote screen
terencehill [Wed, 6 Apr 2016 16:34:00 +0000 (18:34 +0200)]
Merge branch 'master' into terencehill/dynamic_hud
Mario [Tue, 5 Apr 2016 22:55:40 +0000 (08:55 +1000)]
Merge branch 'master' into Mario/hagar_notfixed
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
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
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
Mario [Tue, 5 Apr 2016 16:06:40 +0000 (02:06 +1000)]
Add the new option to config
Mario [Tue, 5 Apr 2016 15:47:03 +0000 (01:47 +1000)]
Add a cvar to allow overriding the default/player chosen skin
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
Severin Meyer [Sun, 3 Apr 2016 22:23:48 +0000 (00:23 +0200)]
Add new Luma menu background image
terencehill [Sun, 3 Apr 2016 12:22:12 +0000 (14:22 +0200)]
Merge branch 'master' into terencehill/modified_default_cvars
terencehill [Sun, 3 Apr 2016 12:21:41 +0000 (14:21 +0200)]
Add cl_damagetext cvars to defaultXonotic.cfg
TimePath [Sun, 3 Apr 2016 02:58:29 +0000 (12:58 +1000)]
Xonstat: uri_escape thrice
terencehill [Sat, 2 Apr 2016 21:33:47 +0000 (23:33 +0200)]
Fix wrong bg image references in a few panels
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
TimePath [Sat, 2 Apr 2016 06:21:14 +0000 (17:21 +1100)]
dedicated_print: switch from `LOG_INFO` to `print`
TimePath [Thu, 31 Mar 2016 12:38:36 +0000 (23:38 +1100)]
mxlib: Return early
TimePath [Thu, 31 Mar 2016 12:04:36 +0000 (23:04 +1100)]
World chat != spectator chat
TimePath [Thu, 31 Mar 2016 11:55:37 +0000 (22:55 +1100)]
Don't call sv_hook_gamestart if we want to restart
TimePath [Thu, 31 Mar 2016 07:47:39 +0000 (18:47 +1100)]
Fix IRC bot double chat
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
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
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
TimePath [Thu, 31 Mar 2016 03:53:13 +0000 (14:53 +1100)]
json: fix array parsing
matrix.org integration
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
terencehill [Wed, 30 Mar 2016 12:23:25 +0000 (14:23 +0200)]
Reimplement ftos_mindecimals in a simpler and more correct way
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
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.
Rudolf Polzer [Tue, 29 Mar 2016 20:43:38 +0000 (16:43 -0400)]
Fix missing g-23 bot waypoint in the Gitlab project.
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.
Rudolf Polzer [Tue, 29 Mar 2016 19:29:25 +0000 (15:29 -0400)]
Stop conveyors from moving a player after respawning elsewhere.
Rudolf Polzer [Tue, 29 Mar 2016 18:31:05 +0000 (14:31 -0400)]
Fix bots with sv_gameplayfix_blowupfallenzombies 0.
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)
Severin Meyer [Mon, 28 Mar 2016 23:10:42 +0000 (01:10 +0200)]
Revise buff images
Severin Meyer [Mon, 28 Mar 2016 23:09:09 +0000 (01:09 +0200)]
Remove background from luma menu gametype icons
terencehill [Mon, 28 Mar 2016 21:43:54 +0000 (23:43 +0200)]
Link more settings to the Apply button
terencehill [Mon, 28 Mar 2016 18:39:56 +0000 (20:39 +0200)]
Fix warmup limit
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)
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)
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'
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
TimePath [Mon, 28 Mar 2016 11:12:49 +0000 (22:12 +1100)]
Merge branch 'TimePath/json'
TimePath [Mon, 28 Mar 2016 11:00:09 +0000 (22:00 +1100)]
json: property accessor
TimePath [Mon, 28 Mar 2016 10:47:37 +0000 (21:47 +1100)]
json: support root arrays
TimePath [Mon, 28 Mar 2016 08:33:22 +0000 (19:33 +1100)]
json: strip insignificant whitespace
TimePath [Mon, 28 Mar 2016 06:07:07 +0000 (17:07 +1100)]
json: return a stringbuffer
TimePath [Tue, 8 Mar 2016 10:59:34 +0000 (21:59 +1100)]
Basic JSON parser
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
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
TimePath [Mon, 28 Mar 2016 03:05:09 +0000 (14:05 +1100)]
#define use use1
terencehill [Sun, 27 Mar 2016 17:43:20 +0000 (19:43 +0200)]
Merge branch 'master' into terencehill/translate_colors_2
terencehill [Sun, 27 Mar 2016 16:41:56 +0000 (18:41 +0200)]
Add g_race_qualifying_timelimit_override description
terencehill [Sun, 27 Mar 2016 16:20:20 +0000 (18:20 +0200)]
Merge branch 'master' into terencehill/race_fix
terencehill [Sun, 27 Mar 2016 15:19:01 +0000 (17:19 +0200)]
Remove padding from many hud cvar values
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
Mario [Sun, 27 Mar 2016 12:15:00 +0000 (22:15 +1000)]
Hopefully fix compilation tests
Mario [Sun, 27 Mar 2016 12:08:17 +0000 (22:08 +1000)]
Fix compile
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
Mario [Sun, 27 Mar 2016 11:44:25 +0000 (21:44 +1000)]
Move use1 definition to util (should fix compilation test unit)
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)
Mario [Sun, 27 Mar 2016 11:26:11 +0000 (21:26 +1000)]
Fix warpzones
Mario [Sun, 27 Mar 2016 11:07:57 +0000 (21:07 +1000)]
Fix the use of self, activator and other globals in .use
terencehill [Sun, 27 Mar 2016 09:11:09 +0000 (11:11 +0200)]
CA: fix "You are now alone!" message displayed twice
TimePath [Sun, 27 Mar 2016 09:05:18 +0000 (20:05 +1100)]
hud: correctly identify icon_right_align as an int
TimePath [Sun, 27 Mar 2016 09:04:22 +0000 (20:04 +1100)]
Race: don't spawn a fake player
Fixes #1717
TimePath [Sun, 27 Mar 2016 08:32:44 +0000 (19:32 +1100)]
Oops
TimePath [Sun, 27 Mar 2016 08:22:43 +0000 (19:22 +1100)]
Propagate this
Mario [Sun, 27 Mar 2016 05:14:45 +0000 (15:14 +1000)]
Merge branch 'Mario/warpzone_self'
Mario [Sun, 27 Mar 2016 05:12:07 +0000 (15:12 +1000)]
Fix more self uses in warpzone lib
terencehill [Sat, 26 Mar 2016 23:30:20 +0000 (00:30 +0100)]
Merge branch 'master' into terencehill/dynamic_hud
Conflicts:
qcsrc/client/quickmenu.qc
terencehill [Sat, 26 Mar 2016 22:55:27 +0000 (23:55 +0100)]
1 1 1" "HUD following scale for the x, y and z axis"
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)
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)
Mario [Sat, 26 Mar 2016 17:50:14 +0000 (03:50 +1000)]
Bring back the precache hook (abused by mods)
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
Mario [Sat, 26 Mar 2016 16:07:27 +0000 (02:07 +1000)]
Always disable self damage from the blaster in instagib
TimePath [Sat, 26 Mar 2016 15:13:13 +0000 (02:13 +1100)]
Self removal kit: update plan
TimePath [Sat, 26 Mar 2016 14:12:30 +0000 (01:12 +1100)]
Propagate this
Mario [Sat, 26 Mar 2016 14:53:36 +0000 (00:53 +1000)]
Purge self from most of the warpzone lib
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)
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)
Mario [Sat, 26 Mar 2016 13:15:31 +0000 (23:15 +1000)]
Hopefully fix silly compilation test unit
Mario [Sat, 26 Mar 2016 13:09:12 +0000 (23:09 +1000)]
Clean up some more self uses
Mario [Sat, 26 Mar 2016 12:19:34 +0000 (22:19 +1000)]
Clean out some more self uses from vehicle code
Mario [Sat, 26 Mar 2016 10:40:04 +0000 (20:40 +1000)]
If the monster is a client, don't attempt to remove it
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
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
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
Mario [Fri, 25 Mar 2016 07:20:56 +0000 (17:20 +1000)]
Set vehic velocity, not self.vehicle
TimePath [Fri, 25 Mar 2016 07:12:25 +0000 (18:12 +1100)]
Iter.qh: refactor
TimePath [Fri, 25 Mar 2016 05:33:08 +0000 (16:33 +1100)]
Menu: force visible when not connected