]>
git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
TimePath [Mon, 2 Feb 2015 00:39:08 +0000 (11:39 +1100)]
seta _cl_gender
Rudolf Polzer [Sun, 1 Feb 2015 17:58:58 +0000 (18:58 +0100)]
Serverbench: include full scoreboard.
Mario [Sun, 1 Feb 2015 10:54:53 +0000 (10:54 +0000)]
Merge branch 'Melanosuchus/preconnect' into 'master'
ClientPreConnect
Sends an event log on ClientPreConnect, requires xonotic/darkplaces!14
The log format is basically the same as the one used in :join.
See merge request !99
Mario [Sun, 1 Feb 2015 08:19:33 +0000 (08:19 +0000)]
Merge branch 'terencehill/menu_optimizations' into 'master'
Terencehill/menu optimizations
Optimize ModalController_draw code so that #1432 (Header labels flicker) gets partially fixed (that is, only in the tab that fades out)
More details in this comment: https://gitlab.com/xonotic/xonotic-data.pk3dir/issues/1432#note_709376
See merge request !79
Mario [Sun, 1 Feb 2015 04:31:41 +0000 (04:31 +0000)]
Merge branch 'Melanosuchus/kickban-unconnected' into 'master'
Melanosuchus/kickban unconnected
Changes:
* Unconnected clients cannot call votes
* Kickban won't discard said unconnected clients
* Bans are enforced on unconnected clients
See merge request !98
Mattia Basaglia [Sat, 31 Jan 2015 21:52:41 +0000 (22:52 +0100)]
Event log on ClientPreConnect
Mattia Basaglia [Sat, 31 Jan 2015 21:34:46 +0000 (22:34 +0100)]
Merge branch 'master' of ssh://gitlab.com/xonotic/xonotic-data.pk3dir into Melanosuchus/kickban-unconnected
Rudolf Polzer [Sat, 31 Jan 2015 19:47:23 +0000 (20:47 +0100)]
Don't use the name "binds-default.cfg"!
Names ending in "default.cfg" are magic to DarkPlaces, and lead to the
engine cvar defaults getting locked.
Fixes #1444, #1448.
Mario [Sat, 31 Jan 2015 02:55:48 +0000 (02:55 +0000)]
Merge branch 'Mario/target_items_fix' into 'master'
Merge branch Mario/target_items_fix (XXS merge request)
Fixes target_items not compatible with old weapon names.
See merge request !96
Mario [Sat, 31 Jan 2015 02:40:58 +0000 (13:40 +1100)]
Possibly fix issue with old weapon names and target_items
Mario [Fri, 30 Jan 2015 10:27:59 +0000 (21:27 +1100)]
Make Luma the default HUD and menu theme
Mario [Fri, 30 Jan 2015 10:26:16 +0000 (10:26 +0000)]
Merge branch 'sev/luma_supplement' into 'master'
Luma Supplement
This branch adds Luma (!76) variants of the chatbubble and the teambubble.
The current images will be replaced, hence the separate branch.
See merge request !87
Mario [Fri, 30 Jan 2015 10:07:24 +0000 (10:07 +0000)]
Merge branch 'sev/luma' into 'master'
Luma
I think Luma is ready for a review.
This branch adds the Luma themes for the menu, HUD, and simple items.
These themes are independent, the branch does not alter existing files.
Menu
http://i.imgur.com/EfugxYq.png
http://i.imgur.com/EgOyW74.png
HUD
http://i.imgur.com/7t3O2CB.png
Simple items
http://i.imgur.com/zxCMCUZ.png
See merge request !76
Mattia Basaglia [Fri, 30 Jan 2015 09:47:27 +0000 (10:47 +0100)]
Merge branch 'master' of ssh://gitlab.com/xonotic/xonotic-data.pk3dir into kickban-unconnected-v2
Mario [Sun, 25 Jan 2015 07:04:01 +0000 (18:04 +1100)]
Add mod icons for instagib (will remove the old MinstaGib icons in 0.8.1)
Mario [Sat, 24 Jan 2015 23:47:58 +0000 (23:47 +0000)]
Merge branch 'sev/more_crosshairs' into 'master'
A few additional crosshairs
This is more a merge suggestion than a request (sorry for the recent avalanche).
Some time ago I created a few crosshairs that I feel are missing in the default set:
simple traditional design, unobtrusive, high-contrast.
Now I've noticed that the new menu has an empty row in the crosshair settings.
Add one and one together and you get this branch.
![crosshairs](https://gitlab.com/uploads/xonotic/xonotic-data.pk3dir/
14dc267bef /crosshairs.png)
See merge request !94
Severin Meyer [Sat, 24 Jan 2015 18:11:56 +0000 (19:11 +0100)]
Add a new row of traditional, unobtrusive, high-contrast crosshairs to the crosshair settings
Mario [Sat, 24 Jan 2015 03:24:04 +0000 (03:24 +0000)]
Merge branch 'sev/menu_sounds_reimplementation' into 'master'
Menu sounds reimplementation
This branch reimplements the menu sounds. It now plays different soundfiles for the following events:
OPEN: opening dialog
CLOSE: closing dialog
FOCUS: moving focus to new item
EXECUTE: pressing button, enter key, or double click
SELECT: using checkbox, radiobutton, or similar
SLIDE: using slider or colorpicker
CLEAR: clearing inputbox or keybind
WINNER: winning single player campaign
The soundfiles are moved into the dedicated directory *data/sound/menu*.
Unfortunately, I can't provide new soundfiles, since I have no experience with sound production,
so I've reused the legacy sounds or added placeholders.
However, I still think it is useful to merge this branch now,
because it improves the way that the sounds are played:
- It greatly reduces the "Geiger counter" effect of the focus sound when the cursor quickly moves across several items
- The focus sound plays for all interactive elements, e.g. also for the inputbox
- The execute (button) sound also plays for double clicks, e.g. in the gametypelist
- The audio settings tab gets a second checkbox to independently toggle focus sounds
See merge request !93
Severin Meyer [Sat, 24 Jan 2015 02:06:50 +0000 (03:06 +0100)]
Remove newlines from menu sounds README file
Mario [Sat, 24 Jan 2015 01:55:46 +0000 (12:55 +1100)]
Merge branch 'Mario/wep_settemp_fix'
Mario [Sat, 24 Jan 2015 01:38:09 +0000 (12:38 +1100)]
Add a hack to fix mapinfo weaponstart settemps not working
terencehill [Sat, 24 Jan 2015 00:27:31 +0000 (01:27 +0100)]
Merge branch 'master' into terencehill/menu_optimizations
Severin Meyer [Sat, 24 Jan 2015 00:00:53 +0000 (01:00 +0100)]
Rename legacy menu soundfiles and add placeholder files
Severin Meyer [Fri, 23 Jan 2015 23:55:25 +0000 (00:55 +0100)]
Add focus sound to menu sound constants
Severin Meyer [Fri, 23 Jan 2015 21:38:57 +0000 (22:38 +0100)]
Disable focus sound for the playerlist, because it is not an interactive item
Severin Meyer [Fri, 23 Jan 2015 21:36:10 +0000 (22:36 +0100)]
Add a checkbox to the audio settings to toggle focus sounds
Severin Meyer [Fri, 23 Jan 2015 21:22:16 +0000 (22:22 +0100)]
Play bonus sound when the winner dialog is opened
Severin Meyer [Fri, 23 Jan 2015 21:19:01 +0000 (22:19 +0100)]
Play OPEN/CLOSE sound when opening/closing dialog
Severin Meyer [Fri, 23 Jan 2015 20:05:11 +0000 (21:05 +0100)]
Play sounds when chosing or executing a listbox item changes the menu state
Severin Meyer [Fri, 23 Jan 2015 19:31:59 +0000 (20:31 +0100)]
Play CLEAR sound when using inputbox clearbutton, also remove unnecessary InputBox_Clear_Click function
Severin Meyer [Fri, 23 Jan 2015 19:27:47 +0000 (20:27 +0100)]
Play SLIDE sound when using slider or colorpicker
Severin Meyer [Fri, 23 Jan 2015 19:20:32 +0000 (20:20 +0100)]
Play SELECT sound when using checkbox or its subtypes
Severin Meyer [Fri, 23 Jan 2015 19:18:10 +0000 (20:18 +0100)]
Revise button sound
Severin Meyer [Fri, 23 Jan 2015 18:05:11 +0000 (19:05 +0100)]
Revise focus sound, use a time guard to prevent "Geiger counter" effect
Mattia Basaglia [Fri, 23 Jan 2015 15:15:28 +0000 (16:15 +0100)]
Use loop macro in Ban_Enforce
Mario [Fri, 23 Jan 2015 01:44:17 +0000 (01:44 +0000)]
Merge branch 'sev/hud_weapon_panel' into 'master'
A few HUD weapon panel improvements
Currently, the HUD weapon panel distributes the weapon icons very akwardly. The scaling is especially off when arranged vertically, sometimes leaving a gap on either side. So I've made to following changes:
- Reimplemented the distribution of the icons to better use the available space, and to be more predictable.
- Added a new cvar *hud_panel_weapons_label_scale*, to change the label size.
- Lastly, I've tightened up the HUD editor selection border for all panels, to more closely resemble the selection border in editors like GIMP or Inkscape.
![hud_weapons_v](https://gitlab.com/uploads/xonotic/xonotic-data.pk3dir/
0c951a653d /hud_weapons_v.png)
![hud_weapons_h](https://gitlab.com/uploads/xonotic/xonotic-data.pk3dir/
e494180790 /hud_weapons_h.png)
See merge request !85
Mario [Fri, 23 Jan 2015 01:42:09 +0000 (01:42 +0000)]
Merge branch 'sev/menu_play_char' into 'master'
Two small menu fixes
Use Unicode character for the playlist play symbol.
Same character as used for the >>> downloading sign on the scoreboard.
*Edit*
I've added another small bugfix to this MR.
See merge request !86
Mario [Fri, 23 Jan 2015 01:37:37 +0000 (01:37 +0000)]
Merge branch 'terencehill/cvar_updates' into 'master'
Terencehill/cvar updates
cvar updates
See merge request !82
Mario [Fri, 23 Jan 2015 01:34:35 +0000 (01:34 +0000)]
Merge branch 'terencehill/ready_restart_tweaks' into 'master'
Terencehill/ready restart tweaks
Improve behaviour when sv_ready_restart and sv_ready_restart_after_countdown are enabled:
* Don't play "Prepare for battle" announcement twice in games made of rounds
* Block players while the countdown to game start is going even if sv_ready_restart_after_countdown is enabled
This is to avoid that a player roaming in the map gets confused by the sudden respawn when the game begins; it also helps to more clearly separate pre-game time from pre-round time (in the latter players are allowed to move depending on the game mode, e.g. CA allows it, FT doesn't)
See merge request !88
Mario [Fri, 23 Jan 2015 01:31:09 +0000 (12:31 +1100)]
Merge branch 'sev/menu_listbox_doubleclick'
Severin Meyer [Thu, 22 Jan 2015 22:11:53 +0000 (23:11 +0100)]
Fix minus key bug in the weaponslist
Severin Meyer [Thu, 22 Jan 2015 17:33:50 +0000 (18:33 +0100)]
Move double click detection from listbox subtypes to the superclass
Mario [Thu, 22 Jan 2015 08:13:18 +0000 (08:13 +0000)]
Merge branch 'sev/hud_kh' into 'master'
Reimplemented Keyhunt HUD modicon panel
The current Keyhunt HUD modicon panel is overly complicated and inconsistent with other gametypes:
- It uses most of the available space to show the original key color, which is irrelevant for the gameplay
- Teams are not grouped
- Ownership is conveyed with different alpha values, which is difficult to understand
- As a result, you get an "RGBA salad"
This branch reimplements the panel:
- Each key is shown in the color of its current owning team
- Keys are grouped by team
- The icons use the same taken/carrying/dropped pattern used for CTF
- The icons blink if RUN HERE is shown
- The icons are more evenly distributed in the available space, esp. in the case of fewer than 4 teams
---
![kh](https://gitlab.com/uploads/xonotic/xonotic-data.pk3dir/
b8cb9585fd /kh.png)
See merge request !75
Mario [Thu, 22 Jan 2015 08:12:07 +0000 (19:12 +1100)]
Merge branch 'master' into sev/hud_kh
Severin Meyer [Thu, 22 Jan 2015 00:41:35 +0000 (01:41 +0100)]
Replace the chatbubble and teambubble with luma versions
terencehill [Wed, 21 Jan 2015 23:22:00 +0000 (00:22 +0100)]
Block players while the countdown to game start is going even if sv_ready_restart_after_countdown is enabled
Severin Meyer [Wed, 21 Jan 2015 23:21:49 +0000 (00:21 +0100)]
Update luma HUD weapon panel config and a few icons
terencehill [Wed, 21 Jan 2015 23:09:21 +0000 (00:09 +0100)]
Don't play "Prepare for battle" announcement again when countdown to game start ends and countdown to round start begins
Severin Meyer [Wed, 21 Jan 2015 22:26:53 +0000 (23:26 +0100)]
Thighten up the panel selection border in the HUD editor
Severin Meyer [Wed, 21 Jan 2015 20:33:09 +0000 (21:33 +0100)]
Add cvar hud_panel_weapons_label_scale
Severin Meyer [Wed, 21 Jan 2015 19:06:41 +0000 (20:06 +0100)]
Improve the distribution of icons in the HUD weapons panel
Severin Meyer [Wed, 21 Jan 2015 07:53:58 +0000 (08:53 +0100)]
Use unicode character for the playlist play symbol
Severin Meyer [Tue, 20 Jan 2015 22:16:19 +0000 (23:16 +0100)]
Update luma HUD config and HUD panel border images
Severin Meyer [Tue, 20 Jan 2015 22:10:09 +0000 (23:10 +0100)]
Update luma keyhunt icons for new modicon panel
Severin Meyer [Tue, 20 Jan 2015 22:05:54 +0000 (23:05 +0100)]
Update a few luma icons
Mario [Tue, 20 Jan 2015 02:42:36 +0000 (13:42 +1100)]
Fix a couple of minor things that have been bugging me for a while
Mario [Mon, 19 Jan 2015 08:04:31 +0000 (19:04 +1100)]
Fix compile. @sev values for the noncurrent ammo cvars in hud_luma.cfg will need to be adjusted
Mario [Mon, 19 Jan 2015 08:01:29 +0000 (19:01 +1100)]
Merge remote-tracking branch 'origin/master' into sev/luma
Mario [Mon, 19 Jan 2015 02:42:57 +0000 (02:42 +0000)]
Merge branch 'sev/hud_ammo_panel' into 'master'
Sev/hud ammo panel
This branch makes the following additions and changes to the HUD ammo panel:
- New cvar *hud_panel_ammo_noncurrent_alpha*, to set the alpha of all ammo items not currently used (was hardcoded)
- New cvar *hud_panel_ammo_noncurrent_scale*, to scale the size of not currently used ammo items in relation to the current ammo
- Never blacks out the current ammo, even if 0. A red 0 is easier to see and understand than a black item
- The red text color for low ammo is slightly brighter, for better visibility
- In conformance to established color codes, infinite ammo text is now green instead of blue
- Infinite ammo text shows the proper infinity symbol, instead of 999
The purpose of this is to improve consistency and to allow setting appart current from noncurrent ammo,
as an alternative to using *hud_panel_ammo_onlycurrent*.
Luma WIP:
![hud_ammo](https://gitlab.com/uploads/xonotic/xonotic-data.pk3dir/
119d9c32a0 /hud_ammo.png)
See merge request !84
Severin Meyer [Sun, 18 Jan 2015 23:51:18 +0000 (00:51 +0100)]
Use proper infinity symbol for infinite ammo count
Severin Meyer [Sun, 18 Jan 2015 23:40:25 +0000 (00:40 +0100)]
For a low ammo count, use slightly brighter red for better visibility. For infinity ammo count, use green instead of blue, in conformance to established color codes (red=bad, green=good).
Severin Meyer [Sun, 18 Jan 2015 23:35:36 +0000 (00:35 +0100)]
Add hud_panel_ammo_noncurrent_scale cvar
Severin Meyer [Sun, 18 Jan 2015 23:23:35 +0000 (00:23 +0100)]
Add hud_panel_ammo_noncurrent_alpha cvar
Severin Meyer [Sun, 18 Jan 2015 23:12:55 +0000 (00:12 +0100)]
Never black out the current ammo, even if empty. A red zero is easier to see and understand than a black item.
Severin Meyer [Sun, 18 Jan 2015 23:06:30 +0000 (00:06 +0100)]
Refactor the DrawAmmoItem() function: remove redundant and unnecessary code, use consistent variable names, calculate colors and alpha in one place
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
Mattia Basaglia [Sat, 17 Jan 2015 10:02:16 +0000 (11:02 +0100)]
Consider unconnected players in Ban_Enforce
Mattia Basaglia [Fri, 16 Jan 2015 15:26:09 +0000 (16:26 +0100)]
Ensure we aren't kicking a client which has already been kicked
Mattia Basaglia [Fri, 16 Jan 2015 15:06:30 +0000 (16:06 +0100)]
Allow the server to kickban unconnected clients and prevent them from calling votes
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 :)
terencehill [Tue, 13 Jan 2015 00:55:52 +0000 (01:55 +0100)]
Revert removal of some autocvar initializations (compatibility)
terencehill [Mon, 12 Jan 2015 16:42:03 +0000 (17:42 +0100)]
Remove autocvar_crosshair_ring_vortex* and autocvar_crosshair_ring_arc* initializations, the respective cvars are already initializated
terencehill [Mon, 12 Jan 2015 15:53:23 +0000 (16:53 +0100)]
Improve a few cvar descriptions
terencehill [Mon, 12 Jan 2015 15:44:34 +0000 (16:44 +0100)]
Add missing crosshair_ring_arc* to crosshairs.cfg so they get saved!
terencehill [Mon, 12 Jan 2015 14:07:42 +0000 (15:07 +0100)]
Update cl_reticle* cvars and fix/improve their descriptions
terencehill [Mon, 12 Jan 2015 13:38:48 +0000 (14:38 +0100)]
Update notification cvars with dumpnotifs
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 ;)