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.
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).
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)
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...
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");
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
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...)
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).
terencehill [Mon, 11 May 2015 17:47:02 +0000 (19:47 +0200)]
Picker: apply the fade effect even focusing another cell through the keyboard; contextually, improve HOME/END key functions so that they skip invalid cells
Mario [Sun, 10 May 2015 03:15:51 +0000 (03:15 +0000)]
Merge branch 'TimePath/qc_updates' into 'master'
Merge branch TimePath/qc_updates (XXL merge request, but no functional changes or file relocations)
Major:
* Stops relying on the progs.src order by fixing all the `#include` lists, prerequisite for removing `-Wno-field-redeclared`. Test script included at `test/compilationunit.sh`
Minor:
* `float` -> `int`
* `var .float fld; ent.fld` -> `var .float fld; ent.(fld)`, less magic
* menu `spawnXXX()` -> `NEW(XXX)`, allows for overloaded constructors to replace `makeXXX(..)`
* some entity class annotations to serve as documentation, and later type checking
projects / xonotic / xonotic-data.pk3dir.git / log