xonotic/xonotic-data.pk3dir.git
3 years agoMerge branch 'master' into martin-t/dmgtext
Martin Taibr [Fri, 2 Mar 2018 21:22:07 +0000 (22:22 +0100)]
Merge branch 'master' into martin-t/dmgtext

3 years agoUpdate languages.txt
Mirio [Fri, 2 Mar 2018 13:59:16 +0000 (13:59 +0000)]
Update languages.txt

3 years agoMake more of the shotorg adjustments available to CSQC
Mario [Fri, 2 Mar 2018 13:02:28 +0000 (23:02 +1000)]
Make more of the shotorg adjustments available to CSQC

3 years agoTransifex autosync
Rudolf Polzer [Fri, 2 Mar 2018 06:24:54 +0000 (07:24 +0100)]
Transifex autosync

3 years agoFix special command third parameter
Mario [Thu, 1 Mar 2018 14:46:02 +0000 (00:46 +1000)]
Fix special command third parameter

3 years agoClean up a movetype check in warpzone code
Mario [Thu, 1 Mar 2018 14:29:17 +0000 (00:29 +1000)]
Clean up a movetype check in warpzone code

3 years agoMerge branch 'terencehill/menu_statslist_strings' into 'master'
Mario [Thu, 1 Mar 2018 10:16:20 +0000 (10:16 +0000)]
Merge branch 'terencehill/menu_statslist_strings' into 'master'

Menu statslist strings

Closes #1904

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

3 years agoTransifex autosync
Rudolf Polzer [Thu, 1 Mar 2018 06:23:59 +0000 (07:23 +0100)]
Transifex autosync

3 years agoMenu: don't allow customization of drag tolerance for slider and listbox in the skins...
terencehill [Wed, 28 Feb 2018 19:17:13 +0000 (20:17 +0100)]
Menu: don't allow customization of drag tolerance for slider and listbox in the skins since it's not a aesthetic parameter; cursor position checks in ListBox_mouseDrag now don't look wrong (drag tolerance x-y components were inverted because listbox used slider drag tolerance values!)

3 years agoRemove an unused function
terencehill [Wed, 28 Feb 2018 18:45:07 +0000 (19:45 +0100)]
Remove an unused function

3 years agoAdd Irish, Chinese-China and Korean to the menu
Mirio [Wed, 28 Feb 2018 15:27:55 +0000 (16:27 +0100)]
Add Irish, Chinese-China and Korean to the menu

3 years agoTransifex autosync
Rudolf Polzer [Wed, 28 Feb 2018 06:24:00 +0000 (07:24 +0100)]
Transifex autosync

3 years agoMake arc heat crosshair ring smooth
Mario [Tue, 27 Feb 2018 18:11:07 +0000 (04:11 +1000)]
Make arc heat crosshair ring smooth

