Projects/Vocaluxe
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,985 Commits 7 Branches 7 Tags
235ce266e53ad86c5da170a78b6fe20d0993f4f6
Commit Graph
50 Commits
Author SHA1 Message Date
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 94f8dcef3c PartyNames: Fix name-selection. 2013-12-26 13:07:30 +01:00
Florian Küpper 915db881e3 PartyNames: Added button for selecting random. 2013-12-26 13:07:28 +01:00
Florian Küpper f5407f1815 Another fix for name-selection. 2013-12-26 13:07:22 +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
lukeIam 341f03714e Fix: HasFlag(EUserRole.TR_USERROLE_GUEST) does not work (workaround replaced it with !NORMAL) 2013-12-26 13:02:01 +01:00
Florian Küpper 5449d985ef Revert PartyNames-changes on develop-branch. 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 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
Florian Küpper 0c807862a8 Patch WebserverFlokuepDevelopTest 2013-12-19 09:02:40 +01:00
Florian Küpper 352b0181fa Changed GuestProfile-option on profiles to UserRole. UserRole could now be set from Vocaluxe. 2013-12-19 08:54:27 +01:00
Flamefire 4e12e2624f Merge branch 'release-0.3' into develop 2013-10-14 22:02:02 +02:00
Florian Küpper 264e9c77df Fix profiles-bug in names-selection 2013-10-06 16:54:53 +02:00
Flamefire 370964ee99 Fix file headers and indentations 2013-09-20 18:09:32 +02:00
Flamefire 44c78fad19 Split Notes, Lines and Voices into separate files/classes 2013-08-22 00:05:01 +02:00
flokuep e093610eaf Fix profile-id-check. 2013-06-27 16:38:14 +02:00
Florian Küpper 480e714afc Improve profile-handling on names-screen, fixes #26 2013-06-27 13:49:35 +02:00
Flamefire 11398dbb2f Cleanups after merge 2013-05-19 18:38:50 +02:00
Flamefire 9d13c32b93 Merge branch 'Better_Graphics_Handling' into develop 
Conflicts:
	Vocaluxe/Base/CBackgroundMusic.cs
	Vocaluxe/Base/CCover.cs
	Vocaluxe/Base/CDataBase.cs
	Vocaluxe/Base/CDraw.cs
	Vocaluxe/Base/CMain.cs
	Vocaluxe/Base/CProfiles.cs
	Vocaluxe/Base/CTheme.cs
	Vocaluxe/Base/CVideo.cs
	Vocaluxe/Base/CWebcam.cs
	Vocaluxe/Base/Fonts/CFont.cs
	Vocaluxe/Base/Fonts/CGlyph.cs
	Vocaluxe/Lib/Draw/CDirect3D.cs
	Vocaluxe/Lib/Draw/CDrawWinForm.cs
	Vocaluxe/Lib/Draw/COpenGL.cs
	Vocaluxe/Lib/Draw/IDraw.cs
	Vocaluxe/Lib/Video/CVideoDecoder.cs
	Vocaluxe/Lib/Video/CVideoDecoderFFmpeg.cs
	Vocaluxe/Lib/Video/CVideoDecoderGstreamer.cs
	Vocaluxe/Lib/Video/IVideoDecoder.cs
	Vocaluxe/Lib/Webcam/CAForgeNet.cs
	Vocaluxe/Lib/Webcam/IWebcam.cs
	Vocaluxe/Screens/CScreenCredits.cs
	Vocaluxe/Screens/CScreenNames.cs
	Vocaluxe/Screens/CScreenOptionsVideo.cs
	Vocaluxe/Screens/CScreenProfiles.cs
	Vocaluxe/Screens/CScreenSing.cs
	VocaluxeLib/Menu/IMenu.cs
	VocaluxeLib/Songs/CCategory.cs
	VocaluxeLib/Songs/CSong.cs
	VocaluxeLib/Structs.cs
	VocaluxeLib/VocaluxeLib.csproj
 2013-05-19 17:53:46 +02:00
