]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
xonotic/xonotic-data.pk3dir.git
8 years agoMerge branch 'master' into Mario/wepent_experimental
Mario [Tue, 6 Dec 2016 15:01:32 +0000 (01:01 +1000)]
Merge branch 'master' into Mario/wepent_experimental

8 years agoMerge branch 'terencehill/item_models' into 'master'
Mario [Mon, 5 Dec 2016 12:58:27 +0000 (12:58 +0000)]
Merge branch 'terencehill/item_models' into 'master'

item models

* Apply correct buff bbox after it respawns
* Make taller powerup, mega and buff bboxes so the real item is always inside it. It fixes #192

See merge request !396

8 years agoUpdate hash 396/head
terencehill [Mon, 5 Dec 2016 12:04:40 +0000 (13:04 +0100)]
Update hash

8 years agoIncrease powerups and megas size. It fixes #192
terencehill [Sun, 4 Dec 2016 20:28:48 +0000 (21:28 +0100)]
Increase powerups and megas size. It fixes #192

8 years agoApply correct buff bbox after it respawns
terencehill [Sun, 4 Dec 2016 20:15:08 +0000 (21:15 +0100)]
Apply correct buff bbox after it respawns

8 years agoFix typos in few cvar descriptions; remove a wrong comment (copy-paste leftover)
terencehill [Sun, 4 Dec 2016 20:08:08 +0000 (21:08 +0100)]
Fix typos in few cvar descriptions; remove a wrong comment (copy-paste leftover)

8 years agoOnly show weapon spawns if they're available
Mario [Sun, 4 Dec 2016 04:48:06 +0000 (14:48 +1000)]
Only show weapon spawns if they're available

8 years agoFor consistency, still handle the private messages
Mario [Sun, 4 Dec 2016 02:15:29 +0000 (12:15 +1000)]
For consistency, still handle the private messages

8 years agoAdd mutator hooks to control who chat messages are sent to
Mario [Sun, 4 Dec 2016 02:14:22 +0000 (12:14 +1000)]
Add mutator hooks to control who chat messages are sent to

8 years agoThis code was meant to run when a bot is NOT dead
terencehill [Sun, 4 Dec 2016 02:09:32 +0000 (03:09 +0100)]
This code was meant to run when a bot is NOT dead

8 years agoAvoid an additional map list reload on menu start
terencehill [Sun, 4 Dec 2016 02:01:24 +0000 (03:01 +0100)]
Avoid an additional map list reload on menu start

8 years agoBlock latent bot movement when it's dead or spectating
terencehill [Sun, 4 Dec 2016 01:47:38 +0000 (02:47 +0100)]
Block latent bot movement when it's dead or spectating

8 years agoIf the hud_shownames_crosshairdistance code says a name must be hidden or displayed...
terencehill [Fri, 2 Dec 2016 17:46:47 +0000 (18:46 +0100)]
If the hud_shownames_crosshairdistance code says a name must be hidden or displayed don't bother checking whether it overlaps or not

8 years agoSimplify an assignment
terencehill [Fri, 2 Dec 2016 17:02:25 +0000 (18:02 +0100)]
Simplify an assignment

8 years agoFix hud_shownames_antioverlap not ignoring spectators
terencehill [Fri, 2 Dec 2016 15:55:48 +0000 (16:55 +0100)]
Fix hud_shownames_antioverlap not ignoring spectators

8 years agoInstead of hiding waypoints for eliminated players in CA clientside make so that...
terencehill [Thu, 1 Dec 2016 18:41:53 +0000 (19:41 +0100)]
Instead of hiding waypoints for eliminated players in CA clientside make so that server never sends private entcs informations of spectators as they're pointless. This way names above eliminated player (CA) and quitters (LMS) don't appear as well as their icons in the radar (CA and LMS); it also reduces bandwith usage

