xonotic/xonotic-data.pk3dir.git
3 years agoMerge branch 'master' into terencehill/bot_AI 404/head
terencehill [Thu, 12 Jan 2017 13:29:37 +0000 (14:29 +0100)]
Merge branch 'master' into terencehill/bot_AI

3 years agoFix compilation unit
terencehill [Thu, 12 Jan 2017 13:27:10 +0000 (14:27 +0100)]
Fix compilation unit

3 years agoMove shockwave down the priority list too
terencehill [Thu, 12 Jan 2017 11:59:30 +0000 (12:59 +0100)]
Move shockwave down the priority list too

3 years agoFix issues with choice notifications
terencehill [Wed, 11 Jan 2017 22:24:19 +0000 (23:24 +0100)]
Fix issues with choice notifications

3 years agoTransifex Sync.
Rudolf Polzer [Wed, 11 Jan 2017 15:42:54 +0000 (16:42 +0100)]
Transifex Sync.

3 years agoMerge branch 'master' into terencehill/bot_AI
terencehill [Wed, 11 Jan 2017 15:05:06 +0000 (16:05 +0100)]
Merge branch 'master' into terencehill/bot_AI

3 years agoSmall cleanup
terencehill [Wed, 11 Jan 2017 14:58:31 +0000 (15:58 +0100)]
Small cleanup

3 years agoMerge branch 'terencehill/notification_cvars' into 'master'
Mario [Tue, 10 Jan 2017 21:50:24 +0000 (21:50 +0000)]
Merge branch 'terencehill/notification_cvars' into 'master'

Reduce number of notification cvars

See merge request !403

3 years agoFix type 403/head
Mario [Tue, 10 Jan 2017 21:34:19 +0000 (07:34 +1000)]
Fix type

3 years agoRemove weapon_blocked
Mario [Tue, 10 Jan 2017 18:42:12 +0000 (04:42 +1000)]
Remove weapon_blocked

3 years agoFix a couple of precache warnings with doors and plats
Mario [Tue, 10 Jan 2017 15:55:59 +0000 (01:55 +1000)]
Fix a couple of precache warnings with doors and plats

3 years agoAssign a higher priority to the vortex on close distances for more lethal vortex...
terencehill [Tue, 10 Jan 2017 15:26:29 +0000 (16:26 +0100)]
Assign a higher priority to the vortex on close distances for more lethal vortex-shotgun combos

3 years agoFix it properly
Mario [Tue, 10 Jan 2017 15:11:09 +0000 (01:11 +1000)]
Fix it properly

3 years agoBot AI: improve item rating
terencehill [Tue, 10 Jan 2017 15:08:16 +0000 (16:08 +0100)]
Bot AI: improve item rating

* fine-tune weapon base values and always use them instead of needlessly calculating every time new ones from the priority lists
* dynamically increase ammo and health/armor values based on the current need of them
* rate already owned weapons like ammo plus a small percentage of base weapon value

3 years agoFix servers always starting with deathmatch
Mario [Tue, 10 Jan 2017 15:07:25 +0000 (01:07 +1000)]
Fix servers always starting with deathmatch

3 years agoTweak flight buff to be more reliable (only needs crouch to trigger change of gravity)
Mario [Mon, 9 Jan 2017 20:21:28 +0000 (06:21 +1000)]
Tweak flight buff to be more reliable (only needs crouch to trigger change of gravity)

3 years agoSimplify modicons panel fading code
terencehill [Mon, 9 Jan 2017 18:51:20 +0000 (19:51 +0100)]
Simplify modicons panel fading code

3 years agoMove game_stopped setting to game modes that want it
terencehill [Mon, 9 Jan 2017 18:42:17 +0000 (19:42 +0100)]
Move game_stopped setting to game modes that want it

3 years agoUpdate attack mode crosshair while raptor is launching
Mario [Mon, 9 Jan 2017 13:16:54 +0000 (23:16 +1000)]
Update attack mode crosshair while raptor is launching

3 years agoRestore round handler resetting behaviour by not setting game_stopped during round...
Mario [Mon, 9 Jan 2017 10:47:14 +0000 (20:47 +1000)]
Restore round handler resetting behaviour by not setting game_stopped during round intermission

3 years agoOptimize round restarting code and fix some modes (temporary hack)
Mario [Mon, 9 Jan 2017 08:22:23 +0000 (18:22 +1000)]
Optimize round restarting code and fix some modes (temporary hack)

3 years agoFix invasion spawn priority preferring spawns that have been used recently
Mario [Mon, 9 Jan 2017 07:41:18 +0000 (17:41 +1000)]
Fix invasion spawn priority preferring spawns that have been used recently

