Commit Graph
100 Commits
Author SHA1 Message Date
Alexander Eckart d24551459f Use hostname instead of the ip. 2013-12-26 13:07:23 +01:00
Alexander Eckart 22e1896f4b Bugfix: No perfect line flares 2013-12-26 13:04:40 +01:00
Alexander Eckart 4e30a43cea added border adjustment (ctrl+alt+shift + left/right). some tvs have borders which can't be deactivated. 2013-12-26 13:03:21 +01:00
Alexander Eckart e2986c0f46 take the first network ip. how can we be sure that this one is the right one? 2013-12-26 13:03:21 +01:00
Alexander Eckart b5b49b837a Bugfix: Crash when starting duet songs.
Please TEST, TEST and TEST before commit! It can't be that this branch contains such silly bugs!
2013-12-26 13:03:13 +01:00
Alexander Eckart d9b8d54eb9 Use hostname instead of the ip. 2013-12-23 11:46:03 +01:00
Alexander Eckart 19f635d345 Merge branch 'develop' of https://github.com/Vocaluxe/Vocaluxe into develop 2013-12-22 23:18:38 +01:00
Alexander Eckart 4a7f7a3518 Bugfix: No perfect line flares 2013-12-22 23:18:17 +01:00
Alexander Eckart f4fca4d798 Merge branch 'develop' of https://github.com/Vocaluxe/Vocaluxe into develop 2013-12-22 17:43:12 +01:00
Alexander Eckart 76ffad20fd added border adjustment (ctrl+alt+shift + left/right). some tvs have borders which can't be deactivated. 2013-12-22 17:43:03 +01:00
Alexander Eckart 18c1b3bd03 take the first network ip. how can we be sure that this one is the right one? 2013-12-22 17:40:17 +01:00
Alexander Eckart 25cccfdeaf Bugfix: Crash when starting duet songs.
Please TEST, TEST and TEST before commit! It can't be that this branch contains such silly bugs!
2013-12-22 02:14:11 +01:00
Alexander Eckart 2f6002e932 small bugfix in server 2013-12-02 22:42:35 +01:00
Alexander Eckart 00660c8b68 use settings for xml writing 2013-09-07 15:45:04 +02:00
Alexander Eckart 84fc0fcb91 Merge remote-tracking branch 'remotes/origin/release-0.3' into develop 2013-07-03 19:35:42 +02:00
Alexander Eckart 2105ce922a Merge pull request #75 from flokuep/release-0.3
Fix wrong selection of playlist in song-options.
2013-07-02 08:52:41 -07:00
Alexander Eckart c6f9289590 Merge pull request #74 from flokuep/release-0.3
Release 0.3
2013-06-27 10:25:14 -07:00
Alexander Eckart 3e07369767 fixed profile handling in challenge medley 2013-06-16 14:27:06 +02:00
Alexander Eckart 622de6ec4d fixed profile handling in party mode challenge (TODO: fix it in challenge medley and tic-tac-toe too) 2013-06-16 14:17:13 +02:00
Alexander Eckart 9e6a48c978 subtract only once 2013-06-15 17:49:11 +02:00
Alexander Eckart 0cdd11f12c update to build 0080 2013-06-15 00:01:15 +02:00
Alexander Eckart 8a527038bc bugfix for last commit 2013-06-15 00:01:03 +02:00
Alexander Eckart 747b6edd1e better cover handling 2013-06-14 23:43:55 +02:00
Alexander Eckart 57bb51e41c preview start -0.5s 2013-06-14 23:06:14 +02:00
Alexander Eckart 2bdad961af skip videos always in back direction. it is much better to get any frame (even if it is the wrong one) than waiting up to 15 seconds for the first. 2013-06-14 22:23:40 +02:00
Alexander Eckart a6b11db907 changed app version 2013-06-09 18:57:04 +02:00
Alexander Eckart 88ab44608b added cropping to send avatar (vocaluxe app) 2013-06-09 16:48:07 +02:00
Alexander Eckart c83ade5e6e renamed AndroidRemote to Vocaluxe App 2013-06-09 13:01:46 +02:00
Alexander Eckart 214cd0f661 some modifications for ClientServerLib 2013-06-09 12:52:26 +02:00
Alexander Eckart ca5fc16332 fixed loading songs (TryReadInt) 2013-06-06 21:34:06 +02:00
Alexander Eckart ad873fbd58 update to build 0079 2013-06-01 11:02:33 +02:00
Alexander Eckart 248f036e72 Merge remote-tracking branch 'remotes/flokuep/release-0.3' into release-0.3 2013-06-01 10:45:26 +02:00
Alexander Eckart ef3d7d2592 Merge branch 'develop' of https://github.com/Vocaluxe/Vocaluxe into release-0.3 2013-06-01 10:43:35 +02:00
Alexander Eckart 6142f23bc0 Merge pull request #72 from Flamefire/develop
Develop
2013-05-27 14:23:11 -07:00
Alexander Eckart f715075e90 readme update 2013-05-25 17:11:17 +02:00
Alexander Eckart 70a75d2f54 do not use static ip and pw (android app) 2013-05-25 14:52:56 +02:00
Alexander Eckart 00199ec762 some client server changes 2013-05-25 13:44:36 +02:00
Alexander Eckart a559a98640 Merge pull request #71 from flokuep/develop
Develop
2013-05-25 00:50:00 -07:00
Alexander Eckart 339e0b41f7 fixed playlist texts 2013-05-20 21:01:46 +02:00
Alexander Eckart 1aeb84ffa2 Merge remote-tracking branch 'remotes/flamefire/develop' into develop 2013-05-20 20:56:13 +02:00
Alexander Eckart e57f6f7486 Added some additional space to glyphs. Textures need some extra pixel for resizing. 2013-05-10 21:02:28 +02:00
Alexander Eckart 04237b9bd3 fixed some text heights 2013-05-10 20:13:13 +02:00
Alexander Eckart 7a40bffa78 fixed playlist opening error, flopkuep: what was the error you wanted to fix? 2013-05-10 19:58:22 +02:00
Alexander Eckart 166bcb5c43 fixed merge error 2013-05-10 19:47:49 +02:00
Alexander Eckart fd7b3ae3a3 fixed some merge errors 2013-05-10 19:36:58 +02:00
Alexander Eckart 4161652a1d Merge remote-tracking branch 'remotes/flokuep/Font_Rewrite' into develop
Conflicts:
	Vocaluxe/Base/CBackgroundMusic.cs
	Vocaluxe/Base/CMain.cs
	Vocaluxe/Base/CTheme.cs
	Vocaluxe/Base/Font/CGlyph.cs
	Vocaluxe/Lib/Draw/CDirect3D.cs
	Vocaluxe/Lib/Draw/CDrawWinForm.cs
	Vocaluxe/Lib/Draw/COpenGL.cs
	Vocaluxe/Program.cs
	Vocaluxe/Screens/CScreenCredits.cs
	Vocaluxe/Screens/CScreenMain.cs
	Vocaluxe/Screens/CScreenOptionsTheme.cs
	Vocaluxe/Screens/CScreenSing.cs
	Vocaluxe/Vocaluxe.csproj
	VocaluxeLib/Menu/IMenu.cs
