Commit Graph
100 Commits
Author SHA1 Message Date
Florian Küpper 7f965e0f9b Check for right screen-version. 2014-09-27 13:13:36 +02:00
Florian Küpper fc432f34eb Fixed some bugs with bg-music. 2014-09-25 19:36:16 +02:00
Florian Küpper 09d0529050 Fix finding gstreamer-lib. 2014-09-22 12:57:23 +02:00
Florian Küpper 025f6542dd Updated installer. Installer checks now which prerequisites are already installed. 2014-09-21 17:12:18 +02:00
Florian Küpper 4eb5872e2f Update installer. Add gstreamer-installer-files manually (don't want to blow up repository) 2014-09-21 16:22:06 +02:00
Florian Küpper 32352e2e1b Merge branch 'develop' of https://github.com/xDarkice/Vocaluxe into develop 2014-09-21 14:33:56 +02:00
Florian Küpper e915e72ce6 Added to zoom-levels to VideoAspect. Toogle on ScreenSing with 'V', saved to song-text if saving is enabled in config.xml. 2014-09-19 16:15:53 +02:00
Florian Küpper 6ea49eeab0 Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into develop 2014-09-19 12:26:12 +02:00
Florian Küpper 2d6a750b0b Merge branch 'theme' into develop 2014-09-19 12:23:23 +02:00
Florian Küpper f0902a02a0 Language update. 2014-09-19 12:13:54 +02:00
Florian Küpper fef075eeb8 Fixed reflections. 2014-09-19 11:51:29 +02:00
Florian Küpper 30439659b9 Some fixes. 2014-09-19 11:16:34 +02:00
Florian Küpper c59b03df6b Added command-line-parameter to load old-theme-files. We should remove it after next release. 2014-09-19 10:46:05 +02:00
Florian Küpper b1ed316d13 Fixed some reflections. 2014-09-18 15:49:31 +02:00
Florian Küpper 6b8379c081 Fix translation-bug in party-modes. 2014-09-18 15:37:47 +02:00
Florian Küpper c07441bc63 Load complete theme-date with de-serialization. 2014-09-18 15:35:52 +02:00
Florian Küpper 4f8c482645 Remove unneeded constructors. 2014-09-15 19:44:19 +02:00
Florian Küpper 9ab0ea5f34 Update more LoadTextures-methods. Some changes are a bit ugly, but will removed later. 2014-09-15 19:35:00 +02:00
Florian Küpper d248292fa3 Update LoadTextures for some elements. 2014-09-12 09:34:55 +02:00
Florian Küpper e936fe4126 Added constructors with STheme*-structs, LoadTextures() will be LoadTheme later and set all needed values from theme-struct to object. 2014-09-10 20:44:39 +02:00
Florian Küpper 912cfac8c5 Saved theme (so everything should be right before changing to de-serialization) 2014-09-10 20:26:13 +02:00
Florian Küpper 6d46cbc069 Some renamings. 2014-09-10 20:22:39 +02:00
Florian Küpper 9cca49745a Added constructors to STheme* for copying. 2014-09-10 11:17:36 +02:00
Florian Küpper cea276090d Change serialization. It think it's much better now. 2014-09-09 22:04:52 +02:00
Florian Küpper 96e50f7723 Changed theme-color-handling. 2014-09-09 21:32:07 +02:00
Florian Küpper a55d724620 Merge branch 'develop' of github.com:Flamefire/Vocaluxe into theme 2014-09-08 21:22:57 +02:00
Florian Küpper d27cbcd7d0 Another fix for bg-music. 2014-08-27 09:05:04 +02:00
Florian Küpper 290f6d024e Serialize complete screens. 2014-08-26 17:37:50 +02:00
Florian Küpper b2102b11d9 Add serialization for all theme-elements. 2014-08-26 16:48:30 +02:00
Florian Küpper 4bbb0bfb14 Try it for background. 2014-08-26 09:29:39 +02:00
Florian Küpper 6b958527ce First try to implement serialisation (for statics). 2014-08-25 17:22:13 +02:00
Florian Küpper abe8987748 Fixed sing-button in bg-popup. 2014-08-24 20:22:38 +02:00
Florian Küpper cd7bb322f9 Merge branch 'sound-player' into develop 2014-08-24 18:03:18 +02:00
Florian Küpper dd1fe4402c Draw color instead of texture when changing song (looks better) 2014-08-24 18:01:02 +02:00
Florian Küpper 46544aee82 Fix repeating of bg-music. 2014-08-24 17:38:37 +02:00
Florian Küpper 942c8dca27 Fix showing bg-video on start (if enabled) 2014-08-24 14:34:51 +02:00
Florian Küpper 74654d7fcf More improvements and fixes (nearly stable now) 2014-08-24 13:09:57 +02:00
Florian Küpper 6c4fe011bf Some improvements. 2014-08-24 12:42:05 +02:00
Florian Küpper fddd56c2f9 Fix bug with medley-countdown. 2014-08-23 08:05:49 +02:00
Florian Küpper fb56c5248b Merge branch 'develop' of github.com:Flamefire/Vocaluxe into develop 2014-08-23 08:03:00 +02:00
Florian Küpper 6dda1a38d0 Added background-music-option: "Only selected song". bg-music is played on name/score/highscore screen with selected song. 2014-08-22 21:22:03 +02:00
Florian Küpper b30efb1913 some fixes. 2014-08-22 21:01:24 +02:00
Florian Küpper f926263706 Fix video sync. 2014-08-22 18:05:50 +02:00
Florian Küpper 6f617aa40b Some improvements... 2014-08-22 17:51:47 +02:00
Florian Küpper eef988fcdb Some code-cleanup. 2014-08-20 19:14:20 +02:00
Florian Küpper d0958b69be Some changes to preview-start. 2014-08-20 19:10:13 +02:00
Florian Küpper c6e8854dda Change preview-player. Now it's part of bg-music. 2014-08-20 18:50:27 +02:00
Florian Küpper 0a7006db43 Small bugfix. 2014-08-09 22:01:01 +02:00
Florian Küpper 8722844646 Merge branch 'develop' of github.com:Flamefire/Vocaluxe into sound-player
Conflicts:
	VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs
2014-08-09 20:04:41 +02:00
Florian Küpper 8e8fdc1277 Play song-preview instead of bg-music (if enabled) on names-, score- and highscore-screen. 2014-08-09 19:50:40 +02:00
Florian Küpper 04c2b85e2b Close stream when finished (*-player) 2014-08-09 17:16:51 +02:00
Florian Küpper 4c01396e46 Added preview-player which is used for playing preview in song-menu. 2014-08-09 17:12:27 +02:00
Florian Küpper bd41de6dbe Merge branch 'develop' of github.com:Flamefire/Vocaluxe into sound-player
Conflicts:
	PartyModes/PartyModeTicTacToe/CPartyScreenTicTacToeMain.cs
	VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs
2014-08-09 14:13:38 +02:00
Florian Küpper 4b02932bb4 Merge branch 'develop' of github.com:Flamefire/Vocaluxe into develop 2014-08-09 14:04:40 +02:00
Florian Küpper b16735bfe0 Merge branch 'develop' of github.com:Flamefire/Vocaluxe into develop 2014-08-08 18:58:19 +02:00
Florian Küpper c683110a80 Update QRCoder.dll 2014-08-05 15:52:11 +02:00
Florian Küpper 240f47090d Fix for background-music-files. 2014-08-05 11:41:20 +02:00
Florian Küpper 3612b9244b Added sound- and song-player to VocaluxeLib. Use it for Background-Music. 2014-08-05 10:54:34 +02:00
Florian Küpper b2aefe8854 Update installer. 2014-08-03 15:13:20 +02:00
Florian Küpper ed6a845168 Do some cleanup (remove unneeded, old client-server-stuff), another update of .gitignore 2014-08-03 14:56:07 +02:00
Florian Küpper 342731084b Update of .gitignore 2014-08-03 13:13:15 +02:00
Florian Küpper f837c329ec Webserver: Show message if there is a problem with init. 2014-08-02 18:35:22 +02:00
Florian Küpper f43116073d Loads faster if song-folder doesn't exist. 2014-08-02 11:16:35 +02:00
Florian Küpper fcdd58f827 Fix some language-files. 2014-08-02 11:09:25 +02:00
Florian Küpper 4f38ac66db Language-Update. Thx to all translators! 2014-06-12 13:48:24 +02:00
Florian Küpper eef512ae98 Added config-file for Transifex Client. 2014-06-12 13:47:04 +02:00
Florian Küpper 43113662c1 Merge branch 'develop' of github.com:Flamefire/Vocaluxe into develop 2014-06-12 12:37:18 +02:00
Florian Küpper ed076865bc Merge branch 'develop' of github.com:Flamefire/Vocaluxe into develop 2014-05-07 15:03:57 +02:00
Florian Küpper e59b1f78ac Merge branch 'develop' of github.com:Flamefire/Vocaluxe into develop 2014-05-02 12:11:56 +02:00
Florian Küpper a3fca21b32 Merge remote-tracking branch 'remotes/flamefire/RecordImprovements' into develop 2014-04-26 19:00:11 +02:00
Florian Küpper c191284030 Merge remote-tracking branch 'remotes/flamefire/RecordImprovements' into develop 2014-04-09 08:30:42 +02:00
Florian Küpper 7bf11363fe Fixes #96 - Also added message if server is not running. 2014-02-18 12:41:50 +01:00
Florian Küpper 70f566682f Fix short-song-mode. 2014-01-21 19:19:04 +01:00
Florian Küpper 9676c1056f Prohibit screen-saver and disabling monitor when vocaluxe is running. 2014-01-21 19:09:29 +01:00
Florian Küpper 5277504e34 Fix forgetting last song after singing. 2013-12-31 15:41:28 +01:00
Florian Küpper 388a5b4078 Merge branch 'develop' of github.com:lukeIam/Vocaluxe into develop 2013-12-31 13:51:02 +01:00
Florian Küpper 8e967dce4e Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into develop 2013-12-31 13:49:01 +01:00
Florian Küpper 599b671ffa Merge branch 'develop' of github.com:lukeIam/Vocaluxe into develop 2013-12-31 12:41:15 +01:00
Florian Küpper 82180d96fc Fixed typos. Sorry. 2013-12-31 12:27:18 +01:00
Florian Küpper b433576de0 PartyNames: Fix 'remembering' of selected profiles. 2013-12-31 11:26:26 +01:00
Florian Küpper 3e91ad499d Fix: Webserver locales. 2013-12-31 11:12:59 +01:00
Florian Küpper ca22ca1719 Language-update. 2013-12-31 11:01:29 +01:00
Florian Küpper 00fb8079e6 Fixed webcam-bug. 2013-12-31 10:36:11 +01:00
Florian Küpper 1d3b238dab Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into develop 2013-12-26 14:30:35 +01:00
Florian Küpper 97abd86661 update .gitignore 2013-12-26 13:44:15 +01:00
Florian Küpper 1db5268b0a Merge branch 'PartyNames' of github.com:flokuep/Vocaluxe into PartyNames 2013-12-26 13:08:49 +01:00
Florian Küpper 978c04916b PartyNames: Use [+] and [-] to in/decrease player/team-num. 2013-12-26 13:07:31 +01:00
Florian Küpper 0f1beb6479 PartyNames: Fix random selection. 2013-12-26 13:07:31 +01:00
Florian Küpper 2f17bfe3b1 PartyNames: Use screen for ChallengeMedley 2013-12-26 13:07:30 +01:00
Florian Küpper 94f8dcef3c PartyNames: Fix name-selection. 2013-12-26 13:07:30 +01:00
Florian Küpper 11df1dd0ad PartyNames: Workaround for right size of select-slide-textures. Anyone better ideas? 2013-12-26 13:07:29 +01:00
Florian Küpper c14ea466f5 PartyNames: Use [1]..[9] to change team and/or increase team-num. 2013-12-26 13:07:29 +01:00
Florian Küpper 4f08a7a796 PartyNames: Some cleanup 2013-12-26 13:07:28 +01:00
Florian Küpper 915db881e3 PartyNames: Added button for selecting random. 2013-12-26 13:07:28 +01:00
Florian Küpper 3f28d6405c PartyNames: Could change team/player-nums on name-selection now if allowed. 2013-12-26 13:07:23 +01:00
Florian Küpper f5407f1815 Another fix for name-selection. 2013-12-26 13:07:22 +01:00
Florian Küpper 774fd7f7a5 Fixed aspect-ration from webcam-texture (video-options) 2013-12-26 13:06:29 +01:00
Florian Küpper 69da81ecac Added screen for screen-adjustments. 2013-12-26 13:06:27 +01:00
Florian Küpper 170f7d2d3e Reset border adjustments with STRG + ALT + SHIFT + 0 2013-12-26 13:06:26 +01:00
Florian Küpper 8de95ffee0 Just a comment-fix 2013-12-26 13:06:24 +01:00