Florian Küpper
9281cd1d35
Fix merge-errors
2015-12-06 11:25:04 +01:00
Florian Küpper
45d0091161
Merge pull request #2 from flokuep/komadoc-develop
...
Komadoc develop
2015-12-06 09:25:35 +01:00
Florian Küpper
fa05e062b5
Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into develop
2015-12-05 23:12:12 +01:00
Florian Küpper
7e8479720e
Merge
2015-12-05 22:02:57 +01:00
Stephan Sundermann
0e2ef9d347
Merge pull request #160 from lukeIam/fixedDuetParsing
...
Fixed duet parsing (closes #159 )
2015-11-28 15:52:46 +01:00
lukeIam
c16ac3eeb3
Fixed duet parsing ( closes #159 )
...
Thanks to @derivator and @BenKmann
2015-11-28 12:51:05 +01:00
Stephan Sundermann
ce6f1c1d64
Merge pull request #158 from lukeIam/PlaylistControlsBroken
...
Fix: Playlist controls are broken
2015-10-15 19:49:19 +02:00
Florian Küpper
58b5c132dd
Revert last commit
2015-09-09 20:05:06 +02:00
Florian Küpper
5ad85ce3db
Upgrade PitchTracker-Project to compile with newer VS and fix compiling
2015-09-09 19:51:47 +02:00
lukeIam
724f8f6a72
Close song options on click on the song menu
2015-09-08 19:09:55 +02:00
lukeIam
28e4c2b3f5
Fixed Playlist buttons (2nd try)
2015-09-08 16:52:23 +02:00
lukeIam
fa9da672cf
Fix: Playlist conrols on the songscreen have no function
2015-08-31 21:31:32 +02:00
lukeIam
1cdf2fa659
Fix: theme videos are not longer optional
2015-08-31 19:23:57 +02:00
Stephan Sundermann
15e28c8a8f
Merge pull request #155 from Shiroi/develop
...
PartyMode Challenge: Added an option to not refill jokers after every…
2015-08-26 17:01:14 +02:00
Syrome
18f3fb74cd
PartyMode Challenge: Added an option to not refill jokers after every song
...
Players can now choose between refilling the jokers every song and save
the amount of jokers (e.g. 5 Jokers per Player for the whole PartyMode).
2015-08-14 12:58:49 +02:00
Stephan Sundermann
d7b358974e
Merge pull request #154 from Shiroi/develop
...
PartyMode Challenge: Made the amount of jokers configurable
2015-08-13 12:08:49 +02:00
Syrome
970610327c
PartyMode Challenge: Made the amount of jokers configurable
2015-08-13 10:48:26 +02:00
Stephan Sundermann
d96759555a
Merge pull request #150 from flokuep/develop
...
Some fixes and additions.
2015-04-02 15:08:11 +02:00
Florian Küpper
e717bb68f0
Added extra statics and texts to ScreenSing that are only shown if player-num matches
2015-04-02 12:24:14 +02:00
Florian Küpper
48645d60d1
Fixed formatting (hopefully).
2015-04-02 11:16:44 +02:00
Florian Küpper
58590c0db3
Fixed duet-bug.
2015-04-02 11:12:13 +02:00
Florian Küpper
4f35c9c583
Merge commit '8d3eb2c395c9e41d2feae3ca0a7b85defc396211' into develop
2015-04-01 14:08:20 +02:00
Stephan Sundermann
8d3eb2c395
Merge pull request #145 from derivator/linux-fixes
...
Linux: set AssemblyInformationalVersion to git version and add install target to makefile
2015-03-05 22:12:29 +01:00
derivator
5da7887c1c
Linux: add install target to makefile
2015-03-05 03:13:53 +01:00
derivator
d7e0b24eec
Linux: set AssemblyInformationalVersion to git version during build
...
just as windows builds do. Also set matchingServerVersion for the web app
and use the new format in CVocaluxeServer.
2015-03-04 22:53:44 +01:00
Stephan Sundermann
0371aebc43
Merge pull request #142 from lukeIam/develop
...
Fixed PS script + Removed unused usings from CGamePad
2015-03-04 21:34:12 +01:00
lukeIam
0f11a800f8
Fixed PS script for version injection into main.js
2015-03-04 21:26:51 +01:00
lukeIam
3c6dcb8c96
Merge branch 'develop' of https://github.com/Vocaluxe/Vocaluxe into develop
2015-03-04 10:37:18 +01:00
Stephan Sundermann
fb8dbb3a04
Merge pull request #143 from derivator/linux-fixes
...
Linux: enable building on x86 and prepare for packaging
2015-03-01 03:15:32 +01:00
derivator
acd89bc2d3
Linux: store config in ~/.config/Vocaluxe instead of in install dir
...
because we might not have permission to write there if installed as a package
If that folder doesn't exist, create it and copy the default profiles there,
so they show up but can still be edited or removed
2015-03-01 02:14:01 +01:00
derivator
1b86baa24d
Linux: build for x86 if we're on x86
2015-03-01 00:34:00 +01:00
lukeIam
7aebfe5442
Removed unused usings from CGamePad
2015-02-28 18:44:25 +01:00
Florian Küpper
b3b8a6ea2e
Updated spanish translation.
2015-02-28 14:09:33 +01:00
Stephan Sundermann
13f72c3cad
Merge pull request #141 from lukeIam/integratedServer
...
Integrated server
2015-02-26 18:58:56 +01:00
Stephan Sundermann
e100101ce4
Merge pull request #139 from derivator/linux-update
...
Make Vocaluxe buildable and playable on GNU/Linux
2015-02-26 11:13:18 +01:00
Stephan Sundermann
cbc1bdd3c0
Merge pull request #140 from lukeIam/GamePad
...
Added support for gamepads
2015-02-26 10:20:43 +01:00
lukeIam
e48d719662
Added support for gamepads
2015-02-25 19:24:15 +01:00
lukeIam
43be49387a
Removed the Wait call after RunSynchronously as it is not needed and causes an exception with Mono
2015-02-22 14:51:41 +01:00
lukeIam
5e58f4a1f8
Typo
2015-02-22 13:28:12 +01:00
lukeIam
86a98e7bf8
- Integration of the server into the main project
...
- Made the webserver calls threadsafe (with Tasks)
- Removed some old and unused server classes
2015-02-21 18:23:21 +01:00
derivator
413e7d7567
Fix graphical glitches on linux
...
.png textures using certain grayscale formats were loaded incorrectly, due to a defect in Mono's Bitmap class (see https://bugzilla.novell.com/show_bug.cgi?id=485773 ). Worked around by
converting these files to standard format.
2015-02-13 12:15:07 +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
Stephan Sundermann
2b9a38ff0d
Merge pull request #138 from flokuep/develop
...
Small fix, new language.
2015-02-06 22:27:52 +01:00
Florian Küpper
336376a1af
Fixed starting next bg-music-track.
2015-02-05 19:57:12 +01:00
Florian Küpper
d94e7a5fde
Added polish-server-translation.
2015-02-05 18:50:08 +01:00
Stephan Sundermann
e8e4c3b1b8
Merge pull request #137 from lukeIam/develop
...
Check if the app fits to the server version
2015-01-18 21:02:21 +01:00
lukeIam
f60e0ac762
Merge branch 'develop' of https://github.com/Vocaluxe/Vocaluxe into develop
...
Conflicts:
Vocaluxe/Vocaluxe.csproj
2015-01-18 20:56:55 +01:00
lukeIam
dc4016a882
PostBuild code format fixed
2015-01-18 20:48:19 +01:00
lukeIam
0f5040d669
[App] - The app stores the Vocaluxe version it was created with
...
[Server] -getServerVersion added
[App] - Checks if the server has the right version, otherwise fallback to inApp WebVersion
2015-01-18 20:44:47 +01:00
Stephan Sundermann
846e20e24a
Merge pull request #136 from lukeIam/develop
...
Serverlib build path
2015-01-17 19:29:33 +01:00
Florian Küpper