]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
xonotic/xonotic-data.pk3dir.git
6 years agoMerge branch 'master' into terencehill/scoreboard_stuff 592/head
terencehill [Thu, 13 Sep 2018 11:58:20 +0000 (13:58 +0200)]
Merge branch 'master' into terencehill/scoreboard_stuff

6 years agoIncrease trigger_hurt default damage to 10000, so tanks can't survive
Mario [Thu, 13 Sep 2018 11:12:01 +0000 (21:12 +1000)]
Increase trigger_hurt default damage to 10000, so tanks can't survive

6 years agoEnable it by default in code too
Mario [Wed, 12 Sep 2018 23:31:54 +0000 (09:31 +1000)]
Enable it by default in code too

6 years agoAdd an option (enabled by default) to show a console message stating the player is...
Mario [Wed, 12 Sep 2018 23:31:09 +0000 (09:31 +1000)]
Add an option (enabled by default) to show a console message stating the player is banned when they try to join

6 years agoMove item_key to mapobjects
Mario [Wed, 12 Sep 2018 23:19:18 +0000 (09:19 +1000)]
Move item_key to mapobjects

6 years agoFix an issue with stepdown code
Mario [Wed, 12 Sep 2018 22:23:10 +0000 (08:23 +1000)]
Fix an issue with stepdown code

6 years agoDon't delay displaying of the accuracy panel when the game is over
terencehill [Wed, 12 Sep 2018 19:10:11 +0000 (21:10 +0200)]
Don't delay displaying of the accuracy panel when the game is over

6 years agoApply a fading in effect to the accuracy panel if it's shown after the scoreboard
terencehill [Wed, 12 Sep 2018 18:12:17 +0000 (20:12 +0200)]
Apply a fading in effect to the accuracy panel if it's shown after the scoreboard

6 years agoDelay 2 seconds display of the accuracy panel after the scoreboard but only if its...
terencehill [Tue, 11 Sep 2018 09:46:13 +0000 (11:46 +0200)]
Delay 2 seconds display of the accuracy panel after the scoreboard but only if its position is low on the screen (with cvars for delay and position)

6 years agoOptimize client wall distance checking slightly when the fade_ keys are set to the...
Mario [Tue, 11 Sep 2018 20:31:22 +0000 (06:31 +1000)]
Optimize client wall distance checking slightly when the fade_ keys are set to the same value

6 years agoset the same thing in another place because everything has to be duplicated in xon
Martin Taibr [Tue, 11 Sep 2018 15:17:26 +0000 (17:17 +0200)]
set the same thing in another place because everything has to be duplicated in xon

6 years agoshow CTF records in console by default
Martin Taibr [Tue, 11 Sep 2018 15:12:04 +0000 (17:12 +0200)]
show CTF records in console by default

6 years agoAllow any burning entity to transfer fire to other entities
Mario [Mon, 10 Sep 2018 16:10:58 +0000 (02:10 +1000)]
Allow any burning entity to transfer fire to other entities

6 years agoMove Inventory to PlayerState and disable the entity pickup messages
Mario [Mon, 10 Sep 2018 15:30:20 +0000 (01:30 +1000)]
Move Inventory to PlayerState and disable the entity pickup messages

6 years agoFix a random reference to .health and .armorvalue in bot CTF code
Mario [Mon, 10 Sep 2018 15:02:08 +0000 (01:02 +1000)]
Fix a random reference to .health and .armorvalue in bot CTF code

6 years agoMake vehicles use the standard health resource instead of a custom field
Mario [Mon, 10 Sep 2018 14:57:29 +0000 (00:57 +1000)]
Make vehicles use the standard health resource instead of a custom field

6 years agoUpdate hash
Mario [Mon, 10 Sep 2018 14:09:40 +0000 (00:09 +1000)]
Update hash

6 years agoDarken eliminated players in the last row of the scoreboard when it lists more than...
terencehill [Mon, 10 Sep 2018 14:00:18 +0000 (16:00 +0200)]
Darken eliminated players in the last row of the scoreboard when it lists more than one player

6 years agoMove checks to show accuracy panel to a dedicated function
terencehill [Mon, 10 Sep 2018 12:29:45 +0000 (14:29 +0200)]
Move checks to show accuracy panel to a dedicated function

6 years agoHide accuracy panel until there is some stats to display, i.e. when you have at least...
terencehill [Mon, 10 Sep 2018 11:55:07 +0000 (13:55 +0200)]
Hide accuracy panel until there is some stats to display, i.e. when you have at least one weapon with positive accuracy. It frees up useful space to see the level description on campaign levels with many bots

