xonotic/xonotic-data.pk3dir.git
2 years agoMerge branch 'terencehill/bot_waypoints'
terencehill [Sat, 27 Oct 2018 10:51:37 +0000 (12:51 +0200)]
Merge branch 'terencehill/bot_waypoints'

2 years agoDon't respawn frozen non-players when touching the void
Mario [Fri, 26 Oct 2018 07:11:48 +0000 (17:11 +1000)]
Don't respawn frozen non-players when touching the void

2 years agoAttach entcs to the client state
Mario [Fri, 26 Oct 2018 03:03:51 +0000 (13:03 +1000)]
Attach entcs to the client state

2 years agoMake the client side IS_PLAYER and IS_CLIENT checks more accurate
Mario [Fri, 26 Oct 2018 02:38:28 +0000 (12:38 +1000)]
Make the client side IS_PLAYER and IS_CLIENT checks more accurate

2 years agoSend player/local status so CSQC can do some things with it without relying on entnum
Mario [Fri, 26 Oct 2018 02:18:55 +0000 (12:18 +1000)]
Send player/local status so CSQC can do some things with it without relying on entnum

2 years agoClean up inventory creation code a bit so that it's somewhat spectatable
Mario [Thu, 25 Oct 2018 22:41:14 +0000 (08:41 +1000)]
Clean up inventory creation code a bit so that it's somewhat spectatable

2 years agoMerge branch 'master' into terencehill/bot_waypoints
terencehill [Mon, 22 Oct 2018 15:38:04 +0000 (17:38 +0200)]
Merge branch 'master' into terencehill/bot_waypoints

2 years agoMinor cleanups
terencehill [Mon, 22 Oct 2018 15:32:28 +0000 (17:32 +0200)]
Minor cleanups

2 years agoWAYPOINT_VERSION 1.01 --> 1.02
terencehill [Mon, 22 Oct 2018 14:53:59 +0000 (16:53 +0200)]
WAYPOINT_VERSION 1.01 --> 1.02

