Projects/Vocaluxe
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,458 Commits 7 Branches 7 Tags
4103d990cf5d397be4fcbb09e5829a0f6ea822f3
Commit Graph
188 Commits
Author SHA1 Message Date
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 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 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 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
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 19339c6888 reconstructed CProfiles (preparing for async profile adding) 2013-05-07 16:56:23 +02:00
Alexander Eckart bde99ff2aa some more reconstructions on avatars 2013-05-07 00:23:44 +02:00
Alexander Eckart ec5bdb7742 SProfile => CProfile; SAvatar => CAvatar 2013-05-06 23:29:31 +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
Florian Küpper 76340f7826 Rename HAlign to ResizeAlign 2013-05-04 11:16:41 +02:00
Flamefire 5aeea59e76 Fixed wrong sizes for resized textures 2013-05-03 23:02:23 +02:00
Flamefire f8fb7bda25 Added auto property for W/H-Ratio 2013-05-03 22:38:19 +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 1bfc76e4d3 Better readability for CSingNotes 2013-05-03 19:56:04 +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
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 c5f5266126 Cleaned up graphics stuff (mostly optional parameters) 2013-05-01 23:05:56 +02:00
Flamefire 553be47783 Removed unused and temporary stuff 2013-05-01 22:14:34 +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 7aa83f0f43 Merge branch 'develop' into Font_Rewrite 2013-04-30 19:54:00 +02:00
Flamefire 1402d92c5b Changed config for lyrics position 2013-04-30 19:53:44 +02:00
Flamefire b54a4c3608 Merge branch 'develop' into Font_Rewrite 2013-04-30 19:47:35 +02:00
Flamefire 5a12cb48f9 Merge branch 'develop' into develop_fk 2013-04-30 19:42:53 +02:00
Flamefire dc3866975e Refactored CText constructor 2013-04-30 16:33:20 +02:00