]>
git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
terencehill [Sun, 5 May 2019 11:36:00 +0000 (13:36 +0200)]
Update hash
terencehill [Sun, 5 May 2019 11:14:10 +0000 (13:14 +0200)]
Bot AI: fix vertical jumppad handling causing bots to fall down when trying to use a jumppad on Dance
terencehill [Sun, 5 May 2019 11:10:36 +0000 (13:10 +0200)]
Get rid of 2 fields
Rudolf Polzer [Wed, 1 May 2019 05:24:37 +0000 (07:24 +0200)]
Transifex autosync
Rudolf Polzer [Tue, 30 Apr 2019 05:24:33 +0000 (07:24 +0200)]
Transifex autosync
Rudolf Polzer [Mon, 29 Apr 2019 05:24:36 +0000 (07:24 +0200)]
Transifex autosync
Rudolf Polzer [Sun, 28 Apr 2019 05:25:46 +0000 (07:25 +0200)]
Transifex autosync
Mario [Sat, 27 Apr 2019 11:26:46 +0000 (21:26 +1000)]
Make sure names aren't truncated to 0 length on old servers and increase the soft limit of name lengths to 64 (not including colour codes)
terencehill [Fri, 26 Apr 2019 19:06:30 +0000 (21:06 +0200)]
Make use of an existent translatable string to compose "^1Intermediate 1 (+15.42)"
terencehill [Fri, 26 Apr 2019 18:30:34 +0000 (20:30 +0200)]
Deduplicate PENALTY message by stripping color codes
terencehill [Fri, 26 Apr 2019 18:18:56 +0000 (20:18 +0200)]
Make "missing a checkpoint" translatable
terencehill [Fri, 26 Apr 2019 17:24:19 +0000 (19:24 +0200)]
Avoid code duplication in some Race code
terencehill [Fri, 26 Apr 2019 16:01:39 +0000 (18:01 +0200)]
Make translatable various centerprint example messages
terencehill [Fri, 26 Apr 2019 15:39:48 +0000 (17:39 +0200)]
Update hash
terencehill [Wed, 24 Apr 2019 22:09:11 +0000 (00:09 +0200)]
Avoid changing solidity state of entcs_sender entities too; it fixes #2225
terencehill [Tue, 23 Apr 2019 18:40:07 +0000 (20:40 +0200)]
Make translatable minigame names
terencehill [Tue, 23 Apr 2019 18:18:29 +0000 (20:18 +0200)]
Make translatable some remaining minigame messages and 2 radar messages
terencehill [Tue, 23 Apr 2019 15:28:33 +0000 (17:28 +0200)]
Specify command bound to default key in some messages (helpful in case player has changed it)
terencehill [Tue, 23 Apr 2019 15:19:03 +0000 (17:19 +0200)]
Simplify a message
terencehill [Tue, 23 Apr 2019 15:18:00 +0000 (17:18 +0200)]
Allow translating gender of player models
Remove wrong attempt to load a translated txt file associated with the player model (it never worked because the input string of language_filename is a pattern (models/player/*_*.txt), not a specific file name)
terencehill [Tue, 23 Apr 2019 14:52:26 +0000 (14:52 +0000)]
Merge branch 'terencehill/translated_keys' into 'master'
Translatable key names
Closes #1867
See merge request xonotic/xonotic-data.pk3dir!584
terencehill [Tue, 23 Apr 2019 13:14:52 +0000 (15:14 +0200)]
When dead forcedly show scoreboard only if not actively playing a minigame
terencehill [Tue, 23 Apr 2019 13:08:16 +0000 (15:08 +0200)]
Fix map timer not being displayed if scoreboard is enabled during map vote; don't allow minigames during map vote
terencehill [Tue, 23 Apr 2019 09:29:49 +0000 (11:29 +0200)]
Remove an useless setting
terencehill [Mon, 22 Apr 2019 20:57:41 +0000 (22:57 +0200)]
Add some safety checks
terencehill [Mon, 22 Apr 2019 20:55:26 +0000 (22:55 +0200)]
Remove some wasted globals
terencehill [Mon, 22 Apr 2019 08:27:18 +0000 (10:27 +0200)]
Make translatable "<KEY NOT FOUND>" and "<UNKNOWN KEYNUM>"
terencehill [Mon, 22 Apr 2019 07:58:52 +0000 (09:58 +0200)]
Replace "F1", "F2", etc... with "F%d"
terencehill [Mon, 22 Apr 2019 07:32:22 +0000 (09:32 +0200)]
Make translatable a few more keys
terencehill [Sun, 21 Apr 2019 16:02:18 +0000 (18:02 +0200)]
Make "SHIFT+ESC" translatable
Rudolf Polzer [Mon, 22 Apr 2019 05:24:32 +0000 (07:24 +0200)]
Transifex autosync
terencehill [Sun, 21 Apr 2019 18:07:19 +0000 (20:07 +0200)]
Replace utf8 character with its literal version in code
terencehill [Sun, 21 Apr 2019 18:00:13 +0000 (20:00 +0200)]
Don't count spectators in the team size total
terencehill [Sun, 21 Apr 2019 17:20:46 +0000 (17:20 +0000)]
Merge branch 'BuddyFriendGuy/reorganize_scoreboard' into 'master'
emphasize important game info in scoreboard
See merge request xonotic/xonotic-data.pk3dir!625
BuddyFriendGuy [Sun, 21 Apr 2019 17:20:46 +0000 (17:20 +0000)]
emphasize important game info in scoreboard
add self indicator
add cvar to choose where/whether to show team size
have server info show map name
terencehill [Sun, 21 Apr 2019 15:44:04 +0000 (17:44 +0200)]
Merge branch 'master' into terencehill/translated_keys
terencehill [Sun, 21 Apr 2019 13:29:06 +0000 (15:29 +0200)]
Improve key binder code a little bit
terencehill [Sun, 21 Apr 2019 13:07:32 +0000 (15:07 +0200)]
Display the hardcoded shortcut to open the console in the key binder
Rudolf Polzer [Sat, 20 Apr 2019 05:24:30 +0000 (07:24 +0200)]
Transifex autosync
Mario [Thu, 18 Apr 2019 09:16:54 +0000 (09:16 +0000)]
Merge branch 'terencehill/dumpturrets' into 'master'
Terencehill/dumpturrets
Closes #2199
See merge request xonotic/xonotic-data.pk3dir!645
terencehill [Tue, 16 Apr 2019 18:41:36 +0000 (20:41 +0200)]
Remove direct reference to a team number
terencehill [Tue, 16 Apr 2019 18:11:33 +0000 (20:11 +0200)]
Respawn turrets when match restarts in game types different from Assault too
terencehill [Tue, 16 Apr 2019 18:03:14 +0000 (20:03 +0200)]
Adjust a debug message and a comment
Rudolf Polzer [Mon, 15 Apr 2019 05:24:34 +0000 (07:24 +0200)]
Transifex autosync
terencehill [Sun, 14 Apr 2019 15:43:39 +0000 (17:43 +0200)]
Merge branch 'terencehill/ForbidWeaponUse'
Fix #2201 "ForbidWeaponUse mutator hook can leave the player holding a weapon they no longer possess". ForbidWeaponUse now forbids weapon use but allows switching to another weapon, while the new mutator hook LockWeapon applies both restrictions
Closes #2201
See merge request xonotic/xonotic-data.pk3dir!644
terencehill [Sun, 14 Apr 2019 12:54:44 +0000 (14:54 +0200)]
Set the correct classname for every turret, e.g. "turret_plasma"
terencehill [Sun, 14 Apr 2019 12:48:50 +0000 (14:48 +0200)]
Don't apply any time limit to superweapons if enabled in weapon arena mode
Rudolf Polzer [Sun, 14 Apr 2019 05:25:47 +0000 (07:25 +0200)]
Transifex autosync
terencehill [Sat, 13 Apr 2019 15:27:44 +0000 (17:27 +0200)]
Turrets: read cvars and define associated fields using TR_PROPS_COMMON
terencehill [Fri, 12 Apr 2019 21:10:40 +0000 (23:10 +0200)]
Read g_turrets_unit_*_target_select_missilebias too
terencehill [Fri, 12 Apr 2019 20:15:17 +0000 (22:15 +0200)]
Remove unused turret cvars g_turrets_unit_*_ammo (initial ammo is loaded from g_turrets_unit_*_ammo_max)
terencehill [Fri, 12 Apr 2019 18:00:42 +0000 (20:00 +0200)]
Add a macro to dump common turret settings
terencehill [Thu, 11 Apr 2019 21:28:30 +0000 (23:28 +0200)]
Reduce config_queue size, it was quite wasted given that the weapon with most settings has 58 settings
terencehill [Thu, 11 Apr 2019 20:23:11 +0000 (22:23 +0200)]
Fix array indices out of bounds; abort dump if a weapon / turret has more than MAX_CONFIG_SETTINGS settings
terencehill [Thu, 11 Apr 2019 15:24:11 +0000 (17:24 +0200)]
Compact 2 macros
terencehill [Thu, 11 Apr 2019 15:10:22 +0000 (17:10 +0200)]
Fix #2199 "sv_cmd dumpturrets doesn't work". The new implementation is similar to the dumpweapons one
Mario [Wed, 10 Apr 2019 23:48:56 +0000 (09:48 +1000)]
Fix compile with TURRET_DEBUG
terencehill [Wed, 10 Apr 2019 14:54:55 +0000 (16:54 +0200)]
Fix #2201 "ForbidWeaponUse mutator hook can leave the player holding a weapon they no longer possess". ForbidWeaponUse now forbids weapon use but allows switching to another weapon, while the new mutator hook LockWeapon applies both restrictions
terencehill [Tue, 9 Apr 2019 17:27:20 +0000 (17:27 +0000)]
Merge branch 'byteManiak/bindingsReset' into 'master'
Fix #2203: "Settings->Input->Reset all should ask for confirmation"
Closes #2203
See merge request xonotic/xonotic-data.pk3dir!643
byteManiak [Tue, 9 Apr 2019 14:25:33 +0000 (17:25 +0300)]
Fixed compilation units.
Martin Taibr [Tue, 9 Apr 2019 09:06:39 +0000 (11:06 +0200)]
vscode gitignore
terencehill [Mon, 8 Apr 2019 01:01:15 +0000 (03:01 +0200)]
Warn if there are too many parameters for a bot in bots.txt
terencehill [Sun, 7 Apr 2019 23:46:10 +0000 (01:46 +0200)]
Apply forced team to bots only in team games
terencehill [Sun, 7 Apr 2019 17:16:25 +0000 (19:16 +0200)]
Reduce player names longer than 30 chars (name_maxlength cvar)
terencehill [Sun, 7 Apr 2019 17:07:47 +0000 (19:07 +0200)]
Update a link, mark eraseable some debug functions
terencehill [Sat, 6 Apr 2019 18:13:54 +0000 (20:13 +0200)]
Fix #254 "Latest Autobuild has weird stuttering when jumping and moving"
terencehill [Fri, 5 Apr 2019 17:28:40 +0000 (19:28 +0200)]
Update hash
terencehill [Fri, 5 Apr 2019 17:18:20 +0000 (19:18 +0200)]
Merge branch 'terencehill/name_tag_fix'
Fix #2195: "Clan Arena: own name tag displayed over teammate's head when a round ends"
See merge request !629
terencehill [Fri, 5 Apr 2019 17:02:33 +0000 (19:02 +0200)]
Fix #2195: "Clan Arena: own name tag displayed over teammate's head when a round ends"
terencehill [Sun, 31 Mar 2019 11:53:54 +0000 (13:53 +0200)]
Small optimization
terencehill [Sun, 31 Mar 2019 11:53:06 +0000 (13:53 +0200)]
Disable scrolling of tabs in menu:Settings/Game (currently inactive because all settings are visible) as it's broken despite all the efforts to make it work (see https://gitlab.com/xonotic/xonotic-data.pk3dir/merge_requests/548 ). It will probably require a different implementation since XonoticScrollPanel should be an instance of Container, not ListBox
Mario [Sun, 31 Mar 2019 11:21:34 +0000 (21:21 +1000)]
Temporary workaround for assault and race spawnpoints
byteManiak [Sat, 30 Mar 2019 14:30:41 +0000 (14:30 +0000)]
Removed useless #include.
byteManiak [Sat, 30 Mar 2019 12:36:41 +0000 (12:36 +0000)]
Hopefully this fixes test_compilation_units error.
byteManiak [Sat, 30 Mar 2019 12:12:32 +0000 (12:12 +0000)]
Keep spelling consistent.
byteManiak [Sat, 30 Mar 2019 00:22:52 +0000 (00:22 +0000)]
Added dialog for keybindings reset.
terencehill [Fri, 29 Mar 2019 23:12:56 +0000 (23:12 +0000)]
Merge branch 'byteManiak/misc' into 'master'
Merge FRAGS_LMS_LOSER and FRAGS_PLAYER_NONSOLID into a single constant called FRAGS_PLAYER_OUT_OF_GAME.
See merge request xonotic/xonotic-data.pk3dir!642
byteManiak [Fri, 29 Mar 2019 23:12:56 +0000 (23:12 +0000)]
LMS loser / CTS nonsolid frags merging
terencehill [Fri, 29 Mar 2019 16:31:27 +0000 (17:31 +0100)]
Fix #2209 "Jetpack sound continues forever after death by trigger"
Rudolf Polzer [Tue, 26 Mar 2019 06:24:26 +0000 (07:24 +0100)]
Transifex autosync
terencehill [Wed, 20 Mar 2019 19:16:50 +0000 (20:16 +0100)]
Remove useless scoreboard_showaccuracy global
terencehill [Wed, 20 Mar 2019 19:10:09 +0000 (20:10 +0100)]
Remove a useless sprintf and a space
terencehill [Wed, 20 Mar 2019 18:50:45 +0000 (19:50 +0100)]
Fix #2208 "Using custom bot teams completely breaks team games"
terencehill [Wed, 20 Mar 2019 18:35:59 +0000 (19:35 +0100)]
Simplify bot_forced_team checks, set bot_forced_team to 0 if it isn't valid
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