This commit reverts 8923c4865 "CA: fix name tags getting displayed above eliminated players (when they are spectating or observing). It fixes #1813"

8 years agoSpeed up bot goal tracing by using vlen2 (the result is never used outside of compari...
Mario [Thu, 1 Dec 2016 13:30:45 +0000 (23:30 +1000)]
Speed up bot goal tracing by using vlen2 (the result is never used outside of comparisons with itself)

8 years agoMerge branch 'master' into Mario/wepent_experimental
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

8 years agoMerge branch 'terencehill/LMS_improvements' into 'master'
Mario [Tue, 29 Nov 2016 14:02:46 +0000 (14:02 +0000)]
Merge branch 'terencehill/LMS_improvements' into 'master'

LMS improvements

* Fix wrong rankings when a player quits the game (by pressing F3) or disconnects; don't allow eliminated players to quit the game
* Suppress pointless spectate warning for real spectators and eliminated players as they are actually spectating
* Add a proper warmup support: lives never decrease, rejoin after spectating is allowed. Previously game ended once everybody is ready

See merge request !394

8 years agoMerge branch 'martin-t/msnt' into 'master'
Mario [Tue, 29 Nov 2016 14:01:37 +0000 (14:01 +0000)]
Merge branch 'martin-t/msnt' into 'master'

Spawning near teammates: don't spawn on chatting players

See merge request !392

8 years agoAdd a hook to handle the message before anything has been replaced
Mario [Tue, 29 Nov 2016 04:32:13 +0000 (14:32 +1000)]
Add a hook to handle the message before anything has been replaced

8 years agoMerge branch 'master' into terencehill/LMS_improvements 394/head
terencehill [Sun, 27 Nov 2016 23:23:32 +0000 (00:23 +0100)]
Merge branch 'master' into terencehill/LMS_improvements

8 years agoLMS: Restore decreasing rank (starting from 665) applied to quitters
terencehill [Sun, 27 Nov 2016 23:23:07 +0000 (00:23 +0100)]
LMS: Restore decreasing rank (starting from 665) applied to quitters

8 years agoShow to spectators all the waypoints that are shown to spectated players. It fixes...
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

8 years agoUpdate hash (gameplay change is most likely due to findchain order)
Mario [Sun, 27 Nov 2016 07:17:08 +0000 (17:17 +1000)]
Update hash (gameplay change is most likely due to findchain order)

8 years agoUse a field to store the nade's lifetime, should fix the pickup timer
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

8 years agoChange autocvar_hud_panel_scoreboard_maxheight too
terencehill [Sat, 26 Nov 2016 02:39:05 +0000 (03:39 +0100)]
Change autocvar_hud_panel_scoreboard_maxheight too

8 years agoDisplay yellow score for remaining players
terencehill [Sat, 26 Nov 2016 02:26:42 +0000 (03:26 +0100)]
Display yellow score for remaining players

8 years agoIncrease a little bit hud_panel_scoreboard_maxheight
terencehill [Sat, 26 Nov 2016 02:18:53 +0000 (03:18 +0100)]
Increase a little bit hud_panel_scoreboard_maxheight

8 years agoFix hud_panel_scoreboard_maxheight
terencehill [Sat, 26 Nov 2016 01:35:20 +0000 (02:35 +0100)]
Fix hud_panel_scoreboard_maxheight

8 years agoMake it clear that FRAGS_PLAYER_NONSOLID and FRAGS_LMS_LOSER hold the same value
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

8 years agoAllow dropping vaporizer (for instagib)
Mario [Fri, 25 Nov 2016 21:35:53 +0000 (07:35 +1000)]
Allow dropping vaporizer (for instagib)

8 years agodon't spawn on chatting players 392/head
Martin Taibr [Thu, 24 Nov 2016 23:58:10 +0000 (00:58 +0100)]
don't spawn on chatting players

8 years agonoref autocvar_xon_sys_*
terencehill [Thu, 24 Nov 2016 23:23:54 +0000 (00:23 +0100)]
noref autocvar_xon_sys_*

8 years agoRemove unused specialcommand stuff from the client
terencehill [Thu, 24 Nov 2016 23:14:53 +0000 (00:14 +0100)]
Remove unused specialcommand stuff from the client

8 years agoAdd a proper warmup support to LMS: lives never decrease, rejoin after spectating...
terencehill [Thu, 24 Nov 2016 16:49:11 +0000 (17:49 +0100)]
Add a proper warmup support to LMS: lives never decrease, rejoin after spectating is allowed. Previously game ended once everybody is ready

8 years agoFix infomessage regression
terencehill [Thu, 24 Nov 2016 15:45:38 +0000 (16:45 +0100)]
Fix infomessage regression

8 years agoSuppress pointless spectate warning for real spectators and eliminated players as...
terencehill [Wed, 23 Nov 2016 17:37:05 +0000 (18:37 +0100)]
Suppress pointless spectate warning for real spectators and eliminated players as they are actually spectating

8 years agoLMS: fix wrong rankings when a player quits the game (by pressing F3) or disconnects...
terencehill [Wed, 23 Nov 2016 17:27:15 +0000 (18:27 +0100)]
LMS: fix wrong rankings when a player quits the game (by pressing F3) or disconnects; don't allow eliminated players to quit the game

8 years agoReset revive progress on respawn for every player. It fixes #1839
terencehill [Mon, 21 Nov 2016 22:33:08 +0000 (23:33 +0100)]
Reset revive progress on respawn for every player. It fixes #1839

8 years agoFix #1834 "Server info doesn't timeout in LMS"
terencehill [Mon, 21 Nov 2016 16:50:55 +0000 (17:50 +0100)]
Fix #1834 "Server info doesn't timeout in LMS"

8 years agoAdd more cvars to config files
terencehill [Mon, 21 Nov 2016 16:48:15 +0000 (17:48 +0100)]
Add more cvars to config files

8 years agoAdd some cvars to the config file
terencehill [Sun, 20 Nov 2016 23:16:22 +0000 (00:16 +0100)]
Add some cvars to the config file

8 years agoRemove an unused variable
terencehill [Sun, 20 Nov 2016 23:09:07 +0000 (00:09 +0100)]
Remove an unused variable

8 years agoRemove definition of a server cvar from the menu
terencehill [Sun, 20 Nov 2016 23:07:50 +0000 (00:07 +0100)]
Remove definition of a server cvar from the menu

8 years agoMerge branch 'master' into Mario/wepent_experimental
Mario [Sun, 20 Nov 2016 18:09:38 +0000 (04:09 +1000)]
Merge branch 'master' into Mario/wepent_experimental

# Conflicts:
# qcsrc/client/view.qc

8 years agoMove tuba's view model handling into the tuba file
Mario [Sun, 20 Nov 2016 18:07:33 +0000 (04:07 +1000)]
Move tuba's view model handling into the tuba file

8 years agoRemove some unused cvars
Mario [Sat, 19 Nov 2016 21:05:01 +0000 (07:05 +1000)]
Remove some unused cvars

8 years agoRemove a few server-side cvars from the client
Mario [Sat, 19 Nov 2016 20:50:53 +0000 (06:50 +1000)]
Remove a few server-side cvars from the client

8 years agoFix ClientPreConnect
Mario [Sat, 19 Nov 2016 16:12:24 +0000 (02:12 +1000)]
Fix ClientPreConnect

8 years agoRename a few parameters and locals named x, y, z
Mario [Sat, 19 Nov 2016 14:54:07 +0000 (00:54 +1000)]
Rename a few parameters and locals named x, y, z

8 years agoMake easier to read code that sets domination_teams
terencehill [Fri, 18 Nov 2016 20:33:13 +0000 (21:33 +0100)]
Make easier to read code that sets domination_teams

8 years agoFix number of teams defaulting to 2 for some game modes (CA, FT and KH)
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)

