]>
git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
TimePath [Wed, 21 Jan 2015 06:18:49 +0000 (17:18 +1100)]
Merge remote-tracking branch 'origin/TimePath/gametypes/infection' into TimePath/gametypes/infection
TimePath [Wed, 21 Jan 2015 06:17:46 +0000 (17:17 +1100)]
Merge branch 'master' into TimePath/gametypes/infection
Mario [Sun, 18 Jan 2015 10:42:33 +0000 (10:42 +0000)]
Merge branch 'terencehill/music_player' into 'master'
Merge branch terencehill/music_player (M merge request)
Adds a music player to the menu.
See merge request !66
Mario [Sun, 18 Jan 2015 10:02:45 +0000 (21:02 +1100)]
Fix hit indication with arc and cl_hitsound 2-3
Rudolf Polzer [Tue, 13 Jan 2015 18:48:23 +0000 (19:48 +0100)]
Transifex sync.
Rudolf Polzer [Tue, 13 Jan 2015 18:38:53 +0000 (10:38 -0800)]
Show optionally condensed fonts right again :)
Rudolf Polzer [Sun, 11 Jan 2015 20:23:57 +0000 (12:23 -0800)]
Oops, revert the chat bubble change for now. This was supposed to only
go in with Luma.
Rudolf Polzer [Sun, 11 Jan 2015 16:22:12 +0000 (16:22 +0000)]
Merge branch 'terencehill/teams_override_cvars' into 'master'
Terencehill/teams override cvars
Remove g_keepaway_teams_override from the menu as it doesn't exist anymore
See merge request !73
Rudolf Polzer [Sun, 11 Jan 2015 16:14:30 +0000 (16:14 +0000)]
Merge branch 'sev/luma_supplement' into 'master'
Luma Supplement
This branch adds Luma variants of the net icon (lag) and the chatbubble.
The current images will be replaced, hence the separate branch.
See merge request !77
Rudolf Polzer [Sun, 11 Jan 2015 16:13:28 +0000 (16:13 +0000)]
Merge branch 'sev/scoreboard_skin' into 'master'
Scoreboard Skin
This branch cleans up the scoreboard skin.
Nothing spectacular, but the graphics and the color will better match the Luma (and Luminos) themes.
Old
![scoreboard_old](https://gitlab.com/uploads/xonotic/xonotic-data.pk3dir/
dcf9a69c07 /scoreboard_old.png)
New
![scoreboard_new](https://gitlab.com/uploads/xonotic/xonotic-data.pk3dir/
bacfd331fd /scoreboard_new.png)
See merge request !78
Rudolf Polzer [Sun, 11 Jan 2015 16:10:26 +0000 (16:10 +0000)]
Merge branch 'terencehill/eliminatedplayer_fix' into 'master'
Terencehill/eliminatedplayer fix
Fix #1455 "Spectating frozen players blanks out spectator name"
See merge request !81
Rudolf Polzer [Sun, 11 Jan 2015 16:09:16 +0000 (16:09 +0000)]
Merge branch 'terencehill/keybinds.txt.it_update' into 'master'
Terencehill/keybinds.txt.it update
keybinds.txt.it update
See merge request !71
Rudolf Polzer [Sun, 11 Jan 2015 15:21:48 +0000 (07:21 -0800)]
Gib clones when they die, as I have no good way of activating their
death animation.
Rudolf Polzer [Sun, 11 Jan 2015 15:08:13 +0000 (07:08 -0800)]
Adjust newlines a bit to make the code more readable.
Rudolf Polzer [Sun, 11 Jan 2015 15:04:47 +0000 (07:04 -0800)]
Kill god mode support for clones/corpses.
Rudolf Polzer [Sun, 11 Jan 2015 15:01:18 +0000 (07:01 -0800)]
Rename anindecide_init to animdecide_load_if_needed (clearer).
Rudolf Polzer [Sun, 11 Jan 2015 14:58:45 +0000 (06:58 -0800)]
Merge remote-tracking branch 'origin/mrbougo/clonefixes'
Rudolf Polzer [Sun, 11 Jan 2015 06:39:34 +0000 (07:39 +0100)]
Welcome, Asturian, to the languages list!
Rudolf Polzer [Sat, 10 Jan 2015 17:00:36 +0000 (09:00 -0800)]
Oops, clear useless flags at the end for consistency.
Rudolf Polzer [Sat, 10 Jan 2015 16:56:45 +0000 (08:56 -0800)]
Add missing flag.
Rudolf Polzer [Sat, 10 Jan 2015 05:32:13 +0000 (21:32 -0800)]
Fix detection of useless waypoints.
Rudolf Polzer [Sat, 10 Jan 2015 05:00:14 +0000 (21:00 -0800)]
Fix initialization of Race and CTS game modes.
Rudolf Polzer [Fri, 9 Jan 2015 15:13:14 +0000 (07:13 -0800)]
Minor autowaypointer fixes.
Rudolf Polzer [Fri, 9 Jan 2015 09:33:04 +0000 (01:33 -0800)]
Fix some spacing in the translations.
Rudolf Polzer [Fri, 9 Jan 2015 07:53:05 +0000 (08:53 +0100)]
Another transifex sync.
Rudolf Polzer [Thu, 8 Jan 2015 14:35:12 +0000 (06:35 -0800)]
Set the name for Polish.
terencehill [Wed, 7 Jan 2015 13:50:37 +0000 (14:50 +0100)]
Fix "spectating a frozen player also darkens the spectator's name in scoreboard"
Rudolf Polzer [Tue, 6 Jan 2015 23:02:57 +0000 (00:02 +0100)]
Auto transifex sync ;)
Rudolf Polzer [Tue, 6 Jan 2015 16:21:04 +0000 (17:21 +0100)]
Condense fonts in listboxes too, where they are influenced by translation strings.
Rudolf Polzer [Mon, 5 Jan 2015 23:03:04 +0000 (00:03 +0100)]
Auto transifex sync ;)
Mario [Mon, 5 Jan 2015 22:11:04 +0000 (22:11 +0000)]
Merge branch 'Mirio/credits' into 'master'
Mirio/credits
Updated credits
See merge request !80
Mirio [Mon, 5 Jan 2015 18:51:50 +0000 (19:51 +0100)]
Japanese translator
Rudolf Polzer [Sun, 4 Jan 2015 23:02:57 +0000 (00:02 +0100)]
Auto transifex sync ;)
Rudolf Polzer [Sun, 4 Jan 2015 20:02:30 +0000 (21:02 +0100)]
Auto transifex sync test ;)
Mirio [Sun, 4 Jan 2015 16:25:02 +0000 (17:25 +0100)]
Update credits
Rudolf Polzer [Sat, 3 Jan 2015 08:36:45 +0000 (09:36 +0100)]
Transifex merge. Now with 100% Russian!
Rudolf Polzer [Wed, 31 Dec 2014 21:25:17 +0000 (22:25 +0100)]
Transifex sync.
Rudolf Polzer [Wed, 31 Dec 2014 06:35:08 +0000 (07:35 +0100)]
All in all it's just a-nother transifex sync.
terencehill [Wed, 31 Dec 2014 00:19:44 +0000 (01:19 +0100)]
keybinds.txt.it: Translate "scoreboard"
terencehill [Tue, 30 Dec 2014 23:42:33 +0000 (00:42 +0100)]
Merge branch 'master' into terencehill/music_player
terencehill [Tue, 30 Dec 2014 22:32:07 +0000 (23:32 +0100)]
Rename button Play/Pause to Pause for brevity's sake
terencehill [Tue, 30 Dec 2014 22:21:22 +0000 (23:21 +0100)]
Make the play button resume the track if paused
Severin Meyer [Tue, 30 Dec 2014 12:16:39 +0000 (13:16 +0100)]
Replace the net and chatbubble icons with versions from the luma theme
Rudolf Polzer [Tue, 30 Dec 2014 11:54:59 +0000 (12:54 +0100)]
Improve transifex sync script a bit.
Rudolf Polzer [Tue, 30 Dec 2014 11:53:04 +0000 (12:53 +0100)]
Another transifex sync :)
Rudolf Polzer [Tue, 30 Dec 2014 11:50:22 +0000 (12:50 +0100)]
Update languages list!
Rudolf Polzer [Tue, 30 Dec 2014 11:43:24 +0000 (12:43 +0100)]
More transifex sync.
Rudolf Polzer [Tue, 30 Dec 2014 11:40:44 +0000 (12:40 +0100)]
Add a feature to regenerate the languages file.
Rudolf Polzer [Tue, 30 Dec 2014 11:38:31 +0000 (12:38 +0100)]
Transifex merge.
Rudolf Polzer [Tue, 30 Dec 2014 11:18:45 +0000 (12:18 +0100)]
iSome new pot.
Severin Meyer [Tue, 30 Dec 2014 07:29:21 +0000 (08:29 +0100)]
Update scoreboard skin cvars
Severin Meyer [Tue, 30 Dec 2014 07:27:51 +0000 (08:27 +0100)]
Update scoreboard skin images
Mario [Tue, 30 Dec 2014 07:13:44 +0000 (18:13 +1100)]
Fix blaster in NIX
Rudolf Polzer [Mon, 29 Dec 2014 13:39:10 +0000 (14:39 +0100)]
Change the default player name to empty now that I tried it and improved
its handling.
Rudolf Polzer [Mon, 29 Dec 2014 13:35:54 +0000 (14:35 +0100)]
Better handle empty player name by showing "Player@<ip>" as player name
then, but not saving this change to the config.
Mario [Mon, 29 Dec 2014 00:50:51 +0000 (00:50 +0000)]
Merge branch 'TimePath/issues/1438,1439' into 'master'
Jetpack spam
Fixes #1438 and #1439
See merge request !74
TimePath [Mon, 29 Dec 2014 00:42:17 +0000 (11:42 +1100)]
Check for jetpack activation, fixes #1438
Check for jetpack, fixes #1439
Mario [Sun, 28 Dec 2014 04:13:32 +0000 (04:13 +0000)]
Merge branch 'terencehill/playerstats_fix' into 'master'
Terencehill/playerstats fix
Fixes #1431 Console spam opening Multiplayer - Create tab
See merge request !72
terencehill [Sat, 27 Dec 2014 21:30:39 +0000 (22:30 +0100)]
Simplify sliderTeams update code
terencehill [Sat, 27 Dec 2014 21:21:55 +0000 (22:21 +0100)]
g_keepaway_teams_override doesn't exist anymore
terencehill [Sat, 27 Dec 2014 15:52:15 +0000 (16:52 +0100)]
Fix bad initialization of playerstats db handlers (caused error spam in the console opening Multiplayer-Create tab when offline)
terencehill [Sat, 27 Dec 2014 15:15:48 +0000 (16:15 +0100)]
Add a check
terencehill [Sat, 27 Dec 2014 00:42:58 +0000 (01:42 +0100)]
keybinds.txt.it update
Mario [Sat, 27 Dec 2014 00:12:48 +0000 (00:12 +0000)]
Merge branch 'terencehill/team_slider_fix' into 'master'
Terencehill/team slider fix
Reload Team slider value when switching gametype
See merge request !70
Mario [Sat, 27 Dec 2014 00:10:16 +0000 (00:10 +0000)]
Merge branch 'TimePath/refactor/mod_operator' into 'master'
Use modulus operator
Convert usages of `mod(A, B)` to `((A) % (B))`
See merge request !68
Mario [Sat, 27 Dec 2014 00:02:31 +0000 (00:02 +0000)]
Merge branch 'TimePath/refactor/nocompat' into 'master'
Remove dead code
Removes code between redundant `COMPAT` macros
See merge request !69
Rudolf Polzer [Fri, 26 Dec 2014 22:12:55 +0000 (22:12 +0000)]
Merge branch 'sev/legacy_char_replacement' into 'master'
Legacy Character Replacements
This is a minor issue, sorry for the bother. AFAIK, there are two remaining uses of legacy characters,
which are blurry and do not support drop shadows:
- The >>> downloading sign on the scoreboard
- The ... used in front of trailing chat message lines (if the chat message exceeds one line)
This branch replaces the dowloading sign with a proper Unicode character.
However, I did not manage to find where the chat "ellipsis" is defined.
I assume the legacy character is U+E007 (\xEE\x80\x87), to be replaced with a periodcentered U+00B7 (\xC2\xB7), or a plain period. Yet I had not luck grepping my way through qcsrc and darkplaces.
See merge request !67
Rudolf Polzer [Fri, 26 Dec 2014 09:02:50 +0000 (10:02 +0100)]
Bump gameversion.
TimePath [Fri, 26 Dec 2014 06:15:34 +0000 (17:15 +1100)]
Remove dead code
terencehill [Thu, 25 Dec 2014 23:51:47 +0000 (00:51 +0100)]
Reload Team slider value when switching gametype
Severin Meyer [Thu, 25 Dec 2014 21:55:12 +0000 (22:55 +0100)]
Use a proper triangle character defined by Unicode for the >>> downloading sign
Rudolf Polzer [Thu, 25 Dec 2014 18:41:06 +0000 (18:41 +0000)]
Merge branch 'sev/menu_charmap' into 'master'
Improved playername charmap
The current playername charmap is of quite a low quality:
- It uses a low-resolution, pre-rendered image of the characters
- The arrangement of the characters is random and redundant
This branch reimplements the charmap:
- The characters are defined in the qc sourcefile and rendered in-game
- They are arranged in a more logical way
- I've added the new Unicode dingbats from the Xolonium font (currently requires checkout of branch sev/xolonium in the main xonotic repo)
![charmap](https://gitlab.com/uploads/xonotic/xonotic-data.pk3dir/
ce6d73410d /charmap.png)
For maintainability, I would prefer to directly include the UTF-8 encoded characters in the sourcefile, instead of the hex value, e.g. strzone("★").
But I first wanted to ask for your policy/opinion about including non-ASCII characters.
See merge request !60
TimePath [Thu, 25 Dec 2014 11:03:27 +0000 (22:03 +1100)]
Replace usages of mod() with the operator %
Mario [Thu, 25 Dec 2014 10:36:22 +0000 (21:36 +1100)]
Merge branch 'master' into terencehill/music_player
Mario [Thu, 25 Dec 2014 10:34:17 +0000 (21:34 +1100)]
Fix a couple of hanging semicolons
Mario [Thu, 25 Dec 2014 10:31:34 +0000 (10:31 +0000)]
Merge branch 'TimePath/issues/1434' into 'master'
Fix broken reloadable weapons (and somehow players using random models)
See issue #1434
See merge request !65
TimePath [Thu, 25 Dec 2014 10:23:51 +0000 (21:23 +1100)]
Fix #1434
Severin Meyer [Thu, 25 Dec 2014 08:34:01 +0000 (09:34 +0100)]
Hardcode the encoding of characters in the Unicode Private Use Area
Mario [Thu, 25 Dec 2014 08:29:56 +0000 (08:29 +0000)]
Merge branch 'TimePath/issues/1428' into 'master'
Repeated hitsound fix
Fixes #1428
See merge request !64
Severin Meyer [Thu, 25 Dec 2014 03:23:40 +0000 (04:23 +0100)]
Use a string instead of arrays for the charmap
Mario [Wed, 24 Dec 2014 04:28:57 +0000 (04:28 +0000)]
Merge branch 'TimePath/features/jetpack_jump' into 'master'
Jetpack Jump
Changes the jetpack to be activated by jumping again in the air, this is much more natural.
Also allows the hook to be used at the same time.
See merge request !59
TimePath [Wed, 24 Dec 2014 03:43:49 +0000 (14:43 +1100)]
Merge branch 'master' into TimePath/features/jetpack_jump
Conflicts:
qcsrc/server/cl_physics.qc
TimePath [Wed, 24 Dec 2014 03:38:27 +0000 (14:38 +1100)]
Add +jetpack to defaultXonotic.cfg
Rudolf Polzer [Sun, 21 Dec 2014 07:02:52 +0000 (08:02 +0100)]
Sync from/to transifex.
Rudolf Polzer [Sun, 21 Dec 2014 06:48:32 +0000 (07:48 +0100)]
New pot file, and use SSL for Transifex.
TimePath [Sun, 21 Dec 2014 06:28:47 +0000 (17:28 +1100)]
Add another jetpack mode
TimePath [Sat, 20 Dec 2014 11:00:02 +0000 (22:00 +1100)]
Merge branch 'master' into TimePath/issues/1428
TimePath [Sat, 20 Dec 2014 10:46:01 +0000 (21:46 +1100)]
Force arc to always play pitch shifted hitsounds for consistency
TimePath [Sat, 20 Dec 2014 10:39:09 +0000 (21:39 +1100)]
Improve reliability by using total damage
TimePath [Sat, 20 Dec 2014 09:26:11 +0000 (20:26 +1100)]
Merge branch 'master' into TimePath/features/jetpack_jump
TimePath [Sat, 20 Dec 2014 08:41:22 +0000 (19:41 +1100)]
Tidying up, consider #1428 fixed
TimePath [Sat, 20 Dec 2014 08:05:24 +0000 (19:05 +1100)]
Track hit time so that constant damage makes a noise
Mario [Sat, 20 Dec 2014 06:22:21 +0000 (17:22 +1100)]
Remove cl_cubemaps_extra
Mario [Sat, 20 Dec 2014 05:05:16 +0000 (05:05 +0000)]
Merge branch 'Mario/notifications' into 'master'
Merge branch Mario/notifications (M merge request)
Moves some prints into the notifications system.
See merge request !63
Mario [Sat, 20 Dec 2014 05:03:39 +0000 (16:03 +1100)]
Fix some minor problems
Mario [Sat, 20 Dec 2014 04:48:17 +0000 (15:48 +1100)]
Merge branch 'master' into Mario/notifications
Conflicts:
qcsrc/common/notifications.qh
qcsrc/server/command/sv_cmd.qc
qcsrc/server/mutators/gamemode_assault.qc
qcsrc/server/teamplay.qc
Mario [Sat, 20 Dec 2014 04:27:31 +0000 (15:27 +1100)]
Tabs to spaces (to make merging a little less painful)
Mario [Sat, 20 Dec 2014 03:15:50 +0000 (14:15 +1100)]
Add TimePath to extended team
Mario [Sat, 20 Dec 2014 03:10:28 +0000 (14:10 +1100)]
Add buffs to the menu
Mario [Fri, 19 Dec 2014 14:15:02 +0000 (01:15 +1100)]
Remove unused stats file (was recently moved to common, this file is a leftover)