Projects/Vocaluxe
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,206 Commits 7 Branches 7 Tags
b07d31f697b6200e45f5df0bc98ed72350ea7246
Commit Graph
461 Commits
Author SHA1 Message Date
Flamefire b07d31f697 Unify object interactions 2014-10-18 18:46:13 +02:00
Flamefire d8cce13211 Rename LoadTextures to LoadSkin 
(Its also Colors, not only textures!)
 2014-10-18 10:42:35 +02:00
Flamefire 38a19b6adb Allow incomplete colors 2014-10-16 23:57:23 +02:00
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 c1866c0ad5 Add checking for required elements 2014-10-10 02:03:07 +02:00
Flamefire 4efd670747 Move and Rename reading of SColorF 2014-10-09 23:27:32 +02:00
Flamefire ae8a3c61d5 Fix disposed exception on disposing a texture 2014-10-08 22:29:22 +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 bf7eec4233 Use Resize function in CoverLoader 
Add possible multithreading
 2014-09-25 12:55:00 +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 649f81494e Fix some race conditions with the texture references 
Add queuing of files
Split CEncoding to separate file
 2014-09-23 21:37:46 +02:00
Flamefire 1121261a4a Resize textures based on its area rather than on its width and Height 
(No need for 2048*2048 textures on a 1280*720 rendering area and also no need to resize a 1280*720 texture to 1024*1024)
 2014-09-22 17:32:58 +02:00
Flamefire d1e9fbaff1 Add extension methods for bitmap GetSize and GetRect 2014-09-22 16:27:00 +02:00
Flamefire f5f1a91481 Remove bounds from DrawTextureReflection because it was never used 2014-09-22 15:55:31 +02:00
Flamefire c9c907e3f0 Add more queue and update functions 
Add CopyTexture function
Document CDraw
 2014-09-22 15:08:45 +02:00
Flamefire be67b039d6 Unify and improve texture updating (Do not create new references) 2014-09-20 17:17:34 +02:00
Flamefire 1ce085b49f Use better references to a single texture and unify more stuff 
Also encapsulate everything graphic related in the Texture classes and not in the references
 2014-09-20 00:50:04 +02:00
Florian Küpper e915e72ce6 Added to zoom-levels to VideoAspect. Toogle on ScreenSing with 'V', saved to song-text if saving is enabled in config.xml. 2014-09-19 16:15:53 +02:00
Florian Küpper fef075eeb8 Fixed reflections. 2014-09-19 11:51:29 +02:00
Florian Küpper 30439659b9 Some fixes. 2014-09-19 11:16:34 +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