]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
xonotic/xonotic-data.pk3dir.git
5 years agoFix indenting so it's consistent with the rest of the function.
David Knapp [Sat, 27 Jul 2019 19:14:04 +0000 (15:14 -0400)]
Fix indenting so it's consistent with the rest of the function.

5 years agoOnly decrease by what's left in the mag. Also improve commenting.
David Knapp [Sat, 27 Jul 2019 19:10:19 +0000 (15:10 -0400)]
Only decrease by what's left in the mag. Also improve commenting.

5 years agoMinor tweak. Negate value directly instead of multiplying by negative 1.
David Knapp [Sat, 27 Jul 2019 18:04:59 +0000 (14:04 -0400)]
Minor tweak. Negate value directly instead of multiplying by negative 1.

5 years agoReadability improvement in really long 'if' statement.
David Knapp [Mon, 22 Jul 2019 03:33:37 +0000 (23:33 -0400)]
Readability improvement in really long 'if' statement.

5 years agoRemove stray whitespace
David Knapp [Mon, 22 Jul 2019 03:24:16 +0000 (23:24 -0400)]
Remove stray whitespace

5 years agoApply the fraction to an integer and use it for the ammo decrease and
David Knapp [Mon, 22 Jul 2019 03:17:22 +0000 (23:17 -0400)]
Apply the fraction to an integer and use it for the ammo decrease and
firing.

Renamed the fraction appropriately.

Minor formatting improvement.

5 years agoUse min() to keep the fraction <= 1 instead of a separate check.
David Knapp [Sat, 20 Jul 2019 01:59:28 +0000 (21:59 -0400)]
Use min() to keep the fraction <= 1 instead of a separate check.

Added comments and improved indentation.

5 years agoApply some math to only fire the (rounded) fraction of clip_load divided by burst_ammo.
David Knapp [Fri, 19 Jul 2019 23:11:41 +0000 (19:11 -0400)]
Apply some math to only fire the (rounded) fraction of clip_load divided by burst_ammo.

This means if each burst costs 3 rounds, fires 10, and there's only 2 left,
it'll only fire 6 rounds.

5 years agoBlock manual reload if bursting to avoid wasting ammo.
David Knapp [Fri, 5 Jul 2019 03:43:56 +0000 (23:43 -0400)]
Block manual reload if bursting to avoid wasting ammo.

5 years agoFix regression where entire mag would be dumped if reloaded mid-burst.
David Knapp [Thu, 4 Jul 2019 10:44:20 +0000 (06:44 -0400)]
Fix regression where entire mag would be dumped if reloaded mid-burst.

5 years agoCheck misc_bulletcounter == 0 before reloading machine gun to let burst finish
David Knapp [Thu, 4 Jul 2019 08:07:15 +0000 (04:07 -0400)]
Check misc_bulletcounter == 0 before reloading machine gun to let burst finish

5 years agoTransifex autosync
Rudolf Polzer [Wed, 3 Jul 2019 05:24:49 +0000 (07:24 +0200)]
Transifex autosync

5 years agoTransifex autosync
Rudolf Polzer [Sun, 30 Jun 2019 05:25:41 +0000 (07:25 +0200)]
Transifex autosync

5 years agoAdd descriptions to a few of the server cvars
Mario [Fri, 28 Jun 2019 10:01:56 +0000 (20:01 +1000)]
Add descriptions to a few of the server cvars

5 years agoTransifex autosync
Rudolf Polzer [Tue, 25 Jun 2019 05:25:08 +0000 (07:25 +0200)]
Transifex autosync

