Commit Graph
68 Commits
Author SHA1 Message Date
Florian Küpper 6e1ae9a17a Fix merge errors 2015-12-07 19:23:13 +01:00
lukeIam d4eb4f74c3 - Fixed VocluxeTests dependency
- VocaluxeLib: direct export to \libs\managed
2015-12-06 13:42:28 +01:00
Florian Küpper 45d0091161 Merge pull request #2 from flokuep/komadoc-develop
Komadoc develop
2015-12-06 09:25:35 +01:00
derivator 5049ba5895 Make Vocaluxe buildable and playable on GNU/Linux
Build with MonoDevelop or make.
Summary of the biggest changes:

* Correct for case differences between System.Data.SQLite and
  Mono.Data.Sqlite
* Exclude Direct3D and DirectSound from linux builds
* Provide linux versions of some windows-specific build events
* Exclude VocaluxeTests from linux builds so xbuild will work
* Add ability to build the native PitchTracker on linux
* Fix some problems with acinerella module
* Fix some windows-specific dependency checks that fail on linux
* Set OpenGL color format to 24-bit on linux
2015-02-13 03:15:19 +01:00
Florian Küpper a199d7fba3 Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into komadoc-develop 2014-12-21 12:45:02 +01:00
Flamefire 84e9163b96 Refactor PartyModes in preparation for a more unified name selection and maybe config 2014-12-14 20:40:08 +01:00
Flamefire 1bb296c04d Add class for calculating combinations and a unitTest 2014-12-14 14:28:02 +01:00
Flamefire 903c4fc182 Remove proxy songmenu class 2014-12-10 21:45:27 +01:00
Flamefire 84694ccbe0 Allow ingame changing of songmenu 2014-12-10 21:11:59 +01:00
Flamefire 0cabd425ef Adapt changes in Vocaluxe to SongMenuList 2014-12-09 22:26:10 +01:00
Flamefire 20b2e735ec Merge branch 'develop' of git://github.com/KoMaDoctors/Vocaluxe into SongListView
Conflicts:
	Vocaluxe/Base/CConfig.cs
	VocaluxeLib/Menu/SongMenu/CSongMenu.cs
2014-12-09 21:49:33 +01:00
Flamefire 26484ad137 Fix blank screen issue
Also fix some other bugs and improvements (easier party modes, volume fixes, new fields for screens to control volume and popups)
2014-11-27 21:47:02 +01:00
Flamefire dd6b0416b6 Rename XML to lowercase Xml in classes and names for consistency 2014-11-17 19:33:48 +01:00
Flamefire 7188208b6b Add documentation 2014-10-30 19:21:28 +01:00
Flamefire 1698c1b027 Serialize playlists 2014-10-27 18:40:47 +01:00
Flamefire 99b7989c48 Make Serializer non-static to allow other underlying classes (e.g. for linux)
Allow also arrays and comments
2014-10-26 14:02:48 +01:00
Flamefire 3ff7540693 Rename class 2014-10-25 12:13:58 +02:00
Flamefire dfc4a2c1cc Implement new class for deserialization 2014-10-24 13:58:59 +02:00
Flamefire 2f99cd2560 Make CSingNotes also implement Draw()
Also a bit refactoring
2014-10-22 22:00:25 +02:00
Flamefire ae7a7fd390 Implement a common Interface for all MenuElements
Also remove CSongMenu and replace it with a factory class
2014-10-19 17:17:39 +02:00
mephasor ef111fde2f Added a list style song menu which can be activated in the game menu screen 2014-10-16 13:57:34 -03:00
Flamefire 355d7b4b5f Merge branch 'develop' into Better_Graphics_Handling
Conflicts:
	VocaluxeLib/Menu/CNameSelection.cs
	VocaluxeLib/Menu/CPlaylist.cs
	VocaluxeLib/Menu/CText.cs
	VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs
	VocaluxeLib/Structs.cs
	VocaluxeLib/VocaluxeLib.csproj
	VocaluxeLib/Xml/CXMLReader.cs
2014-10-05 15:09:52 +02:00
Flamefire 6a3bf7b2c0 Introduce CVideoStream for easier video handling (already includes a texture, important for common usage of streams) 2014-10-05 14:20:57 +02:00
Flamefire 6ebbf7df6f Introduce example for a more flexible deserialization
Also make the CoverGenerator themes serializeable
Rest is automatic reformatting.
2014-10-01 00:54:04 +02:00
Flamefire dd1231ad34 Merge branch 'Better_Graphics_Handling' into Automatic_Covers
Conflicts:
	Vocaluxe/Base/CCover.cs
	Vocaluxe/Base/CGraphics.cs
	Vocaluxe/Base/Fonts/CFontStyle.cs
	Vocaluxe/Base/Fonts/CGlyph.cs
	VocaluxeLib/Menu/CText.cs
	VocaluxeLib/Structs.cs
2014-09-25 19:43:21 +02:00
Flamefire 649f81494e Fix some race conditions with the texture references
Add queuing of files
Split CEncoding to separate file
2014-09-23 21:37:46 +02:00
Flamefire 7f8e974fe1 Rename CTexture to CTextureRef to reflect it is only a reference 2014-09-13 17:51:55 +02:00
Flamefire 445d50bcaf Merge branch 'develop' into Font_Rewrite 2014-09-07 10:49:21 +02:00
Flamefire 94be5ce97b Use CFont class to define the font to use 2014-09-07 10:35: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
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 3612b9244b Added sound- and song-player to VocaluxeLib. Use it for Background-Music. 2014-08-05 10:54:34 +02:00
Flamefire 9fe9455eaf Merge branch 'RecordImprovements' into develop
Conflicts:
	Vocaluxe/Lib/Sound/CPortAudioHandle.cs
	Vocaluxe/Lib/Sound/Record/CBuffer.cs
2014-04-29 20:07:56 +02:00
Flamefire d584206a7f Fix bugs in AKF detection
Add CWavFile.cs for reading wav files
Add more test cases
2014-04-09 18:28:35 +02:00
Flamefire 0a59b250d3 Fix build configurations (use anycpu where it was used) 2014-03-24 02:19:47 +01:00
Flamefire 23364c3bcb Add a class for fading
(we don't have to implement this multiple times)
2014-03-14 16:27:12 +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 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
Stephan Sundermann 2a8d1fb486 Fixed output directories 2013-12-26 13:01:55 +01:00
Flamefire 8e80cf93e2 Add Songwriter and #PREVIEW tag 2013-10-11 20:25:05 +02:00
Flamefire 05e170e91a Rename SongLoader file 2013-10-11 14:50:30 +02:00
Flamefire ed22088728 Split CSong to have single file for note and header reading.
Some simpler assignments and more error checking
2013-10-11 14:50:28 +02:00
Flamefire bf1c00b5d1 Some fixes and support for more than 2 voices 2013-10-11 14:50:27 +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
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 bde99ff2aa some more reconstructions on avatars 2013-05-07 00:23:44 +02:00