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
83 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 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 86fb73ca48 Cleanup not required XML attributes 2014-10-16 21:27:09 +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 2e25bf6610 Merge branch 'Better_Graphics_Handling' into develop 
Conflicts:
	Vocaluxe/Base/Fonts/CFontStyle.cs
 2014-10-02 20:46:04 +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 19f81943d6 Introduce RenderRect for easy access to the full screen rect 2014-09-26 15:05:19 +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 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
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 6c4fe011bf Some improvements. 2014-08-24 12:42:05 +02:00
Florian Küpper b30efb1913 some fixes. 2014-08-22 21:01:24 +02:00
Florian Küpper c6e8854dda Change preview-player. Now it's part of bg-music. 2014-08-20 18:50:27 +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 4b348ceec6 Don't show old preview song in category view 2014-08-09 17:59:53 +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
Flamefire 09d36ccf60 Fix categories not showing on start 2014-08-09 15:05:34 +02:00
Flamefire b14b47fd33 Fix wrong song name showing in party mode 2014-08-08 20:01:39 +02:00
Flamefire e1329b4a93 Fix selection changes 2014-08-07 19:45:47 +02:00
Flamefire fe60f6f5df Simplify Songmenu (only selected and preview numbers) 
More consistent handling of mouse and keyboard selection of songs
 2014-08-07 19:31:17 +02:00
Flamefire 9695e98bbb Update display of no length 2014-05-07 20:20:44 +02:00
Flamefire c07526e195 Fix close order 
Close open audio streams (or at least give opportunity to do so)
 2014-05-06 18:37:46 +02:00
Flamefire 898819fcf5 Fix code issues (naming, unused stuff) 2014-03-12 09:41:34 +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 5277504e34 Fix forgetting last song after singing. 2013-12-31 15:41:28 +01:00
Stephan Sundermann 4d52cf8263 Bugfix: Fixed NullReferenceException when search returned 0 results 2013-12-25 10:39:15 +01:00
Stephan Sundermann 5bac5e98bf gstreamer-sharp: Query duration async 2013-12-22 22:26:10 +01:00
Flamefire dbcd79af79 Merge branch 'release-0.3' into develop 
Conflicts:
	VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs
 2013-10-19 02:12:29 +02:00
Flamefire 83b72604a9 Remove confusing ActSongId 2013-10-19 02:02:53 +02:00
Flamefire 4c82446019 Bugfix on Init() function of song Menu 
Refactoring w/o functional changes
 2013-10-19 01:49:34 +02:00
Flamefire 73e4a9fa74 Merge branch 'release-0.3' into develop 
Conflicts:
	Vocaluxe/Base/CConfig.cs
	Vocaluxe/Lib/Playlist/CPlaylistFile.cs
	Vocaluxe/Screens/CScreenSong.cs
	VocaluxeLib/CHelper.cs
	VocaluxeLib/Menu/CMenu.cs
	VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs
	VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs
 2013-10-19 00:42:56 +02:00
Flamefire 02825cf46a Update preview only when necessary 2013-10-19 00:06:52 +02:00
Flamefire 03d92a474c Remove PreviewId pending stuff (don't need that. If you need a fade or something implement it properly with timer, event... But PreviewId should really be the current preview element) 2013-10-18 23:58:15 +02:00
Flamefire 60bd2c4da4 Rename PreviewSelected to more meaningful PreviewId 2013-10-18 23:50:47 +02:00
Flamefire 3b82d5c13c Fix for inconsistent song Menu 
Multiple refactoring due to ambiguous meanings
 2013-10-18 23:25:42 +02:00
Flamefire b12e4156fa Allow #ENDSHORT tags 
Detect where Preview and ShortEnd came from
Introduce a function to check whether a given GameMode is available for a song
 2013-10-12 21:42:03 +02:00
Flamefire 370964ee99 Fix file headers and indentations 2013-09-20 18:09:32 +02:00
Flamefire 762d2c80d2 Code cleanup 
Added license stuff
 2013-08-22 00:56:58 +02:00
Florian Küpper 6bdfb49cbb Fixed double-click-bug on screen-song. 2013-05-26 14:46:01 +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 ed3047314b finished moving around 2013-05-06 23:18:02 +02:00
Flamefire e43f5e7b0a Changed usage of CTexture.Index: You only need to check for null as of last commit 2013-05-06 20:18:17 +02:00
Flamefire 142a690cc6 Using null instead of CTexture(-1) for "no texture" 2013-05-05 20:02:28 +02:00