Projects/Vocaluxe
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,372 Commits 7 Branches 7 Tags
fdef790583785f59d974635aa0f703261c3ab5dd
Commit Graph
1372 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Küpper fdef790583 More work on jump-to-function. Should it be active in 0.3? There is still something to do. 2013-05-26 12:07:52 +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
Florian Küpper 4ba69da46e Fixed changed-player-bug when using random-joker in tic-tac-toe. 2013-05-23 15:05:47 +02:00
Florian Küpper c2e9fb2aba Fix: config.xml will now be saved after changing timer-option. 2013-05-23 11:07:10 +02:00
Florian Küpper 4473f05487 Avatars on screen-profiles now looks clearer (no alpha) 2013-05-23 11:06:35 +02:00
Florian Küpper 12aec98f2c Fix crash when pressing webcam-button in profiles-screen. 2013-05-23 11:00:35 +02:00
Florian Küpper 2ca07ee777 Fixes for random player-selection on tic-tac-toe-mode. 2013-05-23 10:37:45 +02:00
Florian Küpper f34d8da992 Fixed typo in tic-tac-toe-mode. 2013-05-22 16:34:20 +02:00
Florian Küpper 2740e24830 Fixed crash on tic-tac-toe-mode. 2013-05-22 16:30:24 +02:00
Florian Küpper fcf94a091d Fixed bug with preview-volume on song-screen. 2013-05-22 14:34:28 +02:00
Florian Küpper aa9930b000 Fixed party-mode text-heights. 2013-05-22 14:26:45 +02:00
Florian Küpper 676d195d82 Remove double preview-volume-entry. 2013-05-22 14:17:05 +02: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
Flamefire 9704a1aeb0 Fixed D3D 2013-05-20 19:10:49 +02:00
Flamefire 11398dbb2f Cleanups after merge 2013-05-19 18:38:50 +02:00
Flamefire f83496d66a Fixed merge errors 2013-05-19 18:03:29 +02:00
Flamefire 9d13c32b93 Merge branch 'Better_Graphics_Handling' into develop 
Conflicts:
	Vocaluxe/Base/CBackgroundMusic.cs
	Vocaluxe/Base/CCover.cs
	Vocaluxe/Base/CDataBase.cs
	Vocaluxe/Base/CDraw.cs
	Vocaluxe/Base/CMain.cs
	Vocaluxe/Base/CProfiles.cs
	Vocaluxe/Base/CTheme.cs
	Vocaluxe/Base/CVideo.cs
	Vocaluxe/Base/CWebcam.cs
	Vocaluxe/Base/Fonts/CFont.cs
	Vocaluxe/Base/Fonts/CGlyph.cs
	Vocaluxe/Lib/Draw/CDirect3D.cs
	Vocaluxe/Lib/Draw/CDrawWinForm.cs
	Vocaluxe/Lib/Draw/COpenGL.cs
	Vocaluxe/Lib/Draw/IDraw.cs
	Vocaluxe/Lib/Video/CVideoDecoder.cs
	Vocaluxe/Lib/Video/CVideoDecoderFFmpeg.cs
	Vocaluxe/Lib/Video/CVideoDecoderGstreamer.cs
	Vocaluxe/Lib/Video/IVideoDecoder.cs
	Vocaluxe/Lib/Webcam/CAForgeNet.cs
	Vocaluxe/Lib/Webcam/IWebcam.cs
	Vocaluxe/Screens/CScreenCredits.cs
	Vocaluxe/Screens/CScreenNames.cs
	Vocaluxe/Screens/CScreenOptionsVideo.cs
	Vocaluxe/Screens/CScreenProfiles.cs
	Vocaluxe/Screens/CScreenSing.cs
	VocaluxeLib/Menu/IMenu.cs
	VocaluxeLib/Songs/CCategory.cs
	VocaluxeLib/Songs/CSong.cs
	VocaluxeLib/Structs.cs
	VocaluxeLib/VocaluxeLib.csproj
 2013-05-19 17:53:46 +02:00
Florian Küpper 300163f086 Merge branch 'develop' of github.com:flokuep/Vocaluxe into develop 
Conflicts:
	Vocaluxe/Base/CParty.cs
 2013-05-15 15:57:02 +02:00
Florian Küpper 624ca03db0 Added methods to get party-mode-folder. 2013-05-15 15:55:14 +02:00
Florian Küpper bef0717c15 Added methods to get party-mode-folder. 2013-05-15 15:49:24 +02:00
Florian Küpper 62efcd84d0 Update text-positions (part 2) - Please check if there is still something in main-game looking ugly. 
TODO: Fix party-modes!
 2013-05-13 22:29:48 +02:00
Flamefire f1ca307bc2 Used Queue instead of list for the queue 2013-05-13 19:02:58 +02:00
Flamefire cdad90a93d Renamed texture members to more appropriate ones 2013-05-13 18:56:13 +02:00
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