Projects/Vocaluxe
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,207 Commits 7 Branches 7 Tags
1b4f3ced7dedbc85b289a2566b337d47a69f665f
Commit Graph
74 Commits
Author SHA1 Message Date
Flamefire d8cce13211 Rename LoadTextures to LoadSkin 
(Its also Colors, not only textures!)
 2014-10-18 10:42:35 +02:00
Flamefire 87f3271046 Remove copy constructors for structs 2014-10-16 21:38:22 +02:00
Flamefire 86fb73ca48 Cleanup not required XML attributes 2014-10-16 21:27:09 +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 defb2ca6c7 Rewrite Theme Engine 2014-10-08 22:29:02 +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 89e528c2a6 Factor out CSkin class 
Replace usages of GetColor and remove GetColor(..., skinIndex,...)
 2014-10-05 13:36:11 +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
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 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
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 d248292fa3 Update LoadTextures for some elements. 2014-09-12 09:34:55 +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 9cca49745a Added constructors to STheme* for copying. 2014-09-10 11:17:36 +02:00
Florian Küpper 96e50f7723 Changed theme-color-handling. 2014-09-09 21:32:07 +02:00
Flamefire 94be5ce97b Use CFont class to define the font to use 2014-09-07 10:35:41 +02:00
Florian Küpper b2102b11d9 Add serialization for all theme-elements. 2014-08-26 16:48:30 +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 55d5c61a66 Fix overlapping notes 
More consistent CLyric
Some renaming for clearer meaning
 2013-10-11 14:50:27 +02:00
Flamefire 8890176e97 Merge branch 'release-0.3' into develop 2013-10-03 13:26:00 +02:00
Flamefire 370964ee99 Fix file headers and indentations 2013-09-20 18:09:32 +02:00
Florian Küpper 536ca2868c Fix text-saving. 2013-09-15 13:32:46 +02:00
Flamefire 762d2c80d2 Code cleanup 
Added license stuff
 2013-08-22 00:56:58 +02:00
Florian Küpper ac3294099e Fix edit-mode of texts (and a crash on screen-song) 2013-05-26 15:47:32 +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
Alexander Eckart 166bcb5c43 fixed merge error 2013-05-10 19:47:49 +02:00
Alexander Eckart fd7b3ae3a3 fixed some merge errors 2013-05-10 19:36:58 +02:00
Flamefire 7f5cbbf686 Fixed string comparisons 
Added CCursor.ReloadTextures without position flickering
 2013-05-10 14:31:20 +02:00
Florian Küpper 76340f7826 Rename HAlign to ResizeAlign 2013-05-04 11:16:41 +02:00
Flamefire 151fab8857 Changed texture sizes to more reasonable int 2013-05-03 20:07:53 +02:00
Flamefire c407b26098 Fixed relative reflection 2013-05-02 18:28:58 +02:00
Flamefire 1216a2d0c2 Fixed relative reflection distance 2013-05-02 03:37:53 +02:00
Flamefire 95ff3cd7a3 Simpler CText.Draw... 
Bugfix CMenu._IsMouseOver
 2013-05-02 02:33:39 +02:00
Flamefire fa22096914 Fixed bounds calculation of CText 2013-05-02 02:00:48 +02:00
Flamefire 553be47783 Removed unused and temporary stuff 2013-05-01 22:14:34 +02:00
Flamefire dc3866975e Refactored CText constructor 2013-04-30 16:33:20 +02:00
Flamefire 5df160971d Removed unnecessary Reflection bool 
fixed typo
 2013-04-30 16:25:25 +02:00
Flamefire e602f55bb4 First attempt with smaller glyph textures 
Some CText and SColor improvements
 2013-04-30 15:12:36 +02:00
Flamefire 2967a01cb8 Changed name of CInput to CController 
Added message for missing mic in partymode
Removed pointless input entry for record devices
 2013-04-29 16:14:24 +02:00
Flamefire 2f3f121f88 Split Font-File 2013-04-28 14:02:27 +02:00
Flamefire b1e28ae7bc More refactoring (mainly LINQ) 2013-04-24 00:41:08 +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 ec766aa7b5 Removed code redundancies 2013-04-23 16:55:57 +02:00
Flamefire 5cd47f0537 Fixed floating point comparisons 2013-04-23 15:42:32 +02:00
Flamefire cf39a4b107 Changed string comparisons to easier != "" syntax 2013-04-23 14:52:51 +02:00