xonotic/xonotic-data.pk3dir.git
3 years agotx synC
Rudolf Polzer [Tue, 10 May 2016 19:54:26 +0000 (21:54 +0200)]
tx synC

3 years agoMerge branch 'terencehill/menu_fixes' into 'master'
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

3 years agoHopefully fix remote compilation 316/head
terencehill [Mon, 9 May 2016 18:51:31 +0000 (20:51 +0200)]
Hopefully fix remote compilation

3 years agoMerge branch 'terencehill/notifications_fix' into 'master'
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

3 years agoMerge branch 'terencehill/radar_fix' into 'master'
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

3 years agoMake white arrow indicate player position in the radar, not camera position (they... 317/head
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

3 years agoMerge branch 'terencehill/translate_colors_2' into 'master'
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

3 years agoAdd cvars for yellow and pink teams in "Display capture times in Capture The Flag...
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

3 years agoFix messed up notification choices settings 318/head
terencehill [Sat, 7 May 2016 20:59:09 +0000 (22:59 +0200)]
Fix messed up notification choices settings

3 years agoFix compilation when notifications debug is enabled
terencehill [Sat, 7 May 2016 20:55:51 +0000 (22:55 +0200)]
Fix compilation when notifications debug is enabled

3 years agoLimit number of lines displayed in a tooltip otherwise the menu refuses to allocate... 264/head
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

3 years agoFix wrong cvar of "Display name of flag stealer in Capture The Flag" checkbox and...
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

3 years agoMake "Print on a separate line" checkbox depend on "Show spree information in death...
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

3 years agoMerge branch 'master' into terencehill/translate_colors_2 290/head
terencehill [Sun, 1 May 2016 10:48:52 +0000 (12:48 +0200)]
Merge branch 'master' into terencehill/translate_colors_2

3 years agoAdd an option to make jumppads not affect nexball balls
Mario [Sat, 30 Apr 2016 10:56:33 +0000 (20:56 +1000)]
Add an option to make jumppads not affect nexball balls

3 years agoHide hidden and 'other' weapons from the keybind list
Mario [Sat, 30 Apr 2016 09:58:35 +0000 (19:58 +1000)]
Hide hidden and 'other' weapons from the keybind list

3 years agoFix compile
Mario [Sat, 30 Apr 2016 08:56:41 +0000 (18:56 +1000)]
Fix compile

3 years agoMove setting of the slowmo cvar out of the physics function (physics are called multi...
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)

3 years agoFix sv_vote_nospectators 1
Mario [Sat, 30 Apr 2016 08:43:17 +0000 (18:43 +1000)]
Fix sv_vote_nospectators 1

3 years agoDon't show a carrier health bar if the carrier has no health, fixes empty health...
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

3 years agoFix campcheck counting as self damage
Mario [Sat, 30 Apr 2016 08:07:25 +0000 (18:07 +1000)]
Fix campcheck counting as self damage

3 years agoRemove an unnecessary hack that allowed an infinite ammo glitch with the mine layer
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

3 years agoMerge branch 'sev/luma_update' into 'master'
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

3 years agoMerge branch 'Mario/use1' into 'master'
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

3 years agoDon't show frozen effects during intermission
Mario [Fri, 29 Apr 2016 06:43:42 +0000 (16:43 +1000)]
Don't show frozen effects during intermission

3 years agoMerge branch 'master' into Mario/use1 298/head
Mario [Fri, 29 Apr 2016 01:13:24 +0000 (11:13 +1000)]
Merge branch 'master' into Mario/use1

3 years agoFix assault and clean up some self uses
Mario [Fri, 29 Apr 2016 01:10:49 +0000 (11:10 +1000)]
Fix assault and clean up some self uses

3 years ago#include checkbox.qh
TimePath [Wed, 27 Apr 2016 22:33:11 +0000 (08:33 +1000)]
#include checkbox.qh

3 years agoReally disable console messages if "Display console messages in the top left corner...
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

3 years agoForce to show the menu 1 second after you get disconnected (without a delay it pops...
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)

3 years agoAdd a hack to clean up flag sound precaching
Mario [Mon, 25 Apr 2016 06:59:24 +0000 (16:59 +1000)]
Add a hack to clean up flag sound precaching

3 years agoDo not show any tooltip when the cursor is in a empty area in Settings - Game - Model...
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

3 years agoImplement "Menu sounds" and "Focus sounds" checkboxes in a more sane way (they were...
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)

3 years agoUse the old hack (now fixed) instead of checking Menu_Active to prevent cursor from...
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

3 years agoMerge branch 'terencehill/weapons_panel_fix' into 'master'
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

3 years agoMerge branch 'terencehill/menu_cvarlist_modifiedcvars' into 'master'
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

3 years agoDefine menu_cvarlist_onlymodified 314/head
terencehill [Wed, 20 Apr 2016 21:43:57 +0000 (23:43 +0200)]
Define menu_cvarlist_onlymodified

3 years agoFix weapons panel debug code 313/head
terencehill [Wed, 20 Apr 2016 17:25:47 +0000 (19:25 +0200)]
Fix weapons panel debug code

3 years agoDon't pick specific weapons
terencehill [Wed, 20 Apr 2016 17:12:10 +0000 (19:12 +0200)]
Don't pick specific weapons

3 years agoMerge branch 'terencehill/menu_more_disabled_items' into 'master'
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

3 years agoSmall optimization
terencehill [Tue, 19 Apr 2016 18:14:10 +0000 (20:14 +0200)]
Small optimization

3 years agoFix another regression: show a subset of normal weapons when entering the hud editor...
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

3 years agoAdd a macro to avoid code repetition
terencehill [Tue, 19 Apr 2016 17:29:34 +0000 (19:29 +0200)]
Add a macro to avoid code repetition

3 years agoFix weapons panel showing lots of portos when onlyowned mode is off
terencehill [Tue, 19 Apr 2016 16:50:56 +0000 (18:50 +0200)]
Fix weapons panel showing lots of portos when onlyowned mode is off

3 years agoDisable some labels together with their relative sliders in the weapons panel 312/head
terencehill [Mon, 18 Apr 2016 21:37:18 +0000 (23:37 +0200)]
Disable some labels together with their relative sliders in the weapons panel

3 years agoWork around CMake #12619
TimePath [Mon, 18 Apr 2016 13:24:54 +0000 (23:24 +1000)]
Work around CMake #12619

3 years agoJump pads aren't pure
Mario [Mon, 18 Apr 2016 06:53:52 +0000 (16:53 +1000)]
Jump pads aren't pure

3 years agoGive nades random spread, also fix "amazing" announcement for shooting them
Mario [Mon, 18 Apr 2016 05:41:03 +0000 (15:41 +1000)]
Give nades random spread, also fix "amazing" announcement for shooting them

3 years agoPurge self from the bot code
Mario [Mon, 18 Apr 2016 02:10:05 +0000 (12:10 +1000)]
Purge self from the bot code

3 years agoFix "Hit testing:" not disabled when crosshair is disabled
terencehill [Sun, 17 Apr 2016 17:13:03 +0000 (19:13 +0200)]
Fix "Hit testing:" not disabled when crosshair is disabled

3 years agoDisable cl_damagetext options when cl_damagetext is 0
terencehill [Sun, 17 Apr 2016 17:11:16 +0000 (19:11 +0200)]
Disable cl_damagetext options when cl_damagetext is 0

3 years agoRemove the buffer when hiding the cvar list
terencehill [Fri, 15 Apr 2016 14:11:23 +0000 (16:11 +0200)]
Remove the buffer when hiding the cvar list

3 years agoAdd a checkbox in the cvar list dialog to show only the modified cvars
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

3 years agoFix defer
Mario [Fri, 15 Apr 2016 01:52:58 +0000 (11:52 +1000)]
Fix defer

3 years agoMerge branch 'Mario/angle_fix'
Mario [Thu, 14 Apr 2016 12:23:11 +0000 (22:23 +1000)]
Merge branch 'Mario/angle_fix'

3 years agoDon't enable prediction of every movetype yet
Mario [Thu, 14 Apr 2016 12:22:50 +0000 (22:22 +1000)]
Don't enable prediction of every movetype yet

3 years agoSet the client's view_angles to the physics .v_angle, fixes aiming in side-scrolling...
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)

