]>
git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
Christopher Bock [Wed, 18 May 2016 11:48:33 +0000 (13:48 +0200)]
Merge remote-tracking branch 'origin/master' into TimePath/gametypes/infection
Mario [Wed, 18 May 2016 09:38:31 +0000 (19:38 +1000)]
Purge self from FireRailgunBullet
Mario [Wed, 18 May 2016 08:47:42 +0000 (18:47 +1000)]
Clean some self uses from race/cts
Mario [Wed, 18 May 2016 02:14:29 +0000 (12:14 +1000)]
Fix up waypointsprite_visible_for_player to not use self or other
Mario [Wed, 11 May 2016 15:12:22 +0000 (01:12 +1000)]
Switch some vlen uses to vdist
Mario [Tue, 10 May 2016 22:13:46 +0000 (08:13 +1000)]
Don't set the slowmo cvar during demo playback, possible fix for demo slowmo issues
Rudolf Polzer [Tue, 10 May 2016 19:54:26 +0000 (21:54 +0200)]
tx synC
TimePath [Mon, 9 May 2016 21:03:59 +0000 (21:03 +0000)]
Merge branch 'terencehill/menu_fixes' into 'master'
Misc minor fixes to the menu
See merge request !316
terencehill [Mon, 9 May 2016 18:51:31 +0000 (20:51 +0200)]
Hopefully fix remote compilation
TimePath [Sun, 8 May 2016 21:03:57 +0000 (21:03 +0000)]
Merge branch 'terencehill/notifications_fix' into 'master'
Notification choices fix
Fix messed up notification choices settings
This bug was causing the "Display name of flag stealer in Capture The Flag" checkbox in Settings/Game/Messages to not work at all
See merge request !318
TimePath [Sun, 8 May 2016 21:02:29 +0000 (21:02 +0000)]
Merge branch 'terencehill/radar_fix' into 'master'
Small radar fix
Make white arrow indicate player position in the radar, not camera position (they don't match in 3rd person view). It also fixes white arrow not shown when inside a vehicle
Fixes #1740
See merge request !317
terencehill [Sun, 8 May 2016 19:45:28 +0000 (21:45 +0200)]
Make white arrow indicate player position in the radar, not camera position (they don't match in 3rd person view). It also fixes white arrow not shown when inside a vehicle
Mario [Sun, 8 May 2016 12:03:54 +0000 (12:03 +0000)]
Merge branch 'terencehill/translate_colors_2' into 'master'
Disambiguate translation of team colors
It allows correct translation of team colors in many languages without changing color codes (```^TT```) in the messages, so there's no need to retranslate anything (no need to add other strreplace calls either).
See merge request !290
terencehill [Sat, 7 May 2016 21:24:06 +0000 (23:24 +0200)]
Add cvars for yellow and pink teams in "Display capture times in Capture The Flag" checkbox
terencehill [Sat, 7 May 2016 20:59:09 +0000 (22:59 +0200)]
Fix messed up notification choices settings
terencehill [Sat, 7 May 2016 20:55:51 +0000 (22:55 +0200)]
Fix compilation when notifications debug is enabled
terencehill [Mon, 2 May 2016 14:15:14 +0000 (16:15 +0200)]
Limit number of lines displayed in a tooltip otherwise the menu refuses to allocate a too tall tooltip. It can happen for items controlling many cvars when menu_tooltips is 2, e.g. the "Powerup notifications" checkbox
terencehill [Mon, 2 May 2016 13:59:14 +0000 (15:59 +0200)]
Fix wrong cvar of "Display name of flag stealer in Capture The Flag" checkbox and add another one to it
terencehill [Mon, 2 May 2016 13:56:51 +0000 (15:56 +0200)]
Make "Print on a separate line" checkbox depend on "Show spree information in death messages" checkbox too
terencehill [Sun, 1 May 2016 10:48:52 +0000 (12:48 +0200)]
Merge branch 'master' into terencehill/translate_colors_2
Mario [Sat, 30 Apr 2016 10:56:33 +0000 (20:56 +1000)]
Add an option to make jumppads not affect nexball balls
Mario [Sat, 30 Apr 2016 09:58:35 +0000 (19:58 +1000)]
Hide hidden and 'other' weapons from the keybind list
Mario [Sat, 30 Apr 2016 08:56:41 +0000 (18:56 +1000)]
Fix compile
Mario [Sat, 30 Apr 2016 08:47:57 +0000 (18:47 +1000)]
Move setting of the slowmo cvar out of the physics function (physics are called multiple times per frame, can cause it to be inaccurate)
Mario [Sat, 30 Apr 2016 08:43:17 +0000 (18:43 +1000)]
Fix sv_vote_nospectators 1
Mario [Sat, 30 Apr 2016 08:32:09 +0000 (18:32 +1000)]
Don't show a carrier health bar if the carrier has no health, fixes empty health bar in nexball
Mario [Sat, 30 Apr 2016 08:07:25 +0000 (18:07 +1000)]
Fix campcheck counting as self damage
Mario [Sat, 30 Apr 2016 07:55:24 +0000 (17:55 +1000)]
Remove an unnecessary hack that allowed an infinite ammo glitch with the mine layer
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
terencehill [Tue, 26 Apr 2016 13:16:23 +0000 (15:16 +0200)]
Really disable console messages if "Display console messages in the top left corner" checkbox is unchecked
terencehill [Mon, 25 Apr 2016 18:15:39 +0000 (20:15 +0200)]
Force to show the menu 1 second after you get disconnected (without a delay it pops up for an instant on map change)
Mario [Mon, 25 Apr 2016 06:59:24 +0000 (16:59 +1000)]
Add a hack to clean up flag sound precaching
terencehill [Sat, 23 Apr 2016 17:22:03 +0000 (19:22 +0200)]
Do not show any tooltip when the cursor is in a empty area in Settings - Game - Models tab, it should be shown only in the tab title
terencehill [Fri, 22 Apr 2016 17:35:50 +0000 (19:35 +0200)]
Implement "Menu sounds" and "Focus sounds" checkboxes in a more sane way (they were using a hidden slider)
terencehill [Fri, 22 Apr 2016 17:28:09 +0000 (19:28 +0200)]
Use the old hack (now fixed) instead of checking Menu_Active to prevent cursor from jumping to the upper left corner when hiding the menu; it's better because it now works when showing the console too
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