Commit Graph
2094 Commits
Author SHA1 Message Date
Stephan Sundermann 5f037e6cf3 Merge pull request #110 from lukeIam/develop
New features for the remote keyboard and some JS fixes
2014-11-13 00:24:55 +01:00
lukeIam 0cdb537424 Added manual key send to the remote keyboard 2014-11-12 21:59:35 +01:00
lukeIam b036aa5d69 Removed an unused translation 2014-11-12 21:27:26 +01:00
lukeIam 29dce6c30a Merge branch 'AllKeysKeyboard' into develop
Conflicts:
	Vocaluxe/Website/js/main.js
2014-11-12 21:03:00 +01:00
lukeIam 2da8b54d67 Fixed: ownProfileId is undefined and some similar "this" problems 2014-11-12 20:52:31 +01:00
Stephan Sundermann 207f1a02f0 Include git hash in version 2014-11-12 00:11:26 +01:00
lukeIam e10de6ca0e Added backspace and Alt, Shift, Ctrl to the remote keyboard 2014-11-11 22:05:43 +01:00
Stephan Sundermann a8371303c8 Merge pull request #109 from lukeIam/develop
Added a simple windows build howto
2014-11-11 20:59:32 +01:00
lukeIam a93f2ac448 Added VS13 git client posiblity 2014-11-11 19:33:58 +01:00
lukeIam f3aebd2619 Fixed typos in HowToBuildWin.md 2
rest will follow..
2014-11-11 18:43:01 +01:00
lukeIam 2a3dceea71 Fixed typos in HowToBuildWin.md 2014-11-11 17:08:27 +01:00
lukeIam b59416b575 Layout HowToBuildWin.md 2014-11-11 17:03:21 +01:00
lukeIam 3b15c3e19b Add images to HowToBuildWin.md 2014-11-11 16:55:54 +01:00
lukeIam 2ba0c8df4f Add extension to HowToBuildWin 2014-11-11 16:46:54 +01:00
lukeIam c001fd9342 Added BuildWinHowTo 2014-11-11 16:43:09 +01:00
Stephan Sundermann e377f75f1d Merge pull request #108 from lukeIam/develop
Refactoring of the JS App part
2014-11-10 11:54:10 +01:00
lukeIam 53153774b7 Fixed: remote keyboard not working in input fields 2014-11-09 21:54:52 +01:00
lukeIam 9773aa31d8 Reactivated and modified text field for keyboard 2014-11-09 21:29:15 +01:00
lukeIam 5e67d9d4db Fixed mixed tabs and spaces 2 2014-11-09 11:50:59 +01:00
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