]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/log
xonotic/xonotic-data.pk3dir.git
3 years agoMerge branch 'master' into bones_was_here/q3compat
bones_was_here [Sun, 18 Oct 2020 11:18:12 +0000 (21:18 +1000)]
Merge branch 'master' into bones_was_here/q3compat

3 years agoRename GetAmmoConsumptionPrimary to GetAmmoConsumptionQ3 and move to quake3.qc
bones_was_here [Sun, 18 Oct 2020 10:52:41 +0000 (20:52 +1000)]
Rename GetAmmoConsumptionPrimary to GetAmmoConsumptionQ3 and move to quake3.qc

3 years agoMinor cleanup to nades mutator
Mario [Sun, 18 Oct 2020 10:27:42 +0000 (20:27 +1000)]
Minor cleanup to nades mutator

3 years agoFix plasma turrets using a server-side particle effect number in InstaGib
Mario [Sun, 18 Oct 2020 10:07:50 +0000 (20:07 +1000)]
Fix plasma turrets using a server-side particle effect number in InstaGib

3 years agoTransifex autosync
Rudolf Polzer [Sun, 18 Oct 2020 05:25:23 +0000 (07:25 +0200)]
Transifex autosync

3 years agoSPAWNFUNC macro cleanup
bones_was_here [Sun, 18 Oct 2020 03:53:09 +0000 (13:53 +1000)]
SPAWNFUNC macro cleanup

3 years agoMerge branch 'TimePath/classnames' into 'master'
Mario [Sun, 18 Oct 2020 03:07:43 +0000 (03:07 +0000)]
Merge branch 'TimePath/classnames' into 'master'

Tidy up classnames

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

3 years agoTidy up classnames
TimePath [Sun, 18 Oct 2020 03:07:43 +0000 (03:07 +0000)]
Tidy up classnames

3 years agoq3compat: Fix crash when ammo_bfg has count field set
bones_was_here [Sun, 18 Oct 2020 02:40:08 +0000 (12:40 +1000)]
q3compat: Fix crash when ammo_bfg has count field set

3 years agoMerge branch 'bones_was_here/csprogs' into 'master'
Mario [Sun, 18 Oct 2020 01:59:37 +0000 (01:59 +0000)]
Merge branch 'bones_was_here/csprogs' into 'master'

Server build and csprogs pk3 stuff

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

3 years agoResolve a rabbit hole of header dependencies
Mario [Fri, 16 Oct 2020 21:45:04 +0000 (07:45 +1000)]
Resolve a rabbit hole of header dependencies

3 years agoSort most common includes alphabetically
Mario [Fri, 16 Oct 2020 12:12:54 +0000 (22:12 +1000)]
Sort most common includes alphabetically

3 years agoApply a standard alphabetical sort order to the server side includes and use constant...
Mario [Fri, 16 Oct 2020 11:45:50 +0000 (21:45 +1000)]
Apply a standard alphabetical sort order to the server side includes and use constant paths

3 years agoApply a standard alphabetical sort order to the client side includes and use constant...
Mario [Fri, 16 Oct 2020 11:16:08 +0000 (21:16 +1000)]
Apply a standard alphabetical sort order to the client side includes and use constant paths

3 years agoMerge branch 'Juhu/unnecessary-main-includes' into 'master'
Mario [Fri, 16 Oct 2020 11:01:29 +0000 (11:01 +0000)]
Merge branch 'Juhu/unnecessary-main-includes' into 'master'

Remove unneeded main.qh include lines

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

3 years agoremove unnecessary main.qh includes (also one server/player.qh include)
Juhu [Fri, 16 Oct 2020 06:53:54 +0000 (08:53 +0200)]
remove unnecessary main.qh includes (also one server/player.qh include)

3 years agoRemove an unnecessary main.qh include from the strafehud code
Mario [Fri, 16 Oct 2020 05:50:40 +0000 (15:50 +1000)]
Remove an unnecessary main.qh include from the strafehud code

