]>
git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
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
terencehill [Sun, 25 Feb 2018 01:44:43 +0000 (02:44 +0100)]
Update hash
terencehill [Sun, 25 Feb 2018 01:16:00 +0000 (02:16 +0100)]
Merge branch 'master' into terencehill/accuracy_shotgun
terencehill [Sat, 24 Feb 2018 21:35:09 +0000 (22:35 +0100)]
Add align option to debug_text_3d
Rudolf Polzer [Sat, 24 Feb 2018 06:24:56 +0000 (07:24 +0100)]
Transifex autosync
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)
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
Martin Taibr [Fri, 23 Feb 2018 17:18:21 +0000 (17:18 +0000)]
Stuff useful for debugging
Mario [Wed, 21 Feb 2018 12:26:41 +0000 (22:26 +1000)]
Allow servers to define custom help messages for votes
Mario [Wed, 21 Feb 2018 12:15:17 +0000 (22:15 +1000)]
Fix vhelp not allowing arguments
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
terencehill [Tue, 20 Feb 2018 17:58:36 +0000 (18:58 +0100)]
Display dumptree in the menu_cmd help message
terencehill [Tue, 20 Feb 2018 17:52:11 +0000 (18:52 +0100)]
Make 2 macros less cryptic
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)
Mario [Tue, 20 Feb 2018 12:59:41 +0000 (22:59 +1000)]
Make sure offhand blaster is off by default on old servers
Mario [Tue, 20 Feb 2018 07:02:37 +0000 (17:02 +1000)]
Clean up MapHasRightSize a tiny bit
Mario [Tue, 20 Feb 2018 06:47:25 +0000 (16:47 +1000)]
Allow undefined maximum players
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
terencehill [Sun, 18 Feb 2018 12:43:39 +0000 (13:43 +0100)]
Merge branch 'master' into TimePath/scrollpanel
terencehill [Sun, 18 Feb 2018 00:21:41 +0000 (01:21 +0100)]
Improve comments
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
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
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
Martin Taibr [Sat, 17 Feb 2018 17:15:38 +0000 (18:15 +0100)]
rename all the configs
Mario [Sat, 17 Feb 2018 16:29:59 +0000 (02:29 +1000)]
Turn most cases of _STAT into STAT
Mario [Sat, 17 Feb 2018 13:36:12 +0000 (23:36 +1000)]
Make ReadVector/WriteVector more commonly used
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
Mario [Sat, 17 Feb 2018 11:26:50 +0000 (21:26 +1000)]
Fix numbering of weapon flag bits
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
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
Mario [Sat, 17 Feb 2018 05:54:39 +0000 (15:54 +1000)]
Fix compilation unit again
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)
Lyberta [Sat, 17 Feb 2018 05:21:25 +0000 (08:21 +0300)]
Merge branch 'master' into Lyberta/OffhandBlaster
Mario [Sat, 17 Feb 2018 04:59:41 +0000 (14:59 +1000)]
Give W_SetupShot a deathtype parameter, fixes some ugly hacks
Mario [Sat, 17 Feb 2018 01:49:43 +0000 (11:49 +1000)]
Move DMG_NOWEP to defs.qh to reduce compilation unit madness
Mario [Sat, 17 Feb 2018 01:36:02 +0000 (11:36 +1000)]
Fix a crash caused by some skipped duplicated code
Mario [Fri, 16 Feb 2018 13:38:33 +0000 (23:38 +1000)]
Add a note about DMG_NOWEP
Mario [Fri, 16 Feb 2018 12:24:44 +0000 (22:24 +1000)]
Merge branch 'Mario/dmg_wepent'
Mario [Fri, 16 Feb 2018 11:31:47 +0000 (21:31 +1000)]
Make vortex charge crosshair more accurate
Mario [Fri, 16 Feb 2018 11:01:25 +0000 (21:01 +1000)]
Use a 24 bit sendflag to allow more wepent props
Mario [Fri, 16 Feb 2018 09:42:41 +0000 (19:42 +1000)]
Give Damage a weaponentity parameter (fixes some dual wielding related issues)
Lyberta [Fri, 16 Feb 2018 08:17:43 +0000 (11:17 +0300)]
Move hook cvars and add offhand blaster cvars.
Lyberta [Fri, 16 Feb 2018 08:02:12 +0000 (11:02 +0300)]
Added offhand blaster.
Mario [Fri, 16 Feb 2018 06:41:32 +0000 (16:41 +1000)]
Merge branch 'Mario/weapon_fields'
Mario [Fri, 16 Feb 2018 04:46:51 +0000 (14:46 +1000)]
Use locals to save chainsaw's speed
Mario [Thu, 15 Feb 2018 09:56:18 +0000 (19:56 +1000)]
Fix compilation unit?
Mario [Thu, 15 Feb 2018 06:05:40 +0000 (16:05 +1000)]
Fix compilation unit
Rudolf Polzer [Wed, 14 Feb 2018 06:23:56 +0000 (07:23 +0100)]
Transifex autosync
Martin Taibr [Wed, 14 Feb 2018 03:38:07 +0000 (04:38 +0100)]
enable diffs for everything
terencehill [Tue, 13 Feb 2018 17:52:33 +0000 (18:52 +0100)]
Remove an unused function
terencehill [Tue, 13 Feb 2018 17:47:57 +0000 (18:47 +0100)]
Fix dual wielding detection
Rudolf Polzer [Tue, 13 Feb 2018 06:23:54 +0000 (07:23 +0100)]
Transifex autosync
Mario [Tue, 13 Feb 2018 00:30:13 +0000 (10:30 +1000)]
Port clip_load and clip_size to wepent
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
Mario [Mon, 12 Feb 2018 23:43:21 +0000 (09:43 +1000)]
Fix vortex chargepol
Mario [Mon, 12 Feb 2018 23:32:46 +0000 (09:32 +1000)]
Add a function to check if the player is dual wielding
Martin Taibr [Mon, 12 Feb 2018 19:23:29 +0000 (20:23 +0100)]
enable diffs for some image formats
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)
Mario [Mon, 12 Feb 2018 14:51:02 +0000 (00:51 +1000)]
Limit what's sent for each trigger with a couple of bitflags
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
Mario [Mon, 12 Feb 2018 05:26:38 +0000 (15:26 +1000)]
Disable the 'type' warning (complaining about legacy maps is just 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!)
Mario [Sun, 11 Feb 2018 00:45:20 +0000 (10:45 +1000)]
Merge branch 'DefaultUser/waypoint_icons'
Mario [Sun, 11 Feb 2018 00:33:52 +0000 (10:33 +1000)]
Merge branch 'master' into DefaultUser/waypoint_icons
Mario [Sat, 10 Feb 2018 17:47:29 +0000 (03:47 +1000)]
Optimize monster pitch shifting maths a bit
terencehill [Sat, 10 Feb 2018 17:03:35 +0000 (18:03 +0100)]
Don't set as translatable a debug string
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
Mario [Sat, 10 Feb 2018 14:56:14 +0000 (00:56 +1000)]
Use a different crosshair setting in side-scrolling mode
Mario [Sat, 10 Feb 2018 09:14:03 +0000 (19:14 +1000)]
Whitelist overkill's health/armor items again
Rudolf Polzer [Sat, 10 Feb 2018 06:23:51 +0000 (07:23 +0100)]
Transifex autosync
Martin Taibr [Sat, 10 Feb 2018 03:55:59 +0000 (04:55 +0100)]
update hash
Mario [Sat, 10 Feb 2018 02:54:17 +0000 (12:54 +1000)]
Fix compilation unit
Mario [Sat, 10 Feb 2018 02:53:16 +0000 (12:53 +1000)]
Add a checkbox in the menu for showing text instead of icons
Mario [Sat, 10 Feb 2018 02:47:01 +0000 (12:47 +1000)]
Draw the text instead of the image path
terencehill [Sat, 10 Feb 2018 02:21:01 +0000 (03:21 +0100)]
Properly implement waypoint icon drawing
Mario [Fri, 9 Feb 2018 01:29:28 +0000 (11:29 +1000)]
Fix a regression caused by cleanup
Mario [Thu, 8 Feb 2018 13:40:14 +0000 (23:40 +1000)]
Move buff icon acquisition into the buff's WP_Format mutator hook
Mario [Thu, 8 Feb 2018 13:24:16 +0000 (23:24 +1000)]
Alternative way of making auxiliary crosshairs spectatable
Rudolf Polzer [Thu, 8 Feb 2018 06:23:52 +0000 (07:23 +0100)]
Transifex autosync
Mario [Thu, 8 Feb 2018 05:10:46 +0000 (15:10 +1000)]
Make sure auxiliary crosshairs are reset when observing/respawning
Mario [Thu, 8 Feb 2018 00:58:09 +0000 (00:58 +0000)]
Merge branch 'martin-t/shield' into 'master'
Make shield reduce force as well (unless selfpush)
See merge request xonotic/xonotic-data.pk3dir!526
Martin Taibr [Thu, 8 Feb 2018 00:43:37 +0000 (01:43 +0100)]
include default for takeforce
Mario [Thu, 8 Feb 2018 00:21:35 +0000 (00:21 +0000)]
Merge branch 'terencehill/assault_fix' into 'master'
Assault fix
Closes #1944
See merge request xonotic/xonotic-data.pk3dir!523
Mario [Thu, 8 Feb 2018 00:20:42 +0000 (00:20 +0000)]
Merge branch 'martin-t/defaults-in-descriptions' into 'master'
Remove (soon to be) outdated defaults from descriptions
See merge request xonotic/xonotic-data.pk3dir!525
Mario [Thu, 8 Feb 2018 00:18:05 +0000 (00:18 +0000)]
Merge branch 'martin-t/powerups' into 'master'
Option to spawn quad and shield at the same time
See merge request xonotic/xonotic-data.pk3dir!527
Mario [Wed, 7 Feb 2018 15:10:25 +0000 (01:10 +1000)]
Add target_spawnpoint (allows setting temporary checkpoints)
Mario [Wed, 7 Feb 2018 09:18:46 +0000 (19:18 +1000)]
Merge branch 'master' into DefaultUser/waypoint_icons
Rudolf Polzer [Wed, 7 Feb 2018 06:23:55 +0000 (07:23 +0100)]
Transifex autosync
Mario [Wed, 7 Feb 2018 02:06:58 +0000 (12:06 +1000)]
Reset viewloc when observing instead of constantly, should fix spectators seeing in 1st person
Mario [Tue, 6 Feb 2018 23:15:58 +0000 (09:15 +1000)]
Network colormod to clients and adjust its scaler to allow larger than 1 values with a bit less accuracy (fixes g_player_brightness and anything colormod related)
Martin Taibr [Tue, 6 Feb 2018 21:37:07 +0000 (22:37 +0100)]
cleaner init
Martin Taibr [Tue, 6 Feb 2018 20:02:09 +0000 (21:02 +0100)]
shared random for powerups
Martin Taibr [Mon, 5 Feb 2018 14:02:48 +0000 (15:02 +0100)]
option to spawn quad and shield at the same time
Mario [Mon, 5 Feb 2018 12:43:08 +0000 (22:43 +1000)]
Call w_ready on weapon entity if its state isn't clear and switchweapon is null, fixes offhand hook getting player stuck in firing animation
Mario [Mon, 5 Feb 2018 07:39:27 +0000 (17:39 +1000)]
Clean up the sprite drawing code a little so it isn't duplicated as much
Mario [Mon, 5 Feb 2018 04:37:02 +0000 (14:37 +1000)]
Give unclaimed domination control points a placeholder (blue) icon
Mario [Mon, 5 Feb 2018 04:18:04 +0000 (14:18 +1000)]
Show domination, keyhunt, keepaway and vehicle waypoints
Mario [Mon, 5 Feb 2018 03:27:09 +0000 (13:27 +1000)]
Apply some general fixes and add an icon parameter to REGISTER_WAYPOINT
Martin Taibr [Mon, 5 Feb 2018 02:14:11 +0000 (03:14 +0100)]
make shield reduce force as well (unless selfpush)
Freddy [Sun, 4 Feb 2018 19:45:13 +0000 (20:45 +0100)]
Better positions for waypointsprite icons