]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
xonotic/xonotic-data.pk3dir.git
9 years agoUse explicit IMPLEMENTATION guard
TimePath [Fri, 14 Aug 2015 06:18:05 +0000 (16:18 +1000)]
Use explicit IMPLEMENTATION guard

9 years agoUpdate iterators
TimePath [Fri, 14 Aug 2015 04:40:42 +0000 (14:40 +1000)]
Update iterators

9 years agoMerge branches 'TimePath/oo', 'TimePath/buffsys', 'TimePath/gametypesys'
TimePath [Fri, 14 Aug 2015 03:53:32 +0000 (13:53 +1000)]
Merge branches 'TimePath/oo', 'TimePath/buffsys', 'TimePath/gametypesys'

9 years agoObjectify buffs
TimePath [Fri, 14 Aug 2015 00:30:33 +0000 (10:30 +1000)]
Objectify buffs

9 years agoAllow custom construction of registered objects
TimePath [Fri, 14 Aug 2015 00:25:57 +0000 (10:25 +1000)]
Allow custom construction of registered objects

9 years agoObjectify gametypes
TimePath [Fri, 14 Aug 2015 00:11:36 +0000 (10:11 +1000)]
Objectify gametypes

9 years agoAdd CONSTRUCT for super-initialization
TimePath [Fri, 14 Aug 2015 00:10:51 +0000 (10:10 +1000)]
Add CONSTRUCT for super-initialization

9 years agoImplement CONSTRUCTOR
TimePath [Thu, 13 Aug 2015 23:01:14 +0000 (09:01 +1000)]
Implement CONSTRUCTOR

9 years agoCleanup OO macros
TimePath [Thu, 13 Aug 2015 08:13:53 +0000 (18:13 +1000)]
Cleanup OO macros

9 years agoAdd an explanation, resolving a FIXME.
Rudolf Polzer [Wed, 12 Aug 2015 23:48:44 +0000 (01:48 +0200)]
Add an explanation, resolving a FIXME.

9 years agoMerge branch 'TimePath/nadesys' into 'master'
Mario [Wed, 12 Aug 2015 11:44:51 +0000 (11:44 +0000)]
Merge branch 'TimePath/nadesys' into 'master'

Objectify nades

Also fixes translocate grenade facing direction

See merge request !170

9 years agoObjectify nades
TimePath [Wed, 12 Aug 2015 10:48:16 +0000 (20:48 +1000)]
Objectify nades

9 years agoMerge branch 'sev/luma_itemstime' into 'master'
Mario [Wed, 12 Aug 2015 10:09:52 +0000 (10:09 +0000)]
Merge branch 'sev/luma_itemstime' into 'master'

Small icon updates for itemstime panel

I made a few revisions after the merge of the itemstime panel:

- Because HUD icons are inherited from the default theme, it is unnecessary to add identical icons to the luminos theme.
So I removed them to save some space.

- There already are icons for the strength and shield powerups, it is redundant to add second versions.
However, the quality of the new icons is a lot better than the old ones, so I moved
`default/item_shield` and `default/item_strength` to `default/shield` and `default/strength`.

- To match these new powerup icons, I updated the buff and superweapons icons.

- I added new icons to the Luma theme.

See merge request !169

9 years agoMerge branch 'TimePath/monstersys' into 'master'
Mario [Wed, 12 Aug 2015 10:04:39 +0000 (10:04 +0000)]
Merge branch 'TimePath/monstersys' into 'master'

Re-use generic registry code for monsters

float MON_id --> entity MON_id, .monsterid used to get floats back where currently needed

Classes to be defined in a future merge request

See merge request !167

9 years agoMerge branch 'terencehill/mutator_button_rename' into 'master'
Mario [Wed, 12 Aug 2015 09:53:35 +0000 (09:53 +0000)]
Merge branch 'terencehill/mutator_button_rename' into 'master'

Mutators --> Mutators...

Fixes #1493

See merge request !168

9 years agoRe-use generic registry code for monsters
TimePath [Wed, 12 Aug 2015 08:17:57 +0000 (18:17 +1000)]
Re-use generic registry code for monsters

