Commit Graph
640 Commits
Author SHA1 Message Date
Alexander Eckart 339e0b41f7 fixed playlist texts 2013-05-20 21:01:46 +02:00
Florian Küpper 62efcd84d0 Update text-positions (part 2) - Please check if there is still something in main-game looking ugly.
TODO: Fix party-modes!
2013-05-13 22:29:48 +02:00
Florian Küpper e2d0054ccf Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into develop 2013-05-11 16:29:40 +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
Alexander Eckart 53a917d5f2 fixed typo 2013-05-10 19:14:56 +02:00
Florian Küpper 3f46acd06e Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into develop 2013-05-10 17:25:52 +02:00
Alexander Eckart b18c688936 added CDiscover: searching the network for running vocaluxe server, could be useful for users who do not know what a ip address is. 2013-05-10 16:44:19 +02:00
Alexander Eckart 74af5ae691 made encryption optional, put server params into config, default is server = off 2013-05-10 12:01:20 +02:00
Alexander Eckart 1a68c26e9f added SendProfile 2013-05-09 23:14:04 +02:00
Florian Küpper 94e3652db0 Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into develop 2013-05-07 11:41:08 +02:00
Florian Küpper 2a83c78692 Update positions (part 1) 2013-05-07 11:37:45 +02:00
Alexander Eckart bd0095ea24 added Newtonsoft Licence 2013-05-06 22:13:18 +02:00
Alexander Eckart 6d008cdc06 take profile photos by android phone (still very buggy) 2013-05-06 22:08:59 +02:00
Alexander Eckart eb9e17d2e6 using json as serializer 2013-05-05 16:53:16 +02:00
Alexander Eckart 80b54cad25 some optimizations 2013-05-05 11:23:55 +02:00
Alexander Eckart b959c5ff8a introduced controller framework, simple control test implementation 2013-05-04 23:48:08 +02:00
Alexander Eckart 1147d612fe added login function 2013-05-04 20:28:32 +02:00
Alexander Eckart 7f71853672 added Server/CVocaluxeServer.cs 2013-05-04 19:01:09 +02:00
Florian Küpper 47fce7cbba Update text-heights. 2013-05-04 11:48:19 +02:00
Florian Küpper 76340f7826 Rename HAlign to ResizeAlign 2013-05-04 11:16:41 +02:00
Flamefire 55a466559b Better sizes (with outline Style)
Fix of ScreenOptionsRecord for new font sizes. Other have to follow!
2013-05-02 14:32:30 +02:00
Florian Küpper ff36128326 Added new language-strings. 2013-05-02 11:08:55 +02:00
Flamefire 507df651c0 Added dynamic Glyph resizing
Show Program name on loading screen when videos disabled
2013-05-02 00:32:24 +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 331fbb1526 Revert "Added message for no-mics-error on party-screen."
This reverts commit 3884632772.
2013-04-30 19:42:37 +02:00
Flamefire 600d5cf751 More font fixes
Newer font files (old ones were faulty)
2013-04-30 19:21:11 +02:00
Flamefire d239492f19 Updated record options screen 2013-04-29 16:17:02 +02:00
Florian Küpper 4aa94e188c Added more lyric-position-options.
TRANSIFEX:
Add: TR_SCREENOLYRICS_POSITION, TR_CONFIG_LYRICSPOSITION_BOTTOM, TR_CONFIG_LYRICSPOSITION_TOP, TR_CONFIG_LYRICSPOSITION_BOTH, TR_CONFIG_LYRICSPOSITION_DYNAMIC
Remove: TR_SCREENOLYRICS_ONTOP
2013-04-29 09:24:28 +02:00
Florian Küpper 3884632772 Added message for no-mics-error on party-screen.
Please add "TR_SCREENPARTY_ERROR_MICS" to TRANSIFEX
refs #2
2013-04-29 08:45:42 +02:00
Flamefire 438068cf5d Merge branch 'develop' of git://github.com/flokuep/Vocaluxe into develop
Conflicts:
	Vocaluxe/Base/CConfig.cs
	Vocaluxe/Base/CProfiles.cs
	Vocaluxe/Screens/CScreenNames.cs
	Vocaluxe/Screens/CScreenSing.cs
2013-04-26 12:53:09 +02:00
Florian Küpper c86f2b2f0a Added Flamefire to credits. 2013-04-25 14:22:55 +02:00
Florian Küpper c44c4de339 Added medley-countdown, ref #3 TODO: Fix ugly big numbers... 2013-04-25 12:46:43 +02:00
Flamefire 477b023520 More refactoring (unused stuff removed) 2013-04-23 21:47:46 +02:00
Flamefire dcbbc5caf3 Many cleanups according to ReSharper suggestions (Mostly redundant code)
Minor Bug fixes
2013-04-20 02:19:56 +02:00
Alexander Eckart eb71c1158e update to build 0078 2013-04-17 18:34:26 +02:00
Flamefire 82b446684b Fixed Partymodes
Fixed Text copy constructor
2013-04-16 17:41:55 +02:00
Flamefire 71251b8733 Fixed partymode names 2013-04-16 16:40:04 +02:00
Alexander Eckart 91617d6874 added Dutch and Turkish translations 2013-04-07 17:05:25 +02:00
Alexander Eckart 07646b0953 update to ffmpeg 1.2 2013-04-07 13:22:20 +02:00
Alexander Eckart f0a56b1aed switched to .Net 4.0, fixed some typos 2013-04-06 18:56:10 +02:00
Flamefire 74c0275c3f Changed namespaces of partyModes 2013-03-22 19:46:03 +01:00
Flamefire 7469e86617 CTheme and CText changes 2013-03-19 23:01:04 +01:00
Flamefire 6380c739aa Simpler Screens 2013-03-19 17:43:11 +01:00
Flamefire c3b447ccf6 Duplicate Code in CMenu. CFont, CLanguage removed 2013-03-18 18:17:50 +01:00
Flamefire da889c9d40 Removed duplicate code in CMenu 2013-03-14 00:16:41 +01:00
Flamefire 51da50bf93 Merge remote-tracking branch 'remotes/origin/develop' into develop
Conflicts:
	Vocaluxe.sln
	Vocaluxe/Base/CConfig.cs
2013-02-28 14:13:53 +01:00
Flamefire dbb9c6355f Added option to start current song/enter current category
Added CSong.IsInCategory
2013-02-27 01:03:33 +01:00
Flamefire 30841c5758 SongMenu refactoring
New Shortcuts
Readme update
2013-02-26 21:12:32 +01:00
Alexander Eckart 69e5537f76 Merge remote-tracking branch 'remotes/xdarkice/gstreamer' into develop
Conflicts:
	VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs

Set GStreamer as default audio decoder
2013-02-22 22:29:05 +01:00