]>
git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
Nick S [Mon, 30 Jan 2023 20:11:02 +0000 (22:11 +0200)]
Merge remote-tracking branch 'origin/Juhu/velocity_pads' into morosophos/server-current4
Juhu [Mon, 30 Jan 2023 03:16:12 +0000 (04:16 +0100)]
q3df compat: minor improvements to make trigger_push_velocity behaviour more consistent when using ADD_* spawnflags
Juhu [Mon, 30 Jan 2023 02:03:19 +0000 (03:03 +0100)]
q3df compat: remove IntrusiveList in entity field for trigger_push_velocity to avoid overflow crashes
Juhu [Sat, 28 Jan 2023 14:35:33 +0000 (15:35 +0100)]
q3df compat: handle the z component correctly in trigger_push_velocity
Nick S [Fri, 27 Jan 2023 15:21:56 +0000 (17:21 +0200)]
Merge remote-tracking branch 'origin/Juhu/velocity_pads' into morosophos/server-current4
Juhu [Fri, 27 Jan 2023 15:14:43 +0000 (16:14 +0100)]
q3df compat: only ADD_* operations in trigger_push_velocity activate a single time per trigger touch, also don't unset onground flag while in velocity pad
Nick S [Fri, 27 Jan 2023 14:26:22 +0000 (16:26 +0200)]
Merge remote-tracking branch 'origin/Juhu/velocity_pads' into morosophos/server-current4
Nick S [Fri, 27 Jan 2023 14:26:13 +0000 (16:26 +0200)]
Merge remote-tracking branch 'origin/master' into morosophos/server-current4
Juhu [Fri, 27 Jan 2023 11:26:35 +0000 (12:26 +0100)]
q3df compat: add trigger_push_velocity support
Rudolf Polzer [Fri, 27 Jan 2023 06:23:48 +0000 (07:23 +0100)]
Transifex autosync
Rudolf Polzer [Thu, 26 Jan 2023 06:23:56 +0000 (07:23 +0100)]
Transifex autosync
Nick S [Wed, 25 Jan 2023 21:28:16 +0000 (23:28 +0200)]
Merge remote-tracking branch 'origin/Juhu/scoreboard-strafe' into morosophos/server-current4
Juhu [Wed, 25 Jan 2023 21:25:49 +0000 (22:25 +0100)]
remove excessive precision from new cts scoreboard entries and round them properly
Nick S [Wed, 25 Jan 2023 20:39:25 +0000 (22:39 +0200)]
Merge remote-tracking branch 'origin/Juhu/scoreboard-strafe' into morosophos/server-current4
Nick S [Wed, 25 Jan 2023 20:39:17 +0000 (22:39 +0200)]
Merge remote-tracking branch 'origin/Juhu/strafehud-server' into morosophos/server-current4
Nick S [Wed, 25 Jan 2023 20:39:08 +0000 (22:39 +0200)]
Merge remote-tracking branch 'origin/master' into morosophos/server-current4
Juhu [Wed, 25 Jan 2023 20:35:47 +0000 (21:35 +0100)]
make new cts scoreboard entries update on fastest run only, not on best individual stat, affects strafe efficiency and start / average / top speed
Juhu [Wed, 25 Jan 2023 18:56:48 +0000 (19:56 +0100)]
add average speed and top speed cts scoreboard entries
Juhu [Wed, 25 Jan 2023 19:35:19 +0000 (20:35 +0100)]
Add patch from Juhu/strafehud-features branch: "strafehud: fix switch indicator positioning when using projection"
terencehill [Wed, 25 Jan 2023 11:00:41 +0000 (11:00 +0000)]
Merge branch 'Mario/monster_lod_models' into 'master'
Add LOD models for the monsters to boost performance with lots of monsters in the map and fix some LOD related bugs
See merge request xonotic/xonotic-data.pk3dir!1069
Rudolf Polzer [Wed, 25 Jan 2023 06:23:50 +0000 (07:23 +0100)]
Transifex autosync
bones_was_here [Wed, 25 Jan 2023 05:18:21 +0000 (05:18 +0000)]
Merge branch 'bones_was_here/r_ambient' into 'master'
r_ambient: default to 0
Closes #2767 and xonotic#47
See merge request xonotic/xonotic-data.pk3dir!993
terencehill [Tue, 24 Jan 2023 17:59:47 +0000 (17:59 +0000)]
Merge branch 'drjaska/ctsdamagescorelabels' into 'master'
Remove damage dealt, damage taken and ELO scoreinfo labels and therefore scoreboard panels from modes with independent players (CTS)
See merge request xonotic/xonotic-data.pk3dir!1030
Dr. Jaska [Tue, 24 Jan 2023 17:59:47 +0000 (17:59 +0000)]
Remove damage dealt, damage taken and ELO scoreinfo labels and therefore scoreboard panels from modes with independent players (CTS)
bones_was_here [Mon, 23 Jan 2023 00:34:54 +0000 (00:34 +0000)]
Merge branch 'terencehill/default_server_quickmenu' into 'master'
Quickmenu: allow players to make server's custom quickmenu default
See merge request xonotic/xonotic-data.pk3dir!1090
terencehill [Mon, 23 Jan 2023 00:34:54 +0000 (00:34 +0000)]
Quickmenu: allow players to make server's custom quickmenu default
bones_was_here [Mon, 23 Jan 2023 00:19:51 +0000 (00:19 +0000)]
Use gender-neutral pronouns when referring to the player
Closes #2783, #2784, #2751, #2749, #2734, #2704, #2360, and #2135
See merge request xonotic/xonotic-data.pk3dir!1111
squidink7 [Mon, 23 Jan 2023 00:19:50 +0000 (00:19 +0000)]
Use gender-neutral pronouns when referring to the player
bones_was_here [Mon, 23 Jan 2023 00:01:33 +0000 (00:01 +0000)]
Merge branch 'Mario/item_replacement_fix' into 'master'
Add a new function to copy fields from items to replacements
Closes #2792
See merge request xonotic/xonotic-data.pk3dir!1124
terencehill [Sun, 22 Jan 2023 23:56:48 +0000 (23:56 +0000)]
Merge branch 'Mario/qc_setcolor' into 'master'
Switch to QC-based setcolor implementation, don't fall back to engine player values
See merge request xonotic/xonotic-data.pk3dir!1126
Rudolf Polzer [Sun, 22 Jan 2023 06:24:27 +0000 (07:24 +0100)]
Transifex autosync
Rudolf Polzer [Sat, 21 Jan 2023 06:23:49 +0000 (07:23 +0100)]
Transifex autosync
Nick S [Fri, 20 Jan 2023 22:36:00 +0000 (00:36 +0200)]
Merge remote-tracking branch 'origin/master' into morosophos/server-current4
Nick S [Fri, 20 Jan 2023 22:35:51 +0000 (00:35 +0200)]
Merge remote-tracking branch 'origin/Juhu/strafehud-server' into morosophos/server-current4
Juhu [Fri, 20 Jan 2023 21:48:34 +0000 (22:48 +0100)]
Add patch from Juhu/strafehud-features branch: "strafehud: fix small mistakes of previous projection code commit"
Juhu [Fri, 20 Jan 2023 21:43:43 +0000 (22:43 +0100)]
Add patch from Juhu/strafehud-features branch: "strafehud: add exponent cvar for sonar ranges"
Juhu [Fri, 20 Jan 2023 21:40:12 +0000 (22:40 +0100)]
Add patch from Juhu/strafehud-features branch: "strafehud: implement different projection modes and allow the range to be set to the current fov"
Rudolf Polzer [Fri, 20 Jan 2023 06:23:50 +0000 (07:23 +0100)]
Transifex autosync
Nick S [Thu, 19 Jan 2023 19:42:49 +0000 (21:42 +0200)]
Merge remote-tracking branch 'origin/master' into morosophos/server-current4
Nick S [Thu, 19 Jan 2023 19:41:34 +0000 (21:41 +0200)]
Merge remote-tracking branch 'origin/Juhu/strafehud-server' into morosophos/server-current4
Rudolf Polzer [Thu, 19 Jan 2023 06:23:50 +0000 (07:23 +0100)]
Transifex autosync
Juhu [Wed, 18 Jan 2023 15:13:37 +0000 (16:13 +0100)]
Add patch from Juhu/strafehud-features branch: "strafehud: add vertical angle indicator"
Juhu [Wed, 18 Jan 2023 14:22:45 +0000 (15:22 +0100)]
Add patch from Juhu/strafehud-fixes branch: "strafehud: update the strafehud hud editor and add a dedicated cvar to disable optional features if it didn't already have one"
Juhu [Wed, 18 Jan 2023 12:11:43 +0000 (13:11 +0100)]
Add patch from Juhu/strafehud-features branch: "strafehud: make sonar sound interval dynamic too"
Rudolf Polzer [Wed, 18 Jan 2023 06:23:47 +0000 (07:23 +0100)]
Transifex autosync
Juhu [Tue, 17 Jan 2023 22:37:31 +0000 (23:37 +0100)]
Add patch from Juhu/strafehud-fixes branch: "strafehud: don't draw text indicators if fade time is zero, not even for one frame"
Nick S [Tue, 17 Jan 2023 21:15:18 +0000 (23:15 +0200)]
Merge remote-tracking branch 'origin/Juhu/scoreboard-strafe' into morosophos/server-current4
Juhu [Tue, 17 Jan 2023 21:07:06 +0000 (22:07 +0100)]
Merge branch 'master' into Juhu/scoreboard-strafe
Nick S [Tue, 17 Jan 2023 20:29:36 +0000 (22:29 +0200)]
Merge remote-tracking branch 'origin/Juhu/scoreboard-strafe' into morosophos/server-current4
Nick S [Tue, 17 Jan 2023 20:29:26 +0000 (22:29 +0200)]
Merge remote-tracking branch 'origin/Juhu/strafehud-server' into morosophos/server-current4
Juhu [Tue, 17 Jan 2023 16:47:03 +0000 (17:47 +0100)]
Add patch from Juhu/strafehud-fixes branch: "strafehud: make slickdetector scan only downwards for slick, scan from steepest to least steep angle, slight refactor"
Juhu [Tue, 17 Jan 2023 12:10:52 +0000 (13:10 +0100)]
Add patch from Juhu/strafehud-fixes branch: "strafehud: ignore jump input when determining onground state if track_canjump is enabled"
Juhu [Tue, 17 Jan 2023 12:10:20 +0000 (13:10 +0100)]
Add patch from Juhu/strafehud-fixes branch: "strafehud: put common code for text indicators in a function, refactor text indicator code"
Rudolf Polzer [Tue, 17 Jan 2023 06:23:46 +0000 (07:23 +0100)]
Transifex autosync
bones_was_here [Tue, 17 Jan 2023 05:30:30 +0000 (15:30 +1000)]
Fix compilation unit test derp
bones_was_here [Tue, 17 Jan 2023 04:42:11 +0000 (14:42 +1000)]
Use correct droptofloor distance for each Quake map format
Fixes #2800
terencehill [Mon, 16 Jan 2023 13:05:57 +0000 (14:05 +0100)]
Add more name checks
terencehill [Sat, 14 Jan 2023 22:33:15 +0000 (23:33 +0100)]
Fix #2798 "Armor shards stuck in ground on equinox_lightfix"
Juhu [Sun, 15 Jan 2023 18:33:20 +0000 (19:33 +0100)]
Add patch from Juhu/strafehud-fixes branch: "strafehud: refactor some drawing code + make the angle arrows obey hud shift/scaling"
Juhu [Sun, 15 Jan 2023 14:08:25 +0000 (15:08 +0100)]
Add patch from Juhu/strafehud-fixes branch: "strafehud: store current jumpheight in qu and convert only for comparing and displaying"
Juhu [Sun, 15 Jan 2023 11:47:09 +0000 (12:47 +0100)]
Add patch from Juhu/strafehud-features branch: "strafehud: add audible feedback to strafehud (strafe sonar)"
Juhu [Sun, 15 Jan 2023 01:09:36 +0000 (02:09 +0100)]
Add patch from Juhu/strafehud-fixes branch: "strafehud: ignore a race_checkpointtime of 0 on the start trigger + small startspeed/jumpheight code adjustments"
Juhu [Sun, 15 Jan 2023 00:11:05 +0000 (01:11 +0100)]
Add patch from Juhu/strafehud-fixes branch: "strafehud: change the default value of hud_panel_strafehud_range from 0 (dynamic) to 90, 0 only makes sense with hud_panel_strafehud_mode 1 which isn't the default anymore"
Juhu [Sun, 15 Jan 2023 00:09:40 +0000 (01:09 +0100)]
Add patch from Juhu/strafehud-fixes branch: "strafehud: merge the preaccel zone into the accel zone and make it use a gradient if gradient style is active, add hud_panel_strafehud_bar_preaccel to optionally ignore this part of the accel zone"
Juhu [Sat, 14 Jan 2023 15:40:24 +0000 (16:40 +0100)]
Add patch from Juhu/strafehud-fixes branch: "strafehud: refactor/simplify angle indicator coloring code + small improvement for onground/onslick detection"
Juhu [Wed, 11 Jan 2023 12:13:00 +0000 (13:13 +0100)]
small strafe efficiency code readability enhancement
Juhu [Wed, 11 Jan 2023 11:16:55 +0000 (12:16 +0100)]
simplify strafe efficiency calculation code + misc minor refactoring
Rudolf Polzer [Wed, 11 Jan 2023 06:23:46 +0000 (07:23 +0100)]
Transifex autosync
Rudolf Polzer [Tue, 10 Jan 2023 06:23:45 +0000 (07:23 +0100)]
Transifex autosync
Rudolf Polzer [Mon, 9 Jan 2023 06:23:51 +0000 (07:23 +0100)]
Transifex autosync
Juhu [Sun, 8 Jan 2023 14:11:29 +0000 (15:11 +0100)]
Add patch from Juhu/strafehud-fixes branch: "strafehud: make slick detection more reliable and consistent"
Mario [Sun, 8 Jan 2023 10:21:20 +0000 (20:21 +1000)]
Avoid running ColorTranslateRGB on an empty string
Mario [Sun, 8 Jan 2023 09:58:56 +0000 (19:58 +1000)]
Switch to QC-based setcolor implementation, don't fall back to engine player values
Rudolf Polzer [Sun, 8 Jan 2023 06:24:33 +0000 (07:24 +0100)]
Transifex autosync
Rudolf Polzer [Sat, 7 Jan 2023 13:36:13 +0000 (14:36 +0100)]
Transifex autosync
Mario [Sat, 7 Jan 2023 11:32:19 +0000 (21:32 +1000)]
Fix a minor typo in a comment
Mario [Sat, 7 Jan 2023 08:21:53 +0000 (18:21 +1000)]
Remove an unclear comment about copyentity
Mario [Fri, 6 Jan 2023 18:40:27 +0000 (04:40 +1000)]
Add a new function to copy fields from items to replacements, fixes #2792
terencehill [Thu, 5 Jan 2023 16:15:48 +0000 (16:15 +0000)]
Merge branch 'z411/ctf_notif_fix' into 'master'
Fixed notification bug in 3-4 team CTF
See merge request xonotic/xonotic-data.pk3dir!1087
z411 [Thu, 5 Jan 2023 16:15:47 +0000 (16:15 +0000)]
Fixed notification bug in 3-4 team CTF
Added pickup notification for 3-4 team CTF
LegendaryGuard [Thu, 5 Jan 2023 00:21:19 +0000 (00:21 +0000)]
Merge branch 'terencehill/gibs_config' into 'master'
Gibs: tweak settings to reduce exaggerated throw velocity
See merge request xonotic/xonotic-data.pk3dir!1114
LegendaryGuard [Thu, 5 Jan 2023 00:20:57 +0000 (00:20 +0000)]
Merge branch 'terencehill/weapon_decals_fix' into 'master'
Fix #2777 and a related issue (about decals)
Closes #2777
See merge request xonotic/xonotic-data.pk3dir!1112
terencehill [Thu, 5 Jan 2023 00:02:04 +0000 (00:02 +0000)]
Merge branch 'LegendaryGuard/scale_weapon_models' into 'master'
Update and optimize Akordeon, Devastator, Fireball, Tuba and Vortex v_* files, scaled by -15%. Fix Fireball Gloss material, fix Tuba UVs scaled by -20% and scale v_kleinbottle by -35%
Closes #2786 and #2629
See merge request xonotic/xonotic-data.pk3dir!1113
LegendaryGuard [Thu, 5 Jan 2023 00:02:04 +0000 (00:02 +0000)]
Update and optimize Akordeon, Devastator, Fireball, Tuba and Vortex v_* files, scaled by -15%. Fix Fireball Gloss material, fix Tuba UVs scaled by -20% and scale v_kleinbottle by -35%
terencehill [Wed, 4 Jan 2023 20:40:42 +0000 (20:40 +0000)]
Merge branch 'z411/pickup_panel' into 'master'
Item Pickup panel
See merge request xonotic/xonotic-data.pk3dir!1094
z411 [Wed, 4 Jan 2023 20:40:42 +0000 (20:40 +0000)]
Item Pickup panel
* This panel shows the weapon or item that has been just picked up, with its icon, item name, and time of pickup.
* The time of pickup can be hidden by the client or the server (default in XPM ruleset).
* If you pick up the same item several times in a row it will show (x2, x3...) in parentheses.
* Display time, fade out time and icon size can all be configured. The size of its contents automatically change size to fit the panel size.
terencehill [Mon, 2 Jan 2023 23:58:55 +0000 (23:58 +0000)]
Merge branch 'Mario/ammo_panel_alphabetical' into 'master'
Clean up ammo sorting in the HUD to not reference items directly
See merge request xonotic/xonotic-data.pk3dir!1121
Mario [Mon, 2 Jan 2023 23:58:54 +0000 (23:58 +0000)]
Clean up ammo sorting in the HUD to not reference items directly
bones_was_here [Mon, 2 Jan 2023 16:02:47 +0000 (16:02 +0000)]
Merge branch 'Mario/no_engine_physics' into 'master'
Make all entities (such as monsters and turrets) use physics logic handled by Xonotic rather than the engine, allowing for future advancements in movement and gameplay
See merge request xonotic/xonotic-data.pk3dir!1044
terencehill [Sun, 1 Jan 2023 12:15:43 +0000 (13:15 +0100)]
More whitespace fixes
terencehill [Sun, 1 Jan 2023 12:13:54 +0000 (13:13 +0100)]
Display ammo types in the Items Stats panel in the same order as the Ammo panel
Implemented by rearranging ammo registration calls. Also fixed some whitespace.
Mario [Sun, 1 Jan 2023 08:48:14 +0000 (18:48 +1000)]
Revert "Add brackets around the nested viewmodel draw call, seems to fix a strange case of weapon models disappearing"
This reverts commit
e02b28a21e077b9d74bcd6bb610e684ae6abd4ba .
Mario [Sun, 1 Jan 2023 04:10:25 +0000 (14:10 +1000)]
Add brackets around the nested viewmodel draw call, seems to fix a strange case of weapon models disappearing
terencehill [Sat, 31 Dec 2022 23:37:05 +0000 (23:37 +0000)]
Merge branch 'bones_was_here/gunoffset' into 'master'
Implement cl_gunoffset and related fixes and refactoring
Closes #2374 and #2017
See merge request xonotic/xonotic-data.pk3dir!1100
terencehill [Sat, 31 Dec 2022 17:49:15 +0000 (17:49 +0000)]
Merge branch 'Mario/simple_ammo_pickupevalfunc' into 'master'
Clean up ammo_pickupevalfunc to not reference items directly
See merge request xonotic/xonotic-data.pk3dir!1120
Mario [Sat, 31 Dec 2022 17:49:15 +0000 (17:49 +0000)]
Clean up ammo_pickupevalfunc to not reference items directly
bones_was_here [Sat, 31 Dec 2022 12:17:55 +0000 (12:17 +0000)]
Merge branch 'z411/annce_queue' into 'master'
Implemented announcer queue
Closes #1358
See merge request xonotic/xonotic-data.pk3dir!1075
Mario [Sat, 31 Dec 2022 04:46:49 +0000 (14:46 +1000)]
Update gameplay hash
Mario [Sat, 31 Dec 2022 03:45:37 +0000 (13:45 +1000)]
Merge branch 'master' into Mario/no_engine_physics
terencehill [Fri, 30 Dec 2022 14:32:07 +0000 (14:32 +0000)]
Merge branch 'Mario/undeprecate_weapon_cleanup' into 'master'
Add a registry field for renamed weapons to define their previous name to maintain compatibility
See merge request xonotic/xonotic-data.pk3dir!1119