]>
git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
Mario [Sat, 30 Apr 2016 07:35:34 +0000 (07:35 +0000)]
Merge branch 'sev/luma_update' into 'master'
Small luma update
- Remove background color from menu gametype icons,
because the gametype vote dialog now has its own background.
- Slightly revise the shape of the buff icons
- Make the detailed crosshairs (last row) less obtrusive.
- Add new menu background image
See merge request !304
Mario [Sat, 30 Apr 2016 07:24:03 +0000 (07:24 +0000)]
Merge branch 'Mario/use1' into 'master'
Merge branch Mario/use1 (XL merge request)
Cleans out the use of self from .use, a necessary step towards supporting the Daemon engine and NaCl.
See merge request !298
Mario [Fri, 29 Apr 2016 06:43:42 +0000 (16:43 +1000)]
Don't show frozen effects during intermission
Mario [Fri, 29 Apr 2016 01:13:24 +0000 (11:13 +1000)]
Merge branch 'master' into Mario/use1
Mario [Fri, 29 Apr 2016 01:10:49 +0000 (11:10 +1000)]
Fix assault and clean up some self uses
TimePath [Wed, 27 Apr 2016 22:33:11 +0000 (08:33 +1000)]
#include checkbox.qh
Mario [Mon, 25 Apr 2016 06:59:24 +0000 (16:59 +1000)]
Add a hack to clean up flag sound precaching
Mario [Fri, 22 Apr 2016 12:45:37 +0000 (12:45 +0000)]
Merge branch 'terencehill/weapons_panel_fix' into 'master'
Weapons panel fix
Fix weapons panel showing lots of portos when onlyowned mode is off
See merge request !313
Mario [Thu, 21 Apr 2016 06:24:15 +0000 (06:24 +0000)]
Merge branch 'terencehill/menu_cvarlist_modifiedcvars' into 'master'
Menu: filter for modified cvars in the cvar list
Add a checkbox in the cvar list dialog to show only the modified cvars
See merge request !314
terencehill [Wed, 20 Apr 2016 21:43:57 +0000 (23:43 +0200)]
Define menu_cvarlist_onlymodified
terencehill [Wed, 20 Apr 2016 17:25:47 +0000 (19:25 +0200)]
Fix weapons panel debug code
terencehill [Wed, 20 Apr 2016 17:12:10 +0000 (19:12 +0200)]
Don't pick specific weapons
Mario [Wed, 20 Apr 2016 04:56:39 +0000 (04:56 +0000)]
Merge branch 'terencehill/menu_more_disabled_items' into 'master'
Menu: more disabled items
See merge request !312
terencehill [Tue, 19 Apr 2016 18:14:10 +0000 (20:14 +0200)]
Small optimization
terencehill [Tue, 19 Apr 2016 17:45:47 +0000 (19:45 +0200)]
Fix another regression: show a subset of normal weapons when entering the hud editor while spectating
terencehill [Tue, 19 Apr 2016 17:29:34 +0000 (19:29 +0200)]
Add a macro to avoid code repetition
terencehill [Tue, 19 Apr 2016 16:50:56 +0000 (18:50 +0200)]
Fix weapons panel showing lots of portos when onlyowned mode is off
terencehill [Mon, 18 Apr 2016 21:37:18 +0000 (23:37 +0200)]
Disable some labels together with their relative sliders in the weapons panel
TimePath [Mon, 18 Apr 2016 13:24:54 +0000 (23:24 +1000)]
Work around CMake #12619
Mario [Mon, 18 Apr 2016 06:53:52 +0000 (16:53 +1000)]
Jump pads aren't pure
Mario [Mon, 18 Apr 2016 05:41:03 +0000 (15:41 +1000)]
Give nades random spread, also fix "amazing" announcement for shooting them
Mario [Mon, 18 Apr 2016 02:10:05 +0000 (12:10 +1000)]
Purge self from the bot code
terencehill [Sun, 17 Apr 2016 17:13:03 +0000 (19:13 +0200)]
Fix "Hit testing:" not disabled when crosshair is disabled
terencehill [Sun, 17 Apr 2016 17:11:16 +0000 (19:11 +0200)]
Disable cl_damagetext options when cl_damagetext is 0
terencehill [Fri, 15 Apr 2016 14:11:23 +0000 (16:11 +0200)]
Remove the buffer when hiding the cvar list
terencehill [Fri, 15 Apr 2016 14:09:24 +0000 (16:09 +0200)]
Add a checkbox in the cvar list dialog to show only the modified cvars
Mario [Fri, 15 Apr 2016 01:52:58 +0000 (11:52 +1000)]
Fix defer
Mario [Thu, 14 Apr 2016 12:23:11 +0000 (22:23 +1000)]
Merge branch 'Mario/angle_fix'
Mario [Thu, 14 Apr 2016 12:22:50 +0000 (22:22 +1000)]
Don't enable prediction of every movetype yet
Mario [Thu, 14 Apr 2016 12:09:12 +0000 (22:09 +1000)]
Set the client's view_angles to the physics .v_angle, fixes aiming in side-scrolling mode, but may introduce some single frame glitches (needs testing)
TimePath [Thu, 14 Apr 2016 12:20:44 +0000 (22:20 +1000)]
Log: adjust format
TimePath [Thu, 14 Apr 2016 12:16:44 +0000 (22:16 +1000)]
Merge branch 'TimePath/cmake'
TimePath [Mon, 21 Mar 2016 01:15:29 +0000 (12:15 +1100)]
CMake: copy, prelude
TimePath [Sun, 20 Mar 2016 00:00:30 +0000 (11:00 +1100)]
CMake: pk3, watermark
TimePath [Sat, 19 Mar 2016 13:01:05 +0000 (00:01 +1100)]
Add CMakeLists.txt
Mario [Thu, 14 Apr 2016 09:00:36 +0000 (19:00 +1000)]
Fix self use in tracewalk
Mario [Thu, 14 Apr 2016 06:54:10 +0000 (16:54 +1000)]
Instead of causing an error, print a message about the missiong vote restriction cvar
Mario [Thu, 14 Apr 2016 06:48:22 +0000 (16:48 +1000)]
Don't negate frags if automatically switched teams
Mario [Wed, 13 Apr 2016 05:02:09 +0000 (15:02 +1000)]
Add a cvar to prevent mirroring damage if the attack wasn't from a weapon (burning, drowning etc)
Mario [Wed, 13 Apr 2016 03:01:26 +0000 (13:01 +1000)]
Fix pushing teammates in instagib
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
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 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)