xonotic/xonotic-data.pk3dir.git
4 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

4 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

4 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

4 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

4 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

4 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

4 years agoFix HUD color when spectating a player in a vehicle and a bug in the score panel...
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

4 years agoFix the HUD panels to retain the teamcolor when entering a vehicle, credit to terencehill
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

4 years agoAdd weapon panel cvars to adjust the scale and alpha of noncurrent weapons, like...
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

4 years agoMake Luma weapon bg omnidirectional
Severin Meyer [Fri, 31 Jul 2015 17:51:33 +0000 (19:51 +0200)]
Make Luma weapon bg omnidirectional

4 years agoMake doublerows broken, but not as much
Mario [Fri, 31 Jul 2015 15:33:34 +0000 (01:33 +1000)]
Make doublerows broken, but not as much

4 years agoOnly show available weapons in the accuracy scoreboard
Mario [Fri, 31 Jul 2015 14:47:38 +0000 (00:47 +1000)]
Only show available weapons in the accuracy scoreboard

4 years agoSlightly raise pressedkey and physics HUD panel to prevent clash with vehicle panel
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

4 years agoCorrect the format of one of the nade images
Severin Meyer [Thu, 30 Jul 2015 09:55:56 +0000 (11:55 +0200)]
Correct the format of one of the nade images

4 years agoMerge branch 'sev/menu_icons_mipmap' into 'master'
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

4 years agoMerge branch 'sev/hud_font_weights' into 'master'
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

4 years agoMake vehicle crosshairs even more consistent
Severin Meyer [Wed, 29 Jul 2015 16:56:42 +0000 (18:56 +0200)]
Make vehicle crosshairs even more consistent

4 years agoUse consistent names
Severin Meyer [Tue, 28 Jul 2015 19:54:54 +0000 (21:54 +0200)]
Use consistent names

4 years agoUpdate HUD nade icons
Severin Meyer [Tue, 28 Jul 2015 19:35:02 +0000 (21:35 +0200)]
Update HUD nade icons

4 years agoUse common nade icons for both the ammo and notification panel
Severin Meyer [Tue, 28 Jul 2015 15:04:46 +0000 (17:04 +0200)]
Use common nade icons for both the ammo and notification panel

4 years agoUse tab indents
Severin Meyer [Tue, 28 Jul 2015 13:32:40 +0000 (15:32 +0200)]
Use tab indents

4 years agoSome minor color adjustments for Luma vehicle HUD images
Severin Meyer [Tue, 28 Jul 2015 11:10:46 +0000 (13:10 +0200)]
Some minor color adjustments for Luma vehicle HUD images

4 years agoRevise some of the Luma HUD images and settings
Severin Meyer [Mon, 27 Jul 2015 22:20:06 +0000 (00:20 +0200)]
Revise some of the Luma HUD images and settings

4 years agoMerge branch 'master' of ssh://gitlab.com/xonotic/xonotic-data.pk3dir
Mirio [Mon, 27 Jul 2015 16:29:21 +0000 (18:29 +0200)]
Merge branch 'master' of ssh://gitlab.com/xonotic/xonotic-data.pk3dir

4 years agoAdd Penguinum
Mirio [Mon, 27 Jul 2015 16:28:10 +0000 (18:28 +0200)]
Add Penguinum

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

4 years agoAdjust color and brightness of legacy vehicle images, to make colors multiplied to...
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

4 years agoRemove null.tga and instead test for empty string
Severin Meyer [Mon, 27 Jul 2015 14:19:44 +0000 (16:19 +0200)]
Remove null.tga and instead test for empty string

4 years agoMerge branch 'Mario/qc_physics_prehax' into 'master'
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

4 years agoAdd and revise a few Luma images
Severin Meyer [Mon, 27 Jul 2015 11:03:19 +0000 (13:03 +0200)]
Add and revise a few Luma images

4 years agoUse old behaviour as default
Severin Meyer [Sun, 26 Jul 2015 13:51:41 +0000 (15:51 +0200)]
Use old behaviour as default

