Projects/Vocaluxe
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,836 Commits 7 Branches 7 Tags
668d72d3a7339ce397ca0f68e158eaa9514dd402
Commit Graph
91 Commits
Author SHA1 Message Date
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 21f6213c1a Fix preview start after song end 2013-10-19 02:04:58 +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 3466c09851 Remove redundant code 2013-10-18 23:59:37 +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
Florian Küpper 808c52d471 Fix merge error. 2013-09-15 15:26:25 +02:00
Flamefire 762d2c80d2 Code cleanup 
Added license stuff
 2013-08-22 00:56:58 +02:00
Alexander Eckart 9e6a48c978 subtract only once 2013-06-15 17:49:11 +02:00
Alexander Eckart 57bb51e41c preview start -0.5s 2013-06-14 23:06:14 +02:00
Florian Küpper 6bdfb49cbb Fixed double-click-bug on screen-song. 2013-05-26 14:46:01 +02:00
Florian Küpper fcf94a091d Fixed bug with preview-volume on song-screen. 2013-05-22 14:34:28 +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
Flamefire 7f5cbbf686 Fixed string comparisons 
Added CCursor.ReloadTextures without position flickering
 2013-05-10 14:31:20 +02:00
Flamefire a2c1ee67ad Improved Texture update handling 2013-05-10 13:37:55 +02:00
Alexander Eckart ed3047314b finished moving around 2013-05-06 23:18:02 +02:00
Alexander Eckart 685bc019fd moved some files 2013-05-06 23:11:56 +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
Flamefire f370693dde Convert STexture to class CTexture 2013-05-04 15:14:02 +02:00
Flamefire 5bbfd07e01 Introduced OrigSize for original size of textures 2013-05-03 22:29:47 +02:00
Flamefire 151fab8857 Changed texture sizes to more reasonable int 2013-05-03 20:07:53 +02:00
Flamefire 2018f3a16b Fixed EAspect.Letterbox 
Removed "Vd" prefixes on IVideo functions
 2013-05-03 19:09:26 +02:00
Flamefire c89b9dc8be Load all elements from queue (not doing this will result in not showing covers!) 
Will probably implement a loadOnDemand or sth like that later.
 2013-05-03 00:19:16 +02:00
Alexander Eckart 9e2040e1b7 set video initialization value in CSongMenuFramework.cs to -1. otherwise it will try to unload the wrong stream on start up. 2013-05-01 18:27:20 +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 69c36362f5 On change of Tabs to on it will go out of any category 
Auto reformat
 2013-04-29 02:24:36 +02:00
Flamefire 0af6fbfcde Added missing file 2013-04-28 19:16:24 +02:00
Flamefire 5172f17da7 Fixed and changed category handling and visible songs 2013-04-28 17:19:22 +02:00
Flamefire 780a179fcb Added Gamemode-Classes 2013-04-26 18:56:33 +02:00
Flamefire f43817efd0 Renamed ambiguous Notes classes 2013-04-26 17:47:26 +02:00
Flamefire 69d8af4e87 Automatic cleanup/formating 2013-04-24 01:26:36 +02:00
Flamefire b1e28ae7bc More refactoring (mainly LINQ) 2013-04-24 00:41:08 +02:00
Flamefire f53e08607b Small cleanup (join declarations) 2013-04-23 22:14:53 +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
Flamefire 1540be9120 More refactoring and small fixes 2013-04-23 14:22:42 +02:00