3 years agoMake warnings about unknown gametypes simple debug messages (mod gametypes are unknow...
Mario [Tue, 27 Feb 2018 17:04:10 +0000 (03:04 +1000)]
Make warnings about unknown gametypes simple debug messages (mod gametypes are unknown, no need to spam about it)

3 years agoTransifex autosync
Rudolf Polzer [Tue, 27 Feb 2018 06:23:56 +0000 (07:23 +0100)]
Transifex autosync

3 years agoAdd a mutator hook to skip respawn time calculations (fixes a reference to CA)
Mario [Mon, 26 Feb 2018 12:35:38 +0000 (22:35 +1000)]
Add a mutator hook to skip respawn time calculations (fixes a reference to CA)

3 years agoTransifex autosync
Rudolf Polzer [Mon, 26 Feb 2018 06:24:04 +0000 (07:24 +0100)]
Transifex autosync

3 years agoRemove the null weapon check from W_SetupShot and make sure accuracy_add doesn't...
Mario [Mon, 26 Feb 2018 05:20:45 +0000 (15:20 +1000)]
Remove the null weapon check from W_SetupShot and make sure accuracy_add doesn't try to add accuracy to the null weapon

3 years agoPlayer stats in the menu: clean up translatable strings by removing untranslatable... 539/head
terencehill [Sun, 25 Feb 2018 23:02:04 +0000 (00:02 +0100)]
Player stats in the menu: clean up translatable strings by removing untranslatable parts and underscores; make translatable some strings previously untranslatable. It fixes #1904

3 years agoMove weaponorder_byimpulse to ClientState
Mario [Sun, 25 Feb 2018 17:30:53 +0000 (03:30 +1000)]
Move weaponorder_byimpulse to ClientState

3 years agoMerge branch 'terencehill/accuracy_shotgun' into 'master'
Martin Taibr [Sun, 25 Feb 2018 17:16:59 +0000 (17:16 +0000)]
Merge branch 'terencehill/accuracy_shotgun' into 'master'

Damage stats fixes

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

3 years agoUpdate hash
terencehill [Sun, 25 Feb 2018 01:44:43 +0000 (02:44 +0100)]
Update hash

3 years agoMerge branch 'master' into terencehill/accuracy_shotgun
terencehill [Sun, 25 Feb 2018 01:16:00 +0000 (02:16 +0100)]
Merge branch 'master' into terencehill/accuracy_shotgun

3 years agoAdd align option to debug_text_3d
terencehill [Sat, 24 Feb 2018 21:35:09 +0000 (22:35 +0100)]
Add align option to debug_text_3d

3 years agoTransifex autosync
Rudolf Polzer [Sat, 24 Feb 2018 06:24:56 +0000 (07:24 +0100)]
Transifex autosync

3 years agodebug_text_3d_* macros: remove trailing semicolons, read cvars instead of autocvars...
terencehill [Fri, 23 Feb 2018 19:05:58 +0000 (20:05 +0100)]
debug_text_3d_* macros: remove trailing semicolons, read cvars instead of autocvars (removing a hack and 5 globals)

3 years agoMerge branch 'martin-t/wip-debugging' into 'master'
terencehill [Fri, 23 Feb 2018 17:18:21 +0000 (17:18 +0000)]
Merge branch 'martin-t/wip-debugging' into 'master'

Stuff useful for debugging:
debug_text_3d
some info

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

3 years agoStuff useful for debugging
Martin Taibr [Fri, 23 Feb 2018 17:18:21 +0000 (17:18 +0000)]
Stuff useful for debugging

3 years agoAllow servers to define custom help messages for votes
Mario [Wed, 21 Feb 2018 12:26:41 +0000 (22:26 +1000)]
Allow servers to define custom help messages for votes

3 years agoFix vhelp not allowing arguments
Mario [Wed, 21 Feb 2018 12:15:17 +0000 (22:15 +1000)]
Fix vhelp not allowing arguments

3 years agoDon't keep focus when hovering over non-focusable elements; it fixes scrolling with...
terencehill [Tue, 20 Feb 2018 18:16:20 +0000 (19:16 +0100)]
Don't keep focus when hovering over non-focusable elements; it fixes scrolling with mouse wheel not working in the GameSettings tab (scrollable panel) after hovering cursor over a focusable item, then over a non-focusable one, finally over an empty area of the tab

3 years agoDisplay dumptree in the menu_cmd help message
terencehill [Tue, 20 Feb 2018 17:58:36 +0000 (18:58 +0100)]
Display dumptree in the menu_cmd help message

3 years agoMake 2 macros less cryptic
terencehill [Tue, 20 Feb 2018 17:52:11 +0000 (18:52 +0100)]
Make 2 macros less cryptic

3 years agoSet beam image of missed arc shot (should fix odd behaviour when aiming at the sky)
Mario [Tue, 20 Feb 2018 13:45:05 +0000 (23:45 +1000)]
Set beam image of missed arc shot (should fix odd behaviour when aiming at the sky)

3 years agoMake sure offhand blaster is off by default on old servers
Mario [Tue, 20 Feb 2018 12:59:41 +0000 (22:59 +1000)]
Make sure offhand blaster is off by default on old servers

3 years agoClean up MapHasRightSize a tiny bit
Mario [Tue, 20 Feb 2018 07:02:37 +0000 (17:02 +1000)]
Clean up MapHasRightSize a tiny bit

3 years agoAllow undefined maximum players
Mario [Tue, 20 Feb 2018 06:47:25 +0000 (16:47 +1000)]
Allow undefined maximum players

3 years agoMerge branch 'TimePath/scrollpanel' into 'master'
Mario [Mon, 19 Feb 2018 02:36:52 +0000 (02:36 +0000)]
Merge branch 'TimePath/scrollpanel' into 'master'

Menu: ScrollPanel component

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

3 years agoMerge branch 'master' into TimePath/scrollpanel
terencehill [Sun, 18 Feb 2018 12:43:39 +0000 (13:43 +0100)]
Merge branch 'master' into TimePath/scrollpanel

3 years agoImprove comments
terencehill [Sun, 18 Feb 2018 00:21:41 +0000 (01:21 +0100)]
Improve comments

3 years agoMerge branch 'master' into terencehill/accuracy_shotgun
terencehill [Sun, 18 Feb 2018 00:16:40 +0000 (01:16 +0100)]
Merge branch 'master' into terencehill/accuracy_shotgun

# Conflicts:
# qcsrc/common/weapons/weapon/hagar.qc
# qcsrc/server/player.qc
# qcsrc/server/weapons/tracing.qc

3 years agoChange speed modifying mutators to use the maxspeed_mod stat and PlayerPhysics_Update...
Mario [Sat, 17 Feb 2018 17:48:56 +0000 (03:48 +1000)]
Change speed modifying mutators to use the maxspeed_mod stat and PlayerPhysics_UpdateStats

3 years agoMerge branch 'martin-t/cfgs' into 'master'
Mario [Sat, 17 Feb 2018 17:47:30 +0000 (17:47 +0000)]
Merge branch 'martin-t/cfgs' into 'master'

Rename all the configs

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

3 years agorename all the configs 536/head
Martin Taibr [Sat, 17 Feb 2018 17:15:38 +0000 (18:15 +0100)]
rename all the configs

3 years agoTurn most cases of _STAT into STAT
Mario [Sat, 17 Feb 2018 16:29:59 +0000 (02:29 +1000)]
Turn most cases of _STAT into STAT

3 years agoMake ReadVector/WriteVector more commonly used
Mario [Sat, 17 Feb 2018 13:36:12 +0000 (23:36 +1000)]
Make ReadVector/WriteVector more commonly used

3 years agoMerge branch 't0uYK8Ne/target_init' into 'master'
Mario [Sat, 17 Feb 2018 12:07:26 +0000 (12:07 +0000)]
Merge branch 't0uYK8Ne/target_init' into 'master'

Improve target_init support.

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

3 years agoFix numbering of weapon flag bits
Mario [Sat, 17 Feb 2018 11:26:50 +0000 (21:26 +1000)]
Fix numbering of weapon flag bits

3 years agono damagetext for 0 damage friendly fire
Martin Taibr [Sat, 17 Feb 2018 09:47:43 +0000 (10:47 +0100)]
no damagetext for 0 damage friendly fire

3 years agoMerge branch 'martin-t/diffs' into 'master'
Mario [Sat, 17 Feb 2018 06:04:58 +0000 (06:04 +0000)]
Merge branch 'martin-t/diffs' into 'master'

Enable diffs for some image formats

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

3 years agoMerge branch 'Lyberta/OffhandBlaster' into 'master'
Mario [Sat, 17 Feb 2018 06:03:11 +0000 (06:03 +0000)]
Merge branch 'Lyberta/OffhandBlaster' into 'master'

Offhand blaster mutator

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

3 years agoFix compilation unit again
Mario [Sat, 17 Feb 2018 05:54:39 +0000 (15:54 +1000)]
Fix compilation unit again

3 years agoFix misuse of WEP_TYPE_OTHER and hide weapons with its flag from the scoreboard ...
Mario [Sat, 17 Feb 2018 05:49:08 +0000 (15:49 +1000)]
Fix misuse of WEP_TYPE_OTHER and hide weapons with its flag from the scoreboard (they're weapons that don't hurt)

3 years agoMerge branch 'master' into Lyberta/OffhandBlaster 534/head
Lyberta [Sat, 17 Feb 2018 05:21:25 +0000 (08:21 +0300)]
Merge branch 'master' into Lyberta/OffhandBlaster

3 years agoGive W_SetupShot a deathtype parameter, fixes some ugly hacks
Mario [Sat, 17 Feb 2018 04:59:41 +0000 (14:59 +1000)]
Give W_SetupShot a deathtype parameter, fixes some ugly hacks

3 years agoMove DMG_NOWEP to defs.qh to reduce compilation unit madness
Mario [Sat, 17 Feb 2018 01:49:43 +0000 (11:49 +1000)]
Move DMG_NOWEP to defs.qh to reduce compilation unit madness

3 years agoFix a crash caused by some skipped duplicated code
Mario [Sat, 17 Feb 2018 01:36:02 +0000 (11:36 +1000)]
Fix a crash caused by some skipped duplicated code

3 years agoAdd a note about DMG_NOWEP
Mario [Fri, 16 Feb 2018 13:38:33 +0000 (23:38 +1000)]
Add a note about DMG_NOWEP

3 years agoMerge branch 'Mario/dmg_wepent'
Mario [Fri, 16 Feb 2018 12:24:44 +0000 (22:24 +1000)]
Merge branch 'Mario/dmg_wepent'

3 years agoMake vortex charge crosshair more accurate
Mario [Fri, 16 Feb 2018 11:31:47 +0000 (21:31 +1000)]
Make vortex charge crosshair more accurate

3 years agoUse a 24 bit sendflag to allow more wepent props
Mario [Fri, 16 Feb 2018 11:01:25 +0000 (21:01 +1000)]
Use a 24 bit sendflag to allow more wepent props

3 years agoGive Damage a weaponentity parameter (fixes some dual wielding related issues)
Mario [Fri, 16 Feb 2018 09:42:41 +0000 (19:42 +1000)]
Give Damage a weaponentity parameter (fixes some dual wielding related issues)

3 years agoMove hook cvars and add offhand blaster cvars.
Lyberta [Fri, 16 Feb 2018 08:17:43 +0000 (11:17 +0300)]
Move hook cvars and add offhand blaster cvars.

3 years agoAdded offhand blaster.
Lyberta [Fri, 16 Feb 2018 08:02:12 +0000 (11:02 +0300)]
Added offhand blaster.

3 years agoMerge branch 'Mario/weapon_fields'
Mario [Fri, 16 Feb 2018 06:41:32 +0000 (16:41 +1000)]
Merge branch 'Mario/weapon_fields'

3 years agoUse locals to save chainsaw's speed
Mario [Fri, 16 Feb 2018 04:46:51 +0000 (14:46 +1000)]
Use locals to save chainsaw's speed

3 years agofix cl_damagetext_accumulate_alpha_rel
Martin Taibr [Thu, 15 Feb 2018 15:02:44 +0000 (16:02 +0100)]
fix cl_damagetext_accumulate_alpha_rel

3 years agoMerge branch 'master' into martin-t/dmgtext
Martin Taibr [Thu, 15 Feb 2018 10:20:56 +0000 (11:20 +0100)]
Merge branch 'master' into martin-t/dmgtext

3 years agoFix compilation unit?
Mario [Thu, 15 Feb 2018 09:56:18 +0000 (19:56 +1000)]
Fix compilation unit?

3 years agodamagetext in both world and screen coords
Martin Taibr [Thu, 15 Feb 2018 09:26:51 +0000 (10:26 +0100)]
damagetext in both world and screen coords

3 years agoFix compilation unit
Mario [Thu, 15 Feb 2018 06:05:40 +0000 (16:05 +1000)]
Fix compilation unit

3 years agoTransifex autosync
Rudolf Polzer [Wed, 14 Feb 2018 06:23:56 +0000 (07:23 +0100)]
Transifex autosync

3 years agoenable diffs for everything 531/head
Martin Taibr [Wed, 14 Feb 2018 03:38:07 +0000 (04:38 +0100)]
enable diffs for everything

3 years agoRemove an unused function
terencehill [Tue, 13 Feb 2018 17:52:33 +0000 (18:52 +0100)]
Remove an unused function

3 years agoFix dual wielding detection
terencehill [Tue, 13 Feb 2018 17:47:57 +0000 (18:47 +0100)]
Fix dual wielding detection

3 years agoTransifex autosync
Rudolf Polzer [Tue, 13 Feb 2018 06:23:54 +0000 (07:23 +0100)]
Transifex autosync

3 years agoPort clip_load and clip_size to wepent 532/head
Mario [Tue, 13 Feb 2018 00:30:13 +0000 (10:30 +1000)]
Port clip_load and clip_size to wepent

3 years agoMove some weapon stats into wepent fields, and make spectating weapons a bit more...
Mario [Tue, 13 Feb 2018 00:21:24 +0000 (10:21 +1000)]
Move some weapon stats into wepent fields, and make spectating weapons a bit more reliable

3 years agoFix vortex chargepol
Mario [Mon, 12 Feb 2018 23:43:21 +0000 (09:43 +1000)]
Fix vortex chargepol

3 years agoAdd a function to check if the player is dual wielding
Mario [Mon, 12 Feb 2018 23:32:46 +0000 (09:32 +1000)]
Add a function to check if the player is dual wielding

3 years agoenable diffs for some image formats
Martin Taibr [Mon, 12 Feb 2018 19:23:29 +0000 (20:23 +0100)]
enable diffs for some image formats

3 years agoAdd wr_zoomdir (cleans out another weapon specific function in the main codebase)
Mario [Mon, 12 Feb 2018 15:04:46 +0000 (01:04 +1000)]
Add wr_zoomdir (cleans out another weapon specific function in the main codebase)

3 years agoLimit what's sent for each trigger with a couple of bitflags
Mario [Mon, 12 Feb 2018 14:51:02 +0000 (00:51 +1000)]
Limit what's sent for each trigger with a couple of bitflags

3 years agoMerge branch 'martin-t/warns' into 'master'
Mario [Mon, 12 Feb 2018 05:28:56 +0000 (05:28 +0000)]
Merge branch 'martin-t/warns' into 'master'

A somewhat hidden option to allow warnings when debugging (small MR)

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

3 years agoDisable the 'type' warning (complaining about legacy maps is just spam)
Mario [Mon, 12 Feb 2018 05:26:38 +0000 (15:26 +1000)]
Disable the 'type' warning (complaining about legacy maps is just spam)

3 years agoRemove "Spam" from translatable strings for real by sharing g_waypointsprite_spam...
terencehill [Sun, 11 Feb 2018 11:39:46 +0000 (12:39 +0100)]
Remove "Spam" from translatable strings for real by sharing g_waypointsprite_spam code (damn duplicated code!)

3 years agoMerge branch 'DefaultUser/waypoint_icons'
Mario [Sun, 11 Feb 2018 00:45:20 +0000 (10:45 +1000)]
Merge branch 'DefaultUser/waypoint_icons'

3 years agoMerge branch 'master' into DefaultUser/waypoint_icons 528/head
Mario [Sun, 11 Feb 2018 00:33:52 +0000 (10:33 +1000)]
Merge branch 'master' into DefaultUser/waypoint_icons

3 years agoOptimize monster pitch shifting maths a bit
Mario [Sat, 10 Feb 2018 17:47:29 +0000 (03:47 +1000)]
Optimize monster pitch shifting maths a bit

3 years agoDon't set as translatable a debug string
terencehill [Sat, 10 Feb 2018 17:03:35 +0000 (18:03 +0100)]
Don't set as translatable a debug string

3 years agoWaypoint drawing: fix icon color when g_waypointsprite_iconcolor is active, don't...
terencehill [Sat, 10 Feb 2018 16:52:03 +0000 (17:52 +0100)]
Waypoint drawing: fix icon color when g_waypointsprite_iconcolor is active, don't check icon existence if g_waypointsprite_text is active

3 years agoUse a different crosshair setting in side-scrolling mode
Mario [Sat, 10 Feb 2018 14:56:14 +0000 (00:56 +1000)]
Use a different crosshair setting in side-scrolling mode

3 years agoWhitelist overkill's health/armor items again
Mario [Sat, 10 Feb 2018 09:14:03 +0000 (19:14 +1000)]
Whitelist overkill's health/armor items again

3 years agoTransifex autosync
Rudolf Polzer [Sat, 10 Feb 2018 06:23:51 +0000 (07:23 +0100)]
Transifex autosync

3 years agoupdate hash
Martin Taibr [Sat, 10 Feb 2018 03:55:59 +0000 (04:55 +0100)]
update hash

3 years agoFix compilation unit
Mario [Sat, 10 Feb 2018 02:54:17 +0000 (12:54 +1000)]
Fix compilation unit

3 years agoAdd a checkbox in the menu for showing text instead of icons
Mario [Sat, 10 Feb 2018 02:53:16 +0000 (12:53 +1000)]
Add a checkbox in the menu for showing text instead of icons

3 years agoDraw the text instead of the image path
Mario [Sat, 10 Feb 2018 02:47:01 +0000 (12:47 +1000)]
Draw the text instead of the image path

3 years agoProperly implement waypoint icon drawing
terencehill [Sat, 10 Feb 2018 02:21:01 +0000 (03:21 +0100)]
Properly implement waypoint icon drawing

3 years agoFix a regression caused by cleanup
Mario [Fri, 9 Feb 2018 01:29:28 +0000 (11:29 +1000)]
Fix a regression caused by cleanup