Commit Graph
608 Commits
Author SHA1 Message Date
Flamefire 37aa8e5219 Remove textures with no references 2014-09-13 17:58:59 +02:00
Flamefire 7f8e974fe1 Rename CTexture to CTextureRef to reflect it is only a reference 2014-09-13 17:51:55 +02:00
Flamefire 3fe8cdf05c Workaround for OGL bug 2014-09-13 17:49:21 +02:00
Flamefire 46c3353e08 Add better border and alignment handling 2014-09-13 17:44:46 +02:00
Florian Küpper d248292fa3 Update LoadTextures for some elements. 2014-09-12 09:34:55 +02:00
Flamefire 76ededf9f3 Unify as much of D3D and OpenGL as possible 2014-09-11 21:58:30 +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
Flamefire eaa709813d Merge branch 'Font_Rewrite' into Automatic_Covers 2014-09-10 17:19:25 +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 e66d108df0 Handle errors in profile files 2014-09-07 11:11:16 +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
Flamefire 7f60e6f321 First Step to make CFonts threadsave 2014-09-06 14:17:27 +02:00
Flamefire 9f8dfaa50c Add range checks in XMLReader 2014-09-06 12:48:56 +02:00
Florian Küpper 290f6d024e Serialize complete screens. 2014-08-26 17:37:50 +02:00
Florian Küpper b2102b11d9 Add serialization for all theme-elements. 2014-08-26 16:48:30 +02:00
Florian Küpper 4bbb0bfb14 Try it for background. 2014-08-26 09:29:39 +02:00
Florian Küpper 6b958527ce First try to implement serialisation (for statics). 2014-08-25 17:22:13 +02:00
Florian Küpper abe8987748 Fixed sing-button in bg-popup. 2014-08-24 20:22:38 +02:00
Flamefire b634fb98f9 Add more options and improve splitting of text 2014-08-24 20:07:15 +02:00
Florian Küpper dd1fe4402c Draw color instead of texture when changing song (looks better) 2014-08-24 18:01:02 +02:00
Florian Küpper 46544aee82 Fix repeating of bg-music. 2014-08-24 17:38:37 +02:00
Florian Küpper 74654d7fcf More improvements and fixes (nearly stable now) 2014-08-24 13:09:57 +02:00
Florian Küpper 6c4fe011bf Some improvements. 2014-08-24 12:42:05 +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 b30efb1913 some fixes. 2014-08-22 21:01:24 +02:00
Florian Küpper f926263706 Fix video sync. 2014-08-22 18:05:50 +02:00
Florian Küpper 6f617aa40b Some improvements... 2014-08-22 17:51:47 +02:00
Florian Küpper eef988fcdb Some code-cleanup. 2014-08-20 19:14:20 +02:00
Florian Küpper d0958b69be Some changes to preview-start. 2014-08-20 19:10:13 +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 388bd6310f Add GetSong to Categories 2014-08-14 16:07:06 +02:00
Flamefire d20c31ef71 Add additional logging functionality 2014-08-14 16:06:43 +02:00
Flamefire 43fff7f52f Rename FileName to FilePath 2014-08-14 16:03:09 +02:00
Florian Küpper 0a7006db43 Small bugfix. 2014-08-09 22:01:01 +02:00
Florian Küpper 8722844646 Merge branch 'develop' of github.com:Flamefire/Vocaluxe into sound-player
Conflicts:
	VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs
2014-08-09 20:04:41 +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
Flamefire 41480797e2 Change values of xml argument to xPath only to make it more consistent 2014-08-09 19:49:20 +02:00
Flamefire 4b348ceec6 Don't show old preview song in category view 2014-08-09 17:59:53 +02:00
Flamefire f021e9a9f7 Unify language of songs 2014-08-09 17:59:15 +02:00
Florian Küpper 04c2b85e2b Close stream when finished (*-player) 2014-08-09 17:16:51 +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
Flamefire ced12ac064 Fix NPE with few songs in category 2014-08-09 15:27:05 +02:00