Projects/Vocaluxe
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,204 Commits 7 Branches 7 Tags
9a699f4cb55e644c7b4eec01bd45e34e6311c347
Commit Graph
333 Commits
Author SHA1 Message Date
Flamefire 8109d77ab1 Fix wrong theme stuff 2014-10-16 23:47:52 +02:00
Flamefire 3f76d039b6 Change color representation 
Allow missing ARGB values (defaults to 1)
Allow Name+ARGB to easily overwrite some values
 2014-10-16 22:40:18 +02:00
Flamefire 87f3271046 Remove copy constructors for structs 2014-10-16 21:38:22 +02:00
Flamefire e04480171e Merge branch 'develop' of git://github.com/flokuep/Vocaluxe into develop 2014-10-16 21:28:14 +02:00
Flamefire 86fb73ca48 Cleanup not required XML attributes 2014-10-16 21:27:09 +02:00
Flamefire b988d5f0fe Remove invisible skin 2014-10-15 17:52:03 +02:00
Flamefire aa0579a4f1 Make partymodes reload their themes 
Move PartyModeIds into Partymodes
Fix bug where wrong text size is used (CalculatedFont is now used)
Fix bug where text of the main table in partymodes is displayed wrong
 2014-10-15 17:25:37 +02:00
Flamefire 5d28b19066 Add partymode path as constructor param 2014-10-15 15:43:48 +02:00
Flamefire e119e46c5a Improve partymode loading (return bool instead of incomplete PM) 2014-10-15 15:32:16 +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 f1c89b9a8e Merge branch 'Automatic_Covers' into develop 
Conflicts:
	Vocaluxe/Base/CBackgroundMusic.cs
	VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs
 2014-10-02 20:43:17 +02:00
Flamefire 6ebbf7df6f Introduce example for a more flexible deserialization 
Also make the CoverGenerator themes serializeable
Rest is automatic reformatting.
 2014-10-01 00:54:04 +02:00
Florian Küpper 7f965e0f9b Check for right screen-version. 2014-09-27 13:13:36 +02:00
Flamefire 19f81943d6 Introduce RenderRect for easy access to the full screen rect 2014-09-26 15:05:19 +02:00
Flamefire 25653ee55f Revert "Remove bounds from DrawTextureReflection because it was never used" 
This reverts commit f5f1a91481.

Conflicts:
	Vocaluxe/Base/CMain.cs
	Vocaluxe/Screens/CScreenSing.cs
	VocaluxeLib/IBasic.cs
	VocaluxeLib/Menu/CStatic.cs
	VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs
 2014-09-26 15:04:08 +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
Florian Küpper fc432f34eb Fixed some bugs with bg-music. 2014-09-25 19:36:16 +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 879176a87f Rename SetRect to something more appropriate and tune it 2014-09-25 12:15: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 538eab9516 Add Assertions for color values and fix some wrong ones 2014-09-24 16:52:11 +02:00
Flamefire cc7d8058e2 Move extension methods to Extensions.cs 
Add IsInRange function
 2014-09-24 16:40:45 +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 fef075eeb8 Fixed reflections. 2014-09-19 11:51:29 +02:00
Florian Küpper b1ed316d13 Fixed some reflections. 2014-09-18 15:49:31 +02:00
Florian Küpper 6b8379c081 Fix translation-bug in party-modes. 2014-09-18 15:37:47 +02:00
Florian Küpper c07441bc63 Load complete theme-date with de-serialization. 2014-09-18 15:35:52 +02:00
Florian Küpper 4f8c482645 Remove unneeded constructors. 2014-09-15 19:44:19 +02:00
Florian Küpper 9ab0ea5f34 Update more LoadTextures-methods. Some changes are a bit ugly, but will removed later. 2014-09-15 19:35:00 +02:00
Flamefire 7f8e974fe1 Rename CTexture to CTextureRef to reflect it is only a reference 2014-09-13 17:51:55 +02:00
Florian Küpper d248292fa3 Update LoadTextures for some elements. 2014-09-12 09:34:55 +02:00
Flamefire ad18bec52c Improve CTexture and Drawing stuff related to that 
(Don't use an ID queue, store DataSizes of texture data)
 2014-09-10 20:58:35 +02:00
Florian Küpper e936fe4126 Added constructors with STheme*-structs, LoadTextures() will be LoadTheme later and set all needed values from theme-struct to object. 2014-09-10 20:44:39 +02:00
Florian Küpper 6d46cbc069 Some renamings. 2014-09-10 20:22:39 +02:00
Florian Küpper 9cca49745a Added constructors to STheme* for copying. 2014-09-10 11:17:36 +02:00
Florian Küpper cea276090d Change serialization. It think it's much better now. 2014-09-09 22:04:52 +02:00
Florian Küpper 96e50f7723 Changed theme-color-handling. 2014-09-09 21:32:07 +02:00
Florian Küpper a55d724620 Merge branch 'develop' of github.com:Flamefire/Vocaluxe into theme 2014-09-08 21:22:57 +02:00
Flamefire 64c142345b Disable Buttons also deselects it 2014-09-07 19:31:57 +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 290f6d024e Serialize complete screens. 2014-08-26 17:37:50 +02:00