3 years agoDon't allow players to become spectators after the game has ended
terencehill [Sat, 7 Jan 2017 18:47:55 +0000 (19:47 +0100)]
Don't allow players to become spectators after the game has ended

3 years agoSmall simplification
terencehill [Sat, 7 Jan 2017 18:47:01 +0000 (19:47 +0100)]
Small simplification

3 years agoAdd a hidden flag to monsters, so they don't show up in random spawning, invasion...
Mario [Sat, 7 Jan 2017 13:48:46 +0000 (23:48 +1000)]
Add a hidden flag to monsters, so they don't show up in random spawning, invasion or mob lists (similar to passive type, but more generally hidden)

3 years agoFix players not blocked and not able to vote when a CA match ends. It fixes #1849
terencehill [Sat, 7 Jan 2017 13:39:15 +0000 (14:39 +0100)]
Fix players not blocked and not able to vote when a CA match ends. It fixes #1849

3 years agoRemove an unused function
Mario [Sat, 7 Jan 2017 05:34:06 +0000 (15:34 +1000)]
Remove an unused function

3 years agoProperly unassign hook from player's weapon entity on client side (may fix crouching...
Mario [Sat, 7 Jan 2017 00:15:03 +0000 (10:15 +1000)]
Properly unassign hook from player's weapon entity on client side (may fix crouching issues)

