Florian Küpper
4d19e4af2a
Revert vs-version-change
2015-12-06 12:33:08 +01:00
Florian Küpper
6480176728
Revert "Merge"
...
This reverts commit 7e8479720e
2015-12-06 12:27:54 +01:00
Florian Küpper
c83b7dda3b
Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into develop
2015-12-06 11:47:35 +01:00
Florian Küpper
c25157946e
Some fixes for start without config.xml, also fixes #77
2015-12-06 11:42:07 +01:00
lukeIam
a4f39e6145
Add an option to strech the rendered area instead of displaying black bars ( closes #33 )
2015-12-06 11:35:01 +01:00
Florian Küpper
9281cd1d35
Fix merge-errors
2015-12-06 11:25:04 +01:00
Florian Küpper
6c07ce8026
Merge pull request #163 from lukeIam/develop
...
Increased default cover size (fixes #128 )
2015-12-06 11:19:18 +01:00
lukeIam
140bcfee8f
Increased default cover size ( fixes #128 )
2015-12-06 11:06:14 +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
94e0baa82c
Added Mono.Data.Sqlite.Portable
...
(cherry picked from commit a6dc65fdb993dd8fcfeadca3f84fd78ac19d0a4a)
2015-09-08 19:54:29 +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
a504a77bef
Merge branch 'develop' into nugetDependencies
2015-08-31 19:57:38 +02:00
lukeIam
1cdf2fa659
Fix: theme videos are not longer optional
2015-08-31 19:23:57 +02:00
lukeIam
3c32d3fec8
gstreamer is installed automatically (only if it is not installed on the system)
2015-08-29 18:53:50 +02:00
lukeIam
dee0e2139f
Cleanup
2015-08-29 13:10:58 +02:00
lukeIam
8e26295d3b
working on nuget package restore
2015-08-29 11:58:41 +02:00
lukeIam
06452aacde
Removed deleted files from project
2015-08-27 19:15:29 +02:00
lukeIam
569f1d2e27
Moved NuGet.Config
2015-08-27 19:13:22 +02:00
lukeIam
026bf78222
Added missing packages
2015-08-27 19:03:40 +02:00
lukeIam
80d0808847
Added nuget packages
2015-08-27 18:53:40 +02:00
lukeIam
465d966283
Dependency cleanup for nuget use
2015-08-27 18:38:18 +02:00
lukeIam
8c5480c228
Remove x64/x86 folder for DLLs
2015-08-26 18:01:22 +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
lukeIam
4988e0605d
Remove all dependency dlls
2015-08-04 19:22:50 +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
Florian Küpper