8 years agoCampaign: don't start the first round until player joined the game
terencehill [Fri, 18 Nov 2016 16:39:08 +0000 (17:39 +0100)]
Campaign: don't start the first round until player joined the game

8 years agoDon't try to reset map and players if game ended during countdown to game start
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

8 years agoFix players allowed to move if game ended during countdown to game start. It fixes...
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

8 years agoSpeed up bot enemy choosing search loop
Mario [Thu, 17 Nov 2016 00:00:03 +0000 (10:00 +1000)]
Speed up bot enemy choosing search loop

8 years agoMerge branch 'master' into Mario/wepent_experimental
Mario [Wed, 16 Nov 2016 23:45:45 +0000 (09:45 +1000)]
Merge branch 'master' into Mario/wepent_experimental

8 years agoUse a trick to prevent handling of items that aren't registered with .itemdef (should...
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)

8 years agoFix "bot_cmd X pause" command not working (broken since 8da4929ec)
terencehill [Wed, 16 Nov 2016 16:42:46 +0000 (17:42 +0100)]
Fix "bot_cmd X pause" command not working (broken since 8da4929ec)

8 years agoFix invasion
Mario [Wed, 16 Nov 2016 10:51:10 +0000 (20:51 +1000)]
Fix invasion

8 years agoMake sure bots don't move to removed goals such as a key when a Key Hunt round ends...
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

