Commit Graph
1290 Commits
Author SHA1 Message Date
Florian Küpper 3f46acd06e Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into develop 2013-05-10 17:25:52 +02:00
Alexander Eckart b18c688936 added CDiscover: searching the network for running vocaluxe server, could be useful for users who do not know what a ip address is. 2013-05-10 16:44:19 +02:00
Alexander Eckart 74af5ae691 made encryption optional, put server params into config, default is server = off 2013-05-10 12:01:20 +02:00
Alexander Eckart 50046901fd fixed some bugs 2013-05-10 00:10:12 +02:00
Alexander Eckart 2f1795d9a3 added SendProfile to the android test app, fixed some bugs 2013-05-09 23:58:48 +02:00
Alexander Eckart 1a68c26e9f added SendProfile 2013-05-09 23:14:04 +02:00
Alexander Eckart e70ce5ad68 rewrite of CProfiles.cs, some optimizations in CScreenProfiles.cs, added IsCapturing() to Webcam/IWebcam.cs 2013-05-09 22:01:29 +02:00
Alexander Eckart 8ab93db26f functional async profile adding 2013-05-07 19:18:46 +02:00
Alexander Eckart 2037e3edb4 better Screens/CScreenProfiles.cs behavior 2013-05-07 18:18:43 +02:00
Alexander Eckart 19339c6888 reconstructed CProfiles (preparing for async profile adding) 2013-05-07 16:56:23 +02:00
Florian Küpper 94e3652db0 Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into develop 2013-05-07 11:41:08 +02:00
Alexander Eckart 967e2eb4b1 fixed another reference 2013-05-07 01:01:07 +02:00
Alexander Eckart 50a85cf660 fixed reference 2013-05-07 00:58:51 +02:00
Alexander Eckart 584f80ac2c Merge remote-tracking branch 'remotes/origin/develop' into RemoteControl
Conflicts:
	Vocaluxe/Base/CProfiles.cs
2013-05-07 00:53:43 +02:00
Alexander Eckart bde99ff2aa some more reconstructions on avatars 2013-05-07 00:23:44 +02:00
Alexander Eckart d6a57da73f some reconstructions, there is still a lot to do 2013-05-06 23:38:59 +02:00
Alexander Eckart ec5bdb7742 SProfile => CProfile; SAvatar => CAvatar 2013-05-06 23:29:31 +02:00
Alexander Eckart ed3047314b finished moving around 2013-05-06 23:18:02 +02:00
Alexander Eckart 99fb9b9fff moved one file more 2013-05-06 23:13:35 +02:00
Alexander Eckart 685bc019fd moved some files 2013-05-06 23:11:56 +02:00
Alexander Eckart 2811fc002f added missing dll 2013-05-06 22:15:31 +02:00
Alexander Eckart bd0095ea24 added Newtonsoft Licence 2013-05-06 22:13:18 +02:00
Alexander Eckart d335cad775 added .apk to gitignore 2013-05-06 22:10:03 +02:00
Alexander Eckart 6d008cdc06 take profile photos by android phone (still very buggy) 2013-05-06 22:08:59 +02:00
Alexander Eckart da843b4f06 added missing reference 2013-05-05 17:56:52 +02:00
Alexander Eckart 0a4d1ebe61 added a simple android test application (using xamarin) 2013-05-05 17:03:12 +02:00
Alexander Eckart eb9e17d2e6 using json as serializer 2013-05-05 16:53:16 +02:00
Alexander Eckart 80b54cad25 some optimizations 2013-05-05 11:23:55 +02:00
Alexander Eckart b959c5ff8a introduced controller framework, simple control test implementation 2013-05-04 23:48:08 +02:00
Alexander Eckart 1147d612fe added login function 2013-05-04 20:28:32 +02:00
Alexander Eckart 7f71853672 added Server/CVocaluxeServer.cs 2013-05-04 19:01:09 +02:00
Alexander Eckart 29212e4c81 modified controller class to support more than one controller 2013-05-04 17:20:43 +02:00
Alexander Eckart 40c470c184 added Client Test Form 2013-05-04 16:53:36 +02:00
Alexander Eckart 7346ce5f11 adjusted .gitignore 2013-05-04 15:58:35 +02:00
Alexander Eckart a1084d2bea added ClientServerLib Project (not tested) 2013-05-04 15:57:04 +02:00
Florian Küpper ff36128326 Added new language-strings. 2013-05-02 11:08:55 +02:00
Florian Küpper 17366b5a36 Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into develop 2013-05-02 09:42:15 +02:00
Alexander Eckart 036cc3b4bd fixed crash (if you click very fast on next song). please check if there are any memory leaks now. 2013-05-02 09:25:11 +02:00
Alexander Eckart 8fd0527be1 fixed typo 2013-05-01 21:20:23 +02:00
Alexander Eckart 7b91dd1748 restore ids when closing audio streams 2013-05-01 19:01:37 +02:00
Alexander Eckart 7845c74e13 do not load background music video if it isn't needed 2013-05-01 18:32:18 +02:00
Alexander Eckart 9e2040e1b7 set video initialization value in CSongMenuFramework.cs to -1. otherwise it will try to unload the wrong stream on start up. 2013-05-01 18:27:20 +02:00
Florian Küpper 17cc947a2b Make dynamic lyrics-position more dynamic. 2013-05-01 10:45:02 +02:00
Alexander Eckart 0cd7518de6 Merge branch 'flamedevelop' into develop 2013-05-01 10:02:49 +02:00
Alexander Eckart 30f93a9952 Revert "fixed program closing"
This reverts commit a5cb69ea1f.
2013-05-01 09:47:03 +02:00
Alexander Eckart a5cb69ea1f fixed program closing 2013-05-01 09:29:55 +02:00
Flamefire 1402d92c5b Changed config for lyrics position 2013-04-30 19:53:44 +02:00
Flamefire 9a6f94a769 Changed message for No mics in Party mode
TRANSIFEX: add TR_SCREENPARTY_ERROR_MICS
2013-04-30 19:46:57 +02:00
Flamefire 5a12cb48f9 Merge branch 'develop' into develop_fk 2013-04-30 19:42:53 +02:00
Flamefire 331fbb1526 Revert "Added message for no-mics-error on party-screen."
This reverts commit 3884632772.
2013-04-30 19:42:37 +02:00