]>
git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
Mario [Tue, 29 Nov 2016 14:03:52 +0000 (00:03 +1000)]
Merge branch 'master' into Mario/wepent_experimental
# Conflicts:
# qcsrc/common/mutators/mutator/nades/nades.qc
Mario [Tue, 29 Nov 2016 04:32:13 +0000 (14:32 +1000)]
Add a hook to handle the message before anything has been replaced
terencehill [Sun, 27 Nov 2016 19:19:01 +0000 (20:19 +0100)]
Show to spectators all the waypoints that are shown to spectated players. It fixes #1840
Mario [Sun, 27 Nov 2016 07:17:08 +0000 (17:17 +1000)]
Update hash (gameplay change is most likely due to findchain order)
Mario [Sun, 27 Nov 2016 05:04:47 +0000 (15:04 +1000)]
Use a field to store the nade's lifetime, should fix the pickup timer
terencehill [Sat, 26 Nov 2016 02:39:05 +0000 (03:39 +0100)]
Change autocvar_hud_panel_scoreboard_maxheight too
terencehill [Sat, 26 Nov 2016 02:26:42 +0000 (03:26 +0100)]
Display yellow score for remaining players
terencehill [Sat, 26 Nov 2016 02:18:53 +0000 (03:18 +0100)]
Increase a little bit hud_panel_scoreboard_maxheight
terencehill [Sat, 26 Nov 2016 01:35:20 +0000 (02:35 +0100)]
Fix hud_panel_scoreboard_maxheight
terencehill [Fri, 25 Nov 2016 23:56:25 +0000 (00:56 +0100)]
Make it clear that FRAGS_PLAYER_NONSOLID and FRAGS_LMS_LOSER hold the same value
Mario [Fri, 25 Nov 2016 21:35:53 +0000 (07:35 +1000)]
Allow dropping vaporizer (for instagib)
terencehill [Thu, 24 Nov 2016 23:23:54 +0000 (00:23 +0100)]
noref autocvar_xon_sys_*
terencehill [Thu, 24 Nov 2016 23:14:53 +0000 (00:14 +0100)]
Remove unused specialcommand stuff from the client
terencehill [Mon, 21 Nov 2016 22:33:08 +0000 (23:33 +0100)]
Reset revive progress on respawn for every player. It fixes #1839
terencehill [Mon, 21 Nov 2016 16:50:55 +0000 (17:50 +0100)]
Fix #1834 "Server info doesn't timeout in LMS"
terencehill [Mon, 21 Nov 2016 16:48:15 +0000 (17:48 +0100)]
Add more cvars to config files
terencehill [Sun, 20 Nov 2016 23:16:22 +0000 (00:16 +0100)]
Add some cvars to the config file
terencehill [Sun, 20 Nov 2016 23:09:07 +0000 (00:09 +0100)]
Remove an unused variable
terencehill [Sun, 20 Nov 2016 23:07:50 +0000 (00:07 +0100)]
Remove definition of a server cvar from the menu
Mario [Sun, 20 Nov 2016 18:09:38 +0000 (04:09 +1000)]
Merge branch 'master' into Mario/wepent_experimental
# Conflicts:
# qcsrc/client/view.qc
Mario [Sun, 20 Nov 2016 18:07:33 +0000 (04:07 +1000)]
Move tuba's view model handling into the tuba file
Mario [Sat, 19 Nov 2016 21:05:01 +0000 (07:05 +1000)]
Remove some unused cvars
Mario [Sat, 19 Nov 2016 20:50:53 +0000 (06:50 +1000)]
Remove a few server-side cvars from the client
Mario [Sat, 19 Nov 2016 16:12:24 +0000 (02:12 +1000)]
Fix ClientPreConnect
Mario [Sat, 19 Nov 2016 14:54:07 +0000 (00:54 +1000)]
Rename a few parameters and locals named x, y, z
terencehill [Fri, 18 Nov 2016 20:33:13 +0000 (21:33 +0100)]
Make easier to read code that sets domination_teams
terencehill [Fri, 18 Nov 2016 20:14:49 +0000 (21:14 +0100)]
Fix number of teams defaulting to 2 for some game modes (CA, FT and KH)
terencehill [Fri, 18 Nov 2016 16:39:08 +0000 (17:39 +0100)]
Campaign: don't start the first round until player joined the game
terencehill [Thu, 17 Nov 2016 21:17:00 +0000 (22:17 +0100)]
Don't try to reset map and players if game ended during countdown to game start
terencehill [Thu, 17 Nov 2016 20:56:53 +0000 (21:56 +0100)]
Fix players allowed to move if game ended during countdown to game start. It fixes #1838
Mario [Thu, 17 Nov 2016 00:00:03 +0000 (10:00 +1000)]
Speed up bot enemy choosing search loop
Mario [Wed, 16 Nov 2016 23:45:45 +0000 (09:45 +1000)]
Merge branch 'master' into Mario/wepent_experimental
Mario [Wed, 16 Nov 2016 23:34:06 +0000 (09:34 +1000)]
Use a trick to prevent handling of items that aren't registered with .itemdef (should support any objective items, like flags and keys)
terencehill [Wed, 16 Nov 2016 16:42:46 +0000 (17:42 +0100)]
Fix "bot_cmd X pause" command not working (broken since
8da4929ec )
Mario [Wed, 16 Nov 2016 10:51:10 +0000 (20:51 +1000)]
Fix invasion
terencehill [Tue, 15 Nov 2016 22:44:01 +0000 (23:44 +0100)]
Make sure bots don't move to removed goals such as a key when a Key Hunt round ends. It fixes #1101
Rudolf Polzer [Tue, 15 Nov 2016 15:48:18 +0000 (10:48 -0500)]
Oops, for some reason I lost these changes. Here they are.
Mario [Tue, 15 Nov 2016 15:47:37 +0000 (01:47 +1000)]
Fix key hunt notifications reporting the owner's team, not the key's original team colour
Rudolf Polzer [Tue, 15 Nov 2016 15:45:22 +0000 (10:45 -0500)]
Merge branch 'divVerent/anticheat-playerstats'
Mario [Tue, 15 Nov 2016 09:13:38 +0000 (19:13 +1000)]
Add a button for dodging (not documented in menu yet)
Rudolf Polzer [Mon, 14 Nov 2016 20:14:59 +0000 (15:14 -0500)]
Report anticheat data to playerstats; remove unused anticheat_getvalue function.
terencehill [Mon, 14 Nov 2016 01:27:12 +0000 (02:27 +0100)]
Avoid a glitch when a dropped weapon starts bobbing and smooth passage between stationary and bob animation
terencehill [Sat, 12 Nov 2016 20:01:02 +0000 (21:01 +0100)]
Fix g_spawnshield_blockdamage not working
terencehill [Sat, 12 Nov 2016 19:35:22 +0000 (20:35 +0100)]
Damagetext: remove {health(ph)} and {total(p)}, add the cvar cl_damagetext_format_verbose instead
Mario [Sat, 12 Nov 2016 08:43:00 +0000 (18:43 +1000)]
Add a physics set for overkill
terencehill [Fri, 11 Nov 2016 17:58:14 +0000 (18:58 +0100)]
Improve sv_itemstime description
terencehill [Fri, 11 Nov 2016 17:41:13 +0000 (18:41 +0100)]
Improve code readability
terencehill [Fri, 11 Nov 2016 17:19:43 +0000 (18:19 +0100)]
Damagetext: add {health(ph)}: shows potential_health too if different from health and {total(p)}: shows potential too if different from total
Mario [Fri, 11 Nov 2016 11:04:16 +0000 (21:04 +1000)]
Merge branch 'master' into Mario/wepent_experimental
Mario [Fri, 11 Nov 2016 10:51:58 +0000 (10:51 +0000)]
Merge branch 'DefaultUser/m_itemid' into 'master'
Replace m_itemid references with itemdef references where possible
See merge request !386
terencehill [Thu, 10 Nov 2016 23:32:31 +0000 (00:32 +0100)]
Make use of constants for damagetext bitflags
terencehill [Thu, 10 Nov 2016 22:48:37 +0000 (23:48 +0100)]
Optimize damagetext networking
Freddy [Thu, 10 Nov 2016 21:48:44 +0000 (22:48 +0100)]
Add .m_respawnsound for GameItems
Freddy [Thu, 10 Nov 2016 21:27:27 +0000 (22:27 +0100)]
.m_glow is only needed in GAMEQC
terencehill [Thu, 10 Nov 2016 18:16:25 +0000 (19:16 +0100)]
Simplify
Mario [Thu, 10 Nov 2016 16:05:48 +0000 (02:05 +1000)]
Merge branch 'master' into Mario/wepent_experimental
Mario [Thu, 10 Nov 2016 16:04:58 +0000 (16:04 +0000)]
Merge branch 'terencehill/ca_shownames_fix' into 'master'
CA: fix name tags getting displayed above eliminated players (when they are spectating or observing)
It fixes #1813
See merge request !388
Mario [Thu, 10 Nov 2016 15:58:10 +0000 (15:58 +0000)]
Merge branch 'DefaultUser/more_damagetext' into 'master'
Add more options for damagetext
{potential} describes the full damage the target took without capping it when the target dies
{potential_health} describes the health damage the target took without capping it when the target dies
See merge request !382
Mario [Thu, 10 Nov 2016 15:48:56 +0000 (15:48 +0000)]
Merge branch 'martin-t/msnt' into 'master'
Spawning near teammates
Fixes #1799 and makes the spawn spot selection much more reliable.
The change in defaults is what me and @RomanSixty agreed on as a reasonable value. The 0 was most likely an oversight anyway which caused players to spawn in a chain reaction e.g. https://www.youtube.com/watch?v=c2gbe-MzdAU&feature=youtu.be&t=1m5s .
The FOREACH_CLIENT_RANDOM macro unfortunately can't be nested due to QC arrays being global.
See merge request !383
Mario [Tue, 8 Nov 2016 03:57:13 +0000 (03:57 +0000)]
Merge branch 'DefaultUser/func_train_random_target' into 'master'
Make func_train respect its target's "target_random" field
See merge request !385
Mario [Tue, 8 Nov 2016 03:37:22 +0000 (13:37 +1000)]
Merge branch 'master' into DefaultUser/func_train_random_target
Mario [Mon, 7 Nov 2016 17:29:20 +0000 (03:29 +1000)]
Remove mode prefix from some of the server list categories
terencehill [Mon, 7 Nov 2016 16:20:03 +0000 (17:20 +0100)]
Show no title in the uid2name dialog. It fixes #1836
Mario [Mon, 7 Nov 2016 12:47:27 +0000 (22:47 +1000)]
Turn off standard weaponarena in weapon arena modes (overkill, melee only, instagib)
terencehill [Mon, 7 Nov 2016 10:39:58 +0000 (11:39 +0100)]
Simplify conditions
Mario [Mon, 7 Nov 2016 05:16:18 +0000 (15:16 +1000)]
Don't count weapons available in the map as hidden
terencehill [Sun, 6 Nov 2016 00:24:29 +0000 (01:24 +0100)]
CA: fix name tags getting displayed above eliminated players (when they are spectating or observing). It fixes #1813
Martin Taibr [Sun, 6 Nov 2016 14:47:13 +0000 (15:47 +0100)]
Merge branch 'master' into martin-t/msnt
Martin Taibr [Sun, 6 Nov 2016 14:46:43 +0000 (15:46 +0100)]
entity array
Mario [Sun, 6 Nov 2016 11:44:13 +0000 (21:44 +1000)]
Move nade timer handling out of offhand code (offhand code isn't run when player is frozen)
Freddy [Sat, 5 Nov 2016 17:00:27 +0000 (18:00 +0100)]
Change the way item glow is handled
Freddy [Sat, 5 Nov 2016 13:57:59 +0000 (14:57 +0100)]
Don't apply ITS_POWERUP to all powerups
Mario [Sat, 5 Nov 2016 02:47:31 +0000 (12:47 +1000)]
Update hash for hagar fix
Mario [Sat, 5 Nov 2016 02:43:35 +0000 (12:43 +1000)]
Merge branch 'master' into Mario/wepent_experimental
# Conflicts:
# qcsrc/client/view.qc
# qcsrc/common/weapons/weapon/tuba.qc
Freddy [Sat, 5 Nov 2016 01:41:34 +0000 (02:41 +0100)]
Use .instanceOfPowerup
Mario [Fri, 4 Nov 2016 13:54:47 +0000 (23:54 +1000)]
Fix hagar loading and switching weapons
Martin Taibr [Thu, 3 Nov 2016 13:44:31 +0000 (14:44 +0100)]
test only 10 teammates
Martin Taibr [Wed, 2 Nov 2016 22:30:31 +0000 (23:30 +0100)]
less bad FOREACH_CLIENT_RANDOM
Freddy [Wed, 2 Nov 2016 17:57:18 +0000 (18:57 +0100)]
Add .future_target field for func_train
Mario [Wed, 2 Nov 2016 13:57:43 +0000 (23:57 +1000)]
Hack to fix tuba alternative instruments
Freddy [Wed, 2 Nov 2016 12:04:42 +0000 (13:04 +0100)]
Remove a "="
Mario [Wed, 2 Nov 2016 01:50:23 +0000 (11:50 +1000)]
func_breakable: Always check for updates, not just when activated/destroyed, fixes breakable objects that can move
Freddy [Tue, 1 Nov 2016 15:03:40 +0000 (16:03 +0100)]
Also let the first target of func_train be random
For this to work, the func_train entity needs to have .target_random set
initially
Freddy [Tue, 1 Nov 2016 14:48:34 +0000 (15:48 +0100)]
Random entity selection only for the target field for func_train
Freddy [Tue, 1 Nov 2016 13:24:40 +0000 (14:24 +0100)]
Make func_train respect its target's "target_random" field
terencehill [Sun, 30 Oct 2016 22:22:05 +0000 (22:22 +0000)]
Merge branch 'martin-t/damagetext' into 'master'
Add forgotten cvar to default config
See merge request !384
Martin Taibr [Sun, 30 Oct 2016 20:05:03 +0000 (21:05 +0100)]
add cl_damagetext_accumulate_alpha_rel to default config
Martin Taibr [Sun, 30 Oct 2016 19:32:53 +0000 (20:32 +0100)]
fix default
Martin Taibr [Sun, 30 Oct 2016 19:17:51 +0000 (20:17 +0100)]
cleanup
Martin Taibr [Sat, 29 Oct 2016 22:00:45 +0000 (00:00 +0200)]
remove msnt_deathloc, fix spot selection
Martin Taibr [Sat, 29 Oct 2016 01:16:11 +0000 (03:16 +0200)]
i could do something like this but it looks ugly
Martin Taibr [Fri, 28 Oct 2016 23:40:52 +0000 (01:40 +0200)]
don't test all spots when a good one is found early
Martin Taibr [Fri, 28 Oct 2016 19:23:37 +0000 (21:23 +0200)]
comment
Martin Taibr [Fri, 28 Oct 2016 18:58:49 +0000 (20:58 +0200)]
Merge branch 'master' into martin-t/msnt
Freddy [Fri, 28 Oct 2016 18:43:11 +0000 (20:43 +0200)]
Also change docstring for cl_damagetext_format in defaultXonotic.cfg
Martin Taibr [Fri, 28 Oct 2016 18:40:01 +0000 (20:40 +0200)]
remove redundant test
Martin Taibr [Fri, 28 Oct 2016 18:36:00 +0000 (20:36 +0200)]
iterate through clients in random order
Mario [Fri, 28 Oct 2016 06:04:42 +0000 (16:04 +1000)]
Lower monster think delay (fixes choppy zombies)
Mario [Thu, 27 Oct 2016 23:15:46 +0000 (23:15 +0000)]
Merge branch 'Mario/xonoticless_fix' into 'master'
Merge branch Mario/xonoticless_fix (M merge request)
Moves some stuff around so the game code can be compiled with -DXONOTIC=0 again.
See merge request !381
Mario [Thu, 27 Oct 2016 04:38:05 +0000 (14:38 +1000)]
Fix wall dodging working on the skybox