Projects/Vocaluxe
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,799 Commits 7 Branches 7 Tags
599b671ffa4dd455e5fa6ede080da273f59b101c
Commit Graph
1799 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Flamefire 292f6119fd Removed unnecessary texture parameter setting on update 2013-05-13 18:51:48 +02:00
Florian Küpper e2d0054ccf Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into develop 2013-05-11 16:29:40 +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
Flamefire 914f15f0ad Some styling for Draw classes 2013-05-10 17:53:44 +02:00
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
Flamefire 5587a322be Removed second texture list in D3D (needed to check for GC disposal of CTexture) 2013-05-10 15:23:12 +02:00
Flamefire 2ca2af6ea6 Moved CCursor 2013-05-10 14:46:56 +02:00
Flamefire 7f5cbbf686 Fixed string comparisons 
Added CCursor.ReloadTextures without position flickering
 2013-05-10 14:31:20 +02:00
Flamefire a2c1ee67ad Improved Texture update handling 2013-05-10 13:37:55 +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
Florian Küpper 2a83c78692 Update positions (part 1) 2013-05-07 11:37:45 +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
Flamefire dd96b61cae Improved CTexture creation 2013-05-06 23:35:18 +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
Flamefire e43f5e7b0a Changed usage of CTexture.Index: You only need to check for null as of last commit 2013-05-06 20:18:17 +02:00
Flamefire 142a690cc6 Using null instead of CTexture(-1) for "no texture" 2013-05-05 20:02:28 +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