Flamefire 7f5cbbf686 Fixed string comparisons 
Added CCursor.ReloadTextures without position flickering
 2013-05-10 14:31:20 +02:00
Alexander Eckart 50046901fd fixed some bugs 2013-05-10 00:10:12 +02:00
Alexander Eckart 19339c6888 reconstructed CProfiles (preparing for async profile adding) 2013-05-07 16:56:23 +02:00
Flamefire f370693dde Convert STexture to class CTexture 2013-05-04 15:14:02 +02:00
Flamefire 151fab8857 Changed texture sizes to more reasonable int 2013-05-03 20:07:53 +02:00
Florian Küpper 98ad7a6be0 Update for fast-player-selection. Press MB or P to start, use mouse or arrow-keys to choose player, select player with LB or Enter. Use [1..6] or MB to skip a player, RB or escape to abort. 
I will think about a easy reset-function...
 2013-04-27 12:28:22 +02:00
Flamefire 7cbae3d2db Better player handling with bugfix (selecting not available player number) 2013-04-26 13:19:22 +02:00
Flamefire 1d628fc09c Bugfix for CProfiles 2013-04-25 19:17:05 +02:00
Flamefire bdca0554e4 Changed players->Profile handling (no redundant entries) 2013-04-25 18:27:59 +02:00
Flamefire 69d8af4e87 Automatic cleanup/formating 2013-04-24 01:26:36 +02:00
Flamefire b8fe334153 Used object initializers 2013-04-23 22:11:32 +02:00
Flamefire 477b023520 More refactoring (unused stuff removed) 2013-04-23 21:47:46 +02:00
Flamefire cf39a4b107 Changed string comparisons to easier != "" syntax 2013-04-23 14:52:51 +02:00
Flamefire dcbbc5caf3 Many cleanups according to ReSharper suggestions (Mostly redundant code) 
Minor Bug fixes
 2013-04-20 02:19:56 +02:00
Flamefire 74396eda2f Auto cleanup 2013-04-18 15:09:21 +02:00
Flamefire 67da90427b Renaming for namesheme 2013-04-15 19:10:38 +02:00
Flamefire 1f695a7b83 Added StyleCop Cleanups 2013-03-22 23:17:33 +01:00
Flamefire efab579188 Auto cleanup of VocaluxeLib 2013-03-22 21:12:45 +01:00
Flamefire 91e6d4901b Changed namespace of VocaluxeLib 2013-03-22 20:53:22 +01:00
Flamefire baaa26883a Removed unused usings 2013-03-20 00:45:40 +01:00
Flamefire 7469e86617 CTheme and CText changes 2013-03-19 23:01:04 +01:00
Flamefire 3ebd34fcc3 Made the code checker a bit happier 2013-02-26 16:25:29 +01:00
Alexander Eckart 521033ed97 some code reorganization 2013-02-22 21:27:34 +01:00
Alexander Eckart b4f77d50b2 changed base handling in VocaluxeLib 2013-02-22 17:57:47 +01:00
Flamefire 7465323a2f Renamed variables 2013-02-21 17:15:10 +01:00
Flamefire 506d98bd3c Added CXMLReader for all XML-reading operations 
Added GetIntValueRange to force a value to be in a specific range
 2013-02-21 17:07:09 +01:00
Florian Küpper 148e92a416 Fixed crash on names-screen. 2013-01-11 13:44:05 +01:00
Alexander Eckart 8c5f4bf7c9 added themes support for party modes 2013-01-03 14:12:02 +01:00
Alexander Eckart 9257e6f134 added partymodeID to all elements, fixed bug in buttons (text was drawn twice) 2012-12-15 18:40:22 +01:00
Alexander Eckart d6c97568c9 moved menu and party mode files to the new lib 2012-12-14 21:47:28 +01:00