Commit Graph
233 Commits
Author SHA1 Message Date
Flamefire 4e12e2624f Merge branch 'release-0.3' into develop 2013-10-14 22:02:02 +02:00
Florian Küpper 264e9c77df Fix profiles-bug in names-selection 2013-10-06 16:54:53 +02:00
Flamefire 8890176e97 Merge branch 'release-0.3' into develop 2013-10-03 13:26:00 +02:00
Flamefire 3fbc5994b1 Remove unnecessary golden property 2013-09-20 19:54:25 +02:00
Flamefire 370964ee99 Fix file headers and indentations 2013-09-20 18:09:32 +02:00
Flamefire db9f04cad6 Some name refactoring for clearer meaning (also docu) 2013-09-20 17:57:34 +02:00
Florian Küpper 612cc358a3 Rewind after pause (don't work atm) 2013-09-16 20:41:12 +02:00
Florian Küpper 46c12db857 Save points also to notes. 2013-09-15 16:36:53 +02:00
Florian Küpper 808c52d471 Fix merge error. 2013-09-15 15:26:25 +02:00
Florian Küpper 0400a02bc1 Merge branch 'develop' of github.com:Flamefire/Vocaluxe into develop
Conflicts:
	Vocaluxe/Base/CPlaylists.cs
	Vocaluxe/Base/CProfiles.cs
	Vocaluxe/Base/CSettings.cs
2013-09-15 15:15:10 +02:00
Florian Küpper 536ca2868c Fix text-saving. 2013-09-15 13:32:46 +02:00
Florian Küpper 6e3d0ab28f Added new sort-option: Date added. 2013-09-02 12:50:41 +02:00
Florian Küpper e991010aa9 Change compile-options: Old behavior is Release/Debug; New behavior (save data to user-folde) is installer now. 2013-08-31 13:42:43 +02:00
flokuep afdd3cae62 Profiles could be in different folders now, vocaluxe loads profiles from main-folder and user-folder, new profiles will be saved in user-folder. 2013-08-31 13:42:31 +02:00
flokuep 00f3a3aed2 First step of changing paths. Songs, screenshots, playlists, config and logs are now in %User%/Documents/Vocaluxe
You can compile with PortableWin to get a release-exe with old behavior.
2013-08-31 13:42:30 +02:00
Flamefire 762d2c80d2 Code cleanup
Added license stuff
2013-08-22 00:56:58 +02:00
Flamefire cd826bdafd Merge remote-tracking branch 'remotes/flokuep/release-0.3' into develop
Conflicts:
	Vocaluxe/Base/CDataBase.cs
2013-08-22 00:43:53 +02:00
Flamefire 44c78fad19 Split Notes, Lines and Voices into separate files/classes 2013-08-22 00:05:01 +02:00
Florian Küpper fb9476d1cf Save DatabaseSongID to CSong for (should be) faster saving of NumPlayed and Scores. 2013-08-21 20:55:49 +02:00
Florian Küpper f0ab780a87 Add songs to highscore.db at start, save date to db, read date and numplayed to song-infos. 2013-08-21 20:18:52 +02:00
Florian Küpper 11a72e6e8d Merge branch 'dbv3_DateAdded' of github.com:flokuep/Vocaluxe into release-0.3
Conflicts:
	Vocaluxe/Base/CDataBase.cs
	Vocaluxe/Base/CSettings.cs
	VocaluxeLib/Menu/SongMenu/CSong.cs
2013-08-21 19:55:25 +02:00
Florian Küpper 4a91f39743 Read #DUETSINGERP1 and #DUETSINGERP2 from texts for better compatibility (performous uses this tags). 2013-08-12 10:56:32 +02:00
flokuep e093610eaf Fix profile-id-check. 2013-06-27 16:38:14 +02:00
Florian Küpper b444438862 Merge branch 'develop' of github.com:flokuep/Vocaluxe into release-0.3 2013-06-27 15:54:40 +02:00
Florian Küpper 480e714afc Improve profile-handling on names-screen, fixes #26 2013-06-27 13:49:35 +02:00
Alexander Eckart 622de6ec4d fixed profile handling in party mode challenge (TODO: fix it in challenge medley and tic-tac-toe too) 2013-06-16 14:17:13 +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
Alexander Eckart ca5fc16332 fixed loading songs (TryReadInt) 2013-06-06 21:34:06 +02:00
Alexander Eckart 248f036e72 Merge remote-tracking branch 'remotes/flokuep/release-0.3' into release-0.3 2013-06-01 10:45:26 +02:00
Flamefire 8574314fa5 Merge branch 'FFMpeg_Video_Improvement' into develop 2013-05-27 19:02:56 +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
Florian Küpper 6bdfb49cbb Fixed double-click-bug on screen-song. 2013-05-26 14:46:01 +02:00
Florian Küpper 12aec98f2c Fix crash when pressing webcam-button in profiles-screen. 2013-05-23 11:00:35 +02:00
Florian Küpper fcf94a091d Fixed bug with preview-volume on song-screen. 2013-05-22 14:34:28 +02:00
Flamefire 8cfeec628f Fixed typo 2013-05-22 01:33:20 +02:00
Flamefire 8b71dec2ca Video list -> Dictionary for faster access 2013-05-22 01:19:55 +02:00
Alexander Eckart 339e0b41f7 fixed playlist texts 2013-05-20 21:01:46 +02:00
Flamefire 11398dbb2f Cleanups after merge 2013-05-19 18:38:50 +02:00
Flamefire f83496d66a Fixed merge errors 2013-05-19 18:03:29 +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
Florian Küpper 624ca03db0 Added methods to get party-mode-folder. 2013-05-15 15:55:14 +02:00
Flamefire cdad90a93d Renamed texture members to more appropriate ones 2013-05-13 18:56:13 +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
Alexander Eckart 4161652a1d Merge remote-tracking branch 'remotes/flokuep/Font_Rewrite' into develop
Conflicts:
	Vocaluxe/Base/CBackgroundMusic.cs
	Vocaluxe/Base/CMain.cs
	Vocaluxe/Base/CTheme.cs
	Vocaluxe/Base/Font/CGlyph.cs
	Vocaluxe/Lib/Draw/CDirect3D.cs
	Vocaluxe/Lib/Draw/CDrawWinForm.cs
	Vocaluxe/Lib/Draw/COpenGL.cs
	Vocaluxe/Program.cs
	Vocaluxe/Screens/CScreenCredits.cs
	Vocaluxe/Screens/CScreenMain.cs
	Vocaluxe/Screens/CScreenOptionsTheme.cs
	Vocaluxe/Screens/CScreenSing.cs
	Vocaluxe/Vocaluxe.csproj
	VocaluxeLib/Menu/IMenu.cs
2013-05-10 19:28:20 +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 50046901fd fixed some bugs 2013-05-10 00:10:12 +02:00
Alexander Eckart e70ce5ad68 rewrite of CProfiles.cs, some optimizations in CScreenProfiles.cs, added IsCapturing() to Webcam/IWebcam.cs 2013-05-09 22:01:29 +02:00