]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
xonotic/xonotic-data.pk3dir.git
8 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

8 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

8 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

8 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

8 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

8 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

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

8 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

8 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

8 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

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

8 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

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

8 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

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

8 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

8 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

8 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

8 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

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

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

8 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

8 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

8 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

8 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

8 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

8 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

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

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

8 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

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

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

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

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

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

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

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

8 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

8 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

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

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

8 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

8 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

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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

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