]>
git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
Martin Taibr [Fri, 10 Jan 2020 22:03:51 +0000 (23:03 +0100)]
WIP: electro: allow midair combos to only affect enemy orbs
Martin Taibr [Fri, 10 Jan 2020 20:00:24 +0000 (20:00 +0000)]
Merge branch 'mirceakitsune/campaign_leadlimit' into 'master'
Allow campaign levels to specify leadlimit
See merge request xonotic/xonotic-data.pk3dir!747
Mircea Kitsune [Fri, 10 Jan 2020 20:00:24 +0000 (20:00 +0000)]
Allow campaign levels to specify leadlimit
Mario [Fri, 10 Jan 2020 15:39:03 +0000 (01:39 +1000)]
Update the view smoothing cvars to Xonotic values in code
Mario [Fri, 10 Jan 2020 15:12:10 +0000 (01:12 +1000)]
Set a default value for cl_stairsmoothspeed in code so that it works in any engine
Mario [Thu, 9 Jan 2020 11:22:04 +0000 (21:22 +1000)]
Rename sv_vq3compat to sv_q3defragcompat to clarify its purpose
Mario [Thu, 9 Jan 2020 11:08:35 +0000 (21:08 +1000)]
Automatically detect .defi files and enable VQ3 compat at match start, not while generating the .mapinfo file
Mario [Thu, 9 Jan 2020 09:57:19 +0000 (09:57 +0000)]
Merge branch 'illwieckz/ge128' into 'master'
DarkPlaces does not support alphaFunc GT0 and uses GE128 instead
See merge request xonotic/xonotic-data.pk3dir!753
Thomas Debesse [Thu, 9 Jan 2020 09:27:03 +0000 (10:27 +0100)]
DarkPlaces does not support alphaFunc GT0 and uses GE128 instead
By making this change, we ensure the materials look the same on DarkPlaces and
other engines, even in the case it's wrong on DarkPlaces because Xonotic mappers
now expect the wrong behavior.
Darkplaces only supports one alphaFunc operation, it only reads the alphaFunc
keyword and does not read the function name:
https://gitlab.com/xonotic/darkplaces/blob/
324a5329d33ef90df59e6488abce6433d90ac04c /model_shared.c#L1875-1876
It then uses the GE128 operator unconditionally:
https://gitlab.com/xonotic/darkplaces/blob/
0ea8f691e05ea968bb8940942197fa627966ff99 /render.h#L95
People may silently introduce regressions in their textures designed for GT0
by compressing them using a lossy picture format like Jpg.
Xonotic texture known to trigger this bug (in xonotic-maps):
models/desertfactory/textures/shaders/grass01.jpg
Using GE128 hides Jpeg artifacts while it's possible a TGA version worked with GT0.
Xonotic texture that may benefit from GT0 if supported (in xonotic-maps):
models/desertfactory/textures/shaders/sign_ladder_dirty.jpg
By storing this texture in lossless format and making sure the frame is pure
black and the ladder is a bit less black than pure black, only the frame would
be transparent.
Unfortunately, after years of GE128 usagen displaying the texture with GT0
operation would be a regression.
Note: I also renamed some `alphafunc` to `alphaFunc` even if it was already GE128.
Martin Taibr [Wed, 8 Jan 2020 13:42:30 +0000 (14:42 +0100)]
add link to translation guide on wiki
Mario [Wed, 8 Jan 2020 05:48:31 +0000 (05:48 +0000)]
Merge branch 'martin-t/weaponorder' into 'master'
Cleanup weaponorder
See merge request xonotic/xonotic-data.pk3dir!720
Mario [Wed, 8 Jan 2020 05:42:49 +0000 (05:42 +0000)]
Merge branch 'is_not_beaten' into 'master'
Show goal time in Race scoreboard w/o "is beaten"
Closes #2320
See merge request xonotic/xonotic-data.pk3dir!731
terencehill [Tue, 7 Jan 2020 18:57:51 +0000 (19:57 +0100)]
Make sure g_campaign is always reset to 0 on disconnection (without relying on the "Start Multiplayer!" button of the menu)
Mario [Tue, 7 Jan 2020 18:09:50 +0000 (04:09 +1000)]
Make uses of R_BeginPolygon explicit as to whether they're 2D or 3D
Mario [Tue, 7 Jan 2020 16:57:11 +0000 (02:57 +1000)]
Make the slick flag usable outside of applygravity
Mario [Tue, 7 Jan 2020 14:40:04 +0000 (14:40 +0000)]
Merge branch 'terencehill/frametime_checks' into 'master'
Frametime checks
See merge request xonotic/xonotic-data.pk3dir!751
Mario [Mon, 6 Jan 2020 19:14:35 +0000 (05:14 +1000)]
Fix off-hand grappling hook firing from the center of the screen
Mario [Mon, 6 Jan 2020 18:51:12 +0000 (04:51 +1000)]
Don't copy trace globals when performing touch with entities, the engine does this to provide them to QC, a process that is not required in QC
Mario [Mon, 6 Jan 2020 18:24:43 +0000 (04:24 +1000)]
Tweak unsticking to match the engine a bit closer, fixes some issues with getting stuck inside clips
Mario [Mon, 6 Jan 2020 17:43:07 +0000 (03:43 +1000)]
Update cl_viewmodel_alpha description
Mario [Mon, 6 Jan 2020 17:41:25 +0000 (17:41 +0000)]
Merge branch 'Mario/weapon_opacity_menu' into 'master'
Merge branch Mario/weapon_opacity_menu (S merge request)
Closes #2371
See merge request xonotic/xonotic-data.pk3dir!744
Mario [Mon, 6 Jan 2020 17:41:25 +0000 (17:41 +0000)]
Merge branch Mario/weapon_opacity_menu (S merge request)
Mario [Mon, 6 Jan 2020 12:52:11 +0000 (22:52 +1000)]
Hopefully fix compilation units
Mario [Mon, 6 Jan 2020 12:29:58 +0000 (22:29 +1000)]
Fix crouching not being applied while in bloodloss
Mario [Mon, 6 Jan 2020 12:21:19 +0000 (22:21 +1000)]
Fix glitchy jumping while bloodloss is in effect
Mario [Mon, 6 Jan 2020 11:56:25 +0000 (21:56 +1000)]
Disable bloodloss when the match has ended, fixes cases where players instantly die during intermission
Mario [Mon, 6 Jan 2020 11:52:48 +0000 (21:52 +1000)]
Remove crosshair_hittest_showimpact from the menu and add a notice to its cvar that it's glitchy
Mario [Mon, 6 Jan 2020 10:27:07 +0000 (20:27 +1000)]
Reset weapon alignment on respawn and when dual wielding status changes, default to right alignment when dual wielding
Martin Taibr [Sat, 4 Jan 2020 16:20:45 +0000 (16:20 +0000)]
Merge branch 'mirceakitsune/campaign_gametype_icon' into 'master'
Draw the gametype icon on campaign entries
Since I've been doing multiple campaign fixes, I decided to include an update to the menu part as well. I wanted to see how it would look if the gametype icon of levels was also displayed within the field. Personally I find it good looking, as well somewhat easier to tell which level you're at with this change.
I tried several combinations; Above the checkmark looked okay, but it's harder to tell which level the icon is referring to... it seems to look best on the right side of the map preview image. I included a few screenshots, the first representing the old appearance and the last being what the MR currently adds... if you find another position better please suggest it and I'll make a new commit.
![campaign](/uploads/
3cf11cc059b9353dfa1dc973c4e859b9 /campaign.jpg)
![campaign_above_checkmark](/uploads/
9537d4e2bc7919f4275c8848ffbba405 /campaign_above_checkmark.jpg)
![campaign_preview_left](/uploads/
2ecd0dfa12246c26a9accc4485658b4e /campaign_preview_left.jpg)
![campaign_preview_right](/uploads/
f4b32394f3b54e13daf43a50e32b33a7 /campaign_preview_right.jpg)
See merge request xonotic/xonotic-data.pk3dir!748
Martin Taibr [Fri, 3 Jan 2020 04:33:33 +0000 (04:33 +0000)]
Merge branch 'mirceakitsune/campaign_difficulty' into 'master'
Better campaign difficulty customization
See merge request xonotic/xonotic-data.pk3dir!750
Mircea Kitsune [Fri, 3 Jan 2020 04:33:33 +0000 (04:33 +0000)]
Better campaign difficulty customization
Mario [Thu, 2 Jan 2020 13:04:06 +0000 (23:04 +1000)]
Don't use the IS_DEAD macro in CSQC Player code (not defined in lib)
Rudolf Polzer [Thu, 2 Jan 2020 00:53:11 +0000 (19:53 -0500)]
Use cp instead of ln to create the csprogs pk3.
Makes building work even when hard links are not supported.
terencehill [Wed, 1 Jan 2020 22:13:26 +0000 (23:13 +0100)]
More frametime checks
terencehill [Wed, 1 Jan 2020 21:46:07 +0000 (22:46 +0100)]
Check frametime before executing code that does nothing if frametime is 0
Martin Taibr [Wed, 1 Jan 2020 11:30:14 +0000 (12:30 +0100)]
fix mutator descriptions in menu
Martin Taibr [Wed, 1 Jan 2020 11:18:49 +0000 (12:18 +0100)]
document what _ is
Martin Taibr [Wed, 1 Jan 2020 10:39:02 +0000 (11:39 +0100)]
improve some mutator descriptions, higher touchexplode dmg/push
Martin Taibr [Wed, 1 Jan 2020 09:47:22 +0000 (09:47 +0000)]
Merge branch 'mutator' into 'master'
Add tooltips for all mutators in mutator menu
Some checkboxes for mutators in the Mutator menu were lacking a tooltip, so I added them.
I also updated tooltips for some mutators which weren't really helpful.
Fixes https://gitlab.com/xonotic/xonotic/issues/288
See merge request xonotic/xonotic-data.pk3dir!735
Mario [Tue, 31 Dec 2019 15:15:12 +0000 (15:15 +0000)]
Merge branch 'Mario/qc_camstuff' into 'master'
Merge branch Mario/qc_camstuff (M merge request)
See merge request xonotic/xonotic-data.pk3dir!719
Wuzzy [Fri, 15 Nov 2019 17:22:29 +0000 (18:22 +0100)]
Add tooltips for all mutators in mutator menu
Mircea Kitsune [Mon, 30 Dec 2019 20:26:47 +0000 (22:26 +0200)]
Draw the gametype icon on campaign entries
Mario [Mon, 30 Dec 2019 14:53:05 +0000 (00:53 +1000)]
If the player has no weapon, return "none" in the chat, also report health 2342 as "observing" during intermission
Mario [Mon, 30 Dec 2019 14:31:58 +0000 (00:31 +1000)]
Return pretty names in chat for spectating/observing/dead instead of the engine's magic numbers
Mario [Mon, 30 Dec 2019 13:36:43 +0000 (23:36 +1000)]
Merge branch 'master' into Mario/qc_camstuff
Mario [Mon, 30 Dec 2019 13:09:15 +0000 (23:09 +1000)]
Split most individual features out of CSQC_UpdateView and into their own functions
Mario [Mon, 30 Dec 2019 09:28:41 +0000 (19:28 +1000)]
Don't cause an unused variable error if the ReplicateVars system isn't used
Mario [Mon, 30 Dec 2019 08:47:11 +0000 (18:47 +1000)]
Apply new logic by martin - accommodates horizontal velocity in the vertical fall damage calculations when onlyvertical is enabled, matching regular fall damage more accurately
Martin Taibr [Mon, 30 Dec 2019 07:53:39 +0000 (07:53 +0000)]
Merge branch 'Mario/falldamage_vertical' into 'master'
Merge branch Mario/falldamage_vertical (XS merge request)
Adds an option to make fall damage only apply to the vertical axis, potentially useful.
See merge request xonotic/xonotic-data.pk3dir!745
Mario [Mon, 30 Dec 2019 07:03:15 +0000 (17:03 +1000)]
Move the falldamage velocity comment to a more appropriate location
Mario [Mon, 30 Dec 2019 06:50:54 +0000 (16:50 +1000)]
Optimise logic a bit, only call vlen when absolutely necessary in fall damage checks
Mario [Sun, 29 Dec 2019 17:22:30 +0000 (03:22 +1000)]
Update global stats during the match, not just at map load, fixes some issues when changing cvars, also apply magic numbers to more engine cvars, fixes issues with mismatching client settings
Mario [Sun, 29 Dec 2019 14:10:06 +0000 (00:10 +1000)]
Fix the Arc being visibly inaccurate and flashing the muzzle effect at the center of the screen for a frame
Mario [Sun, 29 Dec 2019 13:27:02 +0000 (13:27 +0000)]
Merge branch 'terencehill/casings_tweaks' into 'master'
Casings tweaks
See merge request xonotic/xonotic-data.pk3dir!746
Mario [Sun, 29 Dec 2019 11:16:25 +0000 (21:16 +1000)]
Make the QC physics match the engine a bit more accurately, fixes some issues with bullet casings and projectiles visibly bouncing before disappearing on impact
Mario [Sun, 29 Dec 2019 08:07:43 +0000 (18:07 +1000)]
Apply martin's version of the walljump angle fix
Mario [Sat, 28 Dec 2019 18:59:09 +0000 (04:59 +1000)]
Announce remaining frags in keepaway when timepoints is off
Mario [Sat, 28 Dec 2019 18:55:38 +0000 (04:55 +1000)]
Add a compatibility hack for trigger_multiple and func_button (makes dfwc2017-2 playable)
Mario [Sat, 28 Dec 2019 18:37:14 +0000 (04:37 +1000)]
Fix compilation unit tests
Mario [Sat, 28 Dec 2019 18:22:29 +0000 (04:22 +1000)]
Rotate .obj entity models 180 degrees around the Y axis, workaround for an engine bug
Mario [Sat, 28 Dec 2019 16:16:15 +0000 (02:16 +1000)]
Give kill credit if a player falls into the void after passing through your portal
Mario [Sat, 28 Dec 2019 15:33:36 +0000 (01:33 +1000)]
Add an option to only account for vertical travel when calculating fall damage
Mario [Sat, 28 Dec 2019 15:19:51 +0000 (01:19 +1000)]
Add rudimentary support for surfaceparm nodamage (negates fall damage)
Mario [Sat, 28 Dec 2019 13:51:37 +0000 (23:51 +1000)]
Add an option to the effects menu to toggle skyboxes, only disabled by the OMG effects configuration
Mario [Sat, 28 Dec 2019 13:40:52 +0000 (13:40 +0000)]
Merge branch 'terencehill/campaign_balance_fix' into 'master'
Campaign balance fix
Closes #2364
See merge request xonotic/xonotic-data.pk3dir!742
Mario [Sat, 28 Dec 2019 13:34:08 +0000 (23:34 +1000)]
Use a semicolon instead of a new line, fixes weird character in the quit tooltip
Mario [Sat, 28 Dec 2019 13:25:05 +0000 (23:25 +1000)]
Create aliases for commands on roughly their correct VM, restores settemp functionality
Mario [Sat, 28 Dec 2019 12:24:26 +0000 (22:24 +1000)]
Rename sv_hook_gamerestart to sv_hook_readyrestart, a more accurate name for its functionality. A note has been left where sv_hook_gamerestart used to be for admins to find the new hook name
Mario [Sat, 28 Dec 2019 11:38:17 +0000 (21:38 +1000)]
Use new method of getting angle vectors in walljump code, fixes a potential issue with invalid angles
Rudolf Polzer [Sat, 28 Dec 2019 06:25:10 +0000 (07:25 +0100)]
Transifex autosync
Mario [Thu, 26 Dec 2019 09:04:10 +0000 (19:04 +1000)]
Update spider and wyvern angles when attacking, since the target is updated then in some cases
Mario [Wed, 25 Dec 2019 14:47:44 +0000 (00:47 +1000)]
Silence a team related warning when enabling developer
Mario [Tue, 24 Dec 2019 17:22:27 +0000 (03:22 +1000)]
Reduce the visible distance of spawn point particles (barely visible at the previous distance, wasting resources)
Mario [Tue, 24 Dec 2019 17:10:00 +0000 (03:10 +1000)]
Don't check each notification choice cvar 4 times, improves client-side performance slightly
Mario [Tue, 24 Dec 2019 16:57:22 +0000 (02:57 +1000)]
Optimise ReplicateVars further by only calling cvar() once
Mario [Tue, 24 Dec 2019 16:50:13 +0000 (02:50 +1000)]
Use strcat instead of sprintf in ReplicateVars, improves client-side performance a bit (heavily called function)
Mario [Tue, 24 Dec 2019 16:30:23 +0000 (02:30 +1000)]
Don't apply developer checks if developer is -1
Mario [Tue, 24 Dec 2019 16:19:41 +0000 (02:19 +1000)]
Disable profile trace logs on static initiation functions
Mario [Tue, 24 Dec 2019 16:12:24 +0000 (02:12 +1000)]
Don't warn about planned/reserved player sounds being listed
Mario [Tue, 24 Dec 2019 15:52:16 +0000 (01:52 +1000)]
Also don't log hit sounds
Mario [Tue, 24 Dec 2019 15:50:39 +0000 (01:50 +1000)]
Don't show a trace log for client-side damage dealt
Mario [Tue, 24 Dec 2019 15:32:21 +0000 (01:32 +1000)]
Use a debug log instead for reporting item pickups (less console spam)
Mario [Tue, 24 Dec 2019 15:28:46 +0000 (01:28 +1000)]
Don't perform a trace log on every item picked up
terencehill [Tue, 24 Dec 2019 15:07:46 +0000 (16:07 +0100)]
Fix #2364 "Campaign doesn't balance bots in team games according to g_campaign_forceteam and forced team for bots"
Mario [Tue, 24 Dec 2019 15:02:06 +0000 (01:02 +1000)]
Close some databases on shutdown if they're open
terencehill [Tue, 24 Dec 2019 15:00:25 +0000 (16:00 +0100)]
Bot config file: properly filter out empty lines
Mario [Tue, 24 Dec 2019 13:31:40 +0000 (23:31 +1000)]
Fix a division by 0
Mario [Tue, 24 Dec 2019 13:24:11 +0000 (23:24 +1000)]
For better compatibility, turn item_doubler into buff_bash on Q3 maps, and medkits into big armor instead of mega
Mario [Tue, 24 Dec 2019 12:39:27 +0000 (22:39 +1000)]
Rename teamnumber to teamnum in some function parameters, so that it may be used elsewhere later
Mario [Mon, 23 Dec 2019 12:17:58 +0000 (22:17 +1000)]
Improve performance slightly by not performing cvar_string operations on every cvar() call
Mario [Sun, 22 Dec 2019 01:44:04 +0000 (11:44 +1000)]
Change g_fullbrightitems description now that it doesn't require cl_fullbrightitems
terencehill [Sat, 21 Dec 2019 23:39:52 +0000 (00:39 +0100)]
Fix #2365 "Div by zero at hydroxon startup"
terencehill [Sat, 21 Dec 2019 23:38:53 +0000 (00:38 +0100)]
When bot_vs_human is enabled ignore team assignment in the bot config file
terencehill [Sat, 21 Dec 2019 23:26:12 +0000 (00:26 +0100)]
Add a comment about tracewalk underwater
Rudolf Polzer [Thu, 19 Dec 2019 06:25:26 +0000 (07:25 +0100)]
Transifex autosync
Mario [Wed, 18 Dec 2019 18:10:06 +0000 (04:10 +1000)]
Remove cl_fullbright_items (if the server enables fullbright items, show them!)
Mario [Wed, 18 Dec 2019 18:05:55 +0000 (04:05 +1000)]
Adjust r_water_refractdistort to a more reasonable value (allows better visibility through warpzones, more visually pleasing effect)
Mario [Wed, 18 Dec 2019 18:03:18 +0000 (04:03 +1000)]
Set r_useportalculling to 1 by default until the issues with the engine's unrecommended default of 2 are resolved, fixes graphical issues on some maps
Mario [Wed, 18 Dec 2019 17:37:36 +0000 (03:37 +1000)]
Remove cl_netfps from the menu (it's not a worthwhile setting to include in the menu, unclear as to its purpose and generally doesn't need changing anyway)
Mario [Wed, 18 Dec 2019 14:37:10 +0000 (00:37 +1000)]
Never show mapinfo warnings in the menu code, since they don't apply to the map being played