3 years agoAdd a function to remove the buff icon model above players, call it when re-spawning...
Mario [Wed, 14 Oct 2020 20:48:59 +0000 (06:48 +1000)]
Add a function to remove the buff icon model above players, call it when re-spawning, fixes #2503

3 years agoMerge branch 'amade/cleanup_includes' into 'master'
Mario [Wed, 14 Oct 2020 20:44:07 +0000 (20:44 +0000)]
Merge branch 'amade/cleanup_includes' into 'master'

Cleanup includes

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

3 years agoCleanup common includes
Amadeusz Sławiński [Wed, 14 Oct 2020 20:44:07 +0000 (20:44 +0000)]
Cleanup common includes

Instead of:
#include "../common/(...)"
use:
#include <common/(...)>

3 years agoMerge branch 'Juhu/strafehud' into 'master'
Mario [Wed, 14 Oct 2020 17:58:56 +0000 (17:58 +0000)]
Merge branch 'Juhu/strafehud' into 'master'

StrafeHUD for Xonotic

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

3 years agoMerge branch 'master' into Juhu/strafehud
Mario [Wed, 14 Oct 2020 17:36:19 +0000 (03:36 +1000)]
Merge branch 'master' into Juhu/strafehud

3 years agoRestore original value of sv_dodging_maxspeed to allow dodging while moving again...
Mario [Tue, 13 Oct 2020 19:14:02 +0000 (05:14 +1000)]
Restore original value of sv_dodging_maxspeed to allow dodging while moving again, fixes #2505

3 years agoTransifex autosync
Rudolf Polzer [Fri, 9 Oct 2020 05:23:57 +0000 (07:23 +0200)]
Transifex autosync

3 years agoFix Arc continuing to fire after the match ends
Mario [Wed, 7 Oct 2020 12:37:16 +0000 (22:37 +1000)]
Fix Arc continuing to fire after the match ends

3 years agoFix locked camera angles if you spectate a particular player via the quickmenu while...
terencehill [Wed, 7 Oct 2020 12:29:28 +0000 (14:29 +0200)]
Fix locked camera angles if you spectate a particular player via the quickmenu while observing

3 years agoMerge branch 'terencehill/fps_display_fix' into 'master'
Mario [Mon, 5 Oct 2020 09:52:46 +0000 (09:52 +0000)]
Merge branch 'terencehill/fps_display_fix' into 'master'

fps display fix

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

3 years agoBuffs: make team field available for item teaming, some polishing
bones_was_here [Fri, 2 Oct 2020 03:51:12 +0000 (13:51 +1000)]
Buffs: make team field available for item teaming, some polishing

3 years agoMerge branch 'master' into bones_was_here/q3compat
bones_was_here [Fri, 2 Oct 2020 03:15:39 +0000 (13:15 +1000)]
Merge branch 'master' into bones_was_here/q3compat

3 years agoClean up buffs_BuffModel_Customize, fix some duplicate checks
Mario [Fri, 2 Oct 2020 03:09:31 +0000 (13:09 +1000)]
Clean up buffs_BuffModel_Customize, fix some duplicate checks

3 years agoMerge branch 'master' into bones_was_here/q3compat
bones_was_here [Wed, 30 Sep 2020 17:20:40 +0000 (03:20 +1000)]
Merge branch 'master' into bones_was_here/q3compat

3 years agoReduce code duplication in weapon impulse code by calling a handler function from...
Mario [Tue, 29 Sep 2020 12:58:51 +0000 (22:58 +1000)]
Reduce code duplication in weapon impulse code by calling a handler function from the macros

3 years agoPurge miscfunctions.qc from the client-side codebase, also remove an old unused CSQC...
Mario [Tue, 29 Sep 2020 11:58:35 +0000 (21:58 +1000)]
Purge miscfunctions.qc from the client-side codebase, also remove an old unused CSQC constants header