4 years agoDo not hardcode dirty fix for aliased gametype icons, instead offer a new menu theme...
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

4 years agoRemove GFX_SERVERLIST_ICON. There is no reason why themes should use a custom icon...
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.

4 years agoDraw menu serverlist icons consistently without mipmap, fix images that would get...
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

4 years agoIntegrate the vehicle HUD images into the existing HUD themes.
Severin Meyer [Sat, 25 Jul 2015 16:52:18 +0000 (18:52 +0200)]
Integrate the vehicle HUD images into the existing HUD themes.

4 years agoGive vehicle crosshairs more consistent and self-explanatory names
Severin Meyer [Fri, 24 Jul 2015 18:29:11 +0000 (20:29 +0200)]
Give vehicle crosshairs more consistent and self-explanatory names

4 years agoThere was no need for custom booleans, the same can be achieved with the existing...
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

4 years agoUse the same gunner crosshair for both the bumblebee pilot and the gunners
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

4 years agoSmall fix for the bumblebee gunner HUD
Severin Meyer [Fri, 24 Jul 2015 13:13:36 +0000 (15:13 +0200)]
Small fix for the bumblebee gunner HUD

4 years agoUse existing cvars for the vehicle HUD, add new cvars for vehicle ammo bar colors
Severin Meyer [Thu, 23 Jul 2015 18:05:02 +0000 (20:05 +0200)]
Use existing cvars for the vehicle HUD, add new cvars for vehicle ammo bar colors

4 years agoRevise vehicle HUD images and make small updates to the HUD drawing function
Severin Meyer [Thu, 23 Jul 2015 14:12:38 +0000 (16:12 +0200)]
Revise vehicle HUD images and make small updates to the HUD drawing function

4 years agoRevise vehicle crosshairs
Severin Meyer [Thu, 23 Jul 2015 09:35:49 +0000 (11:35 +0200)]
Revise vehicle crosshairs

4 years agoBugfix: Properly initialize vehicle_energy, otherwise the old value is carried over...
Severin Meyer [Tue, 21 Jul 2015 17:19:48 +0000 (19:19 +0200)]
Bugfix: Properly initialize vehicle_energy, otherwise the old value is carried over to the spider

4 years agoDelete unused and add new vehicle image files
Severin Meyer [Tue, 21 Jul 2015 11:08:59 +0000 (13:08 +0200)]
Delete unused and add new vehicle image files

4 years agoRewrite vehicle HUD code: Use common HUD drawing function for all vehicles. Calculate...
Severin Meyer [Tue, 21 Jul 2015 11:02:51 +0000 (13:02 +0200)]
Rewrite vehicle HUD code: Use common HUD drawing function for all vehicles. Calculate image positions and sizes relative to frame image. Use global cvar for vehicle crosshair scale. Make all ammo bars behave consistently.

4 years agoMake the vehicle stats more consistent. Use ammo2 to represents the percentage of...
Severin Meyer [Tue, 21 Jul 2015 10:51:20 +0000 (12:51 +0200)]
Make the vehicle stats more consistent. Use ammo2 to represents the percentage of secondary ammo left.

5 years agoMerge branch 'sev/luma_menu_revisions' into 'master'
Mario [Thu, 16 Jul 2015 09:18:35 +0000 (09:18 +0000)]
Merge branch 'sev/luma_menu_revisions' into 'master'

Minor Luma menu revisions

Minor revisions of some skinvalues and images.

Most notably, this branch removes the "(default)" tag from the skinvalues file, and instead makes the code add it automatically.
This way, it doesn't have to be kept in synch manually, and we can use an i18n string.

See merge request !146

5 years agoRevise Luma nexball icon
Severin Meyer [Wed, 15 Jul 2015 20:26:47 +0000 (22:26 +0200)]
Revise Luma nexball icon

5 years agoMake colorbutton frame slightly darker
Severin Meyer [Wed, 15 Jul 2015 20:09:33 +0000 (22:09 +0200)]
Make colorbutton frame slightly darker