5 years agoIf no client state is available, default the forced handicap to 1 (initialized value...
Mario [Mon, 24 Jun 2019 06:41:35 +0000 (16:41 +1000)]
If no client state is available, default the forced handicap to 1 (initialized value), fixes invincible clones

5 years agoMerge branch 'martin-t/settings' into 'master'
Mario [Mon, 24 Jun 2019 05:36:33 +0000 (05:36 +0000)]
Merge branch 'martin-t/settings' into 'master'

Clean up damagetext settings

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

5 years agoTransifex autosync
Rudolf Polzer [Mon, 24 Jun 2019 05:24:48 +0000 (07:24 +0200)]
Transifex autosync

5 years agoMerge branch 'Mario/wickedx_fix_v2' into 'master'
Mario [Mon, 24 Jun 2019 05:09:09 +0000 (05:09 +0000)]
Merge branch 'Mario/wickedx_fix_v2' into 'master'

wickedx bg fix

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

5 years agowickedx bg fix
terencehill [Mon, 24 Jun 2019 05:09:09 +0000 (05:09 +0000)]
wickedx bg fix

5 years agoMerge branch 'martin-t/watermark' into 'master'
Mario [Mon, 24 Jun 2019 05:08:17 +0000 (05:08 +0000)]
Merge branch 'martin-t/watermark' into 'master'

Don't draw the watermark

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

5 years agoMerge branch 'sev/icon-teamkill' into 'master'
Mario [Mon, 24 Jun 2019 05:05:27 +0000 (05:05 +0000)]
Merge branch 'sev/icon-teamkill' into 'master'

Change teamkill icon to symbolic shot in the back

Closes #2188

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

5 years agoTransifex autosync
Rudolf Polzer [Sun, 23 Jun 2019 05:25:38 +0000 (07:25 +0200)]
Transifex autosync

5 years agoTransifex autosync
Rudolf Polzer [Fri, 21 Jun 2019 05:24:48 +0000 (07:24 +0200)]
Transifex autosync

5 years agoChange teamkill icon to symbolic shot in the back 655/head
Severin Meyer [Thu, 20 Jun 2019 08:24:38 +0000 (10:24 +0200)]
Change teamkill icon to symbolic shot in the back

5 years agoTransifex autosync
Rudolf Polzer [Thu, 20 Jun 2019 05:24:34 +0000 (07:24 +0200)]
Transifex autosync

5 years agoTransifex autosync
Rudolf Polzer [Wed, 19 Jun 2019 05:24:46 +0000 (07:24 +0200)]
Transifex autosync

5 years agodon't draw the watermark 654/head
Martin Taibr [Tue, 18 Jun 2019 20:39:58 +0000 (22:39 +0200)]
don't draw the watermark

5 years agoTransifex autosync
Rudolf Polzer [Sat, 15 Jun 2019 05:24:38 +0000 (07:24 +0200)]
Transifex autosync

5 years agoTransifex autosync
Rudolf Polzer [Thu, 13 Jun 2019 05:24:51 +0000 (07:24 +0200)]
Transifex autosync

5 years agoTransifex autosync
Rudolf Polzer [Wed, 12 Jun 2019 05:24:45 +0000 (07:24 +0200)]
Transifex autosync

5 years agoAllow vehicles to push footballs
Mario [Tue, 4 Jun 2019 08:04:30 +0000 (18:04 +1000)]
Allow vehicles to push footballs

5 years agoTransifex autosync
Rudolf Polzer [Mon, 3 Jun 2019 05:24:44 +0000 (07:24 +0200)]
Transifex autosync

5 years agoTransifex autosync
Rudolf Polzer [Wed, 29 May 2019 05:24:41 +0000 (07:24 +0200)]
Transifex autosync

5 years agoTransifex autosync
Rudolf Polzer [Fri, 24 May 2019 05:24:45 +0000 (07:24 +0200)]
Transifex autosync

5 years agoTransifex autosync
Rudolf Polzer [Tue, 21 May 2019 05:24:42 +0000 (07:24 +0200)]
Transifex autosync

5 years agoAlso remove inventory stuff from menu code
terencehill [Mon, 20 May 2019 18:03:52 +0000 (20:03 +0200)]
Also remove inventory stuff from menu code

5 years agoRemove some client stuff from menu code
terencehill [Mon, 20 May 2019 17:46:03 +0000 (19:46 +0200)]
Remove some client stuff from menu code

5 years agoAdd a hook to allow mutators to disable the zoom reticle
Mario [Mon, 20 May 2019 08:25:07 +0000 (18:25 +1000)]
Add a hook to allow mutators to disable the zoom reticle

5 years agoTransifex autosync
Rudolf Polzer [Mon, 20 May 2019 05:24:35 +0000 (07:24 +0200)]
Transifex autosync

5 years agoTransifex autosync
Rudolf Polzer [Sun, 19 May 2019 05:25:46 +0000 (07:25 +0200)]
Transifex autosync

5 years agoFix some comments
terencehill [Mon, 13 May 2019 00:41:38 +0000 (02:41 +0200)]
Fix some comments

5 years agoFix weapon glow color when vortex starts charging
terencehill [Sun, 12 May 2019 23:29:21 +0000 (01:29 +0200)]
Fix weapon glow color when vortex starts charging

5 years agoMerge branch 'terencehill/countrylist_removal' into 'master'
Mario [Sun, 12 May 2019 16:02:14 +0000 (16:02 +0000)]
Merge branch 'terencehill/countrylist_removal' into 'master'

Remove fake country list

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

5 years agoActually fix entering vehicles in independent players mode
Mario [Sun, 12 May 2019 15:47:36 +0000 (01:47 +1000)]
Actually fix entering vehicles in independent players mode

5 years agoSmall optimization
terencehill [Sun, 12 May 2019 09:28:38 +0000 (11:28 +0200)]
Small optimization

5 years agoFilter out unused menu code
terencehill [Sun, 12 May 2019 09:22:33 +0000 (11:22 +0200)]
Filter out unused menu code

5 years agoFix some inconsistent indentation
terencehill [Sun, 12 May 2019 01:33:45 +0000 (03:33 +0200)]
Fix some inconsistent indentation

5 years agoMove vehicle check to the checkpoint_passed function (slight cleanup)
Mario [Sat, 11 May 2019 07:30:22 +0000 (17:30 +1000)]
Move vehicle check to the checkpoint_passed function (slight cleanup)

5 years agoSanity (probable fix for maps not showing up when using legacy gametype names)
Mario [Sat, 11 May 2019 07:20:08 +0000 (17:20 +1000)]
Sanity (probable fix for maps not showing up when using legacy gametype names)

5 years agoHopefully fix compilation units 648/head
Mario [Wed, 8 May 2019 17:22:04 +0000 (03:22 +1000)]
Hopefully fix compilation units

5 years agoIf a vehicle is activating a checkpoint, count the owner as passing, fixes race with...
Mario [Wed, 8 May 2019 15:50:37 +0000 (01:50 +1000)]
If a vehicle is activating a checkpoint, count the owner as passing, fixes race with vehicles

5 years agoFix vehicles able to attack before the round begins
Mario [Wed, 8 May 2019 13:52:05 +0000 (23:52 +1000)]
Fix vehicles able to attack before the round begins

5 years agoDon't allow pressing F to enter a vehicle when in independent players mode, fixes...
Mario [Wed, 8 May 2019 13:40:27 +0000 (23:40 +1000)]
Don't allow pressing F to enter a vehicle when in independent players mode, fixes some bugs in CTS

5 years agoAdd a little bit more clarification to the speed buff's cvar descriptions
Mario [Wed, 8 May 2019 13:14:05 +0000 (23:14 +1000)]
Add a little bit more clarification to the speed buff's cvar descriptions

5 years agoBasic support for winning the level in campaigns when activating a target_changelevel
Mario [Tue, 7 May 2019 00:28:05 +0000 (10:28 +1000)]
Basic support for winning the level in campaigns when activating a target_changelevel

5 years agoTransifex autosync
Rudolf Polzer [Mon, 6 May 2019 05:24:43 +0000 (07:24 +0200)]
Transifex autosync

5 years agoUpdate hash
terencehill [Sun, 5 May 2019 11:36:00 +0000 (13:36 +0200)]
Update hash

5 years agoBot AI: fix vertical jumppad handling causing bots to fall down when trying to use...
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

5 years agoGet rid of 2 fields
terencehill [Sun, 5 May 2019 11:10:36 +0000 (13:10 +0200)]
Get rid of 2 fields

5 years agoTransifex autosync
Rudolf Polzer [Wed, 1 May 2019 05:24:37 +0000 (07:24 +0200)]
Transifex autosync

5 years agoTransifex autosync
Rudolf Polzer [Tue, 30 Apr 2019 05:24:33 +0000 (07:24 +0200)]
Transifex autosync

5 years agoTransifex autosync
Rudolf Polzer [Mon, 29 Apr 2019 05:24:36 +0000 (07:24 +0200)]
Transifex autosync

5 years agoTransifex autosync
Rudolf Polzer [Sun, 28 Apr 2019 05:25:46 +0000 (07:25 +0200)]
Transifex autosync

5 years agoMake sure names aren't truncated to 0 length on old servers and increase the soft...
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)

