Projects/Vocaluxe
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,047 Commits 7 Branches 7 Tags
0a7006db43ba07aea1535166dd2eab7b3dee8bb5
Commit Graph
113 Commits
Author SHA1 Message Date
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 75ff5a0291 Remove redundant names in playlist functions 
Fix handling of playlist IDs
 2014-08-08 23:49:01 +02:00
Flamefire b14b47fd33 Fix wrong song name showing in party mode 2014-08-08 20:01:39 +02:00
Flamefire dd4c3b3cf9 Better name for function 2014-08-07 19:33:26 +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 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 0a59b250d3 Fix build configurations (use anycpu where it was used) 2014-03-24 02:19:47 +01:00
Flamefire 8de9c4c9f8 Remove unused usings 2014-03-16 11:31:06 +01:00
Flamefire 149026ec32 IMPORTANT: Format of all files with Resharper 
NO functional changes. If you have problems merging your changes, merge/rebase on previous commit then merge this. Conflicts can easily be resolved (take yours if in doubt)
After that merge next commits
 2014-02-26 00:36:00 +01:00
Florian Küpper b433576de0 PartyNames: Fix 'remembering' of selected profiles. 2013-12-31 11:26:26 +01:00
Florian Küpper 2f17bfe3b1 PartyNames: Use screen for ChallengeMedley 2013-12-26 13:07:30 +01:00
Florian Küpper 3f28d6405c PartyNames: Could change team/player-nums on name-selection now if allowed. 2013-12-26 13:07:23 +01:00
Florian Küpper d24c47012c Revert "Revert PartyNames-changes on develop-branch." 
This reverts commit 43545ac47f.

Conflicts:
	VocaluxeLib/Menu/CNameSelection.cs
 2013-12-26 13:02:06 +01:00
Florian Küpper 5449d985ef Revert PartyNames-changes on develop-branch. 2013-12-26 13:02:00 +01:00
Florian Küpper aa481bb3f8 PlayerNames: Change player/team-num on NamesScreen. TODO: Theme-stuff and remove options from config screen. 2013-12-26 13:02:00 +01:00
Florian Küpper dfeb19c140 PartyNames: Added support for no teams. 2013-12-26 13:01:58 +01:00
Florian Küpper 14f5c12d9e Added draft for NameSelection in party-modes. Just extend CMenuPartyNameSelection in a screen. 
Developer could use it or not, using it would make creating party-modes much easier.
More additions to this screen will come.
 2013-12-26 13:01:58 +01:00
Florian Küpper 524d0bee75 Make random a bit less random, but already sung songs shouldn't be suggested frequently. 2013-12-19 08:50:46 +01: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 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 0400a02bc1 Merge branch 'develop' of github.com:Flamefire/Vocaluxe into develop 
Conflicts:
	Vocaluxe/Base/CPlaylists.cs
	Vocaluxe/Base/CProfiles.cs
	Vocaluxe/Base/CSettings.cs
 2013-09-15 15:15:10 +02:00
Florian Küpper e991010aa9 Change compile-options: Old behavior is Release/Debug; New behavior (save data to user-folde) is installer now. 2013-08-31 13:42:43 +02:00
flokuep 00f3a3aed2 First step of changing paths. Songs, screenshots, playlists, config and logs are now in %User%/Documents/Vocaluxe 
You can compile with PortableWin to get a release-exe with old behavior.
 2013-08-31 13:42:30 +02:00
Flamefire 44c78fad19 Split Notes, Lines and Voices into separate files/classes 2013-08-22 00:05:01 +02:00
Florian Küpper 74f7969490 Merge branch 'release-0.3' of github.com:Vocaluxe/Vocaluxe into release-0.3 2013-06-16 18:04:15 +02:00
Florian Küpper 0b89f65ea8 Fixed player-handling in tic-tac-toe. 2013-06-16 15:24:23 +02:00
Alexander Eckart 3e07369767 fixed profile handling in challenge medley 2013-06-16 14:27:06 +02:00
Alexander Eckart 622de6ec4d fixed profile handling in party mode challenge (TODO: fix it in challenge medley and tic-tac-toe too) 2013-06-16 14:17:13 +02: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 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
Flamefire 11398dbb2f Cleanups after merge 2013-05-19 18:38:50 +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
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
Flamefire 151fab8857 Changed texture sizes to more reasonable int 2013-05-03 20:07:53 +02:00
Flamefire 2967a01cb8 Changed name of CInput to CController 
Added message for missing mic in partymode
Removed pointless input entry for record devices
 2013-04-29 16:14:24 +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 34be084729 Improved postbuild event 2013-04-28 23:36:02 +02:00
Flamefire 5172f17da7 Fixed and changed category handling and visible songs 2013-04-28 17:19:22 +02:00
Flamefire 5f28c5a103 Fixed DX Close Bug and some typos closes #15 2013-04-28 12:24:48 +02:00
Flamefire 780a179fcb Added Gamemode-Classes 2013-04-26 18:56:33 +02:00
Flamefire f43817efd0 Renamed ambiguous Notes classes 2013-04-26 17:47:26 +02:00
Flamefire bdca0554e4 Changed players->Profile handling (no redundant entries) 2013-04-25 18:27:59 +02:00
Flamefire 69d8af4e87 Automatic cleanup/formating 2013-04-24 01:26:36 +02:00