5 years agoKeepaway: synchronize game start with ball respawn and make sure that while the count...
terencehill [Wed, 15 Jul 2015 18:26:52 +0000 (20:26 +0200)]
Keepaway: synchronize game start with ball respawn and make sure that while the countdown is going on nobody can accidentally take it

5 years agoMake ingame menu background slightly less opaque
Severin Meyer [Wed, 15 Jul 2015 18:15:00 +0000 (20:15 +0200)]
Make ingame menu background slightly less opaque

5 years agoUpdate skinvalues of Luma and Luminos
Severin Meyer [Wed, 15 Jul 2015 18:05:09 +0000 (20:05 +0200)]
Update skinvalues of Luma and Luminos

5 years agoFix ka bot logic bug where it was rated route to either the ball owner and the ball...
terencehill [Wed, 15 Jul 2015 16:45:51 +0000 (18:45 +0200)]
Fix ka bot logic bug where it was rated route to either the ball owner and the ball itself

5 years agoIn the skinlist, set the default tag automatically
Severin Meyer [Wed, 15 Jul 2015 16:18:59 +0000 (18:18 +0200)]
In the skinlist, set the default tag automatically

5 years agoMerge branch 'master' into Mario/qc_physics_prehax
Mario [Wed, 15 Jul 2015 05:43:30 +0000 (15:43 +1000)]
Merge branch 'master' into Mario/qc_physics_prehax

Conflicts:
qcsrc/server/autocvars.qh
qcsrc/server/defs.qh
qcsrc/server/g_triggers.qc
qcsrc/server/g_triggers.qh

5 years agoMerge branch 'Penguinum/Antiwall' into 'master'
Mario [Sun, 12 Jul 2015 11:17:30 +0000 (11:17 +0000)]
Merge branch 'Penguinum/Antiwall' into 'master'

Penguinum/antiwall

