Commit Graph
1985 Commits
Author SHA1 Message Date
Alexander Eckart 74313cf1bd Merge branch 'develop' into medley
Conflicts:
	Output/Themes/Ambient/Skin Blue.xml
	Output/Themes/Ambient/Skin Green.xml
	Output/Themes/Ambient/Skin Red.xml
	Output/Themes/Ambient/Skin Yellow.xml
	Vocaluxe/Screens/CPopupScreenPlayerControl.cs
2012-06-24 21:23:50 +02:00
Alexander Eckart c203da4fc1 Merge remote-tracking branch 'remotes/flokuep/medley' into medley 2012-06-24 21:17:00 +02:00
Alexander Eckart b82b30aea4 a little performance patch for bg music 2012-06-24 18:26:43 +02:00
Alexander Eckart 00998a9fd0 update of ffmpeg (x86), rollback of ffmpeg (x64) to build 0065 2012-06-24 17:36:34 +02:00
Alexander Eckart 3d89d82d46 reset debug flag (from last commit) 2012-06-24 16:09:10 +02:00
Alexander Eckart 157eaadf61 workaround for time jumps (they are coming from portaudio/ffmpeg stream position calculation) 2012-06-24 13:30:43 +02:00
Alexander Eckart c661bc054e fixed keyboard navigation in song menu (last row) 2012-06-24 13:12:12 +02:00
Alexander Eckart 217e73911e changed keyboard selectslide behavior, enter and highlighting is no more needed 2012-06-23 16:40:12 +02:00
Alexander Eckart 73f7a64835 fine tuning for menu navigation behavior 2012-06-23 16:25:31 +02:00
Alexander Eckart 7d6609a771 changed text scaling method from iteration to calculation (faster) 2012-06-22 14:47:07 +02:00
Alexander Eckart da3fa9fcbb fixed horizontal text position for reflections 2012-06-22 11:23:37 +02:00
Alexander Eckart cd375974f1 fixed text position for top and bottom 2012-06-21 20:36:08 +02:00
Alexander Eckart 195ac8f824 fixed typo 2012-06-21 20:07:08 +02:00
Alexander Eckart ece7575fbb update to build 0067 2012-06-21 18:33:59 +02:00
Alexander Eckart 39febd9bc7 added HAlign to texts 2012-06-21 18:01:28 +02:00
Alexander Eckart 6632c64f25 fixed typo 2012-06-21 16:56:05 +02:00
Alexander Eckart 9ab7966cf8 fixed reference to x64 libacinerella.so 2012-06-19 22:47:55 +02:00
Alexander Eckart 2d7211c2bf small bugfix in acinerella makefile 2012-06-19 22:40:40 +02:00
Alexander Eckart 8daac3c497 linux x86 support should be finished now (there is a still a bug with the mouse pointer) 2012-06-19 22:29:42 +02:00
Alexander Eckart 8580817fcc some bugfixes for linux support 2012-06-19 22:02:22 +02:00
Alexander Eckart 36d1f2302e linux support step 1 (first test, no x64 support) 2012-06-19 21:49:54 +02:00
Alexander Eckart b4d155a5a3 compiled Community.CsharpSqlite.dll for target AnyCPU, added source code 2012-06-19 18:29:58 +02:00
Florian Kuepper e6556e54ee Changed playlist. 2012-06-19 18:12:25 +02:00
Alexander Eckart 5b87c37e3a fixed acinerella makefile for linux 2012-06-19 17:47:37 +02:00
Alexander Eckart f5e4cba426 use Path.Combine instead of fixed path separators 2012-06-19 17:42:54 +02:00
Alexander Eckart 9b50c7e563 fixed small bug 2012-06-18 18:18:02 +02:00
Alexander Eckart 481cb8cfa8 fixed typo 2012-06-18 18:14:13 +02:00
Florian Kuepper 6202c67156 Added first basic playlist-format. 2012-06-18 17:28:21 +02:00
Florian Kuepper 8ef112f6b6 Could sing a medley or short-song now. 2012-06-17 18:00:29 +02:00
Florian Kuepper 5f00a432e1 Merge remote-tracking branch 'upstream/develop' into medley 2012-06-17 17:52:24 +02:00
Alexander Eckart 6afc0f64bb added possibility to add individual game modes for each song 2012-06-17 17:20:27 +02:00
Florian Kuepper d3cb14d51a Added switch to small view (not ready yet) 2012-06-17 16:34:30 +02:00
Florian Kuepper ae2c693e37 Merge remote-tracking branch 'upstream/develop' into medley 2012-06-17 15:10:32 +02:00
Alexander Eckart e85a3426a5 added drawing of song menu to the sorting method in CMenu.cs 2012-06-17 15:01:35 +02:00
Alexander Eckart 1fd38bad14 better handling for combined chars in song sorting (sort letter) 2012-06-17 14:31:39 +02:00
Florian Kuepper 6d07fefffc Forget to update CScreenHighscore.cs 2012-06-17 13:47:05 +02:00
Florian Kuepper 3616774bb2 Merge remote-tracking branch 'upstream/develop' into medley 2012-06-17 13:37:48 +02:00
Florian Kuepper a4f253bf67 Added short-song-game-mode. Game-Mode-Names are now translated. 2012-06-17 13:37:18 +02:00
Alexander Eckart 37e554fcc0 fixed bg music after leaving record screen 2012-06-17 12:50:40 +02:00
Alexander Eckart 335447a9e3 Merge pull request #29 from flokuep/develop
Develop
2012-06-17 03:48:16 -07:00
Florian Kuepper 992397d498 Added song-options on ScreenSong. Need fix for drawing... 2012-06-17 11:29:31 +02:00
Florian Kuepper 07bad380a3 Merge remote-tracking branch 'upstream/develop' into medley 2012-06-16 17:20:14 +02:00
Florian Kuepper d6557de01c Added lyrics-options to new screen.
TODO: Update languages (spanish + frensh)
2012-06-16 17:17:45 +02:00
Florian Kuepper 04703c4720 Merge remote-tracking branch 'upstream/develop' into develop 2012-06-16 16:29:38 +02:00
Alexander Eckart c3394f6c83 update of ffmpeg 2012-06-16 15:28:17 +02:00
Florian Kuepper 114dbe6965 Reload (hopefully) all colors now on skin-change. 2012-06-12 18:22:08 +02:00
Florian Kuepper 37cef42151 some theme-fixes & change colors of skins (yellow skin is really yellow now and so on...) 2012-06-12 18:21:07 +02:00
Florian Kuepper 33bc3903e9 Merge remote-tracking branch 'upstream/develop' into develop 2012-06-12 15:27:27 +02:00
Stephan Sundermann 3c29870eba Merge remote-tracking branch 'upstream/develop' into develop 2012-06-10 13:57:55 +02:00
Alexander Eckart 25539d2907 update to build 0066, some minor changes 2012-06-04 22:38:57 +02:00