2013-05-10 19:28:20 +02:00
Alexander Eckart 53a917d5f2 fixed typo 2013-05-10 19:14:56 +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
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
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
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
Alexander Eckart 5e9eabbc9c small bugfix: access error while randoming in songmenu. i don't really know why this happens. and i don't really know why this fix helps. but i know that there is another bug somewhere. if you click rapidly on the middle mouse button in the song menu, the game will crash after some seconds. 2013-04-26 18:30:00 +02:00
Alexander Eckart 242a177eb8 Merge branch 'flamedevelop' into develop 2013-04-26 18:23:10 +02:00
Alexander Eckart eb71c1158e update to build 0078 2013-04-17 18:34:26 +02:00
Alexander Eckart ebd57cb886 renamed ChallengeRounds.cs 2013-04-17 18:11:14 +02:00
Alexander Eckart a2720eb2c5 fixed texture scaling 2013-04-17 18:09:11 +02:00
Alexander Eckart 4fb1544d65 Merge remote-tracking branch 'remotes/Flamefire/develop' into develop 2013-04-17 18:06:58 +02:00
Alexander Eckart 91617d6874 added Dutch and Turkish translations 2013-04-07 17:05:25 +02:00
Alexander Eckart e8a1e426fd update to build 0077 2013-04-07 16:50:09 +02:00
Alexander Eckart fcf4eaebf1 fixed gstreamer 2013-04-07 16:43:48 +02:00
Alexander Eckart 125a624c92 some code reconstructions (no code changes) 2013-04-07 13:52:07 +02:00
Alexander Eckart 07646b0953 update to ffmpeg 1.2 2013-04-07 13:22:20 +02:00
Alexander Eckart 9565956467 build GstreamerHelper.dll x86 2013-04-06 20:02:12 +02:00