3 years agoAvoid potentially drawing a 'bad string' (better to show no reticle at all than to...
Mario [Fri, 6 Jan 2017 22:51:47 +0000 (08:51 +1000)]
Avoid potentially drawing a 'bad string' (better to show no reticle at all than to crash the client)

3 years agoRemove nent_cvarname field, get the cvar name from nent_name
terencehill [Fri, 6 Jan 2017 16:11:09 +0000 (17:11 +0100)]
Remove nent_cvarname field, get the cvar name from nent_name

3 years agoHandle notifications with team information with a single cvar instead of one per...
terencehill [Fri, 6 Jan 2017 10:56:37 +0000 (11:56 +0100)]
Handle notifications with team information with a single cvar instead of one per team. Say goodbye to 156 cvars!

3 years agoFix wrong naming style and initialization in 2 macros that luckily didn't cause any...
terencehill [Thu, 5 Jan 2017 19:55:40 +0000 (20:55 +0100)]
Fix wrong naming style and initialization in 2 macros that luckily didn't cause any trouble as these macros aren't used anywhere

3 years agoAdd the weapon entity to the firebullet mutator hook
Mario [Thu, 5 Jan 2017 17:57:18 +0000 (03:57 +1000)]
Add the weapon entity to the firebullet mutator hook

3 years agoFix another game over check; remove some redundant checks
terencehill [Wed, 4 Jan 2017 22:03:56 +0000 (23:03 +0100)]
Fix another game over check; remove some redundant checks

3 years agoRename gameover to game_stopped as it makes more sense now. Proper game over check...
terencehill [Wed, 4 Jan 2017 18:59:26 +0000 (19:59 +0100)]
Rename gameover to game_stopped as it makes more sense now. Proper game over check is if(intermission_running)

3 years agoAllow spectators to vote if sv_vote_nospectators is 1 if the game is over, not just...
terencehill [Wed, 4 Jan 2017 18:41:02 +0000 (19:41 +0100)]
Allow spectators to vote if sv_vote_nospectators is 1 if the game is over, not just if it's stopped (round has ended)

3 years agoIf a round hasn't started yet forbid primary and secondary fire, allow switching...
terencehill [Wed, 4 Jan 2017 17:43:35 +0000 (18:43 +0100)]
If a round hasn't started yet forbid primary and secondary fire, allow switching to another weapon

3 years agoNew Toys is not a mod worthy of affecting the server list
Mario [Wed, 4 Jan 2017 15:55:31 +0000 (01:55 +1000)]
New Toys is not a mod worthy of affecting the server list

3 years agoMerge branch 'Mario/wepent_experimental' into 'master'
Mario [Wed, 4 Jan 2017 07:07:41 +0000 (07:07 +0000)]
Merge branch 'Mario/wepent_experimental' into 'master'

Merge branch Mario/wepent_experimental (XXL merge request)

See merge request !372

3 years agoUpdate hash 372/head
Mario [Wed, 4 Jan 2017 06:48:28 +0000 (16:48 +1000)]
Update hash

3 years agoMerge branch 'master' into Mario/wepent_experimental
Mario [Tue, 3 Jan 2017 12:37:45 +0000 (22:37 +1000)]
Merge branch 'master' into Mario/wepent_experimental

# Conflicts:
# qcsrc/common/mutators/mutator/overkill/sv_overkill.qc

3 years agoRestore ps_push
Mario [Tue, 3 Jan 2017 12:31:48 +0000 (22:31 +1000)]
Restore ps_push

3 years agoMerge branch 'terencehill/keyhunt' into 'master'
Mario [Tue, 3 Jan 2017 01:34:31 +0000 (01:34 +0000)]
Merge branch 'terencehill/keyhunt' into 'master'

Keyhunt improvements

Closes #1843 and #1837

See merge request !402

3 years agoUpdate notifications.cfg 402/head
terencehill [Mon, 2 Jan 2017 23:08:14 +0000 (00:08 +0100)]
Update notifications.cfg

3 years agoHack in support for duel as a reported gametype to stats
Mario [Mon, 2 Jan 2017 14:06:02 +0000 (00:06 +1000)]
Hack in support for duel as a reported gametype to stats

3 years agoUpdate hash
Mario [Mon, 2 Jan 2017 09:13:01 +0000 (19:13 +1000)]
Update hash

3 years agoAllow multiple traces through the same warpzone, let the recursive warpzone lightshow...
Mario [Mon, 2 Jan 2017 08:21:52 +0000 (18:21 +1000)]
Allow multiple traces through the same warpzone, let the recursive warpzone lightshows begin!

3 years agoMerge branch 'martin-t/ok_weap' into 'master'
Mario [Mon, 2 Jan 2017 08:05:02 +0000 (08:05 +0000)]
Merge branch 'martin-t/ok_weap' into 'master'

overkill: take into account last weapon held when switching while dead

Closes #1728

See merge request !400

3 years agoMerge branch 'martin-t/info' into 'master'
Mario [Mon, 2 Jan 2017 08:01:38 +0000 (08:01 +0000)]
Merge branch 'martin-t/info' into 'master'

Remove "client version and server version are compatible" message

See merge request !401

3 years agoFix a crash caused by stupid maps
Mario [Mon, 2 Jan 2017 02:37:42 +0000 (12:37 +1000)]
Fix a crash caused by stupid maps

3 years agoPreliminary support for triggering items (default action is to give the item to the...
Mario [Sun, 1 Jan 2017 22:50:56 +0000 (08:50 +1000)]
Preliminary support for triggering items (default action is to give the item to the activator), requires spawnflags 16

3 years agoHardcode the health/damage limits for pain sounds and laser jumps, so even powerful...
Mario [Sun, 1 Jan 2017 12:18:08 +0000 (22:18 +1000)]
Hardcode the health/damage limits for pain sounds and laser jumps, so even powerful laser shots will play sounds (also fixes rocket jumping not making a sound)

3 years agoremove "client version and server version are compatible" message 401/head
Martin Taibr [Sun, 1 Jan 2017 00:43:28 +0000 (01:43 +0100)]
remove "client version and server version are compatible" message

3 years agoMerge branch 'master' into terencehill/keyhunt
terencehill [Sat, 31 Dec 2016 22:00:03 +0000 (23:00 +0100)]
Merge branch 'master' into terencehill/keyhunt

3 years agooverkill: take into account last weapon held when switching while dead 400/head
Martin Taibr [Sat, 31 Dec 2016 21:00:59 +0000 (22:00 +0100)]
overkill: take into account last weapon held when switching while dead

3 years agoautocvar_g_grappling_hook can't use be used here as it doesn't work in the campaign...
terencehill [Sat, 31 Dec 2016 17:27:45 +0000 (18:27 +0100)]
autocvar_g_grappling_hook can't use be used here as it doesn't work in the campaign, it fixes #1848

3 years agoCvar descriptions shouldn't be translatable
terencehill [Sat, 31 Dec 2016 14:55:21 +0000 (15:55 +0100)]
Cvar descriptions shouldn't be translatable

3 years agoFix compile
Mario [Sat, 31 Dec 2016 11:06:25 +0000 (21:06 +1000)]
Fix compile

3 years agoMerge branch 'master' into Mario/wepent_experimental
Mario [Sat, 31 Dec 2016 05:44:54 +0000 (15:44 +1000)]
Merge branch 'master' into Mario/wepent_experimental

# Conflicts:
# qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
# qcsrc/common/turrets/turret/plasma.qc
# qcsrc/common/turrets/turret/plasma_dual.qc
# qcsrc/common/weapons/weapon/vaporizer.qc
# qcsrc/common/weapons/weapon/vortex.qc

3 years agoMerge branch 'Mirio/balance' into 'master'
Mario [Sat, 31 Dec 2016 05:29:39 +0000 (05:29 +0000)]
Merge branch 'Mirio/balance' into 'master'

Mirio/balance

See merge request !291

3 years agoMerge branch 'martin-t/shuffleteams' into 'master'
Mario [Sat, 31 Dec 2016 05:18:36 +0000 (05:18 +0000)]
Merge branch 'martin-t/shuffleteams' into 'master'

Fix shuffleteams

Closes #1822

See merge request !393

3 years agoMerge branch 'martin-t/maxshotdist' into 'master'
Mario [Sat, 31 Dec 2016 05:08:32 +0000 (05:08 +0000)]
Merge branch 'martin-t/maxshotdist' into 'master'

Fix fireBullet(), increase MAX_SHOT_DISTANCE

See merge request !395

3 years agoUpdate gameplay hash 291/head
Mario [Sat, 31 Dec 2016 01:51:53 +0000 (11:51 +1000)]
Update gameplay hash

3 years agoMerge branch 'master' into martin-t/shuffleteams 393/head
Mario [Sat, 31 Dec 2016 01:29:51 +0000 (11:29 +1000)]
Merge branch 'master' into martin-t/shuffleteams

3 years agoMerge branch 'master' into martin-t/maxshotdist 395/head
Mario [Sat, 31 Dec 2016 01:28:57 +0000 (11:28 +1000)]
Merge branch 'master' into martin-t/maxshotdist

3 years agoMerge branch 'martin-t/misc' into 'master'
Mario [Sat, 31 Dec 2016 01:25:48 +0000 (01:25 +0000)]
Merge branch 'martin-t/misc' into 'master'

martin-t/misc

See merge request !399

3 years agoMerge branch 'master' into Mario/wepent_experimental
Mario [Sat, 31 Dec 2016 01:00:59 +0000 (11:00 +1000)]
Merge branch 'master' into Mario/wepent_experimental

3 years agoRemove the if() check, all we're doing is setting it to null anyway
Mario [Sat, 31 Dec 2016 00:59:20 +0000 (10:59 +1000)]
Remove the if() check, all we're doing is setting it to null anyway

3 years agoRevert linkexplode change to crylink
Mario [Sat, 31 Dec 2016 00:57:03 +0000 (10:57 +1000)]
Revert linkexplode change to crylink

3 years agoMerge branch 'master' into Mirio/balance
Mario [Sat, 31 Dec 2016 00:54:39 +0000 (10:54 +1000)]
Merge branch 'master' into Mirio/balance

3 years agoUse their instead of his 399/head
Mario [Sat, 31 Dec 2016 00:50:16 +0000 (10:50 +1000)]
Use their instead of his

3 years agoMerge branch 'terencehill/bot_fix' into 'master'
Mario [Sat, 31 Dec 2016 00:44:53 +0000 (00:44 +0000)]
Merge branch 'terencehill/bot_fix' into 'master'

Bot fixes

See merge request !398

3 years agoDon't modify the old weapon entity when observing
Mario [Sat, 31 Dec 2016 00:41:28 +0000 (10:41 +1000)]
Don't modify the old weapon entity when observing

3 years agoFix %W in chat messages again...
terencehill [Fri, 30 Dec 2016 19:01:35 +0000 (20:01 +0100)]
Fix %W in chat messages again...

3 years agoRevert "Show to spectators all the waypoints that are shown to spectated players...
terencehill [Fri, 30 Dec 2016 16:48:05 +0000 (17:48 +0100)]
Revert "Show to spectators all the waypoints that are shown to spectated players. It fixes #1840"

This reverts commit 8802dc71a56bfe87db766c6dab331046575f7eb9.

3 years agoMutators dialog: fix "No start weapons" checkbox enabling all weapons and "Regular...
terencehill [Fri, 30 Dec 2016 16:36:54 +0000 (17:36 +0100)]
Mutators dialog: fix "No start weapons" checkbox enabling all weapons and "Regular (no arena)" checkbox disabling all weapons

3 years agoEnable buffs by default and don't report them as a mutator (support for maps that...
Mario [Fri, 30 Dec 2016 14:47:35 +0000 (00:47 +1000)]
Enable buffs by default and don't report them as a mutator (support for maps that add buff items, they don't replace powerups)

3 years agoUpdate hash 398/head
Mario [Fri, 30 Dec 2016 11:26:03 +0000 (21:26 +1000)]
Update hash

3 years agoPlayerDamage_Calculate -> Damage_Calculate
Martin Taibr [Fri, 30 Dec 2016 03:35:35 +0000 (04:35 +0100)]
PlayerDamage_Calculate -> Damage_Calculate

3 years agofix overkill blaster damaging turrets and vehicles, remove redundant health check
Martin Taibr [Fri, 30 Dec 2016 02:44:49 +0000 (03:44 +0100)]
fix overkill blaster damaging turrets and vehicles, remove redundant health check

3 years agominor optimization
Martin Taibr [Fri, 30 Dec 2016 02:06:49 +0000 (03:06 +0100)]
minor optimization

3 years agosimplify cl_handicap, update description
Martin Taibr [Fri, 30 Dec 2016 02:06:00 +0000 (03:06 +0100)]
simplify cl_handicap, update description

3 years agoOptimize trigger_hurt check
terencehill [Thu, 29 Dec 2016 18:27:58 +0000 (19:27 +0100)]
Optimize trigger_hurt check

3 years agoDon't allow bots to move towards a dropped weapon until it's on the ground
terencehill [Thu, 29 Dec 2016 15:29:21 +0000 (16:29 +0100)]
Don't allow bots to move towards a dropped weapon until it's on the ground

3 years agoFix wrong checks causing bots to ignore dropped weapons (and enemies in the air)...
terencehill [Thu, 29 Dec 2016 15:22:30 +0000 (16:22 +0100)]
Fix wrong checks causing bots to ignore dropped weapons (and enemies in the air) when they look for a goal

3 years agoMerge branch 'master' into Mario/wepent_experimental
Mario [Thu, 29 Dec 2016 06:02:34 +0000 (16:02 +1000)]
Merge branch 'master' into Mario/wepent_experimental

# Conflicts:
# qcsrc/common/weapons/weapon/shotgun.qc

3 years agoMerge branch 'master' into terencehill/bot_fix
terencehill [Thu, 29 Dec 2016 01:59:28 +0000 (02:59 +0100)]
Merge branch 'master' into terencehill/bot_fix

3 years agoFix shotgun ammo field
terencehill [Thu, 29 Dec 2016 01:56:28 +0000 (02:56 +0100)]
Fix shotgun ammo field

3 years agoFix %W in chat messages
terencehill [Thu, 29 Dec 2016 01:55:00 +0000 (02:55 +0100)]
Fix %W in chat messages

3 years agoImprove weapon rating balance: bots now really take small health if low on health...
terencehill [Thu, 29 Dec 2016 01:19:31 +0000 (02:19 +0100)]
Improve weapon rating balance: bots now really take small health if low on health and ammo if low on ammo

3 years agoFix ammo rating, it was always rated 0
terencehill [Wed, 28 Dec 2016 18:39:29 +0000 (19:39 +0100)]
Fix ammo rating, it was always rated 0

3 years agoHigh rating for 50 armor is more than enough (justified by its long respawn time)
terencehill [Wed, 28 Dec 2016 18:38:17 +0000 (19:38 +0100)]
High rating for 50 armor is more than enough (justified by its long respawn time)

3 years agoSmall cleanup
terencehill [Wed, 28 Dec 2016 18:11:42 +0000 (19:11 +0100)]
Small cleanup

3 years agoCustom weapon priorities for bots: improve rating distribution by rating only weapons...
terencehill [Tue, 27 Dec 2016 16:28:12 +0000 (17:28 +0100)]
Custom weapon priorities for bots: improve rating distribution by rating only weapons available on the map

3 years agoMerge branch 'master' into Mario/wepent_experimental
Mario [Tue, 27 Dec 2016 12:44:01 +0000 (22:44 +1000)]
Merge branch 'master' into Mario/wepent_experimental

# Conflicts:
# qcsrc/server/weapons/weaponsystem.qc

3 years agoRemove IT_AMMO
Mario [Tue, 27 Dec 2016 08:20:35 +0000 (18:20 +1000)]
Remove IT_AMMO

3 years agoHopefully fix compilation unit
Mario [Mon, 26 Dec 2016 13:38:51 +0000 (23:38 +1000)]
Hopefully fix compilation unit

3 years agoHunter-Killer: Only loop through entities that can be damaged by contents (not perfec...
Mario [Mon, 26 Dec 2016 13:25:41 +0000 (23:25 +1000)]
Hunter-Killer: Only loop through entities that can be damaged by contents (not perfect coverage, but avoids checking EVERY entity within a 5000 qu radius)

3 years agoIf weapon entity is deleted, delete its hook too
Mario [Mon, 26 Dec 2016 12:34:36 +0000 (22:34 +1000)]
If weapon entity is deleted, delete its hook too

3 years agoAdd a debug option to weaponarena for all weapons (even mutator blocked ones)
Mario [Mon, 26 Dec 2016 12:30:09 +0000 (22:30 +1000)]
Add a debug option to weaponarena for all weapons (even mutator blocked ones)