5 years agoMake use of an existent translatable string to compose "^1Intermediate 1 (+15.42)"
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)"

5 years agoDeduplicate PENALTY message by stripping color codes
terencehill [Fri, 26 Apr 2019 18:30:34 +0000 (20:30 +0200)]
Deduplicate PENALTY message by stripping color codes

5 years agoMake "missing a checkpoint" translatable
terencehill [Fri, 26 Apr 2019 18:18:56 +0000 (20:18 +0200)]
Make "missing a checkpoint" translatable

5 years agoAvoid code duplication in some Race code
terencehill [Fri, 26 Apr 2019 17:24:19 +0000 (19:24 +0200)]
Avoid code duplication in some Race code

5 years agoReplace fake country list (actually language list) with a button that opens window... 647/head
terencehill [Fri, 26 Apr 2019 16:05:26 +0000 (18:05 +0200)]
Replace fake country list (actually language list) with a button that opens window with the language list (Settings/User); it fixes redirection to the Profile page once you change language from Settings/User window

5 years agoMake translatable various centerprint example messages
terencehill [Fri, 26 Apr 2019 16:01:39 +0000 (18:01 +0200)]
Make translatable various centerprint example messages

5 years agoUpdate hash
terencehill [Fri, 26 Apr 2019 15:39:48 +0000 (17:39 +0200)]
Update hash

