Projects/Vocaluxe
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,392 Commits 7 Branches 7 Tags
ef3d7d25926767bc51a6c89918fe23af5fd689fc
Commit Graph
1392 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Flamefire 8574314fa5 Merge branch 'FFMpeg_Video_Improvement' into develop 2013-05-27 19:02:56 +02:00
Flamefire 2b3a5d3416 Merge branch 'develop' of git://github.com/Vocaluxe/Vocaluxe into develop 2013-05-27 19:02:45 +02:00
Alexander Eckart 8d79dd234c added compression to ClientServerLib 2013-05-27 17:21:58 +02:00
Flamefire 1aff7f5e3e Improved skipping of frames 2013-05-26 02:46:40 +02:00
Flamefire 382429ab5e Removed video lock (decoder list is used just from main thread) 2013-05-26 01:23:49 +02:00
Flamefire b493a1f3d7 Fixed dropFrames count 2013-05-26 01:18:43 +02:00
Flamefire acb8862361 Don't load a video just to pause it 
Fixed bug with video sleeping
 2013-05-26 01:14:41 +02:00
Flamefire ac9f1a7c96 Fixed video config setting 2013-05-26 01:00:38 +02:00
Flamefire 91ebcce18c Removed unnecessary lock 2013-05-26 00:40:59 +02:00
Flamefire 517db7d43b Added CFramebuffer.cs 
Introduced Thread waiting for unused videos
 2013-05-26 00:17:47 +02: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
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
Flamefire 1c2f67fce2 Changed current frame selection 2013-05-23 01:09:59 +02:00
Flamefire aead91d11d Variable renamings 
Cleanup
Restructuration
 2013-05-23 00:50:07 +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
Flamefire 8cfeec628f Fixed typo 2013-05-22 01:33:20 +02:00
Flamefire 8b71dec2ca Video list -> Dictionary for faster access 2013-05-22 01:19:55 +02:00
Flamefire 284b46819f Converted SSkinElement to a class (no pointless copies) 2013-05-22 00:44:13 +02:00
Flamefire ac8b7dc940 Improved video loading 2013-05-22 00:24:22 +02:00
Flamefire 389aecd772 Removed useless CVideoDecoder.cs 
Cleanup of FFMpeg Class
 2013-05-21 23:55:18 +02:00
Flamefire 26bfadde64 Moved CDecoder.cs 2013-05-21 22:36:18 +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