Result of [this thread](http://forums.xonotic.org/showthread.php?tid=5441) and [this conversation](https://gitlab.com/xonotic/xonotic-data.pk3dir/commit/7732979dccd0be2d113894202177195626e08ddf#note_1142181).

What was added: fade-out/fade-in for entities, initialized by G_CLIENTMODEL_INIT (at the moment, they are: func_clientwall, func_clientillusionary, misc_clientmodel), ability to deactivate (alpha = 0, solid = SOLID_NOT) or activate (normal condition) them by trigger. Could be useful, for example, for [MrDetonia's map](http://forums.xonotic.org/showthread.php?tid=5251&pid=70359#pid70359).

If you want to see it in action, there is a [test map](https://drive.google.com/file/d/0B4nZJEEvT4LsLTNzazA1VFBLVFk/view?usp=sharing).

See merge request !132

5 years agoMake TimePath happy
Mario [Sun, 12 Jul 2015 11:14:31 +0000 (21:14 +1000)]
Make TimePath happy

5 years agoMake bit usage a little clearer
Mario [Sun, 12 Jul 2015 11:04:15 +0000 (21:04 +1000)]
Make bit usage a little clearer

5 years agoMerge branch 'master' into Penguinum/Antiwall
Mario [Sun, 12 Jul 2015 10:46:34 +0000 (20:46 +1000)]
Merge branch 'master' into Penguinum/Antiwall

5 years agoApply some minor updates from recent code cleanups
Mario [Sun, 12 Jul 2015 02:45:59 +0000 (12:45 +1000)]
Apply some minor updates from recent code cleanups

5 years agoForgot L0
Mirio [Sat, 11 Jul 2015 16:00:08 +0000 (18:00 +0200)]
Forgot L0

5 years agoUpdate credits for new maps
Mirio [Sat, 11 Jul 2015 15:40:17 +0000 (17:40 +0200)]
Update credits for new maps

5 years agoMerge branch 'Melanosuchus/gametype_vote' into 'master'
Mario [Sat, 11 Jul 2015 14:36:43 +0000 (14:36 +0000)]
Merge branch 'Melanosuchus/gametype_vote' into 'master'

Customizable entries for the gametype voting screen

Adds a system which allow to include customized entries in the gametype voting screen.

These entries are defined by a few cvars:
* sv_vote_gametype_(type)_type : The name of the gametype this entry is based on (eg: dm, tdm, ...)
* sv_vote_gametype_(type)_name : A human-readable name, shown in the voting screen
* sv_vote_gametype_(type)_description : A more detailed description of the gametype, shown in the voting screen

Where (type) is the name of the customized entry.
The icon for custom entries follows the same convention as for regular gametypes,
and the hook sv_vote_gametype_hook_(type) is called as for the real gametypes.

This branch also provides the needed definitions to add **duel** to the voting screen without the need for extra configuration.
(See Xonvote 308 http://xonpickbot.designxenon.com:27500/poll/308)

See merge request !145

5 years agoRe-arrange gametypes in the menu
Mario [Sat, 11 Jul 2015 12:28:24 +0000 (22:28 +1000)]
Re-arrange gametypes in the menu

5 years agoKeep the same spacing even if an entry doesn't have an icon
Mattia Basaglia [Sat, 11 Jul 2015 09:58:24 +0000 (11:58 +0200)]
Keep the same spacing even if an entry doesn't have an icon

5 years agoMerge branch 'TimePath/itemsys_fix'
Mario [Sat, 11 Jul 2015 04:56:40 +0000 (14:56 +1000)]
Merge branch 'TimePath/itemsys_fix'

5 years agoClean up the function drawing the gametype vote entries
Mattia Basaglia [Fri, 10 Jul 2015 14:22:07 +0000 (16:22 +0200)]
Clean up the function drawing the gametype vote entries

5 years agoAdjust font weight for some of the HUD text
Severin Meyer [Fri, 10 Jul 2015 10:23:53 +0000 (12:23 +0200)]
Adjust font weight for some of the HUD text

5 years agoFix an oversight in the item system
TimePath [Fri, 10 Jul 2015 10:12:45 +0000 (20:12 +1000)]
Fix an oversight in the item system

5 years agoUse a fallback name on the client if the custom vote options don't provide one
Mattia Basaglia [Fri, 10 Jul 2015 10:05:56 +0000 (12:05 +0200)]
Use a fallback name on the client if the custom vote options don't provide one

5 years agoUpdate credits
Mirio [Thu, 9 Jul 2015 19:23:22 +0000 (21:23 +0200)]
Update credits

5 years agoSet up duel for inclusion in the gametype voting screen as a custom option
Mattia Basaglia [Thu, 9 Jul 2015 11:02:37 +0000 (13:02 +0200)]
Set up duel for inclusion in the gametype voting screen as a custom option

5 years agoDisplay name and description of customized vote options
Mattia Basaglia [Thu, 9 Jul 2015 10:33:53 +0000 (12:33 +0200)]
Display name and description of customized vote options

5 years agoSend name and description for customized vote options
Mattia Basaglia [Thu, 9 Jul 2015 10:03:51 +0000 (12:03 +0200)]
Send name and description for customized vote options

5 years agoMerge branch 'terencehill/shuffleteams_fix' into 'master'
Mario [Thu, 9 Jul 2015 08:27:12 +0000 (08:27 +0000)]
Merge branch 'terencehill/shuffleteams_fix' into 'master'

shuffleteams: properly detect ca players. It fixes #1471 "Shuffleteams results in uneven teams (CA)"

See merge request !136

5 years agoMerge branch 'Mario/physics' into 'master'
Mario [Thu, 9 Jul 2015 08:23:27 +0000 (08:23 +0000)]
Merge branch 'Mario/physics' into 'master'

Merge branch Mario/physics (M merge request)

Adds an option to allow clients to change their physics set (e.g. defrag, nexuiz, xonotic etc).
Handling is fully server side and client predicted, so no exploits here...

See merge request !143

5 years agoTurn mapvote availability into a flag
Mattia Basaglia [Thu, 9 Jul 2015 08:11:05 +0000 (10:11 +0200)]
Turn mapvote availability into a flag

5 years agoBoolerize Physics_Valid
Mario [Thu, 9 Jul 2015 07:39:37 +0000 (17:39 +1000)]
Boolerize Physics_Valid

5 years agoFix hardcoded constant values for cvar_type
Mario [Thu, 9 Jul 2015 07:39:06 +0000 (17:39 +1000)]
Fix hardcoded constant values for cvar_type

5 years agoAdd bones physics and increase jump velocity for Xonotic physics
Mario [Thu, 9 Jul 2015 07:35:04 +0000 (17:35 +1000)]
Add bones physics and increase jump velocity for Xonotic physics

5 years agoKeep only declarations regarding the buplic interface in the mapvoting headers
Mattia Basaglia [Thu, 9 Jul 2015 07:23:28 +0000 (09:23 +0200)]
Keep only declarations regarding the buplic interface in the mapvoting headers

5 years agoMerge branch 'master' into Mario/physics
Mario [Thu, 9 Jul 2015 07:19:29 +0000 (17:19 +1000)]
Merge branch 'master' into Mario/physics

Conflicts:
qcsrc/server/autocvars.qh

5 years agoStart with most weapons & ammo in freeze tag
Mario [Thu, 9 Jul 2015 03:38:08 +0000 (13:38 +1000)]
Start with most weapons & ammo in freeze tag

5 years agoMake corpses sink slowly in water
Mario [Thu, 9 Jul 2015 03:28:32 +0000 (13:28 +1000)]
Make corpses sink slowly in water

5 years agoAdd a hack to fix jumping prediction with the engine's version of physics, also defau...
Mario [Thu, 9 Jul 2015 02:13:42 +0000 (12:13 +1000)]
Add a hack to fix jumping prediction with the engine's version of physics, also default to QC physics

5 years agoHide g_invasion_teams from the impurity checks
Mario [Thu, 9 Jul 2015 01:49:32 +0000 (11:49 +1000)]
Hide g_invasion_teams from the impurity checks

5 years agoMerge branch 'packer-/impure_team_cvars' into 'master'
Mario [Thu, 9 Jul 2015 01:38:50 +0000 (01:38 +0000)]
Merge branch 'packer-/impure_team_cvars' into 'master'

add g_tdm_teams_override and g_domination_teams_override to cvar whitelist

Modifying default team number for gametype tdm or dom makes server impure

g_tdm_teams_override "3" // "0"
g_domination_teams_override "3" // "0"

ca, freezetag and keyhunt are already whitelisted
grep teams_override g_world.qc
BADCVAR("g_ca_teams_override");
BADCVAR("g_freezetag_teams_override");
BADCVAR("g_keyhunt_teams_override");

See merge request !139

5 years agoMerge branch 'terencehill/accelerometer_fix' into 'master'
Mario [Thu, 9 Jul 2015 01:36:23 +0000 (01:36 +0000)]
Merge branch 'terencehill/accelerometer_fix' into 'master'

Minor fixes / improvements to the accelerometer

Fixes / improvements aiming to smooth acceleration values and to make them more readable

See merge request !140

5 years agoAttempt to prevent step sounds while crouching
Mario [Thu, 9 Jul 2015 00:28:10 +0000 (10:28 +1000)]
Attempt to prevent step sounds while crouching

5 years agoAllow cvar-based gametype vote options
Mattia Basaglia [Wed, 8 Jul 2015 21:10:42 +0000 (23:10 +0200)]
Allow cvar-based gametype vote options

5 years agoMerge master into qc_physics_prehax (blame TimePath if it's completely broken)
Mario [Wed, 8 Jul 2015 14:15:25 +0000 (00:15 +1000)]
Merge master into qc_physics_prehax (blame TimePath if it's completely broken)

5 years agoadd g_tdm_teams_override and g_domination_teams_override to cvar whitelist
packer [Sun, 5 Jul 2015 15:59:17 +0000 (17:59 +0200)]
add g_tdm_teams_override and g_domination_teams_override to cvar whitelist

5 years agoMerge branch 'TimePath/itemsys' into 'master'
Mario [Sat, 4 Jul 2015 03:06:12 +0000 (03:06 +0000)]
Merge branch 'TimePath/itemsys' into 'master'

TimePath/itemsys: an item and inventory system

This system and the weapon system seem to overlap quite a bit and would benefit from being combined, currently this one ignores weapons completely.

Current state:
 * All items except weapons are spawned using this system
 * Tracks item pickups from clients and networks their inventories to them
 * Items can define their own behaviour to actions without conditional logic throughout the code

See merge request !128

5 years agoMerge branch 'master' into terencehill/accelerometer_fix
terencehill [Fri, 3 Jul 2015 13:49:33 +0000 (15:49 +0200)]
Merge branch 'master' into terencehill/accelerometer_fix

5 years agoMake numeric values of speed and acceleration more readable by limiting the refresh...
terencehill [Fri, 3 Jul 2015 13:24:28 +0000 (15:24 +0200)]
Make numeric values of speed and acceleration more readable by limiting the refresh rate (cvar hud_panel_physics_update_interval)

5 years agoMerge remote-tracking branch 'remotes/origin/master' into TimePath/itemsys
TimePath [Fri, 3 Jul 2015 06:29:25 +0000 (16:29 +1000)]
Merge remote-tracking branch 'remotes/origin/master' into TimePath/itemsys

# Conflicts:
# qcsrc/client/main.qc
# qcsrc/client/progs.src
# qcsrc/menu/menu.qc
# qcsrc/menu/progs.src
# qcsrc/server/g_world.qc

5 years agoMerge branch 'terencehill/menu_remove_tab_title' into 'master'
Mario [Fri, 3 Jul 2015 05:43:39 +0000 (05:43 +0000)]
Merge branch 'terencehill/menu_remove_tab_title' into 'master'

Menu: Remove tab title attribute

* Don't set the title for tabs since it's the tab button that holds and displays the tab title
* Don't spawn dialog borders (including title) for each tab contained in a dialog

I started this branch when I noticed that a few tab titles didn't match the corresponding tab button text, thus adding unused strings for translation (e.g. "Join" vs "Servers", "Demo" vs "Demos", etc...)

See merge request !126

5 years agoMerge branch 'terencehill/listbox_item_highlight' into 'master'
Mario [Fri, 3 Jul 2015 05:36:13 +0000 (05:36 +0000)]
Merge branch 'terencehill/listbox_item_highlight' into 'master'

Listbox: highlight item under the cursor

* Highlight listbox focused items with a customizable (by skin attributes) fade effect; the same effect is applied to the crosshair picker and to the charmap too

* Crosshair picker now has customizable (by skin attributes) color and alpha, similarly to the charmap ones

* The dot crosshair now appears always white in the crosshair picker

* The crosshair preview is no longer highlighted, nor clickable as it's no longer a button (made no sense)

About the implementation:
Changed the crosshair picker and the crosshair preview from a set of special radio buttons to 2 new different items: a picker with code based on the charmap code and a preview. More precisely the crosshair picker extends the new Picker superclass (same for the charmap).

See merge request !122

5 years agoMerge branch 'TimePath/issues/1472' into 'master'
Mario [Fri, 3 Jul 2015 00:20:40 +0000 (00:20 +0000)]
Merge branch 'TimePath/issues/1472' into 'master'

Ignore sv_mapformat_is_quake3 when checking cvar purity. Fixes #1472

See merge request !138

5 years agoMerge branch 'TimePath/module_roots' into 'master'
Mario [Fri, 3 Jul 2015 00:19:53 +0000 (00:19 +0000)]
Merge branch 'TimePath/module_roots' into 'master'

Light refactoring: rename module roots to `all` for consistency

See merge request !131