Commit Graph
24 Commits
Author SHA1 Message Date
Flamefire 3402c7b4c4 Merge branch 'develop' of git://github.com/Vocaluxe/Vocaluxe into develop 2014-12-07 22:48:00 +01:00
Flamefire c1131cc747 Fix wrong disabling/enabling of team number buttons 2014-12-07 22:33:11 +01:00
Florian Küpper fdfbed9981 Another fix for party-modes. 2014-12-05 17:16:27 +01:00
Florian Küpper ca5d607937 Added check on PartyNameSelection if all player are selected, otherwise Vocaluxe would crash. 2014-12-05 16:52:20 +01:00
Flamefire 26484ad137 Fix blank screen issue
Also fix some other bugs and improvements (easier party modes, volume fixes, new fields for screens to control volume and popups)
2014-11-27 21:47:02 +01:00
Flamefire e7d1febe4b Fix Drag&Drop 2014-10-19 17:32:03 +02:00
Flamefire ae7a7fd390 Implement a common Interface for all MenuElements
Also remove CSongMenu and replace it with a factory class
2014-10-19 17:17:39 +02:00
Flamefire b07d31f697 Unify object interactions 2014-10-18 18:46:13 +02:00
Flamefire 7f8e974fe1 Rename CTexture to CTextureRef to reflect it is only a reference 2014-09-13 17:51:55 +02:00
Flamefire 898819fcf5 Fix code issues (naming, unused stuff) 2014-03-12 09:41:34 +01:00
Flamefire 149026ec32 IMPORTANT: Format of all files with Resharper
NO functional changes. If you have problems merging your changes, merge/rebase on previous commit then merge this. Conflicts can easily be resolved (take yours if in doubt)
After that merge next commits
2014-02-26 00:36:00 +01:00
Florian Küpper b433576de0 PartyNames: Fix 'remembering' of selected profiles. 2013-12-31 11:26:26 +01:00
Florian Küpper 978c04916b PartyNames: Use [+] and [-] to in/decrease player/team-num. 2013-12-26 13:07:31 +01:00
Florian Küpper 0f1beb6479 PartyNames: Fix random selection. 2013-12-26 13:07:31 +01:00
Florian Küpper c14ea466f5 PartyNames: Use [1]..[9] to change team and/or increase team-num. 2013-12-26 13:07:29 +01:00
Florian Küpper 4f08a7a796 PartyNames: Some cleanup 2013-12-26 13:07:28 +01:00
Florian Küpper 915db881e3 PartyNames: Added button for selecting random. 2013-12-26 13:07:28 +01:00
Florian Küpper 3f28d6405c PartyNames: Could change team/player-nums on name-selection now if allowed. 2013-12-26 13:07:23 +01:00
Florian Küpper d24c47012c Revert "Revert PartyNames-changes on develop-branch."
This reverts commit 43545ac47f.

Conflicts:
	VocaluxeLib/Menu/CNameSelection.cs
2013-12-26 13:02:06 +01:00
Florian Küpper 5449d985ef Revert PartyNames-changes on develop-branch. 2013-12-26 13:02:00 +01:00
Florian Küpper aa481bb3f8 PlayerNames: Change player/team-num on NamesScreen. TODO: Theme-stuff and remove options from config screen. 2013-12-26 13:02:00 +01:00
Florian Küpper bdf28a5daf PartyNames: Added visual feedback for max-player-num. 2013-12-26 13:01:59 +01:00
Florian Küpper dfeb19c140 PartyNames: Added support for no teams. 2013-12-26 13:01:58 +01:00
Florian Küpper 14f5c12d9e Added draft for NameSelection in party-modes. Just extend CMenuPartyNameSelection in a screen.
Developer could use it or not, using it would make creating party-modes much easier.
More additions to this screen will come.
2013-12-26 13:01:58 +01:00