3 years agoLog: adjust format
TimePath [Thu, 14 Apr 2016 12:20:44 +0000 (22:20 +1000)]
Log: adjust format

3 years agoMerge branch 'TimePath/cmake'
TimePath [Thu, 14 Apr 2016 12:16:44 +0000 (22:16 +1000)]
Merge branch 'TimePath/cmake'

3 years agoCMake: copy, prelude
TimePath [Mon, 21 Mar 2016 01:15:29 +0000 (12:15 +1100)]
CMake: copy, prelude

3 years agoCMake: pk3, watermark
TimePath [Sun, 20 Mar 2016 00:00:30 +0000 (11:00 +1100)]
CMake: pk3, watermark

3 years agoAdd CMakeLists.txt
TimePath [Sat, 19 Mar 2016 13:01:05 +0000 (00:01 +1100)]
Add CMakeLists.txt

3 years agoFix self use in tracewalk
Mario [Thu, 14 Apr 2016 09:00:36 +0000 (19:00 +1000)]
Fix self use in tracewalk

3 years agoInstead of causing an error, print a message about the missiong vote restriction...
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

3 years agoDon't negate frags if automatically switched teams
Mario [Thu, 14 Apr 2016 06:48:22 +0000 (16:48 +1000)]
Don't negate frags if automatically switched teams

3 years agoAdd a cvar to prevent mirroring damage if the attack wasn't from a weapon (burning...
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)

3 years agoFix pushing teammates in instagib
Mario [Wed, 13 Apr 2016 03:01:26 +0000 (13:01 +1000)]
Fix pushing teammates in instagib

3 years agoAdd an option to not push teammates with the vaporizer 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

3 years agoAdd an option to support damage mirroring if desired
Mario [Mon, 11 Apr 2016 02:22:10 +0000 (12:22 +1000)]
Add an option to support damage mirroring if desired

3 years agoTentatively update the hash
Mario [Thu, 7 Apr 2016 19:18:03 +0000 (05:18 +1000)]
Tentatively update the hash

3 years agoMerge branch 'Mario/hagar_notfixed' into 'master'
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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

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

3 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

3 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

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

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

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

3 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

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

3 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

3 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

3 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

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

matrix.org integration

3 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

3 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

3 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

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

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

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

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