5 years agoAvoid changing solidity state of entcs_sender entities too; it fixes #2225
terencehill [Wed, 24 Apr 2019 22:09:11 +0000 (00:09 +0200)]
Avoid changing solidity state of entcs_sender entities too; it fixes #2225

5 years agoMake translatable minigame names
terencehill [Tue, 23 Apr 2019 18:40:07 +0000 (20:40 +0200)]
Make translatable minigame names

5 years agoMake translatable some remaining minigame messages and 2 radar messages
terencehill [Tue, 23 Apr 2019 18:18:29 +0000 (20:18 +0200)]
Make translatable some remaining minigame messages and 2 radar messages

5 years agoSpecify command bound to default key in some messages (helpful in case player has...
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)

5 years agoSimplify a message
terencehill [Tue, 23 Apr 2019 15:19:03 +0000 (17:19 +0200)]
Simplify a message

5 years agoAllow translating gender of player models
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)

5 years agoMerge branch 'terencehill/translated_keys' into 'master'
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

5 years agoWhen dead forcedly show scoreboard only if not actively playing a minigame
terencehill [Tue, 23 Apr 2019 13:14:52 +0000 (15:14 +0200)]
When dead forcedly show scoreboard only if not actively playing a minigame

5 years agoFix map timer not being displayed if scoreboard is enabled during map vote; don't...
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

5 years agoRemove an useless setting
terencehill [Tue, 23 Apr 2019 09:29:49 +0000 (11:29 +0200)]
Remove an useless setting

5 years agoAdd some safety checks
terencehill [Mon, 22 Apr 2019 20:57:41 +0000 (22:57 +0200)]
Add some safety checks

5 years agoRemove some wasted globals
terencehill [Mon, 22 Apr 2019 20:55:26 +0000 (22:55 +0200)]
Remove some wasted globals

5 years agoMake translatable "<KEY NOT FOUND>" and "<UNKNOWN KEYNUM>"
terencehill [Mon, 22 Apr 2019 08:27:18 +0000 (10:27 +0200)]
Make translatable "<KEY NOT FOUND>" and "<UNKNOWN KEYNUM>"

5 years agoReplace "F1", "F2", etc... with "F%d"
terencehill [Mon, 22 Apr 2019 07:58:52 +0000 (09:58 +0200)]
Replace "F1", "F2", etc... with "F%d"

5 years agoMake translatable a few more keys
terencehill [Mon, 22 Apr 2019 07:32:22 +0000 (09:32 +0200)]
Make translatable a few more keys

5 years agoMake "SHIFT+ESC" translatable
terencehill [Sun, 21 Apr 2019 16:02:18 +0000 (18:02 +0200)]
Make "SHIFT+ESC" translatable

5 years agoTransifex autosync
Rudolf Polzer [Mon, 22 Apr 2019 05:24:32 +0000 (07:24 +0200)]
Transifex autosync

5 years agoReplace utf8 character with its literal version in code
terencehill [Sun, 21 Apr 2019 18:07:19 +0000 (20:07 +0200)]
Replace utf8 character with its literal version in code

5 years agoDon't count spectators in the team size total
terencehill [Sun, 21 Apr 2019 18:00:13 +0000 (20:00 +0200)]
Don't count spectators in the team size total

5 years agoMerge branch 'BuddyFriendGuy/reorganize_scoreboard' into 'master'
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

5 years agoemphasize important game info in scoreboard
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

5 years agoMerge branch 'master' into terencehill/translated_keys
terencehill [Sun, 21 Apr 2019 15:44:04 +0000 (17:44 +0200)]
Merge branch 'master' into terencehill/translated_keys

5 years agoImprove key binder code a little bit
terencehill [Sun, 21 Apr 2019 13:29:06 +0000 (15:29 +0200)]
Improve key binder code a little bit

5 years agoDisplay the hardcoded shortcut to open the console in the key binder
terencehill [Sun, 21 Apr 2019 13:07:32 +0000 (15:07 +0200)]
Display the hardcoded shortcut to open the console in the key binder

5 years agoTransifex autosync
Rudolf Polzer [Sat, 20 Apr 2019 05:24:30 +0000 (07:24 +0200)]
Transifex autosync

5 years agoMerge branch 'terencehill/dumpturrets' into 'master'
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

5 years agoRemove direct reference to a team number
terencehill [Tue, 16 Apr 2019 18:41:36 +0000 (20:41 +0200)]
Remove direct reference to a team number

5 years agoRespawn turrets when match restarts in game types different from Assault too
terencehill [Tue, 16 Apr 2019 18:11:33 +0000 (20:11 +0200)]
Respawn turrets when match restarts in game types different from Assault too