2 years agoBot AI: fix bots getting stuck in oblique warpzones (in the map hyperspace there...
terencehill [Mon, 22 Oct 2018 14:40:20 +0000 (16:40 +0200)]
Bot AI: fix bots getting stuck in oblique warpzones (in the map hyperspace there are 2)

2 years agodocument WEP_FLAG_PENETRATEWALLS
Martin Taibr [Sun, 21 Oct 2018 21:07:25 +0000 (23:07 +0200)]
document WEP_FLAG_PENETRATEWALLS

2 years agoMerge branch 'Mario/mapinfo_title_fix' into 'master'
Martin Taibr [Sun, 21 Oct 2018 17:19:27 +0000 (17:19 +0000)]
Merge branch 'Mario/mapinfo_title_fix' into 'master'

Merge branch Mario/mapinfo_title_fix (XXS merge request)

Closes #2086

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

2 years agoOptimize the redundancy check and ignore color codes (they're stripped anyway)
Mario [Sun, 21 Oct 2018 17:06:58 +0000 (03:06 +1000)]
Optimize the redundancy check and ignore color codes (they're stripped anyway)

2 years agoMerge branch 'master' into Mario/mapinfo_title_fix
Mario [Sun, 21 Oct 2018 16:52:27 +0000 (02:52 +1000)]
Merge branch 'master' into Mario/mapinfo_title_fix

2 years agoMerge branch 'martin-t/weapon_switch' into 'master'
Mario [Sun, 21 Oct 2018 16:47:21 +0000 (16:47 +0000)]
Merge branch 'martin-t/weapon_switch' into 'master'

Option to not reload by weapswitch and not fallback to other weaps from the impulse

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

2 years agoreplicate autoreload and impulse fallback cvars 616/head
Martin Taibr [Sun, 21 Oct 2018 16:32:10 +0000 (18:32 +0200)]
replicate autoreload and impulse fallback cvars

2 years agoUpdate hash
Mario [Sun, 21 Oct 2018 00:19:56 +0000 (10:19 +1000)]
Update hash

2 years agooption to not reload by weapswitch and not fallback to other weaps from the impulse
Martin Taibr [Sat, 20 Oct 2018 22:32:57 +0000 (00:32 +0200)]
option to not reload by weapswitch and not fallback to other weaps from the impulse

2 years agoDon't attach nades to the server-side weapon entity, so it can be disabled safely
Mario [Sat, 20 Oct 2018 21:28:53 +0000 (07:28 +1000)]
Don't attach nades to the server-side weapon entity, so it can be disabled safely

2 years agoMerge branch 'Mario/qcphysics_tweaks' into 'master'
Mario [Sat, 20 Oct 2018 18:50:04 +0000 (18:50 +0000)]
Merge branch 'Mario/qcphysics_tweaks' into 'master'

Merge branch Mario/qcphysics_tweaks (S merge request)

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

2 years agoMerge branch 'master' into Mario/qcphysics_tweaks 612/head
Mario [Sat, 20 Oct 2018 18:36:19 +0000 (04:36 +1000)]
Merge branch 'master' into Mario/qcphysics_tweaks

2 years agoNever group loot items, and only throw overkill shards towards players
Mario [Sat, 20 Oct 2018 18:35:51 +0000 (04:35 +1000)]
Never group loot items, and only throw overkill shards towards players

2 years agoEnable stepping down by default
Mario [Sat, 20 Oct 2018 17:08:50 +0000 (03:08 +1000)]
Enable stepping down by default

2 years agoMerge branch 'master' into Mario/qcphysics_tweaks
Mario [Sat, 20 Oct 2018 17:08:36 +0000 (03:08 +1000)]
Merge branch 'master' into Mario/qcphysics_tweaks

2 years agoMerge branch 'martin-t/effects' into 'master'
Mario [Sat, 20 Oct 2018 14:53:18 +0000 (14:53 +0000)]
Merge branch 'martin-t/effects' into 'master'

Improve graphics

Closes #1937

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

2 years agoother way around
Martin Taibr [Sat, 20 Oct 2018 14:40:51 +0000 (16:40 +0200)]
other way around

2 years agoMerge branch 'master' into martin-t/effects
Martin Taibr [Sat, 20 Oct 2018 14:29:33 +0000 (16:29 +0200)]
Merge branch 'master' into martin-t/effects

2 years agocompress skies in default effects
Martin Taibr [Sat, 20 Oct 2018 14:29:16 +0000 (16:29 +0200)]
compress skies in default effects

2 years agoHide some gametype checks so they somewhat match the server
Mario [Thu, 18 Oct 2018 22:41:21 +0000 (08:41 +1000)]
Hide some gametype checks so they somewhat match the server

2 years agoBot waypoints: improve generation of waypoints for warpzones pointing downwards;...
terencehill [Thu, 18 Oct 2018 20:39:30 +0000 (22:39 +0200)]
Bot waypoints: improve generation of waypoints for warpzones pointing downwards; don't generate waypoints for warpzones pointing upwards, bots can't use them anyway

2 years agoSnap to the ground waypoints of source and destination warpzones depending on their...
terencehill [Wed, 17 Oct 2018 20:18:11 +0000 (22:18 +0200)]
Snap to the ground waypoints of source and destination warpzones depending on their respective orientations, not just the one of the source warpzone; it fixes warpzones of the map newtonian-nightmare

2 years agoUpdate hash
Mario [Wed, 17 Oct 2018 15:41:12 +0000 (01:41 +1000)]
Update hash

2 years agoMerge branch 'Mario/wepgroup_switch' into 'master'
Mario [Wed, 17 Oct 2018 14:55:39 +0000 (14:55 +0000)]
Merge branch 'Mario/wepgroup_switch' into 'master'

Merge branch Mario/wepgroup_switch

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

2 years agoMerge branch 'sev/luma-menu-xpm' into 'master'
Mario [Wed, 17 Oct 2018 12:08:06 +0000 (12:08 +0000)]
Merge branch 'sev/luma-menu-xpm' into 'master'

Add xpm serverlist icon to menu themes

Closes #2107

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

2 years agoDisallow enabling r_water via mapinfo, automatically enable it on maps with warpzones...
Mario [Wed, 17 Oct 2018 08:44:23 +0000 (18:44 +1000)]
Disallow enabling r_water via mapinfo, automatically enable it on maps with warpzones and cameras

2 years agoUse an attack think loop to keep the attack going instead of spamming weapon think...
Mario [Tue, 16 Oct 2018 23:38:29 +0000 (09:38 +1000)]
Use an attack think loop to keep the attack going instead of spamming weapon think, fixes Arc disconnecting clients with buffer overflows

2 years agoDon't count non-client attackers as valid for accuracy
Mario [Tue, 16 Oct 2018 20:18:31 +0000 (06:18 +1000)]
Don't count non-client attackers as valid for accuracy

2 years agoSkip some checks if checking sound_allowed on a null entity
Mario [Tue, 16 Oct 2018 20:13:24 +0000 (06:13 +1000)]
Skip some checks if checking sound_allowed on a null entity

2 years agoFix hagar's animation resetting after the first attack
Mario [Tue, 16 Oct 2018 12:21:48 +0000 (22:21 +1000)]
Fix hagar's animation resetting after the first attack

2 years agoFix compile and move gametype legacy defaults to an attribute
Mario [Mon, 15 Oct 2018 15:42:08 +0000 (01:42 +1000)]
Fix compile and move gametype legacy defaults to an attribute

2 years agoClean up a bunch of gamemode specific references
Mario [Mon, 15 Oct 2018 15:31:35 +0000 (01:31 +1000)]
Clean up a bunch of gamemode specific references

2 years agoUse the weapon entity as a parameter to ATTACK_FINISHED instead of the slot number...
Mario [Mon, 15 Oct 2018 14:50:58 +0000 (00:50 +1000)]
Use the weapon entity as a parameter to ATTACK_FINISHED instead of the slot number, fixes a potential issue when dual wielding different weapons and reduces code redundancy

2 years agoDivide the attack rate by the maximum weapon slots instead of halving it
Mario [Mon, 15 Oct 2018 14:22:00 +0000 (00:22 +1000)]
Divide the attack rate by the maximum weapon slots instead of halving it

2 years agoTweak alternating dual wielding so weapons fire in time
Mario [Mon, 15 Oct 2018 13:53:29 +0000 (23:53 +1000)]
Tweak alternating dual wielding so weapons fire in time

2 years agoUpdate the weapon ammo notification to point people to the developers
Mario [Mon, 15 Oct 2018 12:15:58 +0000 (22:15 +1000)]
Update the weapon ammo notification to point people to the developers

2 years agoTweak crylink a bit more in Mario balance
Mario [Mon, 15 Oct 2018 11:59:12 +0000 (21:59 +1000)]
Tweak crylink a bit more in Mario balance

2 years agoRestore shotgun and tweak crylink in Mario balance
Mario [Mon, 15 Oct 2018 11:54:54 +0000 (21:54 +1000)]
Restore shotgun and tweak crylink in Mario balance

2 years agoApply some tweaks to the QC movetypes to somewhat match what the engine is doing...
Mario [Sat, 13 Oct 2018 16:53:50 +0000 (02:53 +1000)]
Apply some tweaks to the QC movetypes to somewhat match what the engine is doing, attempt to fix players stuck inside other players

2 years agoFix compile
Mario [Sat, 13 Oct 2018 15:07:35 +0000 (01:07 +1000)]
Fix compile

2 years agoBot waypoints: don't create waypoints for jumppads that can be used only by a specifi...
terencehill [Sat, 13 Oct 2018 14:58:59 +0000 (16:58 +0200)]
Bot waypoints: don't create waypoints for jumppads that can be used only by a specific team because bots can't tell them from normal ones (e.g. 2 jumppads on newtonian-nightmare)

2 years agoSimplify waypoint_removelink
terencehill [Sat, 13 Oct 2018 14:53:42 +0000 (16:53 +0200)]
Simplify waypoint_removelink

2 years agoBot waypoints: try to add another link if the 32th link of a waypoint was removed
terencehill [Sat, 13 Oct 2018 14:24:04 +0000 (16:24 +0200)]
Bot waypoints: try to add another link if the 32th link of a waypoint was removed

2 years agoBot waypoints: fix removal of the 32th link of a waypoint
terencehill [Sat, 13 Oct 2018 14:02:10 +0000 (16:02 +0200)]
Bot waypoints: fix removal of the 32th link of a waypoint

2 years agoImprove warning message reporting broken hardwired links
terencehill [Sat, 13 Oct 2018 13:55:21 +0000 (15:55 +0200)]
Improve warning message reporting broken hardwired links

2 years agoDon't rely on the .minelayer_mines field for player's placed mines count (projectiles...
Mario [Sat, 13 Oct 2018 13:48:58 +0000 (23:48 +1000)]
Don't rely on the .minelayer_mines field for player's placed mines count (projectiles can lose their owner)

2 years agoRevert hiding of the weapon entity until a clean solution can be applied
Mario [Sat, 13 Oct 2018 12:03:37 +0000 (22:03 +1000)]
Revert hiding of the weapon entity until a clean solution can be applied

2 years agoPossible workaround for invisible nades
Mario [Sat, 13 Oct 2018 12:02:14 +0000 (22:02 +1000)]
Possible workaround for invisible nades

2 years agoAllow electro orbs to stick to entities if touchexplode is off
Mario [Sat, 13 Oct 2018 06:31:17 +0000 (16:31 +1000)]
Allow electro orbs to stick to entities if touchexplode is off

2 years agoFix electro orbs not sticking to entities properly
Mario [Sat, 13 Oct 2018 06:25:44 +0000 (16:25 +1000)]
Fix electro orbs not sticking to entities properly

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

2 years agoReuse W_SwitchWeapon to reduce code duplication 611/head
Mario [Fri, 12 Oct 2018 19:52:06 +0000 (05:52 +1000)]
Reuse W_SwitchWeapon to reduce code duplication

2 years agoWhen using specific weapon binds, if the player doesn't have the weapon, attempt...
Mario [Fri, 12 Oct 2018 19:44:54 +0000 (05:44 +1000)]
When using specific weapon binds, if the player doesn't have the weapon, attempt to switch to another weapon within the same group

2 years 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)

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

2 years 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)

2 years 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)

2 years 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)

2 years 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)

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

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

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

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

2 years agoAdd xpm serverlist icon to menu themes 613/head
Severin Meyer [Mon, 8 Oct 2018 13:18:22 +0000 (15:18 +0200)]
Add xpm serverlist icon to menu themes

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

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

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

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

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

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

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

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

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

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

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

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

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

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

2 years 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)

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

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

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

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

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

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

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

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

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

2 years agoMerge branch 'master' into DefaultUser/func_button_relay
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

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

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