Commit Graph
100 Commits
Author SHA1 Message Date
Alexander Eckart 6142f23bc0 Merge pull request #72 from Flamefire/develop
Develop
2013-05-27 14:23:11 -07: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
Alexander Eckart 8c335f3fac switched to .Net 4.0 client framework profile 2013-04-06 19:01:22 +02:00
Alexander Eckart f0a56b1aed switched to .Net 4.0, fixed some typos 2013-04-06 18:56:10 +02:00
Alexander Eckart 504f0d318c dynamic loading is much better 2013-04-04 21:59:53 +02:00
Alexander Eckart d32400f4df fixed path delimiter escape sequence 2013-04-04 21:48:11 +02:00
Alexander Eckart b024e9b958 returned to threaded cover loading: there are no threading problems and its a lot faster! 2013-04-04 21:20:25 +02:00
Alexander Eckart 0cf658bce9 Merge branch 'develop_cc' into develop 2013-04-04 21:10:55 +02:00
Alexander Eckart b34c284625 Merge pull request #66 from derivator/duetbug
fixed duet lyrics disappearing when cycling player info display
2013-03-04 22:48:37 -08:00
Alexander Eckart 1f1faa666b Merge pull request #65 from derivator/38a7a2208ef88c78e086df6f134bb7796e2b672a
fixed fading bug
2013-03-04 22:45:50 -08:00
Alexander Eckart 37dea565a9 Merge branch 'gstreamer' into develop 2013-03-05 07:43:54 +01:00
Alexander Eckart 522bbff2c0 Merge branch 'gstreamer' into develop 2013-03-01 16:54:09 +01:00
Alexander Eckart 56bde936b9 try to fix bug #11
please test
2013-02-27 18:44:24 +01:00
Alexander Eckart c3fcd71589 Merge branch 'Flamefire/develop' into develop
Conflicts:
	VocaluxeLib/Menu/SongMenu/CSong.cs
2013-02-25 22:50:38 +01:00
Alexander Eckart ce46c75415 Merge remote-tracking branch 'remotes/flokuep/develop' into develop 2013-02-24 20:05:42 +01:00
Alexander Eckart 4accb26538 fixed handling of CoverBig for category covers 2013-02-24 19:09:15 +01:00
Alexander Eckart baea1cd7eb Merge branch 'Better_note_timing' into develop 2013-02-24 18:50:58 +01:00
Alexander Eckart fe600f5a70 Merge branch 'gstreamer' into develop
Conflicts:
	Output/x64/gstreamer/GstreamerHelper.dll
2013-02-23 11:33:31 +01:00
Alexander Eckart 5747847fe5 Merge branch 'gstreamer' into develop 2013-02-23 11:11:08 +01:00
Alexander Eckart 69e5537f76 Merge remote-tracking branch 'remotes/xdarkice/gstreamer' into develop
Conflicts:
	VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs

Set GStreamer as default audio decoder
2013-02-22 22:29:05 +01:00
Alexander Eckart 6be397ac5b added a name for the 0.3 release 2013-02-22 22:10:51 +01:00
Alexander Eckart f33aee9c14 Merge remote-tracking branch 'remotes/flokuep/develop' into develop 2013-02-22 22:04:12 +01:00
Alexander Eckart 521033ed97 some code reorganization 2013-02-22 21:27:34 +01:00
Alexander Eckart a29f4fb0d6 changed CXMLReader.cs load method to static,
removed the try catch blocks
2013-02-22 20:39:48 +01:00
Alexander Eckart 9c78bbe45f roadmap update 2013-02-22 18:43:20 +01:00
Alexander Eckart a1a3b41ff9 added missing file 2013-02-22 18:02:01 +01:00
Alexander Eckart b4f77d50b2 changed base handling in VocaluxeLib 2013-02-22 17:57:47 +01:00
Alexander Eckart 08658e20e3 added Base object to XMLReader class
the Base object handling must be changed for the whole VocaluxeLib!
2013-02-22 17:11:25 +01:00
Alexander Eckart 406e75408b Merge remote-tracking branch 'remotes/Flamefire/Better_note_timing' into develop 2013-02-22 16:58:58 +01:00
Alexander Eckart 725fc8aff8 added translation page links to README and Readme.txt 2013-02-22 16:34:56 +01:00
Alexander Eckart 79dc7d9c57 fix #5 2013-02-22 15:59:57 +01:00
Alexander Eckart 6bcb709115 Just another redmine test
Fix #{5}
2013-02-22 15:58:06 +01:00
Alexander Eckart 8efe7bb2aa test 2013-02-22 15:54:53 +01:00
Alexander Eckart c336b12aba another redmine test 2013-02-22 15:52:00 +01:00
Alexander Eckart 0d1f1f17a0 added bug tracker line to the main readme too (2nd bug tracker test) 2013-02-21 18:17:15 +01:00
Alexander Eckart 7726824e08 added bugtracker url to readme (just testing the bugtracker) 2013-02-21 18:05:29 +01:00