9 years agoNamespace registry functions
TimePath [Wed, 12 Aug 2015 08:17:43 +0000 (18:17 +1000)]
Namespace registry functions

9 years agoIncrease the alpha value of loading itemstime icons
Severin Meyer [Wed, 12 Aug 2015 00:46:13 +0000 (02:46 +0200)]
Increase the alpha value of loading itemstime icons

9 years agoAdd Luma itemstime icons and update Luma simple items
Severin Meyer [Wed, 12 Aug 2015 00:38:32 +0000 (02:38 +0200)]
Add Luma itemstime icons and update Luma simple items

9 years agoUpdate buff and powerup icons to match the rest of the theme
Severin Meyer [Wed, 12 Aug 2015 00:37:19 +0000 (02:37 +0200)]
Update buff and powerup icons to match the rest of the theme

9 years agoFor the itemstime panel, use existing strength and shield icons instead of adding...
Severin Meyer [Wed, 12 Aug 2015 00:28:55 +0000 (02:28 +0200)]
For the itemstime panel, use existing strength and shield icons instead of adding new ones

9 years agoIcons are inherited from the default HUD theme, therefore it is unnecessary to add...
Severin Meyer [Wed, 12 Aug 2015 00:25:23 +0000 (02:25 +0200)]
Icons are inherited from the default HUD theme, therefore it is unnecessary to add identical icons twice

9 years agoMutators --> Mutators...
terencehill [Tue, 11 Aug 2015 19:55:32 +0000 (21:55 +0200)]
Mutators --> Mutators...

9 years agoMerge branch 'terencehill/menu_listbox_changes' into 'master'
Mario [Tue, 11 Aug 2015 18:42:59 +0000 (18:42 +0000)]
Merge branch 'terencehill/menu_listbox_changes' into 'master'

Menu listbox changes

Menu listbox changes:
* scrolling with mouse wheel / scrollbar no longer changes the current selection
* scrolling and selection changes are now smooth
* FIX: remove highlighting from the focused item when the cursor is moved to the scrollbar area
* FIX: Highlight the focused item even while scrolling
* stats list no longer shows a selected item as it's useless
* servers list no longer automatically scroll at the beginning following the first seen server

See merge request !150

9 years agoRename a variable
terencehill [Tue, 11 Aug 2015 18:34:00 +0000 (20:34 +0200)]
Rename a variable

9 years agoUse the formula with exp, as it's more mathematically correct
terencehill [Tue, 11 Aug 2015 18:31:34 +0000 (20:31 +0200)]
Use the formula with exp, as it's more mathematically correct

9 years agoMerge branch 'master' into terencehill/menu_listbox_changes
terencehill [Tue, 11 Aug 2015 17:48:06 +0000 (19:48 +0200)]
Merge branch 'master' into terencehill/menu_listbox_changes

9 years agoMerge branch 'terencehill/itemstime' into 'master'
Mario [Tue, 11 Aug 2015 16:30:30 +0000 (16:30 +0000)]
Merge branch 'terencehill/itemstime' into 'master'

Items Time

Features:
* Panel that displays left time until important items respawn in the map: mega health, large armor, powerups (strenght, invincible, jetpack, fuel regenerator) and superweapons.

* Waypoints for mega health and large armor, displayed just like the existing powerup waypoints, obviously visible only to spectators

Panel and waypoints can be enabled when spectating (g_waypointsprite_itemstime 1, hud_panel_itemstime 1) or also when playing in warmup stage (g_waypointsprite_itemstime 2, hud_panel_itemstime 2).

In order to prevent cheating, server can completely disable this feature by setting sv_itemstime to 0 (1 by default).

See merge request !133

9 years agoMerge branch 'master' into terencehill/itemstime
Mario [Tue, 11 Aug 2015 16:28:36 +0000 (02:28 +1000)]
Merge branch 'master' into terencehill/itemstime

# Conflicts:
# qcsrc/client/hud.qc
# qcsrc/client/hud_config.qc
# qcsrc/common/stats.qh
# qcsrc/menu/xonotic/mainwindow.qc
# qcsrc/server/autocvars.qh

