]> 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 [Wed, 21 Dec 2016 07:43:38 +0000 (17:43 +1000)]
Merge branch 'master' into Mario/wepent_experimental

8 years agoDon't continue the loop if a valid reticle image is chosen, hopefully fixes a bad...
Mario [Wed, 21 Dec 2016 07:43:27 +0000 (17:43 +1000)]
Don't continue the loop if a valid reticle image is chosen, hopefully fixes a bad string crash

8 years agoPredict jetpack effect and sound (yay for perfectly predicted jetpacks)
Mario [Tue, 20 Dec 2016 01:10:53 +0000 (11:10 +1000)]
Predict jetpack effect and sound (yay for perfectly predicted jetpacks)

8 years agoMerge branch 'master' into Mario/wepent_experimental
Mario [Tue, 20 Dec 2016 00:49:24 +0000 (10:49 +1000)]
Merge branch 'master' into Mario/wepent_experimental

8 years agoRename a lib function (overlaps with an old map entity field)
Mario [Mon, 19 Dec 2016 02:48:08 +0000 (12:48 +1000)]
Rename a lib function (overlaps with an old map entity field)

8 years agoUse registry to get monster list
Mario [Sun, 18 Dec 2016 12:22:24 +0000 (22:22 +1000)]
Use registry to get monster list

8 years agoLimit the number of maps lsmaps can show to 250 (better than either increasing tempst...
Mario [Sun, 18 Dec 2016 12:07:44 +0000 (22:07 +1000)]
Limit the number of maps lsmaps can show to 250 (better than either increasing tempstring size and crashing or showing an empty list)

8 years agoBots: add navigation_clearroute and goalcurrent to public API
TimePath [Sat, 17 Dec 2016 04:22:36 +0000 (15:22 +1100)]
Bots: add navigation_clearroute and goalcurrent to public API

8 years agoRemove unused macro
Mario [Sat, 17 Dec 2016 03:08:08 +0000 (13:08 +1000)]
Remove unused macro

8 years agoFix bots always returning to own base after that the stolen flag has been returned
terencehill [Fri, 16 Dec 2016 19:29:33 +0000 (20:29 +0100)]
Fix bots always returning to own base after that the stolen flag has been returned

8 years agoImprove code readability in W_DecreaseAmmo
Mario [Fri, 16 Dec 2016 18:42:12 +0000 (04:42 +1000)]
Improve code readability in W_DecreaseAmmo

8 years agoShare some waypoint code in a dedicated function
terencehill [Fri, 16 Dec 2016 16:47:35 +0000 (17:47 +0100)]
Share some waypoint code in a dedicated function

8 years agoAdd possibility to send a command to all the bots; improve bot_cmd help description
terencehill [Fri, 16 Dec 2016 16:35:06 +0000 (17:35 +0100)]
Add possibility to send a command to all the bots; improve bot_cmd help description

8 years agoMerge branch 'master' into Mario/wepent_experimental
Mario [Fri, 16 Dec 2016 03:45:00 +0000 (13:45 +1000)]
Merge branch 'master' into Mario/wepent_experimental

8 years agoMerge branch 'master' into Mario/wepent_experimental
Mario [Fri, 16 Dec 2016 03:43:58 +0000 (13:43 +1000)]
Merge branch 'master' into Mario/wepent_experimental

8 years agoPart 2 of edc2958143 "Make sure bots don't move to removed goals such as a key when...
terencehill [Thu, 15 Dec 2016 00:11:37 +0000 (01:11 +0100)]
Part 2 of edc2958143 "Make sure bots don't move to removed goals such as a key when a Key Hunt round ends. It fixes #1101"

8 years agoKeyHunt panel: if there is no key to show return early (avoiding a division by 0...
terencehill [Thu, 15 Dec 2016 00:04:36 +0000 (01:04 +0100)]
KeyHunt panel: if there is no key to show return early (avoiding a division by 0 too); also do a small cleanup

8 years agoGive it some arguments
Mario [Wed, 14 Dec 2016 20:29:39 +0000 (06:29 +1000)]
Give it some arguments

8 years agoAdd some mutator hooks to clear out another gamemode reference
Mario [Wed, 14 Dec 2016 20:26:53 +0000 (06:26 +1000)]
Add some mutator hooks to clear out another gamemode reference

8 years agoUse new item name in Quake compat, may fix weird issues with mega armor on old maps
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

8 years agoAdd a wrapper for item sounds, so they can be easily replaced like weapon sounds...
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

8 years agoRemove the o
Mario [Tue, 13 Dec 2016 18:07:09 +0000 (04:07 +1000)]
Remove the o

8 years agoDon't count target_ entity checkpoints as a touchable trigger if it's targeted by...
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)

8 years agoWhile passing the flag to a team mate, don't return it immediately if an enemy interc...
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

8 years agoCTF: rename an entity field; remove some redundant code
terencehill [Tue, 13 Dec 2016 15:44:28 +0000 (16:44 +0100)]
CTF: rename an entity field; remove some redundant code

8 years agoIf a weapon doesn't have a team, show it even if it's taken, so players know where...
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

8 years agoMerge branch 'master' into Mario/wepent_experimental
Mario [Mon, 12 Dec 2016 14:02:45 +0000 (00:02 +1000)]
Merge branch 'master' into Mario/wepent_experimental

8 years agoRemove an useless placeholder waypoint
terencehill [Sun, 11 Dec 2016 13:20:34 +0000 (14:20 +0100)]
Remove an useless placeholder waypoint

8 years agoAllow target_push to be used as a pusher itself (Quake 3 compatibility)
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)

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

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

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

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

8 years agoMerge branch 'master' into Mario/wepent_experimental
Mario [Wed, 7 Dec 2016 14:18:04 +0000 (00:18 +1000)]
Merge branch 'master' into Mario/wepent_experimental

8 years agoClean Key Hunt code up
terencehill [Tue, 6 Dec 2016 17:43:54 +0000 (18:43 +0100)]
Clean Key Hunt code up

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 terencehill/ca_bots_fix
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

8 years agoFix "bot_cmd X pause" command occasionally blocking all other bots
terencehill [Tue, 29 Nov 2016 17:58:39 +0000 (18:58 +0100)]
Fix "bot_cmd X pause" command occasionally blocking all other bots

8 years agoFix "bot_cmd X pause" command not always working
terencehill [Tue, 29 Nov 2016 17:57:11 +0000 (18:57 +0100)]
Fix "bot_cmd X pause" command not always working

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