Commit Graph
68 Commits
Author SHA1 Message Date
Flamefire df82690cd0 Refactor background music to fix some possible issues and smooth out transitions 2014-12-26 22:39:44 +01:00
Flamefire 4a63180600 Fix a case where no songs will be available
Also some cleaner structure (no double storing of values)
2014-12-07 23:45:16 +01:00
Flamefire 4a78dd4b31 Fix missing song length and wrong volumes (int=0-100, float=0-1)
Also fade in preview music
2014-11-27 23:06:01 +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 33618b4c97 Use extra class for xml exception
Add handler class for xml errors
Fix testcases
2014-11-17 19:27:43 +01:00
Flamefire 61a0d4fdf1 Serialize Profiles
All writings now done through new serializer
2014-10-29 01:29:02 +01:00
Flamefire fe07a2f926 Generate Covers for songs 2014-10-23 17:05:57 +02:00
Flamefire 2f99cd2560 Make CSingNotes also implement Draw()
Also a bit refactoring
2014-10-22 22:00:25 +02:00
Flamefire defb2ca6c7 Rewrite Theme Engine 2014-10-08 22:29:02 +02:00
Flamefire 9e5011374f Rename CTheme to CThemes 2014-10-05 17:27:45 +02:00
Flamefire 355d7b4b5f Merge branch 'develop' into Better_Graphics_Handling
Conflicts:
	VocaluxeLib/Menu/CNameSelection.cs
	VocaluxeLib/Menu/CPlaylist.cs
	VocaluxeLib/Menu/CText.cs
	VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs
	VocaluxeLib/Structs.cs
	VocaluxeLib/VocaluxeLib.csproj
	VocaluxeLib/Xml/CXMLReader.cs
2014-10-05 15:09:52 +02:00
Flamefire 6a3bf7b2c0 Introduce CVideoStream for easier video handling (already includes a texture, important for common usage of streams) 2014-10-05 14:20:57 +02:00
Flamefire 89e528c2a6 Factor out CSkin class
Replace usages of GetColor and remove GetColor(..., skinIndex,...)
2014-10-05 13:36:11 +02:00
Flamefire 31863a7788 Speed up slideshow loading 2014-10-04 11:15:37 +02:00
Flamefire 2e25bf6610 Merge branch 'Better_Graphics_Handling' into develop
Conflicts:
	Vocaluxe/Base/Fonts/CFontStyle.cs
2014-10-02 20:46:04 +02:00
Flamefire 19f81943d6 Introduce RenderRect for easy access to the full screen rect 2014-09-26 15:05:19 +02:00
Flamefire dd1231ad34 Merge branch 'Better_Graphics_Handling' into Automatic_Covers
Conflicts:
	Vocaluxe/Base/CCover.cs
	Vocaluxe/Base/CGraphics.cs
	Vocaluxe/Base/Fonts/CFontStyle.cs
	Vocaluxe/Base/Fonts/CGlyph.cs
	VocaluxeLib/Menu/CText.cs
	VocaluxeLib/Structs.cs
2014-09-25 19:43:21 +02:00
Flamefire c156fa69ab Merge branch 'develop' of git://github.com/flokuep/Vocaluxe into Better_Graphics_Handling
Conflicts:
	Vocaluxe/COSFunctions.cs
	VocaluxeLib/CHelper.cs
	VocaluxeLib/Menu/CStatic.cs
	VocaluxeLib/Structs.cs
2014-09-25 18:49:18 +02:00
Flamefire 926dda7350 Remove DrawLines (was not working in D3D and can actually be replaced by narrow DrawRects) 2014-09-24 18:54:58 +02:00
Flamefire db4096d57f Improve background drawing
Don't convert to RectangleF for rescaling
Add function for colored fitting of a texture in bounds
Add DrawLine in IDrawing
2014-09-24 16:36:18 +02:00
Flamefire f5f1a91481 Remove bounds from DrawTextureReflection because it was never used 2014-09-22 15:55:31 +02:00
Florian Küpper c07441bc63 Load complete theme-date with de-serialization. 2014-09-18 15:35:52 +02:00
Flamefire 7f8e974fe1 Rename CTexture to CTextureRef to reflect it is only a reference 2014-09-13 17:51:55 +02:00
Flamefire 76ededf9f3 Unify as much of D3D and OpenGL as possible 2014-09-11 21:58:30 +02:00
Flamefire 445d50bcaf Merge branch 'develop' into Font_Rewrite 2014-09-07 10:49:21 +02:00
Flamefire a5ddeeee95 Merge branch 'develop' of git://github.com/flokuep/Vocaluxe into develop 2014-09-07 10:37:37 +02:00
Flamefire 94be5ce97b Use CFont class to define the font to use 2014-09-07 10:35:41 +02:00
Florian Küpper 6dda1a38d0 Added background-music-option: "Only selected song". bg-music is played on name/score/highscore screen with selected song. 2014-08-22 21:22:03 +02:00
Florian Küpper 6f617aa40b Some improvements... 2014-08-22 17:51:47 +02:00
Florian Küpper c6e8854dda Change preview-player. Now it's part of bg-music. 2014-08-20 18:50:27 +02:00
Flamefire d20c31ef71 Add additional logging functionality 2014-08-14 16:06:43 +02:00
Florian Küpper 8e8fdc1277 Play song-preview instead of bg-music (if enabled) on names-, score- and highscore-screen. 2014-08-09 19:50:40 +02:00
Florian Küpper 4c01396e46 Added preview-player which is used for playing preview in song-menu. 2014-08-09 17:12:27 +02:00
Florian Küpper bd41de6dbe Merge branch 'develop' of github.com:Flamefire/Vocaluxe into sound-player
Conflicts:
	PartyModes/PartyModeTicTacToe/CPartyScreenTicTacToeMain.cs
	VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs
2014-08-09 14:13:38 +02:00
Flamefire 75ff5a0291 Remove redundant names in playlist functions
Fix handling of playlist IDs
2014-08-08 23:49:01 +02:00
Flamefire b14b47fd33 Fix wrong song name showing in party mode 2014-08-08 20:01:39 +02:00
Flamefire dd4c3b3cf9 Better name for function 2014-08-07 19:33:26 +02:00
Florian Küpper 3612b9244b Added sound- and song-player to VocaluxeLib. Use it for Background-Music. 2014-08-05 10:54:34 +02:00
Flamefire f2bd61937f Loop preview song and video 2014-08-01 16:26:21 +02:00
Flamefire e908f923e8 Fix unintended song loop due to api change 2014-05-07 00:39:58 +02:00
Flamefire a4b1c3eb86 Unify playback libs with common base class
Remove duplicate code
Fix bugs in implementations (threading, logic)
Remove SetStreamVolumeMax and use SetGlobalVolume instead
2014-05-05 02:10:15 +02:00
Flamefire eba5deba2b Make CSettings contain only constant values to avoid accidental misuse. Everything changeable is in CConfig 2014-03-19 19:54:55 +01:00
Flamefire 6053102b8f Rework CBackgroundMusic to avoid crash on startup and assure correct behaviour on runtime 2014-03-18 16:46:59 +01:00
Flamefire e1f8bf4843 Better structure for song sorter and bugfix for "DateAdded" sorting 2014-03-18 02:20:21 +01:00
Flamefire 90ba1188d3 Add more log files to distinguish between classes of messages 2014-03-09 20:07:28 +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 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 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 350ad4d3f6 Added new background-option: SlideShow. 2013-12-19 08:50:45 +01:00