Projects/Vocaluxe
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,707 Commits 7 Branches 7 Tags
develop
Commit Graph
117 Commits
Author SHA1 Message Date
Florian Küpper 8722844646 Merge branch 'develop' of github.com:Flamefire/Vocaluxe into sound-player 
Conflicts:
	VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs
 2014-08-09 20:04:41 +02:00
Florian Küpper 8e8fdc1277 Play song-preview instead of bg-music (if enabled) on names-, score- and highscore-screen. 2014-08-09 19:50:40 +02:00
Flamefire 4b348ceec6 Don't show old preview song in category view 2014-08-09 17:59:53 +02:00
Florian Küpper 4c01396e46 Added preview-player which is used for playing preview in song-menu. 2014-08-09 17:12:27 +02:00
Florian Küpper bd41de6dbe Merge branch 'develop' of github.com:Flamefire/Vocaluxe into sound-player 
Conflicts:
	PartyModes/PartyModeTicTacToe/CPartyScreenTicTacToeMain.cs
	VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs
 2014-08-09 14:13:38 +02:00
Flamefire fe60f6f5df Simplify Songmenu (only selected and preview numbers) 
More consistent handling of mouse and keyboard selection of songs
 2014-08-07 19:31:17 +02:00
Florian Küpper 3612b9244b Added sound- and song-player to VocaluxeLib. Use it for Background-Music. 2014-08-05 10:54:34 +02:00
Flamefire f2bd61937f Loop preview song and video 2014-08-01 16:26:21 +02:00
Flamefire ba7627513e Fix wrong argument order for Song loading (fixes wrong song start time in preview) 2014-08-01 16:01:27 +02:00
Flamefire 8199c3a180 Disable prescan for now in the previews 2014-05-09 19:22:37 +02:00
Flamefire 9695e98bbb Update display of no length 2014-05-07 20:20:44 +02:00
Flamefire e908f923e8 Fix unintended song loop due to api change 2014-05-07 00:39:58 +02:00
Flamefire a4b1c3eb86 Unify playback libs with common base class 
Remove duplicate code
Fix bugs in implementations (threading, logic)
Remove SetStreamVolumeMax and use SetGlobalVolume instead
 2014-05-05 02:10:15 +02:00
Flamefire 790eda4e15 Use CFading where possible 2014-03-14 18:15:12 +01:00
Florian Küpper 5277504e34 Fix forgetting last song after singing. 2013-12-31 15:41:28 +01:00
Flamefire dbcd79af79 Merge branch 'release-0.3' into develop 
Conflicts:
	VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs
 2013-10-19 02:12:29 +02:00
Flamefire 21f6213c1a Fix preview start after song end 2013-10-19 02:04:58 +02:00
Flamefire 83b72604a9 Remove confusing ActSongId 2013-10-19 02:02:53 +02:00
Flamefire 4c82446019 Bugfix on Init() function of song Menu 
Refactoring w/o functional changes
 2013-10-19 01:49:34 +02:00
Flamefire 73e4a9fa74 Merge branch 'release-0.3' into develop 
Conflicts:
	Vocaluxe/Base/CConfig.cs
	Vocaluxe/Lib/Playlist/CPlaylistFile.cs
	Vocaluxe/Screens/CScreenSong.cs
	VocaluxeLib/CHelper.cs
	VocaluxeLib/Menu/CMenu.cs
	VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs
	VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs
 2013-10-19 00:42:56 +02:00
Flamefire 02825cf46a Update preview only when necessary 2013-10-19 00:06:52 +02:00
Flamefire 3466c09851 Remove redundant code 2013-10-18 23:59:37 +02:00
Flamefire 03d92a474c Remove PreviewId pending stuff (don't need that. If you need a fade or something implement it properly with timer, event... But PreviewId should really be the current preview element) 2013-10-18 23:58:15 +02:00
Flamefire 60bd2c4da4 Rename PreviewSelected to more meaningful PreviewId 2013-10-18 23:50:47 +02:00
Flamefire 3b82d5c13c Fix for inconsistent song Menu 
Multiple refactoring due to ambiguous meanings
 2013-10-18 23:25:42 +02:00
Flamefire b12e4156fa Allow #ENDSHORT tags 
Detect where Preview and ShortEnd came from
Introduce a function to check whether a given GameMode is available for a song
 2013-10-12 21:42:03 +02:00
Flamefire 370964ee99 Fix file headers and indentations 2013-09-20 18:09:32 +02:00
Florian Küpper 808c52d471 Fix merge error. 2013-09-15 15:26:25 +02:00
Flamefire 762d2c80d2 Code cleanup 
Added license stuff
 2013-08-22 00:56:58 +02:00
Alexander Eckart 9e6a48c978 subtract only once 2013-06-15 17:49:11 +02:00
Alexander Eckart 57bb51e41c preview start -0.5s 2013-06-14 23:06:14 +02:00
Florian Küpper 6bdfb49cbb Fixed double-click-bug on screen-song. 2013-05-26 14:46:01 +02:00
Florian Küpper fcf94a091d Fixed bug with preview-volume on song-screen. 2013-05-22 14:34:28 +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
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
Flamefire 142a690cc6 Using null instead of CTexture(-1) for "no texture" 2013-05-05 20:02:28 +02:00
Flamefire f370693dde Convert STexture to class CTexture 2013-05-04 15:14:02 +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
Flamefire 69c36362f5 On change of Tabs to on it will go out of any category 
Auto reformat
 2013-04-29 02:24:36 +02:00
Flamefire 5172f17da7 Fixed and changed category handling and visible songs 2013-04-28 17:19:22 +02:00
Flamefire b1e28ae7bc More refactoring (mainly LINQ) 2013-04-24 00:41:08 +02:00
Flamefire f53e08607b Small cleanup (join declarations) 2013-04-23 22:14:53 +02:00
Flamefire b8fe334153 Used object initializers 2013-04-23 22:11:32 +02:00
Flamefire 5cd47f0537 Fixed floating point comparisons 2013-04-23 15:42:32 +02:00
Flamefire cf39a4b107 Changed string comparisons to easier != "" syntax 2013-04-23 14:52:51 +02:00
Flamefire 1540be9120 More refactoring and small fixes 2013-04-23 14:22:42 +02:00
Flamefire dcbbc5caf3 Many cleanups according to ReSharper suggestions (Mostly redundant code) 
Minor Bug fixes
 2013-04-20 02:19:56 +02:00
Flamefire 74396eda2f Auto cleanup 2013-04-18 15:09:21 +02:00
Flamefire 67da90427b Renaming for namesheme 2013-04-15 19:10:38 +02:00