6 years agoHide accuracy panel if it's too far down
terencehill [Mon, 10 Sep 2018 11:42:08 +0000 (13:42 +0200)]
Hide accuracy panel if it's too far down

6 years agoDisable the duel gametype vote preset (causes issues with servers specifying a custom...
Mario [Sun, 9 Sep 2018 19:38:26 +0000 (05:38 +1000)]
Disable the duel gametype vote preset (causes issues with servers specifying a custom player limit, doesn't apply the proper XPM ruleset)

6 years agoDisable gametype voting by default (to be enabled only in the server config)
Mario [Sun, 9 Sep 2018 19:29:30 +0000 (05:29 +1000)]
Disable gametype voting by default (to be enabled only in the server config)

6 years agoOffset the portal aiming line by the weapon's movedir, so as to not interfere with...
Mario [Sun, 9 Sep 2018 17:30:22 +0000 (03:30 +1000)]
Offset the portal aiming line by the weapon's movedir, so as to not interfere with dual wielding

6 years agoAllow portals with infinite lifetime
Mario [Sun, 9 Sep 2018 17:00:31 +0000 (03:00 +1000)]
Allow portals with infinite lifetime

6 years agoIf the player has unlimited superweapons, don't bother showing pickup message or...
Mario [Sun, 9 Sep 2018 16:57:20 +0000 (02:57 +1000)]
If the player has unlimited superweapons, don't bother showing pickup message or HUD timer, also enable unlimited superweapons if g_balance_superweapons_time < 0

6 years agoHunter-Killer: Only attack vehicles by default
Mario [Sun, 9 Sep 2018 14:29:53 +0000 (00:29 +1000)]
Hunter-Killer: Only attack vehicles by default

6 years agoDon't spam an activation warning on old maps
Mario [Sun, 9 Sep 2018 13:20:16 +0000 (23:20 +1000)]
Don't spam an activation warning on old maps

6 years agoFix FLAC cannons unable to target projectiles
Mario [Sat, 8 Sep 2018 10:25:31 +0000 (20:25 +1000)]
Fix FLAC cannons unable to target projectiles

6 years agoInclude the new setting in config
Mario [Sat, 8 Sep 2018 10:15:29 +0000 (20:15 +1000)]
Include the new setting in config

6 years agoOnly show the health bar on turrets (no names) by default
Mario [Sat, 8 Sep 2018 10:14:34 +0000 (20:14 +1000)]
Only show the health bar on turrets (no names) by default

6 years agoApply player clip collision to observers
Mario [Sat, 8 Sep 2018 10:04:46 +0000 (20:04 +1000)]
Apply player clip collision to observers

6 years agoFix compilation unit?
Mario [Fri, 7 Sep 2018 22:50:25 +0000 (08:50 +1000)]
Fix compilation unit?

6 years agoMerge branch 'Mario/item_wepammo_fix' into 'master'
Mario [Fri, 7 Sep 2018 22:48:19 +0000 (22:48 +0000)]
Merge branch 'Mario/item_wepammo_fix' into 'master'

Merge branch Mario/item_wepammo_fix (S merge request)

Closes #1920

See merge request xonotic/xonotic-data.pk3dir!587

6 years agoMore likely fix compilation unit 587/head
Mario [Fri, 7 Sep 2018 22:36:32 +0000 (08:36 +1000)]
More likely fix compilation unit

6 years agoHopefully fix compilation unit
Mario [Fri, 7 Sep 2018 22:18:55 +0000 (08:18 +1000)]
Hopefully fix compilation unit

6 years agoCapitalize all health/armor items for consistency
Mario [Fri, 7 Sep 2018 21:34:58 +0000 (07:34 +1000)]
Capitalize all health/armor items for consistency

6 years agoCapitalize mega item names
Mario [Fri, 7 Sep 2018 21:28:28 +0000 (07:28 +1000)]
Capitalize mega item names

6 years agoDon't notify the chat box about Git based servers, as this causes some confusion...
Mario [Fri, 7 Sep 2018 20:05:03 +0000 (06:05 +1000)]
Don't notify the chat box about Git based servers, as this causes some confusion with players (message is still shown in the console)

6 years agoMerge branch 'Lyberta/TeamplayOverhaul2' into 'master'
Mario [Fri, 7 Sep 2018 19:12:55 +0000 (19:12 +0000)]
Merge branch 'Lyberta/TeamplayOverhaul2' into 'master'

Teamplay overhaul - step 2

Closes #1982 and #2071

See merge request xonotic/xonotic-data.pk3dir!581

6 years agoConsistent indentation in player.qc
terencehill [Fri, 7 Sep 2018 11:40:24 +0000 (13:40 +0200)]
Consistent indentation in player.qc

6 years agoClan Arena: fix team chat (was considered spectator chat for killed players) and...
terencehill [Fri, 7 Sep 2018 11:21:19 +0000 (13:21 +0200)]
Clan Arena: fix team chat (was considered spectator chat for killed players) and real spectators chat (sending messages to killed players too)

This commit reverts d46f774178

6 years agoUse crouch status instead of crouch key to indicate when player is crouching in press...
Mario [Thu, 6 Sep 2018 16:42:39 +0000 (02:42 +1000)]
Use crouch status instead of crouch key to indicate when player is crouching in pressed keys code

6 years agoFix crouching in 2D mode
Mario [Thu, 6 Sep 2018 16:34:17 +0000 (02:34 +1000)]
Fix crouching in 2D mode

6 years agoNote in the documentation that item_wepammo uses both f1 and f2
Mario [Thu, 6 Sep 2018 11:10:28 +0000 (21:10 +1000)]
Note in the documentation that item_wepammo uses both f1 and f2

6 years agoUpdate hash
Mario [Thu, 6 Sep 2018 03:36:41 +0000 (13:36 +1000)]
Update hash

6 years agoGet rid of an array that's actually not used. Add 2 comments to explain a small diffe...
terencehill [Wed, 5 Sep 2018 19:43:02 +0000 (21:43 +0200)]
Get rid of an array that's actually not used. Add 2 comments to explain a small difference

6 years agoRemove an unnecessary ammo check
Mario [Wed, 5 Sep 2018 19:35:14 +0000 (05:35 +1000)]
Remove an unnecessary ammo check

6 years agoTranslate item names
Mario [Wed, 5 Sep 2018 19:31:35 +0000 (05:31 +1000)]
Translate item names

6 years agoMerge branch 'terencehill/wpeditior_command'
terencehill [Wed, 5 Sep 2018 19:26:57 +0000 (21:26 +0200)]
Merge branch 'terencehill/wpeditior_command'

6 years agoFirst part of a fix for untranslated item ammo names on drop: hack the item name...
Mario [Wed, 5 Sep 2018 19:05:56 +0000 (05:05 +1000)]
First part of a fix for untranslated item ammo names on drop: hack the item name handling into notifications system (not translated currently)

6 years agoFix copy-paste error.
Lyberta [Mon, 3 Sep 2018 19:37:17 +0000 (22:37 +0300)]
Fix copy-paste error.

6 years agoTeamplay: Don't send initial spectator team join notification.
Lyberta [Mon, 3 Sep 2018 19:25:48 +0000 (22:25 +0300)]
Teamplay: Don't send initial spectator team join notification.

6 years agoMerge branch 'master' into Lyberta/TeamplayOverhaul2
Lyberta [Mon, 3 Sep 2018 18:13:11 +0000 (21:13 +0300)]
Merge branch 'master' into Lyberta/TeamplayOverhaul2

6 years agoMerge branch 'terencehill/clientkill' into 'master'
Mario [Mon, 3 Sep 2018 12:23:01 +0000 (12:23 +0000)]
Merge branch 'terencehill/clientkill' into 'master'

Move ClientKill code into its own file

See merge request xonotic/xonotic-data.pk3dir!585

6 years agoTransifex autosync
Rudolf Polzer [Sun, 2 Sep 2018 05:24:20 +0000 (07:24 +0200)]
Transifex autosync

6 years agowaypoint_getSymmetricalOrigin --> waypoint_getSymmetricalPoint
terencehill [Tue, 28 Aug 2018 13:12:34 +0000 (15:12 +0200)]
waypoint_getSymmetricalOrigin  -->  waypoint_getSymmetricalPoint

6 years agoDon't make use of impulses to trigger waypoint editor commands
terencehill [Tue, 28 Aug 2018 13:03:39 +0000 (15:03 +0200)]
Don't make use of impulses to trigger waypoint editor commands

6 years agoClan Arena: make work team chat for killed players
terencehill [Tue, 28 Aug 2018 11:57:40 +0000 (13:57 +0200)]
Clan Arena: make work team chat for killed players

6 years agoTransifex autosync
Rudolf Polzer [Tue, 28 Aug 2018 05:24:28 +0000 (07:24 +0200)]
Transifex autosync

6 years agoFix symmetrical editing of waypoints with custom origin (g_waypointeditor_symmetrical...
terencehill [Mon, 27 Aug 2018 21:21:03 +0000 (23:21 +0200)]
Fix symmetrical editing of waypoints with custom origin (g_waypointeditor_symmetrical -1) not working

6 years agoTransifex autosync
Rudolf Polzer [Mon, 27 Aug 2018 05:24:44 +0000 (07:24 +0200)]
Transifex autosync

6 years agoFix buttons for previous and next campaign not working
terencehill [Sat, 25 Aug 2018 18:43:30 +0000 (20:43 +0200)]
Fix buttons for previous and next campaign not working

6 years agoForgot to move the command too in the previous commit
terencehill [Fri, 24 Aug 2018 13:24:20 +0000 (15:24 +0200)]
Forgot to move the command too in the previous commit

6 years agoParse restart vote in VoteCommand_parse
terencehill [Fri, 24 Aug 2018 13:18:59 +0000 (15:18 +0200)]
Parse restart vote in VoteCommand_parse

6 years agoRemove 2 unused function parameters
terencehill [Fri, 24 Aug 2018 12:43:32 +0000 (14:43 +0200)]
Remove 2 unused function parameters

6 years agoTurn 2 vectors into ints
terencehill [Fri, 24 Aug 2018 12:33:55 +0000 (14:33 +0200)]
Turn 2 vectors into ints

6 years agoAdd a delay of 1 second before executing the command restart after a successful vote...
terencehill [Fri, 24 Aug 2018 12:26:58 +0000 (14:26 +0200)]
Add a delay of 1 second before executing the command restart after a successful vote for restart so that vote result can be seen and announcer can be heard

6 years agoMerge branch 'master' into Lyberta/TeamplayOverhaul2
Lyberta [Wed, 22 Aug 2018 10:32:08 +0000 (13:32 +0300)]
Merge branch 'master' into Lyberta/TeamplayOverhaul2

6 years agoMerge branch 'Lyberta/GamemodesSplit' into 'master'
Mario [Wed, 22 Aug 2018 09:17:14 +0000 (09:17 +0000)]
Merge branch 'Lyberta/GamemodesSplit' into 'master'

Split gamemodes into cl and sv

See merge request xonotic/xonotic-data.pk3dir!578

6 years agoUpdate hash
Mario [Wed, 22 Aug 2018 08:40:55 +0000 (18:40 +1000)]
Update hash

6 years agoMerge branch 'Mario/morphed_explosivesmodel'
Mario [Wed, 22 Aug 2018 08:11:32 +0000 (18:11 +1000)]
Merge branch 'Mario/morphed_explosivesmodel'

6 years agoMerge branch 'morphed/energyweapons'
Mario [Wed, 22 Aug 2018 08:11:26 +0000 (18:11 +1000)]
Merge branch 'morphed/energyweapons'

6 years agoMerge branch 'master' into Mario/morphed_explosivesmodel
Mario [Wed, 22 Aug 2018 08:11:08 +0000 (18:11 +1000)]
Merge branch 'master' into Mario/morphed_explosivesmodel

6 years agoMerge branch 'master' into morphed/energyweapons
Mario [Wed, 22 Aug 2018 08:05:21 +0000 (18:05 +1000)]
Merge branch 'master' into morphed/energyweapons

6 years agoMerge branch 'terencehill/bot_ai' into 'master'
terencehill [Tue, 21 Aug 2018 12:27:18 +0000 (12:27 +0000)]
Merge branch 'terencehill/bot_ai' into 'master'

Bot AI fixes and improvements

Closes #2015

See merge request xonotic/xonotic-data.pk3dir!573

6 years agoUpdate hash
terencehill [Tue, 21 Aug 2018 12:14:35 +0000 (14:14 +0200)]
Update hash

6 years agoMerge branch 'master' into terencehill/bot_ai
terencehill [Tue, 21 Aug 2018 11:52:30 +0000 (13:52 +0200)]
Merge branch 'master' into terencehill/bot_ai

# Conflicts:
# .gitlab-ci.yml
# qcsrc/common/gamemodes/gamemode/keepaway/keepaway.qc

6 years agoMerge branch 'master' into Lyberta/GamemodesSplit
Lyberta [Tue, 21 Aug 2018 07:35:05 +0000 (10:35 +0300)]
Merge branch 'master' into Lyberta/GamemodesSplit

6 years agoMerge branch 'terencehill/keepaway_enhancements'
terencehill [Mon, 20 Aug 2018 19:19:15 +0000 (21:19 +0200)]
Merge branch 'terencehill/keepaway_enhancements'

6 years agoKeepaway: spawn the ball only when the game starts, hide it during countdown
terencehill [Sat, 18 Aug 2018 11:17:24 +0000 (13:17 +0200)]
Keepaway: spawn the ball only when the game starts, hide it during countdown

6 years agoKeepaway : Remove redundant use of another entity for ball carrier in ka_DropEvent...
terencehill [Sat, 18 Aug 2018 11:03:41 +0000 (13:03 +0200)]
Keepaway : Remove redundant use of another entity for ball carrier in ka_DropEvent. Move init code in a better place (before hooks and bot logic)

6 years agoMerge branch 'master' into Lyberta/TeamplayOverhaul2
Lyberta [Fri, 17 Aug 2018 22:36:10 +0000 (01:36 +0300)]
Merge branch 'master' into Lyberta/TeamplayOverhaul2

6 years agoMerge branch 'byteManiak/types' into 'master'
terencehill [Fri, 17 Aug 2018 18:08:23 +0000 (18:08 +0000)]
Merge branch 'byteManiak/types' into 'master'

Data types

See merge request xonotic/xonotic-data.pk3dir!586

6 years agoData types
byteManiak [Fri, 17 Aug 2018 18:08:23 +0000 (18:08 +0000)]
Data types

6 years agoKeepaway: don't allow players to get the ball if game hasn't started yet
terencehill [Thu, 16 Aug 2018 11:44:10 +0000 (13:44 +0200)]
Keepaway: don't allow players to get the ball if game hasn't started yet

6 years agoDon't allow all the waypoints to blink at the same time
terencehill [Wed, 15 Aug 2018 14:15:10 +0000 (16:15 +0200)]
Don't allow all the waypoints to blink at the same time

6 years agoFix item waypoint blink effect not working
terencehill [Wed, 15 Aug 2018 13:46:46 +0000 (15:46 +0200)]
Fix item waypoint blink effect not working

6 years agoImprove 2 comments
terencehill [Wed, 15 Aug 2018 09:16:20 +0000 (11:16 +0200)]
Improve 2 comments

6 years agoMerge branch 'terencehill/formatmessage_fix' into 'master'
terencehill [Wed, 15 Aug 2018 08:27:31 +0000 (08:27 +0000)]
Merge branch 'terencehill/formatmessage_fix' into 'master'

Formatmessage fix

Closes #1410

See merge request xonotic/xonotic-data.pk3dir!579

6 years agoMove more ClientKill code to clientkill.qc
terencehill [Tue, 14 Aug 2018 21:25:41 +0000 (23:25 +0200)]
Move more ClientKill code to clientkill.qc

6 years agoSimplify some ClientKill code
terencehill [Tue, 14 Aug 2018 18:00:04 +0000 (20:00 +0200)]
Simplify some ClientKill code

6 years agoMove ClientKill code into its own file
terencehill [Tue, 14 Aug 2018 17:39:57 +0000 (19:39 +0200)]
Move ClientKill code into its own file

6 years agoUpdate hash
terencehill [Thu, 9 Aug 2018 12:54:11 +0000 (14:54 +0200)]
Update hash

6 years agoFix missing new line in 'menu_cmd help' output
terencehill [Thu, 9 Aug 2018 12:27:19 +0000 (14:27 +0200)]
Fix missing new line in 'menu_cmd help' output

6 years agoUse a tracebox instead of traceline to check if player is flying, it fixes #843 ...
terencehill [Thu, 9 Aug 2018 12:24:00 +0000 (14:24 +0200)]
Use a tracebox instead of traceline to check if player is flying, it fixes #843 "Repeated jump sound on xoylent"

6 years agoImplement detection of items (%x) in formatmessage making use of an existing function...
terencehill [Mon, 6 Aug 2018 06:57:39 +0000 (08:57 +0200)]
Implement detection of items (%x) in formatmessage making use of an existing function but slightly modified to work through warpzones

6 years agoRemove redundant use of .ctrace_solidchanged field from crosshair_trace_plusvisibletr...
terencehill [Mon, 6 Aug 2018 06:38:17 +0000 (08:38 +0200)]
Remove redundant use of .ctrace_solidchanged field from crosshair_trace_plusvisibletriggers

6 years agoFix #2066 "Hagar secondary works in CA before round starts"
terencehill [Sun, 5 Aug 2018 18:25:00 +0000 (20:25 +0200)]
Fix #2066 "Hagar secondary works in CA before round starts"

6 years agoMerge branch 'terencehill/bot_waypoints' into 'master'
terencehill [Sun, 5 Aug 2018 18:02:42 +0000 (18:02 +0000)]
Merge branch 'terencehill/bot_waypoints' into 'master'

bot waypoints enhancement

See merge request xonotic/xonotic-data.pk3dir!583