3 years agoUse gettime(GETTIME_FRAMESTART) instead of gettime(GETTIME_REALTIME) to calculate...
terencehill [Sun, 27 Sep 2020 10:27:28 +0000 (12:27 +0200)]
Use gettime(GETTIME_FRAMESTART) instead of gettime(GETTIME_REALTIME) to calculate qc fps as the latter becomes inaccurate after a while (at least on Windows 10). It should be noted that gettime(GETTIME_FRAMESTART) returns the value of the engine variable realtime which is used by the engine to calculate the engine fps

3 years agoMerge branch 'master' into bones_was_here/q3compat
bones_was_here [Sat, 26 Sep 2020 10:39:08 +0000 (20:39 +1000)]
Merge branch 'master' into bones_was_here/q3compat

3 years agoPhase out miscfunctions.qc from the server codebase, preferring more fitting location...
Mario [Fri, 25 Sep 2020 12:12:17 +0000 (22:12 +1000)]
Phase out miscfunctions.qc from the server codebase, preferring more fitting locations for its contents

3 years agoMove GetField_fullspawndata from miscfunctions.qc to main.qc
bones_was_here [Fri, 25 Sep 2020 11:37:10 +0000 (21:37 +1000)]
Move GetField_fullspawndata from miscfunctions.qc to main.qc

3 years agoMerge branch 'master' into bones_was_here/q3compat
bones_was_here [Fri, 25 Sep 2020 11:34:16 +0000 (21:34 +1000)]
Merge branch 'master' into bones_was_here/q3compat

3 years agoMove initialization stage handling out of miscfunctions and into world.qc
Mario [Fri, 25 Sep 2020 10:20:53 +0000 (20:20 +1000)]
Move initialization stage handling out of miscfunctions and into world.qc

3 years agoFurther cleanup miscfunctions, document the need to use intrusive lists on entities...
Mario [Fri, 25 Sep 2020 10:02:50 +0000 (20:02 +1000)]
Further cleanup miscfunctions, document the need to use intrusive lists on entities that use ECS components

3 years agoMove server-side chat handling to its own file, and add a note about miscfunctions
Mario [Fri, 25 Sep 2020 07:58:16 +0000 (17:58 +1000)]
Move server-side chat handling to its own file, and add a note about miscfunctions

3 years agoUse a trace log for the client program version message and remove networked server...
Mario [Wed, 23 Sep 2020 14:29:16 +0000 (00:29 +1000)]
Use a trace log for the client program version message and remove networked server version message

3 years agoMerge branch 'master' into bones_was_here/q3compat
bones_was_here [Wed, 23 Sep 2020 14:16:56 +0000 (00:16 +1000)]
Merge branch 'master' into bones_was_here/q3compat

3 years agoReduce verbosity of player stats debug messages
Mario [Wed, 23 Sep 2020 14:14:17 +0000 (00:14 +1000)]
Reduce verbosity of player stats debug messages

3 years agoReduce verbosity of most logging operations and fix some cvars not being defined...
Mario [Wed, 23 Sep 2020 14:06:05 +0000 (00:06 +1000)]
Reduce verbosity of most logging operations and fix some cvars not being defined in config

3 years agoq3compat: Fix null function crash when a weapon has no ammo_type
bones_was_here [Wed, 23 Sep 2020 14:05:51 +0000 (00:05 +1000)]
q3compat: Fix null function crash when a weapon has no ammo_type

3 years agoEnable __fullspawndata
bones_was_here [Wed, 23 Sep 2020 11:57:37 +0000 (21:57 +1000)]
Enable __fullspawndata

3 years agoMerge branch 'master' into bones_was_here/q3compat
bones_was_here [Wed, 23 Sep 2020 11:48:29 +0000 (21:48 +1000)]
Merge branch 'master' into bones_was_here/q3compat

3 years agoMinor cleanup of world.qc, move most intermission and map handling code into intermis...
Mario [Wed, 23 Sep 2020 10:33:53 +0000 (20:33 +1000)]
Minor cleanup of world.qc, move most intermission and map handling code into intermission.qc

