Projects/Vocaluxe
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,075 Commits 7 Branches 7 Tags
ee7690228fa3d53f9de2fa413d74febd2301ba7c
Commit Graph
2075 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
lukeIam ee7690228f Fixed mixed tabs and spaces 2014-11-09 11:47:46 +01:00
lukeIam 23a9059ff9 Merge remote-tracking branch 'remotes/origin/APP_Refactored_mainJS' into develop 
Conflicts:
	ClientServerLib/ClientServerLib/CServer.cs
	ServerLib/CWebservice.cs
	ServerLib/DataStructs.cs
	ServerLib/ICWebservice.cs

Divided a mixed branch...
 2014-11-07 17:18:49 +01:00
Stephan Sundermann 1a94f3a6f8 Merge pull request #103 from flokuep/develop 
sound/song-player
 2014-09-13 19:34:54 +02:00
Florian Küpper d27cbcd7d0 Another fix for bg-music. 2014-08-27 09:05:04 +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
Flamefire 41480797e2 Change values of xml argument to xPath only to make it more consistent 2014-08-09 19:49:20 +02:00
Flamefire f7202ee9b0 Rename covers to match correct name and remove them from style file 2014-08-09 19:48:47 +02:00
Flamefire a868f02794 Extract CVideoPlayer.cs 2014-08-09 18:59:28 +02:00
Flamefire 4b348ceec6 Don't show old preview song in category view 2014-08-09 17:59:53 +02:00
Flamefire f021e9a9f7 Unify language of songs 2014-08-09 17:59:15 +02:00
Flamefire 48527a4061 Fix missing songs in categories 2014-08-09 17:58:49 +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
Flamefire ced12ac064 Fix NPE with few songs in category 2014-08-09 15:27:05 +02:00
Flamefire 09d36ccf60 Fix categories not showing on start 2014-08-09 15:05:34 +02:00
Flamefire 62675821ed Enable hiding the Server QR-Code Popup 2014-08-09 14:35:03 +02:00
Flamefire 51a5165308 Fix Server 2014-08-09 14:34:34 +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
Flamefire 75ff5a0291 Remove redundant names in playlist functions 
Fix handling of playlist IDs
 2014-08-08 23:49:01 +02:00
Flamefire 10e5312579 Fix crash on closing a sound stream 2014-08-08 20:04:50 +02:00
Flamefire b14b47fd33 Fix wrong song name showing in party mode 2014-08-08 20:01:39 +02:00
Florian Küpper b16735bfe0 Merge branch 'develop' of github.com:Flamefire/Vocaluxe into develop 2014-08-08 18:58:19 +02:00
Flamefire d5ae52a8f7 Fix crash at song end 2014-08-08 17:50:41 +02:00
Flamefire faee5fa107 Merge branch 'develop' of git://github.com/Vocaluxe/Vocaluxe into develop 2014-08-08 17:33:21 +02:00
Flamefire 03b9ea8e49 Rename File/Folder name variables to distinguish them from real (full) paths 
Make sure full path is used everywhere (if I didn't miss anything)
 2014-08-08 17:27:36 +02:00
Flamefire 7b95942653 Better handling of assembly loader 2014-08-08 16:07:27 +02:00
Flamefire cb40cdcd92 Fix medley and short song gamemodes 2014-08-07 20:17:52 +02:00
Flamefire a8f23cb3bf Fix showing/hiding of song menu 2014-08-07 20:07:13 +02:00
Flamefire e1329b4a93 Fix selection changes 2014-08-07 19:45:47 +02:00
Flamefire 029c3f8473 Avoid playing background music in sing screen 2014-08-07 19:35:40 +02:00
Flamefire dd4c3b3cf9 Better name for function 2014-08-07 19:33:26 +02:00