]>
git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
Mario [Sun, 17 Mar 2019 09:54:59 +0000 (19:54 +1000)]
Merge branch 'master' into Mario/monsters
# Conflicts:
# qcsrc/client/csqcmodel_hooks.qc
# qcsrc/common/gamemodes/gamemode/invasion/sv_invasion.qc
# qcsrc/common/monsters/monster/mage.qc
# qcsrc/common/monsters/monster/shambler.qc
# qcsrc/common/monsters/sv_monsters.qc
Mario [Sun, 17 Mar 2019 08:02:15 +0000 (08:02 +0000)]
Merge branch 'mirceakitsune/fix_damageeffects' into 'master'
Get damage effects working again
Closes #2022
See merge request xonotic/xonotic-data.pk3dir!640
Mario [Sun, 17 Mar 2019 07:52:39 +0000 (07:52 +0000)]
Merge branch 'mirceakitsune/button14' into 'master'
Replace button14 with button12 for minigame state
See merge request xonotic/xonotic-data.pk3dir!639
Mario [Sun, 17 Mar 2019 07:41:27 +0000 (17:41 +1000)]
Whitelist max_health (used by trigger_heal)
Rudolf Polzer [Wed, 13 Mar 2019 06:24:31 +0000 (07:24 +0100)]
Transifex autosync
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"
Rudolf Polzer [Sun, 10 Mar 2019 06:25:34 +0000 (07:25 +0100)]
Transifex autosync
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
terencehill [Sat, 9 Mar 2019 18:44:03 +0000 (19:44 +0100)]
Rename a variable
Mircea Kitsune [Sat, 9 Mar 2019 12:50:23 +0000 (14:50 +0200)]
Use a weapon flag to mark weapons that induce bleeding
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)
Rudolf Polzer [Sat, 9 Mar 2019 06:24:27 +0000 (07:24 +0100)]
Transifex autosync
Mircea Kitsune [Fri, 8 Mar 2019 23:09:44 +0000 (01:09 +0200)]
Get damage effects working again
Mircea Kitsune [Fri, 8 Mar 2019 20:41:17 +0000 (22:41 +0200)]
Replace button14 with button12 for minigame state
terencehill [Fri, 8 Mar 2019 20:35:38 +0000 (21:35 +0100)]
Update hash
terencehill [Fri, 8 Mar 2019 16:55:20 +0000 (17:55 +0100)]
Merge branch 'terencehill/bot_ai'
Rudolf Polzer [Fri, 8 Mar 2019 06:24:32 +0000 (07:24 +0100)]
Transifex autosync
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"
terencehill [Sun, 3 Mar 2019 11:15:00 +0000 (12:15 +0100)]
Merge branch 'master' into terencehill/bot_ai
Rudolf Polzer [Wed, 27 Feb 2019 06:24:28 +0000 (07:24 +0100)]
Transifex autosync
Rudolf Polzer [Sun, 24 Feb 2019 06:25:33 +0000 (07:25 +0100)]
Transifex autosync
Rudolf Polzer [Sat, 23 Feb 2019 06:24:29 +0000 (07:24 +0100)]
Transifex autosync
terencehill [Fri, 22 Feb 2019 18:13:05 +0000 (19:13 +0100)]
Refactor Item_GiveAmmoTo a little bit to reduce duplicated code
terencehill [Fri, 22 Feb 2019 17:58:22 +0000 (18:58 +0100)]
Get rid of 2 functions
terencehill [Fri, 22 Feb 2019 17:54:37 +0000 (18:54 +0100)]
Add parentheses to fix a compile error
terencehill [Thu, 21 Feb 2019 18:16:11 +0000 (19:16 +0100)]
Improve SetResource description. Convert some floats to bools
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
Martin Taibr [Wed, 20 Feb 2019 12:58:51 +0000 (13:58 +0100)]
fix cvar description
terencehill [Tue, 19 Feb 2019 00:06:11 +0000 (01:06 +0100)]
Show no damage effect if damage is null (frozen player case)
terencehill [Mon, 18 Feb 2019 23:51:00 +0000 (00:51 +0100)]
Add brackets to GAMETYPE macros
Rudolf Polzer [Mon, 18 Feb 2019 06:24:30 +0000 (07:24 +0100)]
Transifex autosync
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
terencehill [Fri, 15 Feb 2019 17:47:22 +0000 (18:47 +0100)]
When possible use simpler LOG_* macros instead of LOG_*F
terencehill [Fri, 15 Feb 2019 17:40:29 +0000 (18:40 +0100)]
Some minor cleanups and optimizations
terencehill [Tue, 12 Feb 2019 17:34:42 +0000 (18:34 +0100)]
Update notifications.cfg
terencehill [Tue, 12 Feb 2019 17:33:04 +0000 (18:33 +0100)]
Merge branch 'terencehill/more_compilation_optimizations'
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
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
terencehill [Sun, 10 Feb 2019 18:38:57 +0000 (19:38 +0100)]
Concatenate log header strings in code
terencehill [Sun, 10 Feb 2019 17:57:51 +0000 (18:57 +0100)]
Reduce code of FOREACH_CLIENT_RANDOM
terencehill [Sun, 10 Feb 2019 17:53:58 +0000 (18:53 +0100)]
Count notifications in a single FOREACH loop
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)
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
terencehill [Fri, 8 Feb 2019 23:39:07 +0000 (00:39 +0100)]
Use a function to print single effect indexes
terencehill [Fri, 8 Feb 2019 23:30:42 +0000 (00:30 +0100)]
Reduce function calls when writing 2 multi-line messages
terencehill [Fri, 8 Feb 2019 22:16:54 +0000 (23:16 +0100)]
Optimize NOTIF_WRITE_HARDCODED
terencehill [Fri, 8 Feb 2019 19:13:41 +0000 (20:13 +0100)]
Revert
e30214cf "Purge SetResourceAmountExplicit" because it breaks map vote and other things
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)
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
Rudolf Polzer [Thu, 7 Feb 2019 06:24:23 +0000 (07:24 +0100)]
Transifex autosync
terencehill [Wed, 6 Feb 2019 22:13:34 +0000 (23:13 +0100)]
Remove a few useless brackets inside macros
terencehill [Wed, 6 Feb 2019 00:35:42 +0000 (01:35 +0100)]
Mark _checkWhitelisted as eraseable (currently used only by the server)
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!)
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)
terencehill [Tue, 5 Feb 2019 21:43:09 +0000 (22:43 +0100)]
Turn PROCESS_OVERRIDE macro into a function
terencehill [Tue, 5 Feb 2019 21:32:11 +0000 (22:32 +0100)]
Implement MapInfo_Type_FromString in a sane way (without macros)
Rudolf Polzer [Tue, 5 Feb 2019 06:24:31 +0000 (07:24 +0100)]
Transifex autosync
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
terencehill [Mon, 4 Feb 2019 17:13:44 +0000 (18:13 +0100)]
Shorten a few names
terencehill [Mon, 4 Feb 2019 17:10:25 +0000 (18:10 +0100)]
Fix an harmless typo, improve Take/GiveResource hooks comments
terencehill [Sun, 3 Feb 2019 22:20:10 +0000 (23:20 +0100)]
GetResourceAmount --> GetResource, SetResourceAmount --> SetResource
terencehill [Sun, 3 Feb 2019 18:09:37 +0000 (19:09 +0100)]
Reduce name space of resource constants and variables (RESOURCE_* --> RES_*, resource_* --> res_*)
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
Mario [Sun, 3 Feb 2019 01:14:25 +0000 (11:14 +1000)]
Purge SetResourceAmountExplicit
terencehill [Sat, 2 Feb 2019 21:54:20 +0000 (22:54 +0100)]
Fix parenthesis position to make work previous commit...
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
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)
terencehill [Fri, 1 Feb 2019 23:00:56 +0000 (00:00 +0100)]
Some minor optimizations
terencehill [Fri, 1 Feb 2019 22:35:59 +0000 (23:35 +0100)]
Remove redundant brackets from MACRO_BEGIN / MACRO_END calls
terencehill [Fri, 1 Feb 2019 15:40:12 +0000 (16:40 +0100)]
Reveal macro continuation character in some macros
terencehill [Fri, 1 Feb 2019 15:26:21 +0000 (16:26 +0100)]
Reduce a bit expanded code of some often used macros
terencehill [Thu, 31 Jan 2019 15:07:30 +0000 (16:07 +0100)]
Use consistent variable names
terencehill [Thu, 31 Jan 2019 15:05:49 +0000 (16:05 +0100)]
Remove a repeated useless check
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
terencehill [Thu, 31 Jan 2019 13:04:20 +0000 (14:04 +0100)]
Fix typo
Rudolf Polzer [Thu, 31 Jan 2019 06:24:36 +0000 (07:24 +0100)]
Transifex autosync
terencehill [Wed, 30 Jan 2019 17:32:21 +0000 (18:32 +0100)]
entcs: save some bandwidth by scaling angles.y even more
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
Rudolf Polzer [Wed, 30 Jan 2019 06:24:35 +0000 (07:24 +0100)]
Transifex autosync
terencehill [Tue, 29 Jan 2019 21:12:20 +0000 (22:12 +0100)]
Label some field pointers with the const attribute
Rudolf Polzer [Tue, 29 Jan 2019 06:24:27 +0000 (07:24 +0100)]
Transifex autosync
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
terencehill [Mon, 28 Jan 2019 17:38:39 +0000 (18:38 +0100)]
Remove 2 unnecessary macros
Mario [Mon, 28 Jan 2019 13:25:56 +0000 (23:25 +1000)]
Add some missing brackets, fixes issues with settemp in mapinfo
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
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
Rudolf Polzer [Mon, 28 Jan 2019 06:24:19 +0000 (07:24 +0100)]
Transifex autosync
Rudolf Polzer [Sun, 27 Jan 2019 06:25:38 +0000 (07:25 +0100)]
Transifex autosync
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
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
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
Martin Taibr [Fri, 25 Jan 2019 01:20:11 +0000 (02:20 +0100)]
allow teamchat during intermission
terencehill [Thu, 24 Jan 2019 17:10:36 +0000 (18:10 +0100)]
entcs: improve terminology
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
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
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
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
terencehill [Wed, 23 Jan 2019 10:35:50 +0000 (11:35 +0100)]
Fix #2050 "Corpse plays animations after death"
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!)
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