xonotic/xonotic-data.pk3dir.git
3 years agoMerge branch 'master' into 'master'
terencehill [Sat, 16 Feb 2019 23:08:47 +0000 (23:08 +0000)]
Merge branch 'master' into 'master'

Fix crash when g_maxplayers smaller than current amount of active players

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

3 years agoWhen possible use simpler LOG_* macros instead of LOG_*F
terencehill [Fri, 15 Feb 2019 17:47:22 +0000 (18:47 +0100)]
When possible use simpler LOG_* macros instead of LOG_*F

3 years agoSome minor cleanups and optimizations
terencehill [Fri, 15 Feb 2019 17:40:29 +0000 (18:40 +0100)]
Some minor cleanups and optimizations

3 years agoUpdate notifications.cfg
terencehill [Tue, 12 Feb 2019 17:34:42 +0000 (18:34 +0100)]
Update notifications.cfg

3 years agoMerge branch 'terencehill/more_compilation_optimizations'
terencehill [Tue, 12 Feb 2019 17:33:04 +0000 (18:33 +0100)]
Merge branch 'terencehill/more_compilation_optimizations'

3 years agoFix crash when g_maxplayers smaller than current amount of active players 637/head
Slava Bacherikov [Tue, 12 Feb 2019 14:26:02 +0000 (16:26 +0200)]
Fix crash when g_maxplayers smaller than current amount of active players

3 years agoMerge branch 'terencehill/minplayers_per_team' into 'master'
Mario [Tue, 12 Feb 2019 09:01:14 +0000 (09:01 +0000)]
Merge branch 'terencehill/minplayers_per_team' into 'master'

Add minplayers_per_team cvar

Closes #2064

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

3 years agoConcatenate log header strings in code
terencehill [Sun, 10 Feb 2019 18:38:57 +0000 (19:38 +0100)]
Concatenate log header strings in code

3 years agoReduce code of FOREACH_CLIENT_RANDOM
terencehill [Sun, 10 Feb 2019 17:57:51 +0000 (18:57 +0100)]
Reduce code of FOREACH_CLIENT_RANDOM

3 years agoCount notifications in a single FOREACH loop
terencehill [Sun, 10 Feb 2019 17:53:58 +0000 (18:53 +0100)]
Count notifications in a single FOREACH loop

3 years agoUse a function to print the assertion failed message (server: qc -380KB, dat -190KB...
terencehill [Sat, 9 Feb 2019 18:45:25 +0000 (19:45 +0100)]
Use a function to print the assertion failed message (server: qc -380KB, dat -190KB, globals -800)

3 years agoDisable spawnfunc.qh code in client and menu as it's not used
terencehill [Sat, 9 Feb 2019 12:06:33 +0000 (13:06 +0100)]
Disable spawnfunc.qh code in client and menu as it's not used

3 years agoUse a function to print single effect indexes
terencehill [Fri, 8 Feb 2019 23:39:07 +0000 (00:39 +0100)]
Use a function to print single effect indexes

3 years agoReduce function calls when writing 2 multi-line messages
terencehill [Fri, 8 Feb 2019 23:30:42 +0000 (00:30 +0100)]
Reduce function calls when writing 2 multi-line messages

3 years agoOptimize NOTIF_WRITE_HARDCODED
terencehill [Fri, 8 Feb 2019 22:16:54 +0000 (23:16 +0100)]
Optimize NOTIF_WRITE_HARDCODED

3 years agoRevert e30214cf "Purge SetResourceAmountExplicit" because it breaks map vote and...
terencehill [Fri, 8 Feb 2019 19:13:41 +0000 (20:13 +0100)]
Revert e30214cf "Purge SetResourceAmountExplicit" because it breaks map vote and other things

3 years agoCompress code of all the NOTIF_WRITE_* macros (now possible thanks to the new impleme...
terencehill [Thu, 7 Feb 2019 18:15:05 +0000 (19:15 +0100)]
Compress code of all the NOTIF_WRITE_* macros (now possible thanks to the new implementation of NOTIF_WRITE)

3 years agoIntroduce the shared function write_String_To_File that can be used by all the dump...
terencehill [Thu, 7 Feb 2019 17:48:12 +0000 (18:48 +0100)]
Introduce the shared function write_String_To_File that can be used by all the dump* commands

3 years agoTransifex autosync
Rudolf Polzer [Thu, 7 Feb 2019 06:24:23 +0000 (07:24 +0100)]
Transifex autosync

3 years agoRemove a few useless brackets inside macros
terencehill [Wed, 6 Feb 2019 22:13:34 +0000 (23:13 +0100)]
Remove a few useless brackets inside macros

3 years agoMark _checkWhitelisted as eraseable (currently used only by the server)
terencehill [Wed, 6 Feb 2019 00:35:42 +0000 (01:35 +0100)]
Mark _checkWhitelisted as eraseable (currently used only by the server)

3 years agoMove a very long loop into its own function as it was expanded and executed hundreds...
terencehill [Wed, 6 Feb 2019 00:22:11 +0000 (01:22 +0100)]
Move a very long loop into its own function as it was expanded and executed hundreds times inside the spawnfunc macro (server: qc -2.5MB, dat -1.8MB!)

3 years agoMake use of a function to reduce compilation output and globals (particularly for...
terencehill [Tue, 5 Feb 2019 22:06:26 +0000 (23:06 +0100)]
Make use of a function to reduce compilation output and globals (particularly for the server: qc -130KB, dat -70KB, -206 globals)

3 years agoTurn PROCESS_OVERRIDE macro into a function
terencehill [Tue, 5 Feb 2019 21:43:09 +0000 (22:43 +0100)]
Turn PROCESS_OVERRIDE macro into a function

3 years agoImplement MapInfo_Type_FromString in a sane way (without macros)
terencehill [Tue, 5 Feb 2019 21:32:11 +0000 (22:32 +0100)]
Implement MapInfo_Type_FromString in a sane way (without macros)

3 years agoTransifex autosync
Rudolf Polzer [Tue, 5 Feb 2019 06:24:31 +0000 (07:24 +0100)]
Transifex autosync

3 years agoDon't call these 2 LOG_FATALF directly from 2 macros that are called literally thousa...
terencehill [Mon, 4 Feb 2019 22:06:41 +0000 (23:06 +0100)]
Don't call these 2 LOG_FATALF directly from 2 macros that are called literally thousands times in order to reduce compilation output and globals (strings containing filename and line number)

Some stats:
server.qc 710KB smaller
client.qc 780KB smaller

progs.dat 340KB smaller
csprogs.dat 330KB smaller

server globals reduced by 2818 globals

3 years agoShorten a few names
terencehill [Mon, 4 Feb 2019 17:13:44 +0000 (18:13 +0100)]
Shorten a few names

3 years agoFix an harmless typo, improve Take/GiveResource hooks comments
terencehill [Mon, 4 Feb 2019 17:10:25 +0000 (18:10 +0100)]
Fix an harmless typo, improve Take/GiveResource hooks comments

3 years agoGetResourceAmount --> GetResource, SetResourceAmount --> SetResource
terencehill [Sun, 3 Feb 2019 22:20:10 +0000 (23:20 +0100)]
GetResourceAmount --> GetResource, SetResourceAmount --> SetResource

3 years agoReduce name space of resource constants and variables (RESOURCE_* --> RES_*, resour...
terencehill [Sun, 3 Feb 2019 18:09:37 +0000 (19:09 +0100)]
Reduce name space of resource constants and variables (RESOURCE_*  -->  RES_*, resource_*  -->  res_*)

3 years agoMerge branch 'Mario/setresourceamount' into 'master'
terencehill [Sun, 3 Feb 2019 16:33:28 +0000 (16:33 +0000)]
Merge branch 'Mario/setresourceamount' into 'master'

Merge branch Mario/setresourceamount (S merge request)

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

3 years agoPurge SetResourceAmountExplicit 636/head
Mario [Sun, 3 Feb 2019 01:14:25 +0000 (11:14 +1000)]
Purge SetResourceAmountExplicit

3 years agoFix parenthesis position to make work previous commit...
terencehill [Sat, 2 Feb 2019 21:54:20 +0000 (22:54 +0100)]
Fix parenthesis position to make work previous commit...

3 years agoSave some bandwidth by sending statusbar value to waypoints only when there is a...
terencehill [Sat, 2 Feb 2019 18:20:00 +0000 (19:20 +0100)]
Save some bandwidth by sending statusbar value to waypoints only when there is a difference of at least 1/40th of the statusbar

3 years agoReplace a few '1 0 0' * vec with vec.x (it optimizes only compile time since gmqcc...
terencehill [Sat, 2 Feb 2019 17:52:48 +0000 (18:52 +0100)]
Replace a few '1 0 0' * vec with vec.x (it optimizes only compile time since gmqcc is able to optimize them)

3 years agoSome minor optimizations
terencehill [Fri, 1 Feb 2019 23:00:56 +0000 (00:00 +0100)]
Some minor optimizations

3 years agoRemove redundant brackets from MACRO_BEGIN / MACRO_END calls
terencehill [Fri, 1 Feb 2019 22:35:59 +0000 (23:35 +0100)]
Remove redundant brackets from MACRO_BEGIN / MACRO_END calls

3 years agoReveal macro continuation character in some macros
terencehill [Fri, 1 Feb 2019 15:40:12 +0000 (16:40 +0100)]
Reveal macro continuation character in some macros

3 years agoReduce a bit expanded code of some often used macros
terencehill [Fri, 1 Feb 2019 15:26:21 +0000 (16:26 +0100)]
Reduce a bit expanded code of some often used macros

3 years agoUse consistent variable names
terencehill [Thu, 31 Jan 2019 15:07:30 +0000 (16:07 +0100)]
Use consistent variable names

3 years agoRemove a repeated useless check
terencehill [Thu, 31 Jan 2019 15:05:49 +0000 (16:05 +0100)]
Remove a repeated useless check

3 years agoentcs: fix networking of wrong entcs fields (nevertheless miraculously it was working...
terencehill [Thu, 31 Jan 2019 13:50:35 +0000 (14:50 +0100)]
entcs: fix networking of wrong entcs fields (nevertheless miraculously it was working well enough). It should save a bit more bandwidth

3 years agoFix typo
terencehill [Thu, 31 Jan 2019 13:04:20 +0000 (14:04 +0100)]
Fix typo

3 years agoTransifex autosync
Rudolf Polzer [Thu, 31 Jan 2019 06:24:36 +0000 (07:24 +0100)]
Transifex autosync

3 years agoentcs: save some bandwidth by scaling angles.y even more
terencehill [Wed, 30 Jan 2019 17:32:21 +0000 (18:32 +0100)]
entcs: save some bandwidth by scaling angles.y even more

3 years agoFix wrong (outdated) health/armor values displayed above players when game (re)starts...
terencehill [Wed, 30 Jan 2019 14:41:18 +0000 (15:41 +0100)]
Fix wrong (outdated) health/armor values displayed above players when game (re)starts after a countdown

Fixed by assigning values to entcs_sender entity fields when there are really sent, not when they are scheduled to be sent since there is a filter in between that can forbid sending them (private updates) leading to mismatching field values between entcs_sender and entcs_receiver entities

3 years agoTransifex autosync
Rudolf Polzer [Wed, 30 Jan 2019 06:24:35 +0000 (07:24 +0100)]
Transifex autosync

3 years agoLabel some field pointers with the const attribute
terencehill [Tue, 29 Jan 2019 21:12:20 +0000 (22:12 +0100)]
Label some field pointers with the const attribute

3 years agoTransifex autosync
Rudolf Polzer [Tue, 29 Jan 2019 06:24:27 +0000 (07:24 +0100)]
Transifex autosync

3 years agoFix indentation of all the if if else I could find out and add explicit brackets...
terencehill [Mon, 28 Jan 2019 17:48:32 +0000 (18:48 +0100)]
Fix indentation of all the if if else I could find out and add explicit brackets for clarity sake

3 years agoRemove 2 unnecessary macros
terencehill [Mon, 28 Jan 2019 17:38:39 +0000 (18:38 +0100)]
Remove 2 unnecessary macros

3 years agoAdd some missing brackets, fixes issues with settemp in mapinfo
Mario [Mon, 28 Jan 2019 13:25:56 +0000 (23:25 +1000)]
Add some missing brackets, fixes issues with settemp in mapinfo

3 years agoMerge branch 'terencehill/statusbar_highlight' into 'master'
Mario [Mon, 28 Jan 2019 10:15:50 +0000 (10:15 +0000)]
Merge branch 'terencehill/statusbar_highlight' into 'master'

Highlight values from 0 to 100 of health and armor in the status bar above player's head

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

3 years agoMerge branch 'martin-t/teamsay' into 'master'
Mario [Mon, 28 Jan 2019 09:59:05 +0000 (09:59 +0000)]
Merge branch 'martin-t/teamsay' into 'master'

Allow teamchat during intermission

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

3 years agoTransifex autosync
Rudolf Polzer [Mon, 28 Jan 2019 06:24:19 +0000 (07:24 +0100)]
Transifex autosync

3 years agoTransifex autosync
Rudolf Polzer [Sun, 27 Jan 2019 06:25:38 +0000 (07:25 +0100)]
Transifex autosync

3 years agoAdd minplayers_per_team cvar: fill server with bots to reach this number of players...
terencehill [Sat, 26 Jan 2019 15:06:37 +0000 (16:06 +0100)]
Add minplayers_per_team cvar: fill server with bots to reach this number of players per team (if bot_number is not enough); it implements #2064

3 years agoHighlight values from 0 to 100 of health and armor in the status bar above player... 633/head
terencehill [Fri, 25 Jan 2019 18:09:44 +0000 (19:09 +0100)]
Highlight values from 0 to 100 of health and armor in the status bar above player's head

3 years agoMerge branch 'martin-t/bits' into 'master'
terencehill [Fri, 25 Jan 2019 17:32:55 +0000 (17:32 +0000)]
Merge branch 'martin-t/bits' into 'master'

Warn about bit ops

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

3 years agoallow teamchat during intermission 632/head
Martin Taibr [Fri, 25 Jan 2019 01:20:11 +0000 (02:20 +0100)]
allow teamchat during intermission

3 years agoentcs: improve terminology
terencehill [Thu, 24 Jan 2019 17:10:36 +0000 (18:10 +0100)]
entcs: improve terminology

3 years agoPrint to chat the LMS forfeit message too since in LMS it replaces the "player is...
terencehill [Thu, 24 Jan 2019 16:36:41 +0000 (17:36 +0100)]
Print to chat the LMS forfeit message too since in LMS it replaces the "player is now spectating" message

3 years agoFix "player is now spectating" message being displayed when switching from spectator...
terencehill [Thu, 24 Jan 2019 16:25:00 +0000 (17:25 +0100)]
Fix "player is now spectating" message being displayed when switching from spectator to observer

3 years agoSend angles.y value to entcs entities only when the coded value is different
terencehill [Wed, 23 Jan 2019 23:55:17 +0000 (00:55 +0100)]
Send angles.y value to entcs entities only when the coded value is different

3 years agoSend health / armor values to entcs entities only when the coded values are different...
terencehill [Wed, 23 Jan 2019 20:41:00 +0000 (21:41 +0100)]
Send health / armor values to entcs entities only when the coded values are different. It save some bandwidth especially when health / armor is rotting / regenerating

3 years agoFix #2050 "Corpse plays animations after death"
terencehill [Wed, 23 Jan 2019 10:35:50 +0000 (11:35 +0100)]
Fix #2050 "Corpse plays animations after death"

3 years agoBe a bit more explicit with checks for isplayermodel now that it can be valid checkin...
Mario [Wed, 23 Jan 2019 09:19:55 +0000 (19:19 +1000)]
Be a bit more explicit with checks for isplayermodel now that it can be valid checking against clients (possibly needs renaming!)

3 years agoMerge branch 'martin-t/warns' into 'master'
Mario [Wed, 23 Jan 2019 08:57:25 +0000 (08:57 +0000)]
Merge branch 'martin-t/warns' into 'master'

Only show warnings for current map in GAMEQC

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

3 years agoCA: fix 'spectate previous player' action not working when all members of your team...
terencehill [Tue, 22 Jan 2019 13:55:37 +0000 (14:55 +0100)]
CA: fix 'spectate previous player' action not working when all members of your team are dead in games with 3 or more teams (and 'spectate next player' action not cycling through the players); it fixes #2062 (together with the previous commit)

3 years agoCA: fix 'spectate previous player' action not working in real spectator mode; it...
terencehill [Tue, 22 Jan 2019 13:41:42 +0000 (14:41 +0100)]
CA: fix 'spectate previous player' action not working in real spectator mode; it fixes half of #2062

3 years agoPressed keys panel: separate a little bit crouch and jump keys from arrow keys
terencehill [Mon, 21 Jan 2019 17:45:46 +0000 (18:45 +0100)]
Pressed keys panel: separate a little bit crouch and jump keys from arrow keys

3 years agoFix #2081 "FT: Player numbers are tiny when reaching double digits"
terencehill [Mon, 21 Jan 2019 14:47:03 +0000 (15:47 +0100)]
Fix #2081 "FT: Player numbers are tiny when reaching double digits"

3 years agoFx #2142 "hud_panel_pressedkeys_attack 1 shows primary and secondary the same way"
terencehill [Mon, 21 Jan 2019 13:47:59 +0000 (14:47 +0100)]
Fx #2142 "hud_panel_pressedkeys_attack 1 shows primary and secondary the same way"

3 years agoUse a simpler check here
terencehill [Sun, 20 Jan 2019 17:55:32 +0000 (18:55 +0100)]
Use a simpler check here

3 years agoScoreboard: make header descriptions more consistent
terencehill [Sun, 20 Jan 2019 17:26:05 +0000 (18:26 +0100)]
Scoreboard: make header descriptions more consistent

3 years agoScoreboard: add missing translatable column headers and missing headers descriptions...
terencehill [Sun, 20 Jan 2019 17:11:19 +0000 (18:11 +0100)]
Scoreboard: add missing translatable column headers and missing headers descriptions in the help message (scoreboard_columns_help); it fixes #2194 "Mismatch between Cmd_Scoreboard_Help and TranslateScoresLabel"

3 years agoDisplay 'Player is now playing' in chat box too like 'Player is now playing on the...
terencehill [Sat, 19 Jan 2019 22:51:35 +0000 (23:51 +0100)]
Display 'Player is now playing' in chat box too like 'Player is now playing on the X team' (consistently with 'Player is now spectating' too)

3 years agoFix half part of #2191: 'Player is now spectating' isn't shown in teamless games...
terencehill [Sat, 19 Jan 2019 22:45:12 +0000 (23:45 +0100)]
Fix half part of #2191: 'Player is now spectating' isn't shown in teamless games (bug introduced by the commit 2f163ba8)

3 years agoImprove reply of the command 'records' when there are no records
terencehill [Thu, 17 Jan 2019 18:12:19 +0000 (19:12 +0100)]
Improve reply of the command 'records' when there are no records

3 years agoOptimize hud code displaying race/cts records/rankings
terencehill [Thu, 17 Jan 2019 18:10:02 +0000 (19:10 +0100)]
Optimize hud code displaying race/cts records/rankings

3 years agoTransifex autosync
Rudolf Polzer [Tue, 15 Jan 2019 06:24:25 +0000 (07:24 +0100)]
Transifex autosync

3 years agowarn about bit ops 630/head
Martin Taibr [Tue, 15 Jan 2019 01:56:03 +0000 (02:56 +0100)]
warn about bit ops

3 years agoMerge branch 'Mario/fix_me' into 'master'
terencehill [Mon, 14 Jan 2019 15:27:54 +0000 (15:27 +0000)]
Merge branch 'Mario/fix_me' into 'master'

Merge branch Mario/fix_me (XS merge request)

Closes #2120

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

3 years agoAlways use white text when there's /me in a chat line; it fixes "if your name has...
terencehill [Mon, 14 Jan 2019 14:14:38 +0000 (15:14 +0100)]
Always use white text when there's /me in a chat line; it fixes "if your name has no colors and you say test /me test, then the first test is white"

3 years agoMerge branch 'master' into Mario/fix_me
terencehill [Mon, 14 Jan 2019 08:50:15 +0000 (09:50 +0100)]
Merge branch 'master' into Mario/fix_me

3 years agoonly show warnings for current map in GAMEQC 628/head
Martin Taibr [Sun, 13 Jan 2019 23:18:15 +0000 (00:18 +0100)]
only show warnings for current map in GAMEQC

3 years agoMap voting: allow to quickly vote a map with a number grater than 10 with the shortcu...
terencehill [Sun, 13 Jan 2019 17:12:32 +0000 (18:12 +0100)]
Map voting: allow to quickly vote a map with a number grater than 10 with the shortcut ctrl + (X, Y): hold ctrl and press 2 numbers to compose the map number, e.g. hold ctrl, press 2 then 3 (release ctrl) to vote for the map number 23; it closes #2186

3 years agoWTF
terencehill [Sun, 13 Jan 2019 12:40:06 +0000 (13:40 +0100)]
WTF

3 years agoFix #2189 "Teamchat in CA between rounds is sent to everyone"
terencehill [Sun, 13 Jan 2019 10:34:28 +0000 (11:34 +0100)]
Fix #2189 "Teamchat in CA between rounds is sent to everyone"

3 years agoTransifex autosync
Rudolf Polzer [Sat, 12 Jan 2019 06:24:25 +0000 (07:24 +0100)]
Transifex autosync

3 years agoTransifex autosync
Rudolf Polzer [Thu, 10 Jan 2019 06:24:24 +0000 (07:24 +0100)]
Transifex autosync

3 years agoTransifex autosync
Rudolf Polzer [Sat, 5 Jan 2019 06:24:27 +0000 (07:24 +0100)]
Transifex autosync

3 years agoMerge branch '2183-event-log-chats' into 'master'
Martin Taibr [Fri, 4 Jan 2019 14:33:10 +0000 (14:33 +0000)]
Merge branch '2183-event-log-chats' into 'master'

Add a structured event log message for game chats

Closes #2183

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

3 years agoUse minigame.netname instead of minigame entity id in the event log 626/head
morosophos [Fri, 4 Jan 2019 14:04:50 +0000 (16:04 +0200)]
Use minigame.netname instead of minigame entity id in the event log

3 years agoFigure out how to log minigame chats
morosophos [Fri, 4 Jan 2019 13:47:33 +0000 (15:47 +0200)]
Figure out how to log minigame chats

3 years agoAdd structured event log items about chat messages
morosophos [Thu, 3 Jan 2019 16:48:40 +0000 (18:48 +0200)]
Add structured event log items about chat messages

3 years agoUse integer formatting for :team: msg
morosophos [Thu, 3 Jan 2019 16:38:26 +0000 (18:38 +0200)]
Use integer formatting for :team: msg

3 years agoTransifex autosync
Rudolf Polzer [Tue, 1 Jan 2019 06:24:17 +0000 (07:24 +0100)]
Transifex autosync

3 years agoTransifex autosync
Rudolf Polzer [Sun, 30 Dec 2018 06:25:39 +0000 (07:25 +0100)]
Transifex autosync