]>
git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/log
bones_was_here [Sat, 10 Feb 2024 09:00:45 +0000 (09:00 +0000)]
Merge branch 'Spike29/balance_council_vote19' into 'master'
Apply the balance council vote 19
See merge request xonotic/xonotic-data.pk3dir!1260
Spike29 [Sat, 10 Feb 2024 09:00:44 +0000 (09:00 +0000)]
Apply the balance council vote 19
bones_was_here [Sat, 10 Feb 2024 08:31:41 +0000 (08:31 +0000)]
Merge branch 'bones_was_here/maplist_fixes' into 'master'
Map list fixes
See merge request xonotic/xonotic-data.pk3dir!1247
bones_was_here [Mon, 23 Oct 2023 23:28:23 +0000 (09:28 +1000)]
Fix GUI map voting with g_maplist_shuffle <= 0 && g_maplist_selectrandom 0
MaplistMethod_Iterate() returned the same map every time because
Map_Current wasn't updated.
Documents g_maplist_shuffle -1.
bones_was_here [Mon, 23 Oct 2023 21:25:32 +0000 (07:25 +1000)]
g_maplist: refactor initialisation
Reduces code duplication.
Checks/initialises once when adding maps to the voting screen, instead
of doing it again for each map added.
Always uses gametype-specific g_maplist generation, instead of sometimes
including maps from other gametypes (depending which code path was used).
Updates some declarations and removes an unused global.
bones_was_here [Mon, 23 Oct 2023 16:37:48 +0000 (02:37 +1000)]
g_maplist: update with `gametype` command, as well as GUI gametype voting
This fixes the need to manually set g_maplist to \"\" after running the
gametype command on a votable server.
This is consistent with GUI gametype voting (sv_vote_gametype 1)
behaviour and shares its code to reduce duplication.
bones_was_here [Mon, 23 Oct 2023 15:30:36 +0000 (01:30 +1000)]
mapinfo: fix and rename noautomaplist flag to donotwant
This flag was ignored in the code paths used on most servers, and its
name and behaviour were not ideal for its intended use, see
7d48e976c8a9b3f80350b2ad41d9feec2797cf76 description which seems clear
that it's for allowing a certain kind of map to be available on the
server but not be included in the usual voting pool.
This updated implementation omits the flagged maps from GUI voting and
prevents them being selected by other GotoNextMap()/GetNextMap() code
paths, unless there aren't enough viable maps in which case they
can still be used as fallbacks.
The flagged maps are always listed in CLI and may be nominated with
`suggestmap` or vcalled with `gotomap` or `nextmap`.
bones_was_here [Fri, 9 Feb 2024 19:28:37 +0000 (05:28 +1000)]
Q3 compat: implement a 1ms fallback traveltime for all movers
This fixes the doors failing to open on q3df map sdc-uk_08 which uses
trigger_multiple -> func_button.speed = -1 -> func_door
Buttons trigger targets at the end of their movement and that one didn't
move at all.
Signed-off-by: bones_was_here <bones_was_here@xonotic.au>
terencehill [Fri, 9 Feb 2024 13:34:59 +0000 (13:34 +0000)]
Merge branch 'terencehill/registry_check' into 'master'
Fix REGISTRY_CHECK
See merge request xonotic/xonotic-data.pk3dir!1259
Dr. Jaska [Fri, 9 Feb 2024 01:42:19 +0000 (01:42 +0000)]
Merge branch 'drjaska/ca_prevent_stalemate_2' into 'master'
Separated `g_ca_prevent_stalemate`'s survivor count and health checking.
See merge request xonotic/xonotic-data.pk3dir!1189
Dr. Jaska [Fri, 9 Feb 2024 01:42:19 +0000 (01:42 +0000)]
Separated `g_ca_prevent_stalemate`'s survivor count and health checking.
terencehill [Wed, 7 Feb 2024 21:53:39 +0000 (22:53 +0100)]
Remove a few dangling semicolons
terencehill [Wed, 7 Feb 2024 21:40:06 +0000 (22:40 +0100)]
Fix REGISTRY_CHECK not checking all elements of a huge registry like the Notifications registry
Code is optimized to have basically the same performance as before while adding string length checks.
bones_was_here [Tue, 6 Feb 2024 14:15:01 +0000 (14:15 +0000)]
Merge MR 'func_door and func_plat fixes and Q3 compatibility'
See merge request xonotic/xonotic-data.pk3dir!1242
Dr. Jaska [Tue, 6 Feb 2024 13:46:55 +0000 (13:46 +0000)]
Merge branch 'drjaska/spawnfunc-item_buff_name' into 'master'
restore item_buff_speed and item_buff_invisibility spawnfuncs
See merge request xonotic/xonotic-data.pk3dir!1160
Rudolf Polzer [Fri, 26 Jan 2024 06:23:13 +0000 (07:23 +0100)]
Transifex autosync
terencehill [Sat, 20 Jan 2024 12:54:05 +0000 (13:54 +0100)]
playerlist.qc: remove some useless operations in 2 draw_Text calls; while at it clean up code
terencehill [Sat, 20 Jan 2024 12:34:35 +0000 (13:34 +0100)]
Fix #2893 "cl_zoomfactor 1 results in division by zero"; also simplify the current_viewzoom check (almost_equals performs redundant checks in this case)
Rudolf Polzer [Sat, 20 Jan 2024 06:24:03 +0000 (07:24 +0100)]
Transifex autosync
Rudolf Polzer [Mon, 15 Jan 2024 06:23:18 +0000 (07:23 +0100)]
Transifex autosync
Rudolf Polzer [Sat, 13 Jan 2024 06:23:49 +0000 (07:23 +0100)]
Transifex autosync
Dr. Jaska [Mon, 8 Jan 2024 15:13:52 +0000 (15:13 +0000)]
Merge branch 'drjaska/hashtest' into 'master'
Create an usable tool for local hash testing
See merge request xonotic/xonotic-data.pk3dir!1150
Dr. Jaska [Mon, 8 Jan 2024 15:13:52 +0000 (15:13 +0000)]
Create an usable tool for local hash testing
Rudolf Polzer [Mon, 8 Jan 2024 06:23:27 +0000 (07:23 +0100)]
Transifex autosync
terencehill [Thu, 4 Jan 2024 01:23:35 +0000 (02:23 +0100)]
Fix and make indentation consistent in the Overkill weapon files
terencehill [Thu, 4 Jan 2024 01:20:27 +0000 (02:20 +0100)]
Use cvar_set
terencehill [Thu, 4 Jan 2024 01:04:20 +0000 (02:04 +0100)]
Freeze Tag: fix players getting 1 point for a teamkill (they get -1 points now) and not getting -1 points if killed by a map entity (e.g. triggerhurt)
Rudolf Polzer [Wed, 3 Jan 2024 03:18:17 +0000 (22:18 -0500)]
hud_postprocessing: disable the postprocess shader when not in use.
Works best with upcoming r_skipblend.
drjaska [Fri, 29 Dec 2023 08:20:30 +0000 (10:20 +0200)]
Fix some damagetext accumulation edge cases
Fixes cl_damagetext_accumulate_alpha_rel 1 and
cl_damagetext_accumulate_lifetime 0 not being able to opt
out of DT accumulation
terencehill [Thu, 28 Dec 2023 19:21:12 +0000 (19:21 +0000)]
Merge branch 'drjaska/damagetext' into 'master'
DamageText code quality changes and new DT lifetime and accumulation lifetime cvars
See merge request xonotic/xonotic-data.pk3dir!1249
Dr. Jaska [Thu, 28 Dec 2023 19:21:12 +0000 (19:21 +0000)]
DamageText code quality changes and new DT lifetime and accumulation lifetime cvars
bones_was_here [Thu, 28 Dec 2023 08:03:37 +0000 (18:03 +1000)]
Update pipeline for DP engine upgrade
The FIXME was fixed (or at least worked around) in DP's Makefile, see
-mno-avx and its comments.
Rudolf Polzer [Mon, 25 Dec 2023 06:23:32 +0000 (07:23 +0100)]
Transifex autosync
terencehill [Thu, 21 Dec 2023 17:27:29 +0000 (17:27 +0000)]
Merge branch 'terencehill/playerstats_update' into 'master'
Minor updates to playerstats
See merge request xonotic/xonotic-data.pk3dir!1255
Rudolf Polzer [Thu, 21 Dec 2023 06:23:27 +0000 (07:23 +0100)]
Transifex autosync
Rudolf Polzer [Tue, 19 Dec 2023 06:23:25 +0000 (07:23 +0100)]
Transifex autosync
terencehill [Wed, 13 Dec 2023 11:12:41 +0000 (12:12 +0100)]
Don't send match stats if game ends during warmup (xonstats doesn't register them anyway)
terencehill [Mon, 11 Dec 2023 22:27:10 +0000 (23:27 +0100)]
Send total number of rounds played to xonstats
Rudolf Polzer [Mon, 11 Dec 2023 06:23:30 +0000 (07:23 +0100)]
Transifex autosync
Rudolf Polzer [Sat, 9 Dec 2023 06:23:32 +0000 (07:23 +0100)]
Transifex autosync
Dr. Jaska [Wed, 6 Dec 2023 11:19:23 +0000 (11:19 +0000)]
Merge branch 'drjaska/shotorigincleanup' into 'master'
Allow for negative z offsets for shot origin
See merge request xonotic/xonotic-data.pk3dir!1253
Rudolf Polzer [Mon, 4 Dec 2023 06:24:04 +0000 (07:24 +0100)]
Transifex autosync
drjaska [Mon, 27 Nov 2023 23:04:12 +0000 (01:04 +0200)]
cleanup and a few comments
Rudolf Polzer [Fri, 1 Dec 2023 06:23:25 +0000 (07:23 +0100)]
Transifex autosync
Rudolf Polzer [Tue, 21 Nov 2023 06:23:28 +0000 (07:23 +0100)]
Transifex autosync
Rudolf Polzer [Sun, 19 Nov 2023 06:23:24 +0000 (07:23 +0100)]
Transifex autosync
Rudolf Polzer [Sat, 18 Nov 2023 06:23:52 +0000 (07:23 +0100)]
Transifex autosync
Rudolf Polzer [Sun, 12 Nov 2023 06:23:26 +0000 (07:23 +0100)]
Transifex autosync
terencehill [Sat, 11 Nov 2023 17:11:51 +0000 (18:11 +0100)]
Don't allow negative values for the y component of the shot origin offset because the gun can't be aligned to the left by default. Thanks to this change it's possible to restore precision of the y and z components back to 0.25
terencehill [Fri, 10 Nov 2023 17:59:58 +0000 (18:59 +0100)]
Allow negative values for the shot origin offset vector. This change reduces precision of the y and z components from 0.25 to 0.5
bones_was_here [Thu, 9 Nov 2023 05:44:23 +0000 (05:44 +0000)]
Merge branch 'Juhu/velocity_pads_cleanup2' into 'master'
Move trigger_push_velocity last_pushed code out of StartFrame()
See merge request xonotic/xonotic-data.pk3dir!1251
Juhu [Wed, 8 Nov 2023 18:22:52 +0000 (19:22 +0100)]
move trigger_push_velocity's last_pushed check, StartFrame() should not run jump pad physics code
Dr. Jaska [Wed, 8 Nov 2023 01:19:29 +0000 (01:19 +0000)]
Merge branch 'Juhu/target_print' into 'master'
q3compat: add support for the target_print entity
See merge request xonotic/xonotic-data.pk3dir!1141
Dr. Jaska [Wed, 8 Nov 2023 01:17:09 +0000 (01:17 +0000)]
Merge branch 'drjaska/damage-center-player-origin' into 'master'
Added an inactive gameplay cvar for using the own shot origin or centers of other players' bboxes for force direction calculations
See merge request xonotic/xonotic-data.pk3dir!1215
Dr. Jaska [Wed, 8 Nov 2023 01:17:09 +0000 (01:17 +0000)]
Added an inactive gameplay cvar for using the own shot origin or centers of other players' bboxes for force direction calculations
Dr. Jaska [Sun, 5 Nov 2023 17:50:33 +0000 (17:50 +0000)]
Merge branch 'drjaska/damagetext' into 'master'
Refactor damagetext to use a new linked list instead of proximity search and fix 2D and 3D damagetexts not accumulating
Closes #2861
See merge request xonotic/xonotic-data.pk3dir!1235
Dr. Jaska [Sun, 5 Nov 2023 17:50:33 +0000 (17:50 +0000)]
Refactor damagetext to use a new linked list instead of proximity search and fix 2D and 3D damagetexts not accumulating
terencehill [Sun, 29 Oct 2023 19:14:05 +0000 (19:14 +0000)]
Merge branch 'Juhu/velocity_pads_cleanup' into 'master'
Move trigger_push_velocity last_pushed code out of execute_next_frame()
See merge request xonotic/xonotic-data.pk3dir!1217
Juhu [Sun, 29 Oct 2023 19:14:05 +0000 (19:14 +0000)]
Move trigger_push_velocity last_pushed code out of execute_next_frame()
terencehill [Fri, 27 Oct 2023 08:38:20 +0000 (08:38 +0000)]
Merge branch 'bones_was_here/sv_autopause_intermission' into 'master'
sv_autopause: don't pause during intermission, unpause on endmatch command
Closes #2880
See merge request xonotic/xonotic-data.pk3dir!1246
Rudolf Polzer [Mon, 23 Oct 2023 05:24:36 +0000 (07:24 +0200)]
Transifex autosync
Rudolf Polzer [Tue, 17 Oct 2023 05:23:28 +0000 (07:23 +0200)]
Transifex autosync
bones_was_here [Thu, 5 Oct 2023 15:16:46 +0000 (01:16 +1000)]
sv_autopause: don't pause during intermission, unpause on endmatch command
Rudolf Polzer [Sun, 1 Oct 2023 05:25:05 +0000 (07:25 +0200)]
Transifex autosync
bones_was_here [Fri, 29 Sep 2023 05:13:49 +0000 (15:13 +1000)]
g_maxplayers -1: when rounding to a team multiple, go down at the midpoint
It seems a 5 players max DM map is more likely to suit 2v2 TDM/FT than 3v3.
It will still round up to 6 if there's 3 teams.
Also catches misconfigurations with g_maxplayers -1 and no teams.
Changes to more meaningful var names.
bones_was_here [Thu, 21 Sep 2023 21:52:15 +0000 (07:52 +1000)]
Explicitly enable sv_gameplayfix_unstickplayers
Xonotic's QC physics still depend on this cvar, but the feature is
deprecated in current DP.
bones_was_here [Mon, 18 Sep 2023 00:29:45 +0000 (00:29 +0000)]
Merge branch 'terencehill/load_fonts_once' into 'master'
Fix #2878 "Client startup executes font-xolonium.cfg twice"
Closes #2878
See merge request xonotic/xonotic-data.pk3dir!1243
terencehill [Sat, 16 Sep 2023 13:44:48 +0000 (15:44 +0200)]
Fix #2878 "Client startup executes font-xolonium.cfg twice"
bones_was_here [Fri, 15 Sep 2023 17:15:12 +0000 (03:15 +1000)]
Fix sticky electro orbs and mines being unhittable on DP master
The moving projectiles are configured correctly but when they touch a
surface they're deleted and replaced with a sticky projectile.
Those weren't configured to be hittable directly, and weren't linked to
the area grid so findradius couldn't find them for splash damage.
bones_was_here [Fri, 15 Sep 2023 06:42:57 +0000 (16:42 +1000)]
Support custom func_door and func_plat sounds on Q3A maps
This adds FindFileInMapPack(), a very simple version of
_MapInfo_FindArenaFile().
bones_was_here [Fri, 14 Oct 2022 08:34:12 +0000 (18:34 +1000)]
func_plat: Use Q3 defaults for .dmg .speed and .lip on Q3 maps
bones_was_here [Fri, 15 Sep 2023 06:37:11 +0000 (16:37 +1000)]
func_plat: don't spawn a "start moving" trigger when .targetname is set on Q3 maps
bones_was_here [Fri, 15 Sep 2023 06:45:13 +0000 (16:45 +1000)]
func_plat: fix being stuck in the extended position when .targetname is set on Q3 maps
bones_was_here [Thu, 13 Oct 2022 11:46:33 +0000 (21:46 +1000)]
func_door: merge door_use() and door_fire()
Unnecessary tiny func is tiny and unnecessary (and suboptimal for perf).
bones_was_here [Fri, 15 Sep 2023 06:47:11 +0000 (16:47 +1000)]
func_door: implement Q3 CRUSHER spawnflag
bones_was_here [Fri, 15 Sep 2023 06:28:11 +0000 (16:28 +1000)]
func_door: implement Q3 team-based door linking using fullspawndata
bones_was_here [Fri, 15 Sep 2023 06:49:19 +0000 (16:49 +1000)]
func_door: fix bug where doors blocked by players never reversed direction
This bug was inherited from Nexuiz. It worked properly in Quake which
didn't have this condition, and in Quake 3.
bones_was_here [Wed, 12 Oct 2022 12:57:46 +0000 (22:57 +1000)]
func_door: use Q3 default .dmg of 2 on Q3 maps
bones_was_here [Wed, 12 Oct 2022 12:48:50 +0000 (22:48 +1000)]
func_door: update documentation to reflect default .dmg of 0
IMO 0 is the best default, because if it were > 0 then mappers would
have no way to configure a door that doesn't deal any damage when blocked.
The implemented default has been 0 since (at least) Nexuiz 2.5.2 so
changing it now would not be ideal for compatibility.
The comment about the default of 2 was inherited from Quake.
bones_was_here [Fri, 15 Sep 2023 06:50:44 +0000 (16:50 +1000)]
func_door: fix .dmg field having no effect
The player's .takedamage == DAMAGE_AIM not DAMAGE_YES
bones_was_here [Fri, 15 Sep 2023 05:57:29 +0000 (15:57 +1000)]
func_door: update DOOR_START_OPEN documentation
bones_was_here [Fri, 7 Oct 2022 10:10:34 +0000 (20:10 +1000)]
func_door: use Q3 default of 2s .wait time on Q3 maps
bones_was_here [Fri, 7 Oct 2022 10:11:22 +0000 (20:11 +1000)]
func_door: fix .angle values of 315 and 135 degrees being inverted
This bug was inherited from Quake and is fixed by updating to
the same maths used in Quake 2 and 3.
bones_was_here [Fri, 7 Oct 2022 12:37:58 +0000 (22:37 +1000)]
func_door: fix erratic behaviour of spawned trigger field
This was most noticeable with door .wait <= 1 but would eventually occur
at higher wait values if players hang around in the trigger field.
Also the door(s) usually did not stay open for the full .wait time after
the player left the trigger field, as some time had passed since the
.door_finished timestamp was set.
To make this reliable AND efficient requires updating the state of the
door(s), instead of maintaining a separate state in the trigger field entity.
bones_was_here [Fri, 15 Sep 2023 05:45:26 +0000 (15:45 +1000)]
Cleanups following
ff0befb7d2c673b926cbc9bf0bbf8a1e07f2aff6 and
9d63bcaed353f093ad6297774e08c979a0135776
Some of those changes were superfluous (not required by CONTRIBUTING.md)
or didn't fix existing issues.
bones_was_here [Fri, 15 Sep 2023 06:56:02 +0000 (16:56 +1000)]
Revert "Merge branch 'bones_was_here/func_door' into 'master'"
This reverts commit
8195181f4a0c5384bbb58d3029b86333c8f39dde , reversing
changes made to
39fafd26f46f8050cfe82aaa1ef76b3a5c9dbb3f .
IE reverts https://gitlab.com/xonotic/xonotic-data.pk3dir/-/merge_requests/1083
which was squash merged so the bad commit can't be reverted separately,
instead a new MR will replace it.
Fixes #2876
Rudolf Polzer [Fri, 15 Sep 2023 05:26:30 +0000 (07:26 +0200)]
Transifex autosync
Rudolf Polzer [Wed, 6 Sep 2023 05:23:10 +0000 (07:23 +0200)]
Transifex autosync
terencehill [Sun, 3 Sep 2023 16:35:15 +0000 (16:35 +0000)]
Merge branch 'drjaska/menu-music' into 'master'
re-allow main menu to play music when coming back to it
Closes #2866
See merge request xonotic/xonotic-data.pk3dir!1240
Dr. Jaska [Sun, 3 Sep 2023 16:35:14 +0000 (16:35 +0000)]
re-allow main menu to play music when coming back to it
bones_was_here [Fri, 1 Sep 2023 10:32:35 +0000 (20:32 +1000)]
terencehill [Thu, 31 Aug 2023 07:04:13 +0000 (07:04 +0000)]
Merge branch 'bones_was_here/csqc_bmodels' into 'master'
triggers: set bmodel correctly in CSQC
See merge request xonotic/xonotic-data.pk3dir!1237
Rudolf Polzer [Mon, 28 Aug 2023 05:23:19 +0000 (07:23 +0200)]
Transifex autosync
terencehill [Sun, 27 Aug 2023 09:08:40 +0000 (11:08 +0200)]
Minigames: apply panel alpha to highlights too
bones_was_here [Sat, 26 Aug 2023 11:54:18 +0000 (21:54 +1000)]
triggers: set bmodel correctly in CSQC
Previously the .model field would be (for example) "*2" in SVQC but ""
in CSQC. This change makes it "*2" in both.
Rudolf Polzer [Sat, 26 Aug 2023 05:23:17 +0000 (07:23 +0200)]
Transifex autosync
Dr. Jaska [Tue, 22 Aug 2023 03:20:20 +0000 (03:20 +0000)]
Merge branch 'Mario/mehrdad08_spectatorlist' into 'master'
Implement C4 and TTT minigame spectator list by mehrdad dowlatabadi
See merge request xonotic/xonotic-data.pk3dir!1099
Mario [Tue, 22 Aug 2023 03:20:20 +0000 (03:20 +0000)]
Implement C4 and TTT minigame spectator list by mehrdad dowlatabadi
terencehill [Fri, 18 Aug 2023 22:31:25 +0000 (22:31 +0000)]
Merge branch 'drjaska/rounds_pl' into 'master'
Fix "rounds played" scoreboard column showing up in DM in the layout with all columns
See merge request xonotic/xonotic-data.pk3dir!1206
Dr. Jaska [Fri, 18 Aug 2023 22:31:25 +0000 (22:31 +0000)]
Fix "rounds played" scoreboard column showing up in DM in the layout with all columns