xonotic/xonotic-data.pk3dir.git
23 months agoAdd an option to alternate between weapons when dual wielding
Mario [Sat, 13 Oct 2018 05:47:15 +0000 (15:47 +1000)]
Add an option to alternate between weapons when dual wielding

23 months agoSet nodrawtoclient on the server-side view model (doesn't need to render)
Mario [Fri, 12 Oct 2018 17:28:13 +0000 (03:28 +1000)]
Set nodrawtoclient on the server-side view model (doesn't need to render)

23 months agoFix dumpweapons including the special attacks
Mario [Fri, 12 Oct 2018 12:38:43 +0000 (22:38 +1000)]
Fix dumpweapons including the special attacks

23 months agoRemove g_duel_warmup (XPM ruleset turns on warmup when executed)
Mario [Thu, 11 Oct 2018 06:18:51 +0000 (16:18 +1000)]
Remove g_duel_warmup (XPM ruleset turns on warmup when executed)

23 months agoMove the Say function into client code (not really a player-specific thing)
Mario [Thu, 11 Oct 2018 03:11:30 +0000 (13:11 +1000)]
Move the Say function into client code (not really a player-specific thing)

23 months agoDon't allow a trigger to target itself (infinite loops tend to be crashy)
Mario [Thu, 11 Oct 2018 03:11:10 +0000 (13:11 +1000)]
Don't allow a trigger to target itself (infinite loops tend to be crashy)

23 months agoFix a potential crash in Weapons_fromstr (WEP_Null is expected, not NULL)
Mario [Wed, 10 Oct 2018 10:48:52 +0000 (20:48 +1000)]
Fix a potential crash in Weapons_fromstr (WEP_Null is expected, not NULL)

23 months agoMerge branch 'Mario/cts_killprojectiles'
Mario [Wed, 10 Oct 2018 03:15:54 +0000 (13:15 +1000)]
Merge branch 'Mario/cts_killprojectiles'

23 months agoMove some antiwall handling out of the main trigger code
Mario [Tue, 9 Oct 2018 11:13:36 +0000 (21:13 +1000)]
Move some antiwall handling out of the main trigger code

23 months agoRemove FixSize (hack no longer needed)
Mario [Tue, 9 Oct 2018 10:57:55 +0000 (20:57 +1000)]
Remove FixSize (hack no longer needed)

23 months agoAdd an option to remove the player's projectiles when they suicide in CTS 610/head
Mario [Mon, 8 Oct 2018 14:26:50 +0000 (00:26 +1000)]
Add an option to remove the player's projectiles when they suicide in CTS

23 months agofix #2110
Martin Taibr [Sun, 7 Oct 2018 21:27:03 +0000 (23:27 +0200)]
fix #2110

23 months agoMerge branch 'DefaultUser/func_door_lip' into 'master'
Mario [Sat, 6 Oct 2018 23:57:44 +0000 (23:57 +0000)]
Merge branch 'DefaultUser/func_door_lip' into 'master'

func_door: fix default value for lip

Closes xonotic-maps.pk3dir#153

See merge request xonotic/xonotic-data.pk3dir!609

23 months agofunc_door: Calculate pos2 after initialising this.lip 609/head
Freddy [Sat, 6 Oct 2018 19:56:05 +0000 (19:56 +0000)]
func_door: Calculate pos2 after initialising this.lip

23 months agoMerge branch 'terencehill/eventchase_tweaks'
terencehill [Tue, 2 Oct 2018 18:58:40 +0000 (20:58 +0200)]
Merge branch 'terencehill/eventchase_tweaks'

23 months agoClan Arena: display the "You are now alone!" message only when needed
terencehill [Tue, 2 Oct 2018 18:56:45 +0000 (20:56 +0200)]
Clan Arena: display the "You are now alone!" message only when needed

23 months agoOnly play 'vote now' announcement if the vote hasn't already passed
Mario [Tue, 2 Oct 2018 17:24:22 +0000 (03:24 +1000)]
Only play 'vote now' announcement if the vote hasn't already passed

23 months agoUpdate hash
Mario [Mon, 1 Oct 2018 14:25:40 +0000 (00:25 +1000)]
Update hash

23 months agoFix electro combos
Mario [Mon, 1 Oct 2018 12:20:28 +0000 (22:20 +1000)]
Fix electro combos

23 months agoMerge branch 'sev/luma-menu-update' into 'master'
Mario [Mon, 1 Oct 2018 11:47:06 +0000 (11:47 +0000)]
Merge branch 'sev/luma-menu-update' into 'master'

Minor Luma menu theme update

See merge request xonotic/xonotic-data.pk3dir!604

23 months agoTrace to the shot origin properly, fixes projectiles getting stuck inside walls
Mario [Mon, 1 Oct 2018 09:37:04 +0000 (19:37 +1000)]
Trace to the shot origin properly, fixes projectiles getting stuck inside walls

23 months agoMark the overkill weapons as hidden so they don't appear in the create menu
Mario [Mon, 1 Oct 2018 06:03:02 +0000 (16:03 +1000)]
Mark the overkill weapons as hidden so they don't appear in the create menu

23 months agoAdd an option (enabled by default) to configure whether the duel gamemode has a warmup
Mario [Mon, 1 Oct 2018 05:34:58 +0000 (15:34 +1000)]
Add an option (enabled by default) to configure whether the duel gamemode has a warmup

23 months agoUse the weapon instead of its ID in accuracy_add
Mario [Mon, 1 Oct 2018 05:30:21 +0000 (15:30 +1000)]
Use the weapon instead of its ID in accuracy_add

23 months agoAdd an option (disabled by default) to spawn powerups in duel
Mario [Mon, 1 Oct 2018 05:29:56 +0000 (15:29 +1000)]
Add an option (disabled by default) to spawn powerups in duel

23 months agoLimit warmups to 3 minutes by default (restored to full timelimit in XPM ruleset)
Mario [Sun, 30 Sep 2018 19:07:43 +0000 (05:07 +1000)]
Limit warmups to 3 minutes by default (restored to full timelimit in XPM ruleset)

23 months agoAdd vehicles.cfg so the vehicle settings are pre-defined
Mario [Sun, 30 Sep 2018 18:58:36 +0000 (04:58 +1000)]
Add vehicles.cfg so the vehicle settings are pre-defined

23 months agoPort kill command to QC so that we can use the health resource
Mario [Sun, 30 Sep 2018 17:58:53 +0000 (03:58 +1000)]
Port kill command to QC so that we can use the health resource

23 months agoBind K to kill by default
Mario [Sun, 30 Sep 2018 17:33:22 +0000 (03:33 +1000)]
Bind K to kill by default

23 months agoMerge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
Martin Taibr [Sun, 30 Sep 2018 16:13:18 +0000 (18:13 +0200)]
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir

23 months agochange xdf icon to lowercase
Martin Taibr [Sun, 30 Sep 2018 16:11:46 +0000 (18:11 +0200)]
change xdf icon to lowercase

23 months agoRestore active state of buttons on reset
Mario [Sun, 30 Sep 2018 16:02:58 +0000 (02:02 +1000)]
Restore active state of buttons on reset

23 months agoMake arc bolts mimic the Q3 lightning gun force in XDF
Mario [Sun, 30 Sep 2018 16:01:12 +0000 (02:01 +1000)]
Make arc bolts mimic the Q3 lightning gun force in XDF

23 months agoMerge branch 'DefaultUser/func_button_relay' into 'master'
Mario [Sun, 30 Sep 2018 15:30:22 +0000 (15:30 +0000)]
Merge branch 'DefaultUser/func_button_relay' into 'master'

Allow func_button to be deactivated by relay_deactivate

See merge request xonotic/xonotic-data.pk3dir!486

23 months agoUpdate luma menu theme 604/head
Severin Meyer [Sun, 30 Sep 2018 15:24:22 +0000 (17:24 +0200)]
Update luma menu theme

23 months agoMerge branch 'master' into DefaultUser/func_button_relay 486/head
Mario [Sun, 30 Sep 2018 15:04:47 +0000 (01:04 +1000)]
Merge branch 'master' into DefaultUser/func_button_relay

# Conflicts:
# qcsrc/common/mapobjects/func/button.qc

23 months agoMerge branch 'martin-t/bullet-trails' into 'master'
Mario [Sun, 30 Sep 2018 14:36:44 +0000 (14:36 +0000)]
Merge branch 'martin-t/bullet-trails' into 'master'

Pass effect entity to fireBullet(), give weak trail to hitscan weaps

See merge request xonotic/xonotic-data.pk3dir!521

23 months agoFix hash and hopefully compilation units
Mario [Sun, 30 Sep 2018 14:28:24 +0000 (00:28 +1000)]
Fix hash and hopefully compilation units

23 months agoMake cl_eventchase_spectated_change last 1 second instead of 0.5s; allow customizing...
terencehill [Sun, 30 Sep 2018 14:11:34 +0000 (16:11 +0200)]
Make cl_eventchase_spectated_change last 1 second instead of 0.5s; allow customizing this value with the new cvar cl_eventchase_spectated_change_time

23 months agoDon't perform various LOD/skeleton checks and handling when the player is invisible...
Mario [Sun, 30 Sep 2018 14:08:09 +0000 (00:08 +1000)]
Don't perform various LOD/skeleton checks and handling when the player is invisible, saves a bit of performance while inside vehicles

23 months agocl_eventchase_spectated_change: disable chase_active while eventchase is still enable...
terencehill [Sun, 30 Sep 2018 13:53:16 +0000 (15:53 +0200)]
cl_eventchase_spectated_change: disable chase_active while eventchase is still enabled so to avoid a glicth

23 months agoMerge branch 'Mario/duel' into 'master'
Mario [Sun, 30 Sep 2018 12:30:31 +0000 (12:30 +0000)]
Merge branch 'Mario/duel' into 'master'

Merge branch Mario/duel (S merge request)

See merge request xonotic/xonotic-data.pk3dir!590

23 months agoUse the new player limit function for limiting bot count 590/head
Mario [Sun, 30 Sep 2018 12:29:06 +0000 (22:29 +1000)]
Use the new player limit function for limiting bot count

23 months agoMerge branch 'master' into Mario/duel
Mario [Sun, 30 Sep 2018 12:26:19 +0000 (22:26 +1000)]
Merge branch 'master' into Mario/duel

23 months agoMerge branch 'master' into martin-t/bullet-trails 521/head
Martin Taibr [Sun, 30 Sep 2018 12:24:21 +0000 (14:24 +0200)]
Merge branch 'master' into martin-t/bullet-trails

23 months agoDon't do extra unnecessary antilag checks for the arc's smoke effect
Mario [Sun, 30 Sep 2018 12:22:11 +0000 (22:22 +1000)]
Don't do extra unnecessary antilag checks for the arc's smoke effect

23 months agoRemove an old TODO that's since been resolved
Mario [Sun, 30 Sep 2018 12:01:46 +0000 (22:01 +1000)]
Remove an old TODO that's since been resolved

23 months agoFix arc preventing switching weapons when you change weapons with the button held
Mario [Sun, 30 Sep 2018 11:41:40 +0000 (21:41 +1000)]
Fix arc preventing switching weapons when you change weapons with the button held

23 months agoIf arc's beam direction is the same as shot direction, snap it, reduces bandwidth...
Mario [Sun, 30 Sep 2018 11:06:52 +0000 (21:06 +1000)]
If arc's beam direction is the same as shot direction, snap it, reduces bandwidth usage when standing still

23 months agoMerge branch 'martin-t/help' into 'master'
Mario [Sun, 30 Sep 2018 05:53:03 +0000 (05:53 +0000)]
Merge branch 'martin-t/help' into 'master'

Help system

See merge request xonotic/xonotic-data.pk3dir!603

23 months agoTransifex autosync
Rudolf Polzer [Sun, 30 Sep 2018 05:24:18 +0000 (07:24 +0200)]
Transifex autosync

23 months agoChange the example gametype vote to be 1v1 CTF instead of duel (which is an actual...
Mario [Sun, 30 Sep 2018 04:00:41 +0000 (14:00 +1000)]
Change the example gametype vote to be 1v1 CTF instead of duel (which is an actual gametype here)

23 months agoMerge branch 'Mario/bot_maxplayers' into 'master'
Martin Taibr [Sat, 29 Sep 2018 17:39:04 +0000 (17:39 +0000)]
Merge branch 'Mario/bot_maxplayers' into 'master'

Merge branch Mario/bot_maxplayers (XXS merge request)

See merge request xonotic/xonotic-data.pk3dir!601

23 months agoMove some TDM settings to the gamemodes config
Mario [Sat, 29 Sep 2018 15:00:26 +0000 (01:00 +1000)]
Move some TDM settings to the gamemodes config

23 months agooff by 1 in help system 603/head
Martin Taibr [Sat, 29 Sep 2018 14:59:21 +0000 (16:59 +0200)]
off by 1 in help system

23 months agoadjust the comments, add a tip
Martin Taibr [Sat, 29 Sep 2018 14:57:13 +0000 (16:57 +0200)]
adjust the comments, add a tip

23 months agoRemove some unused cvars from config
Mario [Sat, 29 Sep 2018 14:57:05 +0000 (00:57 +1000)]
Remove some unused cvars from config

23 months agoTemporarily disable QC physics until the player sticking issue can be resolved
Mario [Sat, 29 Sep 2018 14:30:25 +0000 (00:30 +1000)]
Temporarily disable QC physics until the player sticking issue can be resolved

23 months agoonly exec help.cfg once
Martin Taibr [Sat, 29 Sep 2018 14:28:54 +0000 (16:28 +0200)]
only exec help.cfg once

23 months agoinclude tips for overkill
Martin Taibr [Sat, 29 Sep 2018 14:09:42 +0000 (16:09 +0200)]
include tips for overkill

23 months agoMerge branch 'master' into Mario/duel
Mario [Sat, 29 Sep 2018 13:59:52 +0000 (23:59 +1000)]
Merge branch 'master' into Mario/duel

23 months agocopy help.cfg from server/
Martin Taibr [Sat, 29 Sep 2018 13:35:52 +0000 (15:35 +0200)]
copy help.cfg from server/

23 months agoMake use of the thiswep parameter in weapon functions, fixes some potential issues...
Mario [Sat, 29 Sep 2018 07:03:30 +0000 (17:03 +1000)]
Make use of the thiswep parameter in weapon functions, fixes some potential issues with reusing attacks and greatly reduces the number of references to the specific weapons

23 months agoAdd a property to tell when gamemodes are supposed to be forced supported (TDM on...
Mario [Sat, 29 Sep 2018 06:33:29 +0000 (16:33 +1000)]
Add a property to tell when gamemodes are supposed to be forced supported (TDM on DM maps)

23 months agoFix client model fade distance fields being limited to 255
Mario [Fri, 28 Sep 2018 10:25:57 +0000 (20:25 +1000)]
Fix client model fade distance fields being limited to 255

23 months agoMake use of a temporary intrusive list to avoid checking revivng players twice for...
terencehill [Thu, 27 Sep 2018 13:28:19 +0000 (15:28 +0200)]
Make use of a temporary intrusive list to avoid checking revivng players twice for each player

23 months agoAdjust view offset too so it isn't poking out the top of the model
Mario [Thu, 27 Sep 2018 05:29:38 +0000 (15:29 +1000)]
Adjust view offset too so it isn't poking out the top of the model

23 months agoUse the cvar directly (stats don't work server side for some reason)
Mario [Thu, 27 Sep 2018 05:06:25 +0000 (15:06 +1000)]
Use the cvar directly (stats don't work server side for some reason)

23 months agoAdd an option to use the Quake 3 hitbox size when playing VQ3 maps
Mario [Thu, 27 Sep 2018 04:34:49 +0000 (14:34 +1000)]
Add an option to use the Quake 3 hitbox size when playing VQ3 maps

23 months agoMake bots obey g_maxplayers 601/head
Mario [Thu, 27 Sep 2018 02:06:03 +0000 (12:06 +1000)]
Make bots obey g_maxplayers

23 months agoMerge branch 'terencehill/ft_bugfix' into 'master'
Mario [Thu, 27 Sep 2018 01:26:44 +0000 (01:26 +0000)]
Merge branch 'terencehill/ft_bugfix' into 'master'

FT bugfixes

Closes #2098 and #2079

See merge request xonotic/xonotic-data.pk3dir!600

23 months agoUnpress button14 on CSQC shutdown
Mario [Wed, 26 Sep 2018 10:46:43 +0000 (20:46 +1000)]
Unpress button14 on CSQC shutdown

23 months agoMerge branch 'master' into martin-t/bullet-trails
Martin Taibr [Wed, 26 Sep 2018 06:43:27 +0000 (08:43 +0200)]
Merge branch 'master' into martin-t/bullet-trails

23 months agoMerge branch 'Mario/warmup_timer' into 'master'
Mario [Wed, 26 Sep 2018 06:23:54 +0000 (06:23 +0000)]
Merge branch 'Mario/warmup_timer' into 'master'

Merge branch Mario/warmup_timer (XXS merge request)

See merge request xonotic/xonotic-data.pk3dir!598

23 months agoAdd a temporary client-server option to allow turning off auto switching in CTS
Mario [Wed, 26 Sep 2018 00:30:44 +0000 (10:30 +1000)]
Add a temporary client-server option to allow turning off auto switching in CTS

2 years agoUse FROZEN_* constants in all the Freeze calls 600/head
terencehill [Tue, 25 Sep 2018 12:48:35 +0000 (14:48 +0200)]
Use FROZEN_* constants in all the Freeze calls

2 years agoRearrange code to avoid redundant checks
terencehill [Tue, 25 Sep 2018 12:34:00 +0000 (14:34 +0200)]
Rearrange code to avoid redundant checks

2 years agoReplace cases of !SAME_TEAM with DIFF_TEAM
Mario [Mon, 24 Sep 2018 12:47:33 +0000 (22:47 +1000)]
Replace cases of !SAME_TEAM with DIFF_TEAM

2 years agoMerge branch 'packer/dmg-and-ca-scoring' into 'master'
Mario [Mon, 24 Sep 2018 12:46:44 +0000 (12:46 +0000)]
Merge branch 'packer/dmg-and-ca-scoring' into 'master'

fix dmg and ca scoring

See merge request xonotic/xonotic-data.pk3dir!599

2 years agoAdd an undraggable function and make use of it in the exclusions
Mario [Mon, 24 Sep 2018 08:07:29 +0000 (18:07 +1000)]
Add an undraggable function and make use of it in the exclusions

2 years agoAdd a way for entities to tell whether they're draggable (currently unused)
Mario [Mon, 24 Sep 2018 07:13:26 +0000 (17:13 +1000)]
Add a way for entities to tell whether they're draggable (currently unused)

2 years agoRename Item to MenuItem, to avoid potential duplicate issues in the future
Mario [Mon, 24 Sep 2018 01:57:10 +0000 (11:57 +1000)]
Rename Item to MenuItem, to avoid potential duplicate issues in the future

2 years agoFix #2079: "Progress indicator sometimes missing when reviving teammates in FT"
terencehill [Sun, 23 Sep 2018 16:35:39 +0000 (18:35 +0200)]
Fix #2079: "Progress indicator sometimes missing when reviving teammates in FT"

2 years agoIntroduce some constants to indicate frozen states; improve a few frozen state checks...
terencehill [Sun, 23 Sep 2018 10:49:27 +0000 (12:49 +0200)]
Introduce some constants to indicate frozen states; improve a few frozen state checks in freezetag code

2 years agoMinor optimisation to client physics options
Mario [Sun, 23 Sep 2018 03:12:18 +0000 (13:12 +1000)]
Minor optimisation to client physics options

2 years agoFix unsticking so it uses the actual offset position rather than the entity's current...
Mario [Sun, 23 Sep 2018 01:48:18 +0000 (11:48 +1000)]
Fix unsticking so it uses the actual offset position rather than the entity's current position, also implement SV_CheckStuck for player unsticking to oldorigin

2 years agoMerge branch 'Mario/qcphysics'
Mario [Sat, 22 Sep 2018 21:50:12 +0000 (07:50 +1000)]
Merge branch 'Mario/qcphysics'

2 years agoIf stepdown is 2, enable the old fix for stair smoothing while going down stairs
Mario [Sat, 22 Sep 2018 21:48:56 +0000 (07:48 +1000)]
If stepdown is 2, enable the old fix for stair smoothing while going down stairs

2 years agoClean up code by avoiding resetting player's health in Unfreeze as it's not needed...
terencehill [Sat, 22 Sep 2018 19:10:33 +0000 (21:10 +0200)]
Clean up code by avoiding resetting player's health in Unfreeze as it's not needed in most cases. Don't automatically count alive players in the ft hook of Unfreeze as it's now redundant

2 years agodo not give damage score when shooting teammates 599/head
packer [Sat, 22 Sep 2018 11:43:49 +0000 (13:43 +0200)]
do not give damage score when shooting teammates

2 years agoclan arena:
packer [Sat, 22 Sep 2018 11:37:48 +0000 (13:37 +0200)]
clan arena:
- fix how scoring is performed when damage exceeds remaining
  health/armor fragged player (e.g. telefrag and void frag)
- dont give any score when killing teammates

2 years agoOn second thought, don't override the intermission timer with the warmup text 598/head
Mario [Sat, 22 Sep 2018 05:39:40 +0000 (15:39 +1000)]
On second thought, don't override the intermission timer with the warmup text

2 years agoDuring warmup stage, show WARMUP instead of a timer, but restore the timer 1 minute...
Mario [Sat, 22 Sep 2018 05:36:38 +0000 (15:36 +1000)]
During warmup stage, show WARMUP instead of a timer, but restore the timer 1 minute before the match starts

2 years agoAbuse a button slot to tell the server when a player is playing a minigame
Mario [Sat, 22 Sep 2018 05:17:01 +0000 (15:17 +1000)]
Abuse a button slot to tell the server when a player is playing a minigame

2 years agoMerge branch 'terencehill/scoreboard_stuff' into 'master'
Mario [Sat, 22 Sep 2018 04:50:48 +0000 (04:50 +0000)]
Merge branch 'terencehill/scoreboard_stuff' into 'master'

Scoreboard stuff

See merge request xonotic/xonotic-data.pk3dir!592

2 years agoFreezetag: fix wrong count of alive players when a frozen player becomes spectator...
terencehill [Fri, 21 Sep 2018 22:20:23 +0000 (00:20 +0200)]
Freezetag: fix wrong count of alive players when a frozen player becomes spectator or disconnects; it fixes #2098

2 years agoMerge branch 'Lyberta/OKShotgunAccuracy' into 'master'
Mario [Fri, 21 Sep 2018 22:11:28 +0000 (22:11 +0000)]
Merge branch 'Lyberta/OKShotgunAccuracy' into 'master'

Fix OKShotgun accuracy stats

See merge request xonotic/xonotic-data.pk3dir!596

2 years agoFix OKShotgun accuracy stats. 596/head
Lyberta [Fri, 21 Sep 2018 04:34:11 +0000 (07:34 +0300)]
Fix OKShotgun accuracy stats.

2 years agoMerge branch 'Mario/cursor' into 'master'
Mario [Fri, 21 Sep 2018 02:19:30 +0000 (02:19 +0000)]
Merge branch 'Mario/cursor' into 'master'

Merge branch Mario/cursor (M merge request)

Closes #1128

See merge request xonotic/xonotic-data.pk3dir!570

2 years agoDon't prompt about turns in singleplayer minigames
Mario [Fri, 21 Sep 2018 02:14:12 +0000 (12:14 +1000)]
Don't prompt about turns in singleplayer minigames