Commit Graph
313 Commits
Author SHA1 Message Date
Florian Kuepper 3fa7393014 Merge remote-tracking branch 'upstream/develop' into 6-player 2012-04-09 11:20:01 +02:00
Alexander Eckart 70192b8213 Merge remote-tracking branch 'remotes/origin/bugfix-0.1.1' into develop
Conflicts:
	Vocaluxe/Base/CSettings.cs
2012-04-09 11:14:54 +02:00
Florian Kuepper df0688d563 Merge remote-tracking branch 'upstream/develop' into 6-player 2012-04-09 11:07:22 +02:00
Alexander Eckart 96dc37e788 bugfix: crash at startup 2012-04-09 00:03:06 +02:00
Alexander Eckart e18ba9d2bb set project status back to alpha and adjusted build counter 2012-04-08 19:57:08 +02:00
Alexander Eckart 9d72369a92 Merge branch 'release-0.1' 2012-04-08 19:32:48 +02:00
Alexander Eckart 8a2df18a3c Merge pull request #27 from Vocaluxe/release-0.1
merge Release 0.1 branch changes into develop branch
2012-04-08 10:31:21 -07:00
Alexander Eckart 2ae8d3de56 update to build 0060 (0.1.0 final) 2012-04-07 20:10:05 +02:00
Alexander Eckart 6a48f90099 better dynamic loading 2012-04-07 17:37:26 +02:00
Alexander Eckart c52e82becc fixed scaling bug 2012-04-07 17:22:29 +02:00
Alexander Eckart 85055dfd20 some error handling for theme loading 2012-04-07 14:26:37 +02:00
Alexander Eckart 8fd6594e19 added some error handling to main program 2012-04-06 16:55:48 +02:00
Alexander Eckart 1e0120faab ffmpeg update 2012-04-06 13:38:53 +02:00
Florian Kuepper c428dbb404 Save selected players to config and load them on start. 2012-04-06 11:40:45 +02:00
Florian Kuepper 1f29aa7759 Fix name-selection with keyboard. 2012-04-02 22:55:08 +02:00
Florian Kuepper 999923bbd9 Fix colors on ScoreScreen. 2012-04-02 22:53:49 +02:00
Florian Kuepper 02ed1e9b0b Fix wrong color on SingScreen. 2012-04-02 18:45:12 +02:00
Florian Kuepper 0ac0ce49d0 Change color for player 5. 2012-04-02 18:43:49 +02:00
Florian Kuepper 20087ef7db Don't show "Rating:" and "Difficulty:" on ScoreScreen.... 2012-04-02 18:34:55 +02:00
Florian Kuepper 20c684c494 Update ProgramCodeName 2012-04-02 14:33:01 +02:00
Florian Kuepper 5d0ffec05e Show second lyrics also for 4-player-singing. 2012-04-02 14:21:54 +02:00
Florian Kuepper ef55a9e83b Use NumBlock-Numbers for choosing player, too. Add +/- to change player-number. 2012-04-02 14:17:16 +02:00
Florian Kuepper f11be295f7 Fix bug in selecting with keyboard. 2012-04-02 14:08:14 +02:00
Florian Kuepper 217bbaded0 If name selection is active, press active player-number to exit selection or other player-number to select an other player... 2012-04-02 13:38:23 +02:00
Florian Kuepper dc574605f1 Fix problem with showing names. 2012-04-02 00:08:52 +02:00
Florian Kuepper f2dbe6c965 Some theme adjustments.... 2012-04-01 23:52:22 +02:00
Alexander Eckart 3dafd429d1 Merge branch 'release-0.1' of https://github.com/Vocaluxe/Vocaluxe into release-0.1 2012-03-31 18:00:43 +02:00
Alexander Eckart 9aaaab1bc3 added middle button support (random in songscreen), but it does not work properly 2012-03-31 18:00:09 +02:00
Florian Kuepper 8f91d60270 Some clean-up. 2012-03-31 15:46:13 +02:00
Florian Kuepper 6567aa413d Added keyboard-support. Press 1-6 to start selecting player, enter to select and esc to abort. 2012-03-31 15:20:19 +02:00
Benjamin Hess 8da004d3e3 fixed bug on exit: dispose already nulled textures 2012-03-31 19:25:22 +08:00
Florian Kuepper f5050028c6 Added scrolling for offset. 2012-03-31 13:05:58 +02:00
Florian Kuepper aba9c97988 Finished Score-Screen for 6 players. 2012-03-31 12:36:37 +02:00
Florian Kuepper 4affefa133 Finished 5-player on ScoreScreen. 2012-03-31 11:03:23 +02:00
Florian Kuepper ea6471ad80 Fix: Right number of drop-areas OnShow... 2012-03-31 10:59:53 +02:00
Florian Kuepper 86cfdab4ad Forget to remove setting test-value... 2012-03-31 10:25:13 +02:00
Florian Kuepper 0456eb6493 First step of 6-player-singing. Maybe very unstable, buggy and busy. There is still a lot to to do:
- NamesScreen (Drag/Drop-Visibility, Scrolling, Using Keyboard...)
- ScoreScreen (For 5+6 players)

But please check and test :)
2012-03-31 00:34:12 +02:00
Benjamin Hess ed5e5bf0b6 call UpdateTimings on CLines at the end of loading (was called after adding a note) 2012-03-30 23:25:16 +08:00
Benjamin Hess 269dd38402 changed skin element lookup to dictionary (was linear search) 2012-03-30 23:25:16 +08:00
Alexander Eckart d7e474d774 Merge remote-tracking branch 'remotes/xDarkice/release-0.1' into release-0.1 2012-03-30 17:06:42 +02:00
Stephan Sundermann fa975a9960 Fixed resizing 2012-03-28 14:27:57 +02:00
Stephan Sundermann 3804810545 Better ID management 2012-03-26 17:26:48 +02:00
Florian Kuepper 93104e45e6 Merge remote-tracking branch 'upstream/develop' into release-0.1 2012-03-25 15:19:35 +02:00
Florian Kuepper 5d38e6d711 Merge remote-tracking branch 'upstream/release-0.1' into release-0.1 2012-03-25 15:18:23 +02:00
Alexander Eckart 4f09465ce5 fixed cover loading: use cover names from xml 2012-03-24 18:37:00 +01:00
Alexander Eckart 042ba7d207 Merge branch 'release-0.1' into develop 2012-03-24 17:11:40 +01:00
Stephan Sundermann d251329791 The aspect ratio is now correct on startup 2012-03-24 16:54:40 +01:00
Alexander Eckart ecf631034f update to build 0059, fixed highscore saving bug 2012-03-24 13:56:39 +01:00
Alexander Eckart 22181bd5e4 update to build 0058 && RC 2012-03-23 15:59:46 +01:00
Alexander Eckart 26cabd32d6 readme update 2012-03-23 15:00:38 +01:00