8 years agoOops, for some reason I lost these changes. Here they are.
Rudolf Polzer [Tue, 15 Nov 2016 15:48:18 +0000 (10:48 -0500)]
Oops, for some reason I lost these changes. Here they are.

8 years agoFix key hunt notifications reporting the owner's team, not the key's original team...
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

8 years agoMerge branch 'divVerent/anticheat-playerstats'
Rudolf Polzer [Tue, 15 Nov 2016 15:45:22 +0000 (10:45 -0500)]
Merge branch 'divVerent/anticheat-playerstats'

8 years agoAdd a button for dodging (not documented in menu yet)
Mario [Tue, 15 Nov 2016 09:13:38 +0000 (19:13 +1000)]
Add a button for dodging (not documented in menu yet)

8 years agoReport anticheat data to playerstats; remove unused anticheat_getvalue function.
Rudolf Polzer [Mon, 14 Nov 2016 20:14:59 +0000 (15:14 -0500)]
Report anticheat data to playerstats; remove unused anticheat_getvalue function.

8 years agoAvoid a glitch when a dropped weapon starts bobbing and smooth passage between statio...
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

8 years agoFix g_spawnshield_blockdamage not working
terencehill [Sat, 12 Nov 2016 20:01:02 +0000 (21:01 +0100)]
Fix g_spawnshield_blockdamage not working

8 years agoDamagetext: remove {health(ph)} and {total(p)}, add the cvar cl_damagetext_format_ver...
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

8 years agoAdd a physics set for overkill
Mario [Sat, 12 Nov 2016 08:43:00 +0000 (18:43 +1000)]
Add a physics set for overkill

8 years agoImprove sv_itemstime description
terencehill [Fri, 11 Nov 2016 17:58:14 +0000 (18:58 +0100)]
Improve sv_itemstime description

8 years agoImprove code readability
terencehill [Fri, 11 Nov 2016 17:41:13 +0000 (18:41 +0100)]
Improve code readability

8 years agoDamagetext: add {health(ph)}: shows potential_health too if different from health...
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

8 years agoMerge branch 'master' into Mario/wepent_experimental
Mario [Fri, 11 Nov 2016 11:04:16 +0000 (21:04 +1000)]
Merge branch 'master' into Mario/wepent_experimental

8 years agoMerge branch 'DefaultUser/m_itemid' into 'master'
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

