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
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
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)
Rudolf Polzer [Sat, 8 Aug 2015 10:43:34 +0000 (12:43 +0200)]
Transifex Sync
Mario [Wed, 5 Aug 2015 14:52:33 +0000 (00:52 +1000)]
Fix an issue with jump speed caps and slopes
Mario [Wed, 5 Aug 2015 13:11:14 +0000 (23:11 +1000)]
Disable swapper & magnet buffs by default
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
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
Mario [Wed, 5 Aug 2015 12:56:12 +0000 (22:56 +1000)]
Add a limit to prevent ultra rare buffs
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
Severin Meyer [Wed, 5 Aug 2015 12:30:32 +0000 (14:30 +0200)]
Remove deprecated buff HUD panel and associated cvars
Mario [Wed, 5 Aug 2015 12:26:10 +0000 (22:26 +1000)]
Make TimePath happier
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
Mario [Wed, 5 Aug 2015 11:48:39 +0000 (21:48 +1000)]
Merge branch 'master' into Mario/triggers
Severin Meyer [Tue, 4 Aug 2015 21:32:37 +0000 (23:32 +0200)]
Update HUD themes for new powerup panel
Severin Meyer [Tue, 4 Aug 2015 21:29:56 +0000 (23:29 +0200)]
Reduce blur of default buff icons
Severin Meyer [Tue, 4 Aug 2015 19:31:00 +0000 (21:31 +0200)]
Remove unused powerup icons from Luma theme (sourcefiles remain available)
Severin Meyer [Tue, 4 Aug 2015 19:21:45 +0000 (21:21 +0200)]
Add default buff HUD icons
Severin Meyer [Tue, 4 Aug 2015 19:20:47 +0000 (21:20 +0200)]
Add Luma buff HUD icons
Severin Meyer [Tue, 4 Aug 2015 13:00:57 +0000 (15:00 +0200)]
Revise buff colors
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
Severin Meyer [Tue, 4 Aug 2015 11:24:44 +0000 (13:24 +0200)]
Revise buff shaders
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
Severin Meyer [Tue, 4 Aug 2015 11:07:42 +0000 (13:07 +0200)]
Remove deprecated buff shaders
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
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
BuddyFriendGuy [Tue, 4 Aug 2015 05:07:28 +0000 (01:07 -0400)]
fix gametype filter bug
BuddyFriendGuy [Tue, 4 Aug 2015 02:32:08 +0000 (22:32 -0400)]
function for add all button; tooltip
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
BuddyFriendGuy [Tue, 4 Aug 2015 02:22:20 +0000 (22:22 -0400)]
add add all button in the UI
Rudolf Polzer [Mon, 3 Aug 2015 18:27:18 +0000 (20:27 +0200)]
Set the teamplay cvar because DP needs it.
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
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
terencehill [Mon, 3 Aug 2015 13:58:42 +0000 (15:58 +0200)]
Remove g_instagib, it's useless now
Matthias Krüger [Mon, 3 Aug 2015 10:04:25 +0000 (12:04 +0200)]
cl_zoomfactor: max zoom: 16->30
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
terencehill [Sun, 2 Aug 2015 22:02:56 +0000 (00:02 +0200)]
Fix accuracy board layout
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
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
Mario [Sun, 2 Aug 2015 11:18:00 +0000 (21:18 +1000)]
Fix capture and pass effects
Severin Meyer [Sun, 2 Aug 2015 09:52:09 +0000 (11:52 +0200)]
Make noncurrent weapon icons in Luma slightly larger again
Severin Meyer [Sun, 2 Aug 2015 09:40:58 +0000 (11:40 +0200)]
Merge branch 'master' into sev/luma_revisions
TimePath [Sun, 2 Aug 2015 09:11:01 +0000 (19:11 +1000)]
Merge branch 'master' into Mario/ctf_updates
TimePath [Sun, 2 Aug 2015 08:23:25 +0000 (18:23 +1000)]
Compact HUD_Mod_CTF
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
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.