9 years agoExtract registry functionality
TimePath [Tue, 11 Aug 2015 03:04:45 +0000 (13:04 +1000)]
Extract registry functionality

9 years agoSimplify item definitions
TimePath [Tue, 11 Aug 2015 02:28:51 +0000 (12:28 +1000)]
Simplify item definitions

9 years agoAdjust item definition syntax
TimePath [Tue, 11 Aug 2015 01:27:31 +0000 (11:27 +1000)]
Adjust item definition syntax

9 years agoCenter icon when item has no time
terencehill [Mon, 10 Aug 2015 23:50:02 +0000 (01:50 +0200)]
Center icon when item has no time

9 years agoseta hud_panel_itemstime_hidespawned "1" "if 1 hide an item from the panel when all...
terencehill [Mon, 10 Aug 2015 22:58:09 +0000 (00:58 +0200)]
seta hud_panel_itemstime_hidespawned "1" "if 1 hide an item from the panel when all the occurrences of it are available again; if 2 hide it when at least one occurrence is available again"

9 years agoMerge branch 'terencehill/kh_fix' into 'master'
Mario [Mon, 10 Aug 2015 18:11:18 +0000 (18:11 +0000)]
Merge branch 'terencehill/kh_fix' into 'master'

Fix and improve not working notification about missing teams in KeyHunt

Fix not working notification about missing teams in KeyHunt (outdated notification parameters) and use the improved system used in CA and FT to detect changes of missing teams

See merge request !164

9 years agoMerge branch 'terencehill/g_chat_nospectators_fix' into 'master'
Mario [Mon, 10 Aug 2015 18:01:45 +0000 (18:01 +0000)]
Merge branch 'terencehill/g_chat_nospectators_fix' into 'master'

Fix condition for displaying g_chat_nospectators warning

Fix condition for displaying g_chat_nospectators warning (warmup_stage is initially cvar("g_warmup") but can be turned off by a mod)

See merge request !165

9 years agoMerge branch 'Mario/buff_updates' into 'master'
Mario [Mon, 10 Aug 2015 17:58:19 +0000 (17:58 +0000)]
Merge branch 'Mario/buff_updates' into 'master'

Merge branch Mario/buff_updates (XL merge request)

Includes many changes & fixes to the buffs mutator, along with sev's work on their graphical side (HUD & model icons).

See merge request !162

9 years agoAlways draw the icon at full alpha when hud_panel_itemstime_hidespawned is enabled
terencehill [Sun, 9 Aug 2015 15:16:33 +0000 (17:16 +0200)]
Always draw the icon at full alpha when hud_panel_itemstime_hidespawned is enabled

9 years agoApply the icon expanding effect when an item is available again
terencehill [Sun, 9 Aug 2015 15:14:31 +0000 (17:14 +0200)]
Apply the icon expanding effect when an item is available again