8 years agoMake use of constants for damagetext bitflags
terencehill [Thu, 10 Nov 2016 23:32:31 +0000 (00:32 +0100)]
Make use of constants for damagetext bitflags

8 years agoOptimize damagetext networking
terencehill [Thu, 10 Nov 2016 22:48:37 +0000 (23:48 +0100)]
Optimize damagetext networking

8 years agoAdd .m_respawnsound for GameItems 386/head
Freddy [Thu, 10 Nov 2016 21:48:44 +0000 (22:48 +0100)]
Add .m_respawnsound for GameItems

8 years ago.m_glow is only needed in GAMEQC
Freddy [Thu, 10 Nov 2016 21:27:27 +0000 (22:27 +0100)]
.m_glow is only needed in GAMEQC

8 years agoSimplify
terencehill [Thu, 10 Nov 2016 18:16:25 +0000 (19:16 +0100)]
Simplify

8 years agoMerge branch 'master' into Mario/wepent_experimental
Mario [Thu, 10 Nov 2016 16:05:48 +0000 (02:05 +1000)]
Merge branch 'master' into Mario/wepent_experimental

8 years agoMerge branch 'terencehill/ca_shownames_fix' into 'master'
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

8 years agoMerge branch 'DefaultUser/more_damagetext' into 'master'
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

8 years agoMerge branch 'martin-t/msnt' into 'master'
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

8 years agoMerge branch 'DefaultUser/func_train_random_target' into 'master'
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

8 years agoMerge branch 'master' into DefaultUser/func_train_random_target 385/head
Mario [Tue, 8 Nov 2016 03:37:22 +0000 (13:37 +1000)]
Merge branch 'master' into DefaultUser/func_train_random_target

8 years agoRemove mode prefix from some of the server list categories
Mario [Mon, 7 Nov 2016 17:29:20 +0000 (03:29 +1000)]
Remove mode prefix from some of the server list categories

8 years agoShow no title in the uid2name dialog. It fixes #1836
terencehill [Mon, 7 Nov 2016 16:20:03 +0000 (17:20 +0100)]
Show no title in the uid2name dialog. It fixes #1836

8 years agoTurn off standard weaponarena in weapon arena modes (overkill, melee only, instagib)
Mario [Mon, 7 Nov 2016 12:47:27 +0000 (22:47 +1000)]
Turn off standard weaponarena in weapon arena modes (overkill, melee only, instagib)

8 years agoSimplify conditions
terencehill [Mon, 7 Nov 2016 10:39:58 +0000 (11:39 +0100)]
Simplify conditions

8 years agoDon't count weapons available in the map as hidden
Mario [Mon, 7 Nov 2016 05:16:18 +0000 (15:16 +1000)]
Don't count weapons available in the map as hidden

8 years agoCA: fix name tags getting displayed above eliminated players (when they are spectatin... 388/head
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

8 years agoMerge branch 'master' into martin-t/msnt 383/head
Martin Taibr [Sun, 6 Nov 2016 14:47:13 +0000 (15:47 +0100)]
Merge branch 'master' into martin-t/msnt

8 years agoentity array
Martin Taibr [Sun, 6 Nov 2016 14:46:43 +0000 (15:46 +0100)]
entity array

8 years agoMove nade timer handling out of offhand code (offhand code isn't run when player...
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)

8 years agoChange the way item glow is handled
Freddy [Sat, 5 Nov 2016 17:00:27 +0000 (18:00 +0100)]
Change the way item glow is handled

8 years agoDon't apply ITS_POWERUP to all powerups
Freddy [Sat, 5 Nov 2016 13:57:59 +0000 (14:57 +0100)]
Don't apply ITS_POWERUP to all powerups

8 years agoUpdate hash for hagar fix
Mario [Sat, 5 Nov 2016 02:47:31 +0000 (12:47 +1000)]
Update hash for hagar fix

8 years agoMerge branch 'master' into Mario/wepent_experimental
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