Flamefire
24922e8c05
Merge commit '6be397ac5b9b475b35c008e10a6464f7b33da752' into Better_note_timing
...
Conflicts:
VocaluxeLib/Menu/SongMenu/CSong.cs
VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs
2013-02-23 14:26:52 +01:00
Florian Küpper
e20bd7093f
Added option to config.xml for switching bg-music start-tag behavior.
2013-02-23 14:13:49 +01:00
Flamefire
5ff1677563
Cover loading refactored
...
Fixed song loading check
Correct use of CoverTextureBig
2013-02-23 14:04:38 +01:00
Florian Küpper
4420a11b08
Fixed video in bg-music with start-tag.
2013-02-23 14:03:57 +01:00
Florian Küpper
08e2f8245b
Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into develop
2013-02-23 13:16:52 +01:00
Alexander Eckart
fe600f5a70
Merge branch 'gstreamer' into develop
...
Conflicts:
Output/x64/gstreamer/GstreamerHelper.dll
2013-02-23 11:33:31 +01:00
Stephan Sundermann
f5a510f10e
Disabled /SAFESEF for x86 release configuration, refs #1
2013-02-23 11:21:36 +01:00
Alexander Eckart
5747847fe5
Merge branch 'gstreamer' into develop
2013-02-23 11:11:08 +01:00
Stephan Sundermann
bd6687c2b6
Added missing lib file for x86
...
Fixed project build options for x64 release mode
refs #1
2013-02-23 01:31:17 +01:00
Florian Küpper
0fa5b69682
Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into develop
2013-02-23 00:09:50 +01:00
Florian Küpper
d227490124
Fix starting bg-music when disabled on start.
2013-02-23 00:07:28 +01:00
Florian Küpper
0d79abcda8
Fix some errors with volume-control, closes #10
2013-02-22 23:56:33 +01:00
Flamefire
9761c115b2
Refactored song loading
...
~9% faster and a bit more stable
2013-02-22 23:19:13 +01:00
Alexander Eckart
69e5537f76
Merge remote-tracking branch 'remotes/xdarkice/gstreamer' into develop
...
Conflicts:
VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs
Set GStreamer as default audio decoder
2013-02-22 22:29:05 +01:00
Alexander Eckart
6be397ac5b
added a name for the 0.3 release
2013-02-22 22:10:51 +01:00
Alexander Eckart
f33aee9c14
Merge remote-tracking branch 'remotes/flokuep/develop' into develop
2013-02-22 22:04:12 +01:00
Alexander Eckart
521033ed97
some code reorganization
2013-02-22 21:27:34 +01:00
Alexander Eckart
a29f4fb0d6
changed CXMLReader.cs load method to static,
...
removed the try catch blocks
2013-02-22 20:39:48 +01:00
Florian Küpper
57c7f6ca2e
Fixed bg-music on ScreenSong, #7
2013-02-22 19:06:46 +01:00
Alexander Eckart
9c78bbe45f
roadmap update
2013-02-22 18:43:20 +01:00
Alexander Eckart
a1a3b41ff9
added missing file
2013-02-22 18:02:01 +01:00
Alexander Eckart
b4f77d50b2
changed base handling in VocaluxeLib
2013-02-22 17:57:47 +01:00
Stephan Sundermann
b60169d2a6
Some cleanup in Gstreamer Audio, should be finished 100% now! Please test
...
Frames are now pulled in a thread for better performance. We still need to grab the right frame from the Framebuffer and we might need to switch Gstreamer's Frame stepping API.
refs #1
2013-02-22 17:53:57 +01:00
Alexander Eckart
08658e20e3
added Base object to XMLReader class
...
the Base object handling must be changed for the whole VocaluxeLib!
2013-02-22 17:11:25 +01:00
Alexander Eckart
406e75408b
Merge remote-tracking branch 'remotes/Flamefire/Better_note_timing' into develop
2013-02-22 16:58:58 +01:00
Alexander Eckart
725fc8aff8
added translation page links to README and Readme.txt
2013-02-22 16:34:56 +01:00
Alexander Eckart
79dc7d9c57
fix #5
2013-02-22 15:59:57 +01:00
Alexander Eckart
6bcb709115
Just another redmine test
...
Fix #{5}
2013-02-22 15:58:06 +01:00
Alexander Eckart
8efe7bb2aa
test
2013-02-22 15:54:53 +01:00
Alexander Eckart
c336b12aba
another redmine test
2013-02-22 15:52:00 +01:00
Alexander Eckart
0d1f1f17a0
added bug tracker line to the main readme too (2nd bug tracker test)
2013-02-21 18:17:15 +01:00
Alexander Eckart
7726824e08
added bugtracker url to readme (just testing the bugtracker)
2013-02-21 18:05:29 +01:00
Flamefire
03e4485d2d
Merge branch 'XML_Reader_Rewrite' into Better_note_timing
...
Conflicts:
Vocaluxe/Base/CConfig.cs
2013-02-21 17:18:18 +01:00
Flamefire
7465323a2f
Renamed variables
2013-02-21 17:15:10 +01:00
Flamefire
fa78bd1cd9
Added option for timing
2013-02-21 17:13:53 +01:00
Flamefire
506d98bd3c
Added CXMLReader for all XML-reading operations
...
Added GetIntValueRange to force a value to be in a specific range
2013-02-21 17:07:09 +01:00
Flamefire
1a644ab22c
Added Mic delay in calculation of line breaks
...
Added config entry for minimal time before text is show
2013-02-21 13:11:30 +01:00
Stephan Sundermann
ea4a8abd87
Added basic video support, not working very good
2013-02-14 19:17:39 +01:00
Stephan Sundermann
8fbe3f8501
Bound time to a clock, does not work too well
2013-02-12 18:50:23 +01:00
Stephan Sundermann
a7e528109a
First working gstreamer video output.
...
Frames are not in sync with the time provided in GetFrame! Need to implement a own GstClock for that first
2013-02-12 16:13:06 +01:00
Stephan Sundermann
d66e47ff47
Merge remote-tracking branch 'remotes/upstream/develop' into gstreamer
2013-02-11 20:49:03 +01:00
Alexander Eckart
84796993c1
full path for party mode textures and videos
2013-02-11 20:47:24 +01:00
Stephan Sundermann
5264e1f291
Further work on gstreamer video support, not working yet
2013-02-11 20:33:20 +01:00
Alexander Eckart
508cdcf218
Merge pull request #62 from Flamefire/develop
...
Support relative songs
2013-02-11 09:25:27 -08:00
Flamefire
75451a0a17
Support relative songs
2013-02-11 17:49:17 +01:00
Stephan Sundermann
1bc7ff8944
fixed x86 gstreamer path
2013-02-10 18:13:29 +01:00
Stephan Sundermann
b324c3e600
Merge remote-tracking branch 'remotes/upstream/develop' into gstreamer
2013-02-10 18:05:48 +01:00
Stephan Sundermann
2be1c021ce
Added empty gstreamer video implementation
2013-02-10 18:03:53 +01:00
Alexander Eckart
748d9929b5
Merge branch 'develop' of git://github.com/flokuep/Vocaluxe into develop
2013-02-10 17:10:25 +01:00
Alexander Eckart
f9d7de5f76
Merge branch 'develop' of git://github.com/xDarkice/Vocaluxe into develop
2013-02-10 17:09:55 +01:00
Flamefire