]>
git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
Mario [Fri, 16 Dec 2016 03:43:58 +0000 (13:43 +1000)]
Merge branch 'master' into Mario/wepent_experimental
Mario [Wed, 14 Dec 2016 20:29:39 +0000 (06:29 +1000)]
Give it some arguments
Mario [Wed, 14 Dec 2016 20:26:53 +0000 (06:26 +1000)]
Add some mutator hooks to clear out another gamemode reference
Mario [Wed, 14 Dec 2016 13:00:03 +0000 (23:00 +1000)]
Use new item name in Quake compat, may fix weird issues with mega armor on old maps
Mario [Wed, 14 Dec 2016 10:22:58 +0000 (20:22 +1000)]
Add a wrapper for item sounds, so they can be easily replaced like weapon sounds by mods
Mario [Tue, 13 Dec 2016 18:07:09 +0000 (04:07 +1000)]
Remove the o
Mario [Tue, 13 Dec 2016 17:50:27 +0000 (03:50 +1000)]
Don't count target_ entity checkpoints as a touchable trigger if it's targeted by something (usually a real trigger)
terencehill [Tue, 13 Dec 2016 15:59:08 +0000 (16:59 +0100)]
While passing the flag to a team mate, don't return it immediately if an enemy intercepts it and if manual return mode is on
terencehill [Tue, 13 Dec 2016 15:44:28 +0000 (16:44 +0100)]
CTF: rename an entity field; remove some redundant code
Mario [Tue, 13 Dec 2016 14:50:12 +0000 (00:50 +1000)]
If a weapon doesn't have a team, show it even if it's taken, so players know where its spawn point is
Mario [Mon, 12 Dec 2016 14:02:45 +0000 (00:02 +1000)]
Merge branch 'master' into Mario/wepent_experimental
terencehill [Sun, 11 Dec 2016 13:20:34 +0000 (14:20 +0100)]
Remove an useless placeholder waypoint
Mario [Sat, 10 Dec 2016 16:29:29 +0000 (02:29 +1000)]
Allow target_push to be used as a pusher itself (Quake 3 compatibility)
Mario [Sat, 10 Dec 2016 06:24:31 +0000 (06:24 +0000)]
Merge branch 'DefaultUser/armormega' into 'master'
Armor and Health name inconsistency
Fixes item name inconsistency (see Issue #1490) of Armor and Health by renaming HealthLarge to HealthBig and ArmorLarge to ArmorMega as well as all associated cvars
See https://gitlab.com/xonotic/xonotic-maps.pk3dir/tree/DefaultUser/entity_def for updated entity definitions for radiant
See merge request !387
Mario [Sat, 10 Dec 2016 06:20:22 +0000 (06:20 +0000)]
Merge branch 'terencehill/ca_bots_fix' into 'master'
CA and LMS: fix for bots getting stuck
* CA: fix bots getting stuck right after one of them dies
* LMS: fix bots getting stuck right after one of them is out of lives
* Fix "bot_cmd X pause" command not always working
See merge request !389
Mario [Sat, 10 Dec 2016 06:13:34 +0000 (06:13 +0000)]
Merge branch 'terencehill/gameover_stuff' into 'master'
gameover stuff
* Assault: when the first round ends show the message "Objective destroyed in X minutes" and block the game for 5 seconds before starting the other round in order to show objective destruction
* When a round ends block players and switch to 3rd person view (affected game types: Clan Arena, Domination, Freeze Tag, Invasion, Onslaught)
Implementation details:
* intermission_running and gameover are now 2 different conditions
* if set gameover has the effect of blocking players and triggering 3rd person view (eventchase); server must reset (respawn) players and vehicles (round_handler takes care of it) when resetting gameover to false.
See merge request !368
Mario [Sat, 10 Dec 2016 06:09:41 +0000 (16:09 +1000)]
Merge branch 'master' into DefaultUser/armormega
# Conflicts:
# mutators.cfg
# qcsrc/common/mutators/mutator/nix/sv_nix.qc
Mario [Wed, 7 Dec 2016 14:18:04 +0000 (00:18 +1000)]
Merge branch 'master' into Mario/wepent_experimental
terencehill [Tue, 6 Dec 2016 17:43:54 +0000 (18:43 +0100)]
Clean Key Hunt code up
Mario [Tue, 6 Dec 2016 15:01:32 +0000 (01:01 +1000)]
Merge branch 'master' into Mario/wepent_experimental
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
terencehill [Mon, 5 Dec 2016 12:04:40 +0000 (13:04 +0100)]
Update hash
terencehill [Sun, 4 Dec 2016 20:28:48 +0000 (21:28 +0100)]
Increase powerups and megas size. It fixes #192
terencehill [Sun, 4 Dec 2016 20:15:08 +0000 (21:15 +0100)]
Apply correct buff bbox after it respawns
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)
Mario [Sun, 4 Dec 2016 04:48:06 +0000 (14:48 +1000)]
Only show weapon spawns if they're available
Mario [Sun, 4 Dec 2016 02:15:29 +0000 (12:15 +1000)]
For consistency, still handle the private messages
Mario [Sun, 4 Dec 2016 02:14:22 +0000 (12:14 +1000)]
Add mutator hooks to control who chat messages are sent to
terencehill [Sun, 4 Dec 2016 02:09:32 +0000 (03:09 +0100)]
This code was meant to run when a bot is NOT dead
terencehill [Sun, 4 Dec 2016 02:01:24 +0000 (03:01 +0100)]
Avoid an additional map list reload on menu start
terencehill [Sun, 4 Dec 2016 01:47:38 +0000 (02:47 +0100)]
Block latent bot movement when it's dead or spectating
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
terencehill [Fri, 2 Dec 2016 17:02:25 +0000 (18:02 +0100)]
Simplify an assignment
terencehill [Fri, 2 Dec 2016 15:55:48 +0000 (16:55 +0100)]
Fix hud_shownames_antioverlap not ignoring spectators
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"
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)
terencehill [Tue, 29 Nov 2016 18:22:07 +0000 (19:22 +0100)]
Merge branch 'master' into terencehill/ca_bots_fix
Conflicts:
qcsrc/server/mutators/mutator/gamemode_lms.qc
terencehill [Tue, 29 Nov 2016 17:58:39 +0000 (18:58 +0100)]
Fix "bot_cmd X pause" command occasionally blocking all other bots
terencehill [Tue, 29 Nov 2016 17:57:11 +0000 (18:57 +0100)]
Fix "bot_cmd X pause" command not always working
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 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
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
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 23:23:32 +0000 (00:23 +0100)]
Merge branch 'master' into terencehill/LMS_improvements
terencehill [Sun, 27 Nov 2016 23:23:07 +0000 (00:23 +0100)]
LMS: Restore decreasing rank (starting from 665) applied to quitters
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)
Martin Taibr [Thu, 24 Nov 2016 23:58:10 +0000 (00:58 +0100)]
don't spawn on chatting players
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 [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
terencehill [Thu, 24 Nov 2016 15:45:38 +0000 (16:45 +0100)]
Fix infomessage regression
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
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
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 18:14:55 +0000 (19:14 +0100)]
Merge branch 'master' into terencehill/ca_bots_fix
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