See merge request !148
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
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
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
terencehill [Sat, 1 Aug 2015 15:16:35 +0000 (17:16 +0200)]
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
Severin Meyer [Fri, 31 Jul 2015 20:05:47 +0000 (22:05 +0200)]
Fix the HUD panels to retain the teamcolor when entering a vehicle, credit to terencehill
Severin Meyer [Fri, 31 Jul 2015 18:15:43 +0000 (20:15 +0200)]
Add weapon panel cvars to adjust the scale and alpha of noncurrent weapons, like they already exist for the ammo panel
Severin Meyer [Fri, 31 Jul 2015 17:51:33 +0000 (19:51 +0200)]
Make Luma weapon bg omnidirectional
Mario [Fri, 31 Jul 2015 15:33:34 +0000 (01:33 +1000)]
Make doublerows broken, but not as much
Mario [Fri, 31 Jul 2015 14:47:38 +0000 (00:47 +1000)]
Only show available weapons in the accuracy scoreboard
Mario [Fri, 31 Jul 2015 14:37:26 +0000 (00:37 +1000)]
Fix an issue that's been around since the beginning of this branch
Mario [Fri, 31 Jul 2015 14:20:50 +0000 (00:20 +1000)]
Some new features and stuff for triggers (plus side-scrolling mode)
Severin Meyer [Fri, 31 Jul 2015 10:39:46 +0000 (12:39 +0200)]
Slightly raise pressedkey and physics HUD panel to prevent clash with vehicle panel
Mario [Fri, 31 Jul 2015 09:51:17 +0000 (19:51 +1000)]
Apply some old updates
Mario [Fri, 31 Jul 2015 09:45:40 +0000 (19:45 +1000)]
Merge branch 'master' into Mario/buff_updates
# Conflicts:
# qcsrc/common/stats.qh
# qcsrc/server/autocvars.qh
# qcsrc/server/g_damage.qc
# qcsrc/server/mutators/mutator_buffs.qc
# qcsrc/server/mutators/mutator_buffs.qh
Severin Meyer [Thu, 30 Jul 2015 09:55:56 +0000 (11:55 +0200)]
Correct the format of one of the nade images
terencehill [Thu, 30 Jul 2015 09:37:29 +0000 (11:37 +0200)]
Make sure mapvote panel doesn't interact with the hud editor as it's not editable
Mario [Thu, 30 Jul 2015 05:26:59 +0000 (05:26 +0000)]
Merge branch 'sev/menu_icons_mipmap' into 'master'
Fix blurry menu icons
Before I made Luma, new gametype and serverlist icons were added to the existing menu themes.
However, they are too sharp, which causes aliasing in-game.
Seemingly as a quick and dirty fix, some of those images are preloaded with the MIPMAP flag.
This inconsistent drawing of the images causes issues for Luma,
where the icons get too blurry (http://i.imgur.com/9mJCnJA.png).
This branch makes the following fixes:
- All server icons are either fixed or remade, so they don't need MIPMAP.
- Each menu theme can chose itself if the gametype icons need MIPMAP,
with the new theme variable BOOL_GAMETYPELIST_ICON_BLUR.
See merge request !151
Rudolf Polzer [Wed, 29 Jul 2015 21:34:02 +0000 (21:34 +0000)]
Merge branch 'sev/hud_font_weights' into 'master'
Adjust font weight for some of the HUD text
This merge request accompanies xonotic/xonotic!11
The new version of the Xolonium fonts features a bolder bold version.
This causes some of the text to become too dense.
Therefore, this branch makes the following changes:
Bold to Regular:
- Scoreboard column titles
- Weapon panel binds/numbers/names
(These are not very important, hence bold is not crucial anyway.)
- Race panel auxiliary info
(The running time is important, hence it remains bold.
The checkpoint delta and penalty is a lot smaller and not bold anymore.)
Regular to Bold:
- Health/Armor panel numbers
(Arguably the most important text on screen, hence they should be bold.)
See merge request !144
Severin Meyer [Wed, 29 Jul 2015 16:56:42 +0000 (18:56 +0200)]
Make vehicle crosshairs even more consistent
terencehill [Wed, 29 Jul 2015 16:51:28 +0000 (18:51 +0200)]
Highlight the selected map including its name
terencehill [Wed, 29 Jul 2015 15:23:21 +0000 (17:23 +0200)]
Make the mapvote panel less horizontally stretched: reduce a bit available width and increase available height by resizing (if too high) / moving to the bottom the chat panel
Severin Meyer [Tue, 28 Jul 2015 19:54:54 +0000 (21:54 +0200)]
Use consistent names
Severin Meyer [Tue, 28 Jul 2015 19:35:02 +0000 (21:35 +0200)]
Update HUD nade icons
Severin Meyer [Tue, 28 Jul 2015 15:04:46 +0000 (17:04 +0200)]
Use common nade icons for both the ammo and notification panel
Severin Meyer [Tue, 28 Jul 2015 13:32:40 +0000 (15:32 +0200)]
Use tab indents
Severin Meyer [Tue, 28 Jul 2015 11:10:46 +0000 (13:10 +0200)]
Some minor color adjustments for Luma vehicle HUD images
Severin Meyer [Mon, 27 Jul 2015 22:20:06 +0000 (00:20 +0200)]
Revise some of the Luma HUD images and settings
terencehill [Mon, 27 Jul 2015 21:59:22 +0000 (23:59 +0200)]
This comment wasn't supposed to be committed
terencehill [Mon, 27 Jul 2015 18:28:12 +0000 (20:28 +0200)]
Make map/gametype voting screen a panel; apply a background to it in the default hud skin
Mirio [Mon, 27 Jul 2015 16:29:21 +0000 (18:29 +0200)]
Merge branch 'master' of ssh://gitlab.com/xonotic/xonotic-data.pk3dir
Mirio [Mon, 27 Jul 2015 16:28:10 +0000 (18:28 +0200)]
Add Penguinum
Mario [Mon, 27 Jul 2015 16:22:28 +0000 (16:22 +0000)]
Merge branch 'terencehill/ka_fixes' into 'master'
Keepaway fixes
See merge request !147
Mario [Mon, 27 Jul 2015 14:45:58 +0000 (00:45 +1000)]
Merge branch 'master' into Mario/ctf_updates
# Conflicts:
# qcsrc/common/stats.qh
# qcsrc/server/mutators/gamemode_ctf.qc
# qcsrc/server/mutators/gamemode_ctf.qh
Severin Meyer [Mon, 27 Jul 2015 14:25:12 +0000 (16:25 +0200)]
Adjust color and brightness of legacy vehicle images, to make colors multiplied to them more visible
Severin Meyer [Mon, 27 Jul 2015 14:19:44 +0000 (16:19 +0200)]
Remove null.tga and instead test for empty string
Mario [Mon, 27 Jul 2015 13:59:25 +0000 (13:59 +0000)]
Merge branch 'Mario/qc_physics_prehax' into 'master'
Merge branch Mario/qc_physics_prehax (XXL merge request)
Ported client side movement prediction to CSQC, both server and client physics are matched as a common physics.qc file.
Also moving triggers and movetypes code to common folders for better organization.
Only a few features have been added to the physics, namely fully predicted jet packs and support for slick (slippery) surfaces.
See merge request !123
Severin Meyer [Mon, 27 Jul 2015 11:03:19 +0000 (13:03 +0200)]
Add and revise a few Luma images
terencehill [Sun, 26 Jul 2015 17:42:17 +0000 (19:42 +0200)]
Gametype vote screen: fix border thickness not correctly applied
terencehill [Sun, 26 Jul 2015 15:22:44 +0000 (17:22 +0200)]
Fix mapvote header text not perfectly centered (also make it proportional to hud_fontsize)
Severin Meyer [Sun, 26 Jul 2015 13:51:41 +0000 (15:51 +0200)]
Use old behaviour as default
Severin Meyer [Sun, 26 Jul 2015 13:22:54 +0000 (15:22 +0200)]
Do not hardcode dirty fix for aliased gametype icons, instead offer a new menu theme variable BOOL_GAMETYPELIST_ICON_BLUR
Severin Meyer [Sun, 26 Jul 2015 11:31:33 +0000 (13:31 +0200)]
Remove GFX_SERVERLIST_ICON. There is no reason why themes should use a custom icon name prefix, and no existing theme does.
Severin Meyer [Sun, 26 Jul 2015 11:22:40 +0000 (13:22 +0200)]
Draw menu serverlist icons consistently without mipmap, fix images that would get too aliased
terencehill [Thu, 16 Jul 2015 14:27:25 +0000 (16:27 +0200)]
Small cleanup
Signed-off-by: terencehill <piuntn@gmail.com>
terencehill [Thu, 16 Jul 2015 13:52:02 +0000 (15:52 +0200)]
Decrease a bit cell ar
Signed-off-by: terencehill <piuntn@gmail.com>
terencehill [Wed, 15 Jul 2015 13:33:59 +0000 (15:33 +0200)]
Make map voting screen more compact when possible (hard size limit is now applied to the table cell rather than to the items within the cell)
Signed-off-by: terencehill <piuntn@gmail.com>
terencehill [Wed, 15 Jul 2015 13:26:22 +0000 (15:26 +0200)]
Further changes were necessary to make everything work fine...
Signed-off-by: terencehill <piuntn@gmail.com>
terencehill [Tue, 14 Jul 2015 12:26:13 +0000 (14:26 +0200)]
Reduce too big map images when there are very few choices
Signed-off-by: terencehill <piuntn@gmail.com>
terencehill [Mon, 13 Jul 2015 19:52:22 +0000 (21:52 +0200)]
Self explanatory function name
Signed-off-by: terencehill <piuntn@gmail.com>
terencehill [Mon, 13 Jul 2015 19:15:48 +0000 (21:15 +0200)]
Improve map voting and gametype voting layouts: items as big as possible with minimum alteration of the desired item aspect ratio (like the weapons panel layout)
Signed-off-by: terencehill <piuntn@gmail.com>
Severin Meyer [Sat, 25 Jul 2015 16:52:18 +0000 (18:52 +0200)]
Integrate the vehicle HUD images into the existing HUD themes.
Severin Meyer [Fri, 24 Jul 2015 18:29:11 +0000 (20:29 +0200)]
Give vehicle crosshairs more consistent and self-explanatory names
Severin Meyer [Fri, 24 Jul 2015 18:24:24 +0000 (20:24 +0200)]
There was no need for custom booleans, the same can be achieved with the existing HUD_ constants
Severin Meyer [Fri, 24 Jul 2015 13:24:38 +0000 (15:24 +0200)]
Use the same gunner crosshair for both the bumblebee pilot and the gunners