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 [Thu, 30 Jul 2015 09:55:56 +0000 (11:55 +0200)]
Correct the format of one of the nade images
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 [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
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 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 [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
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
Severin Meyer [Wed, 15 Jul 2015 20:26:47 +0000 (22:26 +0200)]
Revise Luma nexball icon
Severin Meyer [Wed, 15 Jul 2015 20:09:33 +0000 (22:09 +0200)]
Make colorbutton frame slightly darker
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
Severin Meyer [Wed, 15 Jul 2015 18:15:00 +0000 (20:15 +0200)]
Make ingame menu background slightly less opaque
Severin Meyer [Wed, 15 Jul 2015 18:05:09 +0000 (20:05 +0200)]
Update skinvalues of Luma and Luminos
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
Severin Meyer [Wed, 15 Jul 2015 16:18:59 +0000 (18:18 +0200)]
In the skinlist, set the default tag automatically
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
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
Mario [Sun, 12 Jul 2015 11:14:31 +0000 (21:14 +1000)]
Make TimePath happy
Mario [Sun, 12 Jul 2015 11:04:15 +0000 (21:04 +1000)]
Make bit usage a little clearer
Mario [Sun, 12 Jul 2015 10:46:34 +0000 (20:46 +1000)]
Merge branch 'master' into Penguinum/Antiwall
Mario [Sun, 12 Jul 2015 02:45:59 +0000 (12:45 +1000)]
Apply some minor updates from recent code cleanups
Mirio [Sat, 11 Jul 2015 16:00:08 +0000 (18:00 +0200)]
Forgot L0
Mirio [Sat, 11 Jul 2015 15:40:17 +0000 (17:40 +0200)]
Update credits for new maps
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
Mario [Sat, 11 Jul 2015 12:28:24 +0000 (22:28 +1000)]
Re-arrange gametypes in the menu
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
Mario [Sat, 11 Jul 2015 04:56:40 +0000 (14:56 +1000)]
Merge branch 'TimePath/itemsys_fix'
Mattia Basaglia [Fri, 10 Jul 2015 14:22:07 +0000 (16:22 +0200)]
Clean up the function drawing the gametype vote entries
Severin Meyer [Fri, 10 Jul 2015 10:23:53 +0000 (12:23 +0200)]
Adjust font weight for some of the HUD text
TimePath [Fri, 10 Jul 2015 10:12:45 +0000 (20:12 +1000)]
Fix an oversight in the item system
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
Mirio [Thu, 9 Jul 2015 19:23:22 +0000 (21:23 +0200)]
Update credits
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
Mattia Basaglia [Thu, 9 Jul 2015 10:33:53 +0000 (12:33 +0200)]
Display name and description of customized vote options
Mattia Basaglia [Thu, 9 Jul 2015 10:03:51 +0000 (12:03 +0200)]
Send name and description for customized vote options
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
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
Mattia Basaglia [Thu, 9 Jul 2015 08:11:05 +0000 (10:11 +0200)]
Turn mapvote availability into a flag
Mario [Thu, 9 Jul 2015 07:39:37 +0000 (17:39 +1000)]
Boolerize Physics_Valid
Mario [Thu, 9 Jul 2015 07:39:06 +0000 (17:39 +1000)]
Fix hardcoded constant values for cvar_type
Mario [Thu, 9 Jul 2015 07:35:04 +0000 (17:35 +1000)]
Add bones physics and increase jump velocity for Xonotic physics
Mattia Basaglia [Thu, 9 Jul 2015 07:23:28 +0000 (09:23 +0200)]
Keep only declarations regarding the buplic interface in the mapvoting headers
Mario [Thu, 9 Jul 2015 07:19:29 +0000 (17:19 +1000)]
Merge branch 'master' into Mario/physics
Conflicts:
qcsrc/server/autocvars.qh
Mario [Thu, 9 Jul 2015 03:38:08 +0000 (13:38 +1000)]
Start with most weapons & ammo in freeze tag
Mario [Thu, 9 Jul 2015 03:28:32 +0000 (13:28 +1000)]
Make corpses sink slowly in water
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
Mario [Thu, 9 Jul 2015 01:49:32 +0000 (11:49 +1000)]
Hide g_invasion_teams from the impurity checks
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
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
Mario [Thu, 9 Jul 2015 00:28:10 +0000 (10:28 +1000)]
Attempt to prevent step sounds while crouching
Mattia Basaglia [Wed, 8 Jul 2015 21:10:42 +0000 (23:10 +0200)]
Allow cvar-based gametype vote options
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)
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
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
terencehill [Fri, 3 Jul 2015 13:49:33 +0000 (15:49 +0200)]
Merge branch 'master' into terencehill/accelerometer_fix
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)
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
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
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
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
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
Mario [Thu, 2 Jul 2015 10:37:25 +0000 (10:37 +0000)]
Merge branch 'terencehill/hud_configure' into 'master'
HUD editor changes
A few changes to the hud editor
See merge request !120
Mario [Thu, 2 Jul 2015 09:13:50 +0000 (09:13 +0000)]
Merge branch 'Melanosuchus/vote_caller' into 'master'
Store the name of the vote caller
If only the entity of the caller is stored, there can be some inconsistencies.
Example: If a player leaves the server after calling the vote, the result will show an empty name.
This branch fixes such inconsistencies, while the normal flow isn't affected.
(ie: Votes from the server still show the correct name and if a player changes their name, messages will show the new name)
See merge request !127
TimePath [Tue, 30 Jun 2015 04:27:27 +0000 (14:27 +1000)]
Ignore sv_mapformat_is_quake2 too
TimePath [Tue, 30 Jun 2015 04:20:57 +0000 (14:20 +1000)]
Ignore sv_mapformat_is_quake3 when checking cvar purity. Fixes #1472
terencehill [Mon, 29 Jun 2015 16:08:22 +0000 (18:08 +0200)]
Optimize code by anticipating hud_panel_physics_text check
terencehill [Mon, 29 Jun 2015 15:59:31 +0000 (17:59 +0200)]
Don't show negative 0 values in the accelerometer
terencehill [Fri, 19 Jun 2015 20:47:07 +0000 (22:47 +0200)]
Add a cvar to allow disabling the averaging method used for calculating acceleration
terencehill [Fri, 19 Jun 2015 20:32:49 +0000 (22:32 +0200)]
Fix a small mathematical issue
terencehill [Thu, 18 Jun 2015 13:47:47 +0000 (15:47 +0200)]
Fix accelerometer displaying the real acceleration value (not very stable) instead of the average value
terencehill [Thu, 11 Jun 2015 22:57:24 +0000 (00:57 +0200)]
shuffleteams: properly detect ca players. It fixes #1471 "Shuffleteams results in uneven teams (CA)"
Rudolf Polzer [Mon, 1 Jun 2015 09:15:31 +0000 (11:15 +0200)]
Bump gameversion.
Penguinum [Wed, 20 May 2015 06:04:28 +0000 (09:04 +0300)]
Vertical offset, comments, etc
Penguinum [Tue, 19 May 2015 09:14:21 +0000 (12:14 +0300)]
Fixed probable division by zero (didn't affect anything in test map, though).
Penguinum [Tue, 19 May 2015 06:56:26 +0000 (09:56 +0300)]
Removed very stupid piece of code, renamed aw_inactive.
Penguinum [Mon, 18 May 2015 19:20:07 +0000 (22:20 +0300)]
Moved code from g_triggers.qc to better place
TimePath [Wed, 13 May 2015 23:32:50 +0000 (09:32 +1000)]
Replace `MAP(IDENTITY)` with `UNWORDS`
TimePath [Wed, 13 May 2015 23:27:58 +0000 (09:27 +1000)]
Replace `IF(ALL,` with `APPLY(`
TimePath [Wed, 13 May 2015 05:54:31 +0000 (15:54 +1000)]
Tidy up
TimePath [Wed, 13 May 2015 05:46:07 +0000 (15:46 +1000)]
Inventory system
Counts collected items and sends them with delta compression
TimePath [Wed, 13 May 2015 00:54:31 +0000 (10:54 +1000)]
Add an item dumping command
TimePath [Wed, 13 May 2015 00:34:15 +0000 (10:34 +1000)]
Cleanup
TimePath [Tue, 12 May 2015 10:27:11 +0000 (20:27 +1000)]
Add instagib items
TimePath [Tue, 12 May 2015 10:09:44 +0000 (20:09 +1000)]
Add jetpack
Fix incorrect ammo from ammo pickups
TimePath [Tue, 12 May 2015 09:35:15 +0000 (19:35 +1000)]
Fix items not respawning
LMS mutator anyone?
TimePath [Tue, 12 May 2015 09:15:29 +0000 (19:15 +1000)]
Add powerups
TimePath [Tue, 12 May 2015 07:58:00 +0000 (17:58 +1000)]
Light refactoring: rename module roots to `all` for consistency
TimePath [Tue, 12 May 2015 07:07:27 +0000 (17:07 +1000)]
Move LAMBDA
TimePath [Tue, 12 May 2015 07:02:16 +0000 (17:02 +1000)]
Remove SPAWNTIMES enum