]>
git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/log
Lyberta [Tue, 27 Mar 2018 23:08:52 +0000 (02:08 +0300)]
Merge branch 'master' into Lyberta/GiveResourceWithLimit
Lyberta [Tue, 27 Mar 2018 23:05:20 +0000 (02:05 +0300)]
Added ResourceAmountChanged hook.
Mario [Sun, 25 Mar 2018 07:52:34 +0000 (17:52 +1000)]
Send scale as a Coord (it absolutely needs accuracy at high values)
Mario [Fri, 23 Mar 2018 16:09:59 +0000 (02:09 +1000)]
Hide hidden weapons from the weapons panel unless held
Mario [Fri, 23 Mar 2018 14:34:58 +0000 (00:34 +1000)]
Initialize viewloc_mousepos to the center of the screen (even if it's unused)
terencehill [Mon, 19 Mar 2018 18:05:47 +0000 (19:05 +0100)]
Fix duplicated [[accumulate]]
Lyberta [Mon, 19 Mar 2018 15:58:09 +0000 (18:58 +0300)]
Merge branch 'master' into Lyberta/GiveResourceWithLimit
Lyberta [Mon, 19 Mar 2018 15:57:43 +0000 (18:57 +0300)]
Merge branch 'master' into Lyberta/FilterItemDefinition
terencehill [Mon, 19 Mar 2018 15:45:26 +0000 (16:45 +0100)]
Group some STATIC_INIT functions
Mario [Mon, 19 Mar 2018 13:54:36 +0000 (23:54 +1000)]
Update gameplay hash
Lyberta [Mon, 19 Mar 2018 13:03:58 +0000 (16:03 +0300)]
Fixed compilation units.
Lyberta [Mon, 19 Mar 2018 12:36:45 +0000 (15:36 +0300)]
Small fixes.
Lyberta [Mon, 19 Mar 2018 12:22:20 +0000 (15:22 +0300)]
Better random item selection algorithm.
Lyberta [Mon, 19 Mar 2018 11:09:34 +0000 (14:09 +0300)]
Delete prespawned item if it is not allowed.
Lyberta [Mon, 19 Mar 2018 10:59:10 +0000 (13:59 +0300)]
Added FilterItemDefinition hook.
Lyberta [Mon, 19 Mar 2018 10:37:05 +0000 (13:37 +0300)]
Fixed hash change.
Lyberta [Mon, 19 Mar 2018 08:39:22 +0000 (11:39 +0300)]
Added GiveResourceWithLimit hook.
Mario [Sun, 18 Mar 2018 11:21:39 +0000 (21:21 +1000)]
Make sure dual plasma turret's attack is hidden
Freddy [Sat, 17 Mar 2018 15:54:02 +0000 (16:54 +0100)]
Move non-generic entity flags to their own headers
Freddy [Sat, 17 Mar 2018 15:14:26 +0000 (16:14 +0100)]
trigger_music can now be controlled with relays
Mario [Sat, 17 Mar 2018 13:19:40 +0000 (23:19 +1000)]
Fix attacking
Mario [Sat, 17 Mar 2018 13:10:15 +0000 (23:10 +1000)]
Disable some input buttons while typing
Mario [Sat, 17 Mar 2018 12:30:06 +0000 (22:30 +1000)]
Add an option to allow bots to typefrag
Rudolf Polzer [Sat, 17 Mar 2018 06:24:02 +0000 (07:24 +0100)]
Transifex autosync
Mario [Fri, 16 Mar 2018 03:51:37 +0000 (13:51 +1000)]
Fix and tweak trigger_music to work with side-scrolling mode and support the soon-to-be-included fullvolume bitflag (constant definition pending)
Freddy [Fri, 16 Mar 2018 02:13:56 +0000 (03:13 +0100)]
minor cleanup for trigger_music and target_music
This commit does not fix trigger_music.
Freddy [Fri, 16 Mar 2018 00:14:57 +0000 (01:14 +0100)]
Whitelist falloff entity field
Freddy [Thu, 15 Mar 2018 23:30:31 +0000 (00:30 +0100)]
Remove a few more magic numbers and minor code cleanup
Freddy [Thu, 15 Mar 2018 22:57:03 +0000 (23:57 +0100)]
trigger_multi: replace magic numbers, minor cleanup
terencehill [Wed, 14 Mar 2018 23:23:09 +0000 (00:23 +0100)]
scoreboard_columns_help: fix 'sum' description
terencehill [Wed, 14 Mar 2018 22:44:01 +0000 (23:44 +0100)]
scoreboard_columns_help: invert order of 2 messages
terencehill [Wed, 14 Mar 2018 22:40:48 +0000 (23:40 +0100)]
Make scoreboard_columns_set help messages translator-friendly
terencehill [Tue, 13 Mar 2018 21:30:10 +0000 (22:30 +0100)]
Restore ScoreInfo_SetLabel_PlayerScore(SP_ELO, "elo", 0); ELO display was broken :/
Freddy [Tue, 13 Mar 2018 19:58:49 +0000 (20:58 +0100)]
trigger_monoflop: replace magic number
Freddy [Tue, 13 Mar 2018 19:53:53 +0000 (20:53 +0100)]
magicear: replace magic numbers
terencehill [Tue, 13 Mar 2018 18:52:36 +0000 (19:52 +0100)]
SP_ELO doesn't need a label since it's not a real score (like ping, pl and name). Probably it was also needlessly reported to XonStats
Freddy [Tue, 13 Mar 2018 18:26:06 +0000 (19:26 +0100)]
minor cleanup for jumppads
Freddy [Tue, 13 Mar 2018 12:03:51 +0000 (13:03 +0100)]
Rename variables to not overlap with builtin functions
terencehill [Mon, 12 Mar 2018 22:14:09 +0000 (23:14 +0100)]
Merge branch 'terencehill/quickmenu_fixes'
terencehill [Mon, 12 Mar 2018 21:38:18 +0000 (22:38 +0100)]
Quickmenu: fix ambiguity of hud_panel_quickmenu_translatecommands checkbox name; reload current page when that checkbox is toggled
terencehill [Mon, 12 Mar 2018 19:17:30 +0000 (20:17 +0100)]
Quickmenu: turn some debbug printfs and LOG_WARNFs into LOG_INFOF
terencehill [Mon, 12 Mar 2018 19:11:09 +0000 (20:11 +0100)]
Quickmenu: fix an almost unnoticeable wrong highlighting due to precision errors
terencehill [Mon, 12 Mar 2018 19:03:19 +0000 (20:03 +0100)]
Quickmenu: fix repetition of commands when they are split into multiple pages
Freddy [Mon, 12 Mar 2018 17:28:01 +0000 (18:28 +0100)]
Cleanup for trigger_impulse
Freddy [Mon, 12 Mar 2018 15:16:30 +0000 (16:16 +0100)]
trigger_hurt: minor cleanup
Freddy [Mon, 12 Mar 2018 15:02:55 +0000 (16:02 +0100)]
trigger_heal: minor cleanup
Freddy [Mon, 12 Mar 2018 14:32:27 +0000 (15:32 +0100)]
trigger_gravity: use .active instead of .state, remove magic numbers
Freddy [Mon, 12 Mar 2018 13:33:28 +0000 (14:33 +0100)]
trigger_flipflop: minor cleanup
Freddy [Sun, 11 Mar 2018 16:45:33 +0000 (17:45 +0100)]
trigger_counter: replace magic number and document hidden feature
Freddy [Sun, 11 Mar 2018 16:18:12 +0000 (17:18 +0100)]
target_speaker: deprecate GLOBAL (BIT(2)) spawnflag, remove magic numbers
Freddy [Sun, 11 Mar 2018 15:54:36 +0000 (16:54 +0100)]
target_spawn: replace magic number
Freddy [Sun, 11 Mar 2018 15:23:27 +0000 (16:23 +0100)]
Add a comment
Freddy [Sun, 11 Mar 2018 14:40:12 +0000 (15:40 +0100)]
trigger_changelevel: replace magic number, whitelist fields
also a bit of comments
terencehill [Sun, 11 Mar 2018 14:33:33 +0000 (15:33 +0100)]
Reimplement g_pickup_respawntime_initial_random 1 to be more self-contained and to generate a different respawn time when game starts after warmup; it fixes #2000
Mario [Sun, 11 Mar 2018 13:04:19 +0000 (23:04 +1000)]
Allow using offhand nades when the player has hook in their inventory
Mario [Sun, 11 Mar 2018 02:53:35 +0000 (12:53 +1000)]
Default nade alpha to 1 (fixes client projectiles)
terencehill [Sat, 10 Mar 2018 22:35:51 +0000 (23:35 +0100)]
Menu, mutators dialog, weapon arena settings: improve layout a little bit
terencehill [Sat, 10 Mar 2018 22:28:14 +0000 (23:28 +0100)]
Make use of defined constants in colormapPaletteColor code
Freddy [Sat, 10 Mar 2018 20:37:18 +0000 (21:37 +0100)]
teleport_dest: replace magic numbers
Freddy [Sat, 10 Mar 2018 20:28:29 +0000 (21:28 +0100)]
misc_laser: .active instead of .state, replace magic numbers
Mario [Sat, 10 Mar 2018 18:03:07 +0000 (04:03 +1000)]
Add a new nade type
Freddy [Sat, 10 Mar 2018 15:26:39 +0000 (16:26 +0100)]
Remove magic numbers in misc_follow
Freddy [Sat, 10 Mar 2018 15:18:56 +0000 (16:18 +0100)]
Whitelist some trigger entity fields
Freddy [Sat, 10 Mar 2018 15:17:48 +0000 (16:17 +0100)]
Fix sound for func_vectormamamam
terencehill [Fri, 9 Mar 2018 23:45:38 +0000 (00:45 +0100)]
Shorten a variable name used in 70K+ checks (when macros are expanded), reducing size of server.qc by 560KB+
terencehill [Fri, 9 Mar 2018 23:27:24 +0000 (00:27 +0100)]
Remove duplicate FIELD_VEC(fld, maxs)
Freddy [Fri, 9 Mar 2018 22:19:45 +0000 (23:19 +0100)]
func_vectormamamam: remove magic numbers and better variable names
terencehill [Fri, 9 Mar 2018 19:01:14 +0000 (20:01 +0100)]
Fix weapon arena tooltip ("that weapon" -> "a set of weapons") and while at it shorten it
Freddy [Fri, 9 Mar 2018 17:39:09 +0000 (18:39 +0100)]
Replace magic numbers in func_train
Freddy [Fri, 9 Mar 2018 16:35:59 +0000 (17:35 +0100)]
func_rotating: stop sound when deactivated, minor cleanup
Freddy [Fri, 9 Mar 2018 13:25:29 +0000 (14:25 +0100)]
func_rain and func_snow: back to weird field name to not use an engine field
Freddy [Fri, 9 Mar 2018 01:52:49 +0000 (02:52 +0100)]
func_rain and func_snow: fix density, remove magic numbers and use colormap instead of cnt for color
Freddy [Thu, 8 Mar 2018 14:56:37 +0000 (15:56 +0100)]
Simplify func_sparks spawnfunc
Mario [Thu, 8 Mar 2018 05:33:47 +0000 (15:33 +1000)]
Merge branch 'master' into Mario/crouch
# Conflicts:
# qcsrc/common/physics/player.qc
# qcsrc/server/client.qc
Mario [Thu, 8 Mar 2018 01:57:43 +0000 (11:57 +1000)]
Reduce Arc range
Mario [Wed, 7 Mar 2018 23:56:49 +0000 (09:56 +1000)]
Some minor fixes to the mutators dialog
Freddy [Wed, 7 Mar 2018 20:52:54 +0000 (21:52 +0100)]
func_pointparticles: use relays, replace magic numbers
Freddy [Wed, 7 Mar 2018 16:55:12 +0000 (17:55 +0100)]
Minor cleanup for func_plat
Freddy [Wed, 7 Mar 2018 16:20:55 +0000 (17:20 +0100)]
Conveyors: use .active instead of .state
Freddy [Wed, 7 Mar 2018 13:46:01 +0000 (14:46 +0100)]
Merge branch 'master' into DefaultUser/trigger_cleanup
Mario [Wed, 7 Mar 2018 08:18:03 +0000 (08:18 +0000)]
Merge branch 'martin-t/nottarg' into 'master'
Kill nottargeted field
See merge request xonotic/xonotic-data.pk3dir!537
Mario [Wed, 7 Mar 2018 07:57:17 +0000 (17:57 +1000)]
Maybe fix compilation unit
Mario [Wed, 7 Mar 2018 01:56:11 +0000 (11:56 +1000)]
Clear out a macro from trigger_common_read
Freddy [Tue, 6 Mar 2018 23:00:24 +0000 (00:00 +0100)]
Common file for trigger/func states, replace more magic numbers
Freddy [Tue, 6 Mar 2018 19:04:50 +0000 (20:04 +0100)]
Remove magic number state from func_breakable
Freddy [Tue, 6 Mar 2018 18:57:21 +0000 (19:57 +0100)]
func_breakable: replace spawnflag magic numbers
Freddy [Tue, 6 Mar 2018 14:42:58 +0000 (15:42 +0100)]
Move entity spawnflags to a common file
Freddy [Tue, 6 Mar 2018 13:26:26 +0000 (14:26 +0100)]
Update comment
terencehill [Tue, 6 Mar 2018 12:06:25 +0000 (13:06 +0100)]
Fix compilation unit for real
Mario [Tue, 6 Mar 2018 06:32:34 +0000 (16:32 +1000)]
Disable it in code too
Mario [Tue, 6 Mar 2018 06:30:15 +0000 (16:30 +1000)]
Disable dropping buffs by default (overlaps with the flag dropping, active buffs aren't as wacky anymore)
Freddy [Mon, 5 Mar 2018 20:57:40 +0000 (21:57 +0100)]
Remove code duplication for func_door and func_door_rotating spawnfuncs
Freddy [Mon, 5 Mar 2018 20:55:51 +0000 (21:55 +0100)]
door_secret: precache all sounds, fix problems with wait < 0, more minor adjustments
terencehill [Mon, 5 Mar 2018 18:51:05 +0000 (19:51 +0100)]
Fix compilation unit
Freddy [Mon, 5 Mar 2018 14:37:00 +0000 (15:37 +0100)]
Don't use PLAT_CRUSH for doors (same as DOOR_DONT_LINK)
Freddy [Mon, 5 Mar 2018 13:50:18 +0000 (14:50 +0100)]
Move door_rotating_* functions into the proper file
Mario [Mon, 5 Mar 2018 13:38:08 +0000 (23:38 +1000)]
Also update prediction for crouching underwater
Freddy [Mon, 5 Mar 2018 13:31:17 +0000 (14:31 +0100)]
Doors: Use PLAT_CRUSH instead of 8 (already in use for other infos)
Also remove more magic numbers
Freddy [Mon, 5 Mar 2018 12:26:24 +0000 (13:26 +0100)]
Replace magic numbers in door_rotating, fix sound precache issues
Also remove useless spawnflag check
Freddy [Mon, 5 Mar 2018 12:23:28 +0000 (13:23 +0100)]
Use BIT() macro in door.qh