3 years agoReplace some of the remaining cvar globals with autocvars, allows changing a few...
Mario [Wed, 23 Sep 2020 08:15:18 +0000 (18:15 +1000)]
Replace some of the remaining cvar globals with autocvars, allows changing a few more settings without restarting the match, also move a few function definitions out of miscfunctions

3 years agoMove expr_evaluate to cvar.qh in lib
Mario [Tue, 22 Sep 2020 17:01:44 +0000 (03:01 +1000)]
Move expr_evaluate to cvar.qh in lib

3 years agoAdd a commented definition for _fullspawndata outside of the dpdefs file
Mario [Tue, 22 Sep 2020 16:09:12 +0000 (02:09 +1000)]
Add a commented definition for _fullspawndata outside of the dpdefs file

3 years agoUpdate dpdefs to match current master
Mario [Tue, 22 Sep 2020 15:59:53 +0000 (01:59 +1000)]
Update dpdefs to match current master

3 years agoExclude burning and buff damage types from damage text, fixes #2490
Mario [Tue, 22 Sep 2020 14:14:30 +0000 (00:14 +1000)]
Exclude burning and buff damage types from damage text, fixes #2490

3 years agoImplement support for target_delay (compatibility spawn function for target_relay...
Mario [Tue, 22 Sep 2020 13:53:49 +0000 (23:53 +1000)]
Implement support for target_delay (compatibility spawn function for target_relay with a default wait time of 1 second)

3 years agoLock camera angles while moving the cursor if hud_cursormode is 0 in minigame menu...
terencehill [Mon, 21 Sep 2020 15:51:05 +0000 (17:51 +0200)]
Lock camera angles while moving the cursor if hud_cursormode is 0 in minigame menu and ONS radar too

3 years agoMove some more functions out of miscfunctions, split eliminated players handling...
Mario [Mon, 21 Sep 2020 12:57:50 +0000 (22:57 +1000)]
Move some more functions out of miscfunctions, split eliminated players handling into its own file

3 years agoSupport sv and pk3 make target passthrough in parent Makefile
bones_was_here [Sat, 12 Sep 2020 03:46:23 +0000 (13:46 +1000)]
Support sv and pk3 make target passthrough in parent Makefile

3 years agoq3compat: Fix some nexuiz maps that rely on adjacent bboxes counting as touching
bones_was_here [Fri, 11 Sep 2020 10:57:25 +0000 (20:57 +1000)]
q3compat: Fix some nexuiz maps that rely on adjacent bboxes counting as touching

3 years agoMerge branch 'martin-t/jump' into 'master'
Mario [Fri, 11 Sep 2020 08:31:01 +0000 (08:31 +0000)]
Merge branch 'martin-t/jump' into 'master'

Fix bug allowing players to avoid falldamage (tiny MR)

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

3 years agoq3compat: enable default and custom CPMA sounds for func_door and func_plat
bones_was_here [Wed, 9 Sep 2020 17:50:32 +0000 (03:50 +1000)]
q3compat: enable default and custom CPMA sounds for func_door and func_plat

3 years agoAdd function to access "raw" map entity field values in engines with __fullspawndata...
bones_was_here [Wed, 9 Sep 2020 17:34:46 +0000 (03:34 +1000)]
Add function to access "raw" map entity field values in engines with __fullspawndata support

3 years agoRemove comment about q3 hitbox off-by-1 (the hitbox exactly matches q3 on a world...
bones_was_here [Sat, 5 Sep 2020 12:24:00 +0000 (22:24 +1000)]
Remove comment about q3 hitbox off-by-1 (the hitbox exactly matches q3 on a world collision test map)

3 years agoq3compat: support holdable_invulnerability, holdable_kamikaze, holdable_teleporter
bones_was_here [Sat, 5 Sep 2020 12:13:00 +0000 (22:13 +1000)]
q3compat: support holdable_invulnerability, holdable_kamikaze, holdable_teleporter

3 years agoWhitelist supported Q3 & DF map entity fields
bones_was_here [Sat, 29 Aug 2020 06:07:08 +0000 (16:07 +1000)]
Whitelist supported Q3 & DF map entity fields

3 years agoq3compat: make 'fast' trigger_hurt do damage every frame (no delay from other trigger...
bones_was_here [Sat, 29 Aug 2020 05:44:04 +0000 (15:44 +1000)]
q3compat: make 'fast' trigger_hurt do damage every frame (no delay from other triggers), and some cleanup

3 years agoRevert "q3compat: make trigger_hurt without spawnflags 16 deal damage every frame...
bones_was_here [Fri, 28 Aug 2020 20:50:01 +0000 (06:50 +1000)]
Revert "q3compat: make trigger_hurt without spawnflags 16 deal damage every frame even if triggerhurttime still on cooldown"

This reverts commit 33205d85e6afeed580bd50883d087eb045adbc86.

This patch was incorrect because it allows the trigger_hurt to damage a
player multiple times per frame.

3 years agotarget_give: support multiple targets that give the same resource, and support all...
bones_was_here [Fri, 28 Aug 2020 02:40:47 +0000 (12:40 +1000)]
target_give: support multiple targets that give the same resource, and support all health & armor items

3 years agoSupport count field of Q3 ammo pickups, also tuba support
bones_was_here [Thu, 27 Aug 2020 23:50:47 +0000 (09:50 +1000)]
Support count field of Q3 ammo pickups, also tuba support

3 years agoAdd function to get ammo consumption of primary fire mode
bones_was_here [Thu, 27 Aug 2020 20:05:37 +0000 (06:05 +1000)]
Add function to get ammo consumption of primary fire mode

3 years agoFix StartItem indenting
bones_was_here [Wed, 26 Aug 2020 04:39:11 +0000 (14:39 +1000)]
Fix StartItem indenting

3 years agoRemove weapon-specific code from target_give_init and support count field on powerup...
bones_was_here [Wed, 26 Aug 2020 04:27:02 +0000 (14:27 +1000)]
Remove weapon-specific code from target_give_init and support count field on powerup pickups

3 years agoFix netname field of weapon and item entities (was getting set to m_name)
bones_was_here [Wed, 26 Aug 2020 02:23:25 +0000 (12:23 +1000)]
Fix netname field of weapon and item entities (was getting set to m_name)

3 years agoSupport count field on weapon pickups, fix 0 ammo with target_give and no count set...
bones_was_here [Tue, 25 Aug 2020 23:14:35 +0000 (09:14 +1000)]
Support count field on weapon pickups, fix 0 ammo with target_give and no count set on weapon ent

3 years agoImprove indentation consistency in client.qc
terencehill [Tue, 25 Aug 2020 16:08:02 +0000 (18:08 +0200)]
Improve indentation consistency in client.qc

3 years agoJoin ifs
terencehill [Tue, 25 Aug 2020 16:04:18 +0000 (18:04 +0200)]
Join ifs

3 years agoAdd a macro to check g_chat_nospectators
terencehill [Tue, 25 Aug 2020 15:49:27 +0000 (17:49 +0200)]
Add a macro to check g_chat_nospectators

3 years agoHide shownames health / armor bg as soon as player dies, instead of waiting for the...
terencehill [Tue, 25 Aug 2020 15:41:46 +0000 (17:41 +0200)]
Hide shownames health / armor bg as soon as player dies, instead of waiting for the body to disappear

3 years agoTransifex autosync
Rudolf Polzer [Tue, 25 Aug 2020 05:23:58 +0000 (07:23 +0200)]
Transifex autosync

3 years agoTransifex autosync
Rudolf Polzer [Sat, 22 Aug 2020 05:24:01 +0000 (07:24 +0200)]
Transifex autosync

3 years agoTransifex autosync
Rudolf Polzer [Fri, 21 Aug 2020 05:24:01 +0000 (07:24 +0200)]
Transifex autosync

3 years agoAdd Czech and Turkish
Mirio [Fri, 21 Aug 2020 00:08:10 +0000 (00:08 +0000)]
Add Czech and Turkish

3 years agoTransifex autosync
Rudolf Polzer [Thu, 20 Aug 2020 05:24:03 +0000 (07:24 +0200)]
Transifex autosync

3 years agoFix indenting & cleanup in trigger_race_checkpoint_verify
bones_was_here [Thu, 20 Aug 2020 03:08:53 +0000 (13:08 +1000)]
Fix indenting & cleanup in trigger_race_checkpoint_verify

3 years agoq3df: Spawn waypoints for all entities able to trigger a checkpoint and be directly...
bones_was_here [Thu, 20 Aug 2020 02:25:36 +0000 (12:25 +1000)]
q3df: Spawn waypoints for all entities able to trigger a checkpoint and be directly activated by a player (Fixes #2465)

3 years agoTransifex autosync
Rudolf Polzer [Wed, 19 Aug 2020 05:24:05 +0000 (07:24 +0200)]
Transifex autosync

3 years agoReduce a few overlong lines in crosshair code
terencehill [Sun, 16 Aug 2020 08:52:10 +0000 (10:52 +0200)]
Reduce a few overlong lines in crosshair code

3 years agoAvoid using duplicated code for vortex and oknex crosshair ring
terencehill [Sun, 16 Aug 2020 08:40:59 +0000 (10:40 +0200)]
Avoid using duplicated code for vortex and oknex crosshair ring

3 years agotarget_give: support shield and strength powerups
bones_was_here [Wed, 12 Aug 2020 06:28:49 +0000 (16:28 +1000)]
target_give: support shield and strength powerups

3 years agoFix trigger_once and trigger_multiple.wait == -1 allowing multiple activations by...
bones_was_here [Tue, 11 Aug 2020 07:52:37 +0000 (17:52 +1000)]
Fix trigger_once and trigger_multiple.wait == -1 allowing multiple activations by another map entity

3 years agoq3compat: make weapon_prox_launcher spawn Mortar instead of Mine Layer
bones_was_here [Mon, 10 Aug 2020 10:21:54 +0000 (20:21 +1000)]
q3compat: make weapon_prox_launcher spawn Mortar instead of Mine Layer

3 years agoOnly do Q3 entity removal checks when it's a Q3 map
bones_was_here [Mon, 10 Aug 2020 09:17:10 +0000 (19:17 +1000)]
Only do Q3 entity removal checks when it's a Q3 map

3 years agoUse readable labels for q3compat bits
bones_was_here [Mon, 10 Aug 2020 06:50:38 +0000 (16:50 +1000)]
Use readable labels for q3compat bits

3 years agoTransifex autosync
Rudolf Polzer [Mon, 10 Aug 2020 05:24:04 +0000 (07:24 +0200)]
Transifex autosync

3 years agoq3compat: make trigger_hurt without spawnflags 16 deal damage every frame even if...
bones_was_here [Sun, 9 Aug 2020 15:48:29 +0000 (01:48 +1000)]
q3compat: make trigger_hurt without spawnflags 16 deal damage every frame even if triggerhurttime still on cooldown

3 years agoImprove indentation consistency in weapon code
terencehill [Sun, 9 Aug 2020 15:16:01 +0000 (17:16 +0200)]
Improve indentation consistency in weapon code

3 years agoMerge branch 'master' into bones_was_here/q3compat
bones_was_here [Sun, 9 Aug 2020 13:38:03 +0000 (23:38 +1000)]
Merge branch 'master' into bones_was_here/q3compat

3 years agoUse an ordered list to find triggers to touch, fixes some odd cases with overlapping...
Mario [Sun, 9 Aug 2020 12:01:43 +0000 (22:01 +1000)]
Use an ordered list to find triggers to touch, fixes some odd cases with overlapping triggers

3 years agoAdd machinegun support to target_give
bones_was_here [Sun, 9 Aug 2020 08:03:09 +0000 (18:03 +1000)]
Add machinegun support to target_give

3 years agoMerge branch 'master' into bones_was_here/q3compat
bones_was_here [Sun, 9 Aug 2020 06:55:54 +0000 (16:55 +1000)]
Merge branch 'master' into bones_was_here/q3compat