9 years agoFix condition for displaying g_chat_nospectators warning (warmup_stage is initially...
terencehill [Sun, 9 Aug 2015 09:30:17 +0000 (11:30 +0200)]
Fix condition for displaying g_chat_nospectators warning (warmup_stage is initially cvar("g_warmup") but can be turned off by a mod)

9 years agoTransifex Sync
Rudolf Polzer [Sat, 8 Aug 2015 10:43:34 +0000 (12:43 +0200)]
Transifex Sync

9 years agoFix not working notification about missing teams in KeyHunt (outdated notification...
terencehill [Fri, 7 Aug 2015 15:01:31 +0000 (17:01 +0200)]
Fix not working notification about missing teams in KeyHunt (outdated notification parameters) and use the improved system used in CA and FT to detect changes of missing teams

9 years agoInitialize autocvar_hud_panel_itemstime_progressbar_maxtime too
terencehill [Fri, 7 Aug 2015 13:59:53 +0000 (15:59 +0200)]
Initialize autocvar_hud_panel_itemstime_progressbar_maxtime too

9 years agoRename hud_panel_itemstime_showspawned to hud_panel_itemstime_hidespawned, and make...
terencehill [Thu, 6 Aug 2015 22:27:15 +0000 (00:27 +0200)]
Rename hud_panel_itemstime_showspawned to hud_panel_itemstime_hidespawned, and make it an user cvar

9 years agoRename 2 functions
terencehill [Thu, 6 Aug 2015 21:53:56 +0000 (23:53 +0200)]
Rename 2 functions

9 years agoRemove some code that now is useless
terencehill [Thu, 6 Aug 2015 21:12:28 +0000 (23:12 +0200)]
Remove some code that now is useless

9 years agoFix issues with Instagib items and superweapons times
terencehill [Thu, 6 Aug 2015 16:32:50 +0000 (18:32 +0200)]
Fix issues with Instagib items and superweapons times

9 years agoshowspawned enabled: show item icon more transparent when all items of the same kind...
terencehill [Thu, 6 Aug 2015 09:45:19 +0000 (11:45 +0200)]
showspawned enabled: show item icon more transparent when all items of the same kind aren't available, show it at full alpha if at least one item is available; update time when an item is taken in order to always refer to the next item of the same kind going to respawn

9 years agoHide times of every item, not just armor and MH ones when itemstime is disabled by...
terencehill [Wed, 5 Aug 2015 21:51:44 +0000 (23:51 +0200)]
Hide times of every item, not just armor and MH ones when itemstime is disabled by the server

9 years agoMake no sound if the waypoint isn't visible for the player
terencehill [Wed, 5 Aug 2015 17:41:26 +0000 (19:41 +0200)]
Make no sound if the waypoint isn't visible for the player

9 years agoFix an issue with jump speed caps and slopes
Mario [Wed, 5 Aug 2015 14:52:33 +0000 (00:52 +1000)]
Fix an issue with jump speed caps and slopes

9 years agoDisable swapper & magnet buffs by default
Mario [Wed, 5 Aug 2015 13:11:14 +0000 (23:11 +1000)]
Disable swapper & magnet buffs by default

9 years agoMerge branch 'master' into Mario/buff_updates
Mario [Wed, 5 Aug 2015 13:07:22 +0000 (23:07 +1000)]
Merge branch 'master' into Mario/buff_updates

# Conflicts:
# _hud_descriptions.cfg
# hud_luma.cfg
# hud_luminos.cfg
# hud_luminos_minimal.cfg
# hud_luminos_minimal_xhair.cfg
# hud_luminos_old.cfg
# hud_nexuiz.cfg
# qcsrc/client/hud.qc
# qcsrc/client/hud.qh

9 years agoMerge branch 'sev/buff_updates' into 'Mario/buff_updates'
Mario [Wed, 5 Aug 2015 12:58:38 +0000 (12:58 +0000)]
Merge branch 'sev/buff_updates' into 'Mario/buff_updates'

Buff revisions

This branch combines all my visual buff updates.

- The buff shaders have been revised for a consistent quality
- Buff icons are added to the HUD themes
- The powerup panel now also shows the buffs with their icons
- The buff colors have been updated

One thing that is left: The buff HUD panel, and all associated cvars, are now obsolete.
If you agree, I can remove them.

See merge request !160

9 years agoAdd a limit to prevent ultra rare buffs
Mario [Wed, 5 Aug 2015 12:56:12 +0000 (22:56 +1000)]
Add a limit to prevent ultra rare buffs

9 years agoMerge branch 'Mario/triggers' into 'master'
Mario [Wed, 5 Aug 2015 12:34:44 +0000 (12:34 +0000)]
Merge branch 'Mario/triggers' into 'master'

Merge branch Mario/triggers (L merge request)

Adds various useful flags to existing triggers and brushes, and a new side-scroller trigger for extra fun.

See merge request !161

9 years agoRemove deprecated buff HUD panel and associated cvars
Severin Meyer [Wed, 5 Aug 2015 12:30:32 +0000 (14:30 +0200)]
Remove deprecated buff HUD panel and associated cvars

9 years agoMake TimePath happier
Mario [Wed, 5 Aug 2015 12:26:10 +0000 (22:26 +1000)]
Make TimePath happier

9 years agoAdd a virtually useless comment as an excuse to push to this branch again
Mario [Wed, 5 Aug 2015 12:09:16 +0000 (22:09 +1000)]
Add a virtually useless comment as an excuse to push to this branch again

9 years agoMerge branch 'master' into Mario/triggers
Mario [Wed, 5 Aug 2015 11:48:39 +0000 (21:48 +1000)]
Merge branch 'master' into Mario/triggers

9 years agoUpdate HUD themes for new powerup panel
Severin Meyer [Tue, 4 Aug 2015 21:32:37 +0000 (23:32 +0200)]
Update HUD themes for new powerup panel

9 years agoReduce blur of default buff icons
Severin Meyer [Tue, 4 Aug 2015 21:29:56 +0000 (23:29 +0200)]
Reduce blur of default buff icons

9 years agoRemove unused powerup icons from Luma theme (sourcefiles remain available)
Severin Meyer [Tue, 4 Aug 2015 19:31:00 +0000 (21:31 +0200)]
Remove unused powerup icons from Luma theme (sourcefiles remain available)

9 years agoAdd default buff HUD icons
Severin Meyer [Tue, 4 Aug 2015 19:21:45 +0000 (21:21 +0200)]
Add default buff HUD icons

9 years agoAdd Luma buff HUD icons
Severin Meyer [Tue, 4 Aug 2015 19:20:47 +0000 (21:20 +0200)]
Add Luma buff HUD icons

9 years agoRename a cvar that had a typo in its name
terencehill [Tue, 4 Aug 2015 17:33:06 +0000 (19:33 +0200)]
Rename a cvar that had a typo in its name

9 years agoMerge branch 'master' into terencehill/itemstime
terencehill [Tue, 4 Aug 2015 16:11:26 +0000 (18:11 +0200)]
Merge branch 'master' into terencehill/itemstime

Conflicts:
_hud_descriptions.cfg
hud_luma.cfg
hud_luminos.cfg
hud_luminos_minimal.cfg
hud_luminos_minimal_xhair.cfg
hud_luminos_old.cfg
hud_nexuiz.cfg
qcsrc/client/hud.qh
qcsrc/common/stats.qh

9 years agoRevise buff colors
Severin Meyer [Tue, 4 Aug 2015 13:00:57 +0000 (15:00 +0200)]
Revise buff colors

9 years agoRewrite the powerup panel to handle a variable number of items, and add the buffs...
Severin Meyer [Tue, 4 Aug 2015 12:53:52 +0000 (14:53 +0200)]
Rewrite the powerup panel to handle a variable number of items, and add the buffs to the powerup panel

9 years agoRevise buff shaders
Severin Meyer [Tue, 4 Aug 2015 11:24:44 +0000 (13:24 +0200)]
Revise buff shaders

9 years agoRename buff shaders to match the buff netnames from common/buffs.qh
Severin Meyer [Tue, 4 Aug 2015 11:18:28 +0000 (13:18 +0200)]
Rename buff shaders to match the buff netnames from common/buffs.qh

9 years agoRemove deprecated buff shaders
Severin Meyer [Tue, 4 Aug 2015 11:07:42 +0000 (13:07 +0200)]
Remove deprecated buff shaders

9 years agoMerge branch 'terencehill/mapvote_layout_changes' into 'master'
Mario [Tue, 4 Aug 2015 05:52:30 +0000 (05:52 +0000)]
Merge branch 'terencehill/mapvote_layout_changes' into 'master'

Map/gametype vote layout changes

Improvements over the map/gametype vote screens:
* items as big as possible with minimum alteration of the desired item aspect ratio (like in the weapons panel layout)
* layout more compact with limited item size (especially with very few vote choices)
* added a background in the default hud skin, as part of the change that makes them real panels
* fixed a few minor things
* the fps panel (if enabled) is kept on screen during the map vote

See merge request !152

9 years agoMerge branch 'BuddyFriendGuy/mapStringFilter' into 'master'
Mario [Tue, 4 Aug 2015 05:23:22 +0000 (05:23 +0000)]
Merge branch 'BuddyFriendGuy/mapStringFilter' into 'master'

request merging BuddyFriendGuy's map string filter

This is the feature for the multi-user game creation tab. It filters the list of the maps by a user-provided string.

See merge request !117

9 years agofix gametype filter bug
BuddyFriendGuy [Tue, 4 Aug 2015 05:07:28 +0000 (01:07 -0400)]
fix gametype filter bug

9 years agofunction for add all button; tooltip
BuddyFriendGuy [Tue, 4 Aug 2015 02:32:08 +0000 (22:32 -0400)]
function for add all button; tooltip

9 years agoMerge branch 'master' into Mario/buff_updates
Mario [Tue, 4 Aug 2015 02:30:37 +0000 (12:30 +1000)]
Merge branch 'master' into Mario/buff_updates

# Conflicts:
# effectinfo.txt
# qcsrc/common/notifications.qh
# qcsrc/common/stats.qh

9 years agoadd add all button in the UI
BuddyFriendGuy [Tue, 4 Aug 2015 02:22:20 +0000 (22:22 -0400)]
add add all button in the UI

9 years agoSet the teamplay cvar because DP needs it.
Rudolf Polzer [Mon, 3 Aug 2015 18:27:18 +0000 (20:27 +0200)]
Set the teamplay cvar because DP needs it.

9 years agoMerge branch 'terencehill/accuracyboard_fix' into 'master'
Mario [Mon, 3 Aug 2015 15:55:43 +0000 (15:55 +0000)]
Merge branch 'terencehill/accuracyboard_fix' into 'master'

Fix accuracy board layout

Accuracy board layout should be fine now with whatever number of weapons and configuration (single/double row mode)

See merge request !158

9 years agoMerge branch 'matthiaskrgr/campingsimulator_2015' into 'master'
Mario [Mon, 3 Aug 2015 15:41:24 +0000 (15:41 +0000)]
Merge branch 'matthiaskrgr/campingsimulator_2015' into 'master'

cl_zoomfactor: max zoom: 16->30

increases the max zoom limit from 16 to 30.

See merge request !159

9 years agoRemove g_instagib, it's useless now
terencehill [Mon, 3 Aug 2015 13:58:42 +0000 (15:58 +0200)]
Remove g_instagib, it's useless now

9 years agocl_zoomfactor: max zoom: 16->30
Matthias Krüger [Mon, 3 Aug 2015 10:04:25 +0000 (12:04 +0200)]
cl_zoomfactor: max zoom: 16->30

9 years agoMove new flag effects to the bottom of the file, to prevent mismatches on old servers
Mario [Mon, 3 Aug 2015 08:27:23 +0000 (18:27 +1000)]
Move new flag effects to the bottom of the file, to prevent mismatches on old servers

9 years agoFix accuracy board layout
terencehill [Sun, 2 Aug 2015 22:02:56 +0000 (00:02 +0200)]
Fix accuracy board layout

9 years agoMerge branch 'sev/luma_revisions' into 'master'
Mario [Sun, 2 Aug 2015 12:58:35 +0000 (12:58 +0000)]
Merge branch 'sev/luma_revisions' into 'master'

Luma revisions

This branch adds some of the remaining servericons to the Luma menu theme, and revises the HUD theme.

See merge request !155

9 years agoMerge branch 'Mario/ctf_updates' into 'master'
Mario [Sun, 2 Aug 2015 12:23:59 +0000 (12:23 +0000)]
Merge branch 'Mario/ctf_updates' into 'master'

Merge branch Mario/ctf_updates (L merge request)

Adds support for 3 and 4 team CTF, along with a couple of other fixes & features (namely one-flag, new reverse mode where flags are not switched & players pickup their own flag, option to delay returning of the flag when it touches the void).

See merge request !142

9 years agoFix capture and pass effects
Mario [Sun, 2 Aug 2015 11:18:00 +0000 (21:18 +1000)]
Fix capture and pass effects

9 years agoMerge branch 'master' into terencehill/itemstime
TimePath [Sun, 2 Aug 2015 10:08:07 +0000 (20:08 +1000)]
Merge branch 'master' into terencehill/itemstime

# Conflicts:
# qcsrc/common/stats.qh

9 years agoMake noncurrent weapon icons in Luma slightly larger again
Severin Meyer [Sun, 2 Aug 2015 09:52:09 +0000 (11:52 +0200)]
Make noncurrent weapon icons in Luma slightly larger again

9 years agoMerge branch 'master' into sev/luma_revisions
Severin Meyer [Sun, 2 Aug 2015 09:40:58 +0000 (11:40 +0200)]
Merge branch 'master' into sev/luma_revisions

9 years agoMerge branch 'master' into Mario/ctf_updates
TimePath [Sun, 2 Aug 2015 09:11:01 +0000 (19:11 +1000)]
Merge branch 'master' into Mario/ctf_updates

9 years agoCompact HUD_Mod_CTF
TimePath [Sun, 2 Aug 2015 08:23:25 +0000 (18:23 +1000)]
Compact HUD_Mod_CTF

9 years agoMerge branch 'Mario/weapon_stats' into 'master'
Mario [Sun, 2 Aug 2015 03:00:19 +0000 (03:00 +0000)]
Merge branch 'Mario/weapon_stats' into 'master'

Merge branch Mario/weapon_stats (S merge request)

Hides unavailable weapons from the scoreboard, also attempted fix for scoreboard_accuracy_doublerows (was completely misaligned before, aligns properly now, but shows a load of unnecessary tiles).

See merge request !157

9 years agoMerge branch 'sev/luma_hud_vehicles' into 'master'
Mario [Sun, 2 Aug 2015 02:53:46 +0000 (02:53 +0000)]
Merge branch 'sev/luma_hud_vehicles' into 'master'

Luma vehicle HUD revision

I intended to update some of the vehicle HUD images,
but ended up rewriting the vehicle HUD drawing code as well.

Changes from a developers perspective:
- The server sends more consistent vehicle stats, especially for secondary ammo.
- All vehicles now use a common HUD drawing function.
- All HUD images are drawn in relation to the frame image, rather than being measured individually.
- All vehicle crosshairs are scaled consistently, with cl_vehicles_crosshair_size.
- **Update**: The vehicle images are now fully integrated with the existing HUD themes.

Changes from a players perspective:
- Improved and more consistent crosshairs, also with a special healing crosshair for the Bumblebee.
- Secondary ammo is better represented. The bar shows the total ammo left, instead of reloading after each shot.
While the weapon is unusable during recharge, the icon is grayed out.
- Icons and bars are colored, using the health/armor colors from the main HUD for consistency.

![luma_vehicles](https://gitlab.com/xonotic/xonotic-data.pk3dir/uploads/832fdcf76cd3294494055b39cb3a85bb/luma_vehicles.png)

See merge request !148

9 years agoMerge branch 'master' into sev/luma_hud_vehicles
Mario [Sun, 2 Aug 2015 02:53:02 +0000 (12:53 +1000)]
Merge branch 'master' into sev/luma_hud_vehicles

# Conflicts:
# qcsrc/client/view.qc

9 years agoMerge branch 'sev/hud_nades' into 'master'
Mario [Sun, 2 Aug 2015 02:38:11 +0000 (02:38 +0000)]
Merge branch 'sev/hud_nades' into 'master'

Nade HUD icons

Currently, the bonus nade is drawn in an unusual way in the ammo panel.
It is split up into different layers, with the top layer being multiplied the
color of the current nade type, which does not work well for Luma.
At the same time, there are separate nade icons for the notification panel.

**New solution**
Have one icon per nade type, use them for both panels.

See merge request !153

9 years agoMerge branch 'master' into terencehill/menu_listbox_changes
terencehill [Sat, 1 Aug 2015 20:18:20 +0000 (22:18 +0200)]
Merge branch 'master' into terencehill/menu_listbox_changes

9 years agoImprove scrolling in the players list too (server info dialog)
terencehill [Sat, 1 Aug 2015 20:14:30 +0000 (22:14 +0200)]
Improve scrolling in the players list too (server info dialog)

9 years agoMerge branch 'terencehill/vehicle_hud_fix' into 'master'
Mario [Sat, 1 Aug 2015 17:02:52 +0000 (17:02 +0000)]
Merge branch 'terencehill/vehicle_hud_fix' into 'master'

Vehicle HUD fixes

Fix HUD color when spectating a player in a vehicle and a bug in the score panel when you're in a vehicle by making use of current_player

See merge request !156