xonotic/xonotic-data.pk3dir.git
2 years agoMerge branch 'master' into Mario/qc_camstuff
Mario [Sat, 16 Mar 2019 10:03:49 +0000 (20:03 +1000)]
Merge branch 'master' into Mario/qc_camstuff

2 years agoTransifex autosync
Rudolf Polzer [Wed, 13 Mar 2019 06:24:31 +0000 (07:24 +0100)]
Transifex autosync

2 years agoRestore old code in the hope it fixes #2205 for real. This commit together with the...
terencehill [Sun, 10 Mar 2019 13:01:17 +0000 (14:01 +0100)]
Restore old code in the hope it fixes #2205 for real. This commit together with the previous one fully reverts 5e4b14b3 "Fix wrong (outdated) health/armor values displayed above players when game (re)starts after a countdown"

2 years agoTransifex autosync
Rudolf Polzer [Sun, 10 Mar 2019 06:25:34 +0000 (07:25 +0100)]
Transifex autosync

2 years agoRestore initial _entcs_send calls with MSG_ONE as they are needed, but call them...
terencehill [Sat, 9 Mar 2019 18:57:26 +0000 (19:57 +0100)]
Restore initial _entcs_send calls with MSG_ONE as they are needed, but call them a bit later to hopefully avoid the old bug with bots permanently in the spectators list; it should fix #2205 and similar bugs

2 years agoRename a variable
terencehill [Sat, 9 Mar 2019 18:44:03 +0000 (19:44 +0100)]
Rename a variable

2 years agoSet the flag's movetype to MOVETYPE_NONE when respawning it (matches initial spawning...
Mario [Sat, 9 Mar 2019 08:34:34 +0000 (18:34 +1000)]
Set the flag's movetype to MOVETYPE_NONE when respawning it (matches initial spawning code, fixes maps where the flags are above teleporters but not set to be floating)

2 years agoTransifex autosync
Rudolf Polzer [Sat, 9 Mar 2019 06:24:27 +0000 (07:24 +0100)]
Transifex autosync

2 years agoUpdate hash
terencehill [Fri, 8 Mar 2019 20:35:38 +0000 (21:35 +0100)]
Update hash

2 years agoMerge branch 'terencehill/bot_ai'
terencehill [Fri, 8 Mar 2019 16:55:20 +0000 (17:55 +0100)]
Merge branch 'terencehill/bot_ai'

2 years agoTransifex autosync
Rudolf Polzer [Fri, 8 Mar 2019 06:24:32 +0000 (07:24 +0100)]
Transifex autosync

2 years agoDisable fire tolerance since bots tend to shoot way less then before when enemy is...
terencehill [Wed, 6 Mar 2019 14:44:27 +0000 (15:44 +0100)]
Disable fire tolerance since bots tend to shoot way less then before when enemy is close to them even with low range weapons that don't need extreme accuracy

This commit actually reverts c82f443c "Bot AI: fix bots starting to fire when they aren't aiming at the enemy yet"

2 years agoMerge branch 'master' into terencehill/bot_ai
terencehill [Sun, 3 Mar 2019 11:15:00 +0000 (12:15 +0100)]
Merge branch 'master' into terencehill/bot_ai

2 years agoTransifex autosync
Rudolf Polzer [Wed, 27 Feb 2019 06:24:28 +0000 (07:24 +0100)]
Transifex autosync

2 years agoTransifex autosync
Rudolf Polzer [Sun, 24 Feb 2019 06:25:33 +0000 (07:25 +0100)]
Transifex autosync

2 years agoTransifex autosync
Rudolf Polzer [Sat, 23 Feb 2019 06:24:29 +0000 (07:24 +0100)]
Transifex autosync

2 years agoRefactor Item_GiveAmmoTo a little bit to reduce duplicated code
terencehill [Fri, 22 Feb 2019 18:13:05 +0000 (19:13 +0100)]
Refactor Item_GiveAmmoTo a little bit to reduce duplicated code

2 years agoGet rid of 2 functions
terencehill [Fri, 22 Feb 2019 17:58:22 +0000 (18:58 +0100)]
Get rid of 2 functions

2 years agoAdd parentheses to fix a compile error
terencehill [Fri, 22 Feb 2019 17:54:37 +0000 (18:54 +0100)]
Add parentheses to fix a compile error

2 years agoImprove SetResource description. Convert some floats to bools
terencehill [Thu, 21 Feb 2019 18:16:11 +0000 (19:16 +0100)]
Improve SetResource description. Convert some floats to bools

2 years agoDon't even try to count damage as score if it's null
terencehill [Thu, 21 Feb 2019 17:30:15 +0000 (18:30 +0100)]
Don't even try to count damage as score if it's null

2 years agofix cvar description
Martin Taibr [Wed, 20 Feb 2019 12:58:51 +0000 (13:58 +0100)]
fix cvar description

2 years agoShow no damage effect if damage is null (frozen player case)
terencehill [Tue, 19 Feb 2019 00:06:11 +0000 (01:06 +0100)]
Show no damage effect if damage is null (frozen player case)

2 years agoAdd brackets to GAMETYPE macros
terencehill [Mon, 18 Feb 2019 23:51:00 +0000 (00:51 +0100)]
Add brackets to GAMETYPE macros

2 years agoTransifex autosync
Rudolf Polzer [Mon, 18 Feb 2019 06:24:30 +0000 (07:24 +0100)]
Transifex autosync

2 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

2 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

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

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

2 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'

2 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

2 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

2 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

2 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

2 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

2 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)

2 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

2 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

2 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

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

2 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

2 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)

2 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

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

2 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

2 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)

2 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!)

2 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)

2 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

2 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)

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

2 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

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

2 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

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

2 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_*)

2 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

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

2 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...

2 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

2 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)

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

2 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

2 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

2 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

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

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

2 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

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

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

2 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

2 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

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

2 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

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

2 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

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

2 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

2 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

2 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

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

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

2 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

2 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

2 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

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

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

2 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

2 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

2 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

2 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

2 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"

2 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!)

2 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

2 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)

2 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

2 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

2 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"

2 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"

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