Jason Felds
fa2f3232be
Add the AppVeyor (window) status.
2015-10-05 17:42:22 -04:00
Jason Felds
b717918298
Try a more flexible DirectX search path setup.
...
This is being done to get Appveyor to work.
2015-10-05 16:50:24 -04:00
Kyzentun
66c4f8f411
Merge pull request #828 from mattmccutchen/submit/global-offset-and-rate
...
Fix interaction between global offset and music rate.
2015-10-04 18:30:30 -06:00
Jason Felds
67a52139f7
Merge pull request #331 from lthls/ffmpeg-fix
...
FFMpeg: Fix uninitialized AVFrame
2015-10-04 16:40:08 -04:00
Vincent Laviron
85599a7a43
FFMpeg: Fix uninitialized AVFrame
...
Fixes crashes with recent version of libav and ffmpeg on Linux while attempting to play a video
2015-10-04 22:21:06 +02:00
Jason Felds
c79dd4ba5c
Update changelog: FFmpeg on windows edition.
2015-10-04 14:56:02 -04:00
Jason Felds
a27e3d5b6c
Merge pull request #835 from wolfman2000/wolf-windows-ffmpeg-2.1.3
...
Use ffmpeg 2.1.3 on Windows.
2015-10-04 14:55:14 -04:00
Jason Felds
fdac0835b8
Use ffmpeg 2.1.3 on Windows.
...
Once again, thanks to Zeranoe's builds.
2015-10-04 14:39:07 -04:00
Jason Felds
8de6f4e5f9
Partial revert: see #834 .
2015-10-04 14:36:26 -04:00
Jason Felds
1b559bddf0
Merge pull request #834 from stepmania/revert-832-wolf-ffmpeg-lgpl
...
Revert "Default to GPL off for ffmpeg."
2015-10-04 14:33:19 -04:00
Jason Felds
b0465a8622
Revert "Default to GPL off for ffmpeg."
2015-10-04 14:33:06 -04:00
Jason Felds
8f9b5717ba
Update changelog.
2015-10-04 13:56:11 -04:00
Jason Felds
e83b76cae2
Merge pull request #832 from wolfman2000/wolf-ffmpeg-lgpl
...
Default to GPL off for ffmpeg.
2015-10-04 13:52:31 -04:00
Jason Felds
27ef5301ec
Default to GPL off for ffmpeg.
2015-10-04 12:53:56 -04:00
Jason Felds
6be6d6794c
Merge pull request #830 from lthls/fix-cmake-ffmpeg
...
Fix CMake build with option WITH_SYSTEM_FFMPEG
2015-10-04 11:16:42 -04:00
Vincent Laviron
93cc62f0ad
Fix CMake build with option WITH_SYSTEM_FFMPEG
2015-10-04 16:38:08 +02:00
Kyzentun
8e7b4ee7ee
Merge pull request #203 from kyzentun/FixScaleToClipped
...
Rewrote Sprite::ScaleToClipped and CropTo to actually work.
2015-10-03 21:31:45 -06:00
Dan Guzek
232f6537f9
Merge pull request #827 from wolfman2000/wolf-macosx-ffmpeg-proper
...
Finally bring ffmpeg 2.1.3 to Mac OS X.
2015-10-03 23:12:14 -04:00
Jason Felds
b8700f11a7
Finally bring ffmpeg 2.1.3 to Mac OS X.
...
This replaces #611 .
2015-10-03 22:32:14 -04:00
Matt McCutchen
343bbd0e56
Fix interaction between global offset and music rate.
...
The global offset is a correction for audio latency, which is measured
in wall-clock time, but TimingData elapsed time values represent offsets
into the sound file. To get the offset in the sound file that
corresponds to the wall-clock time of the global offset, we have to
multiply by the music rate.
2015-10-03 22:21:21 -04:00
Jason Felds
8b08c7c182
Merge pull request #826 from wolfman2000/wolf-macosx-bzip2-iconv
...
Reference bzip2 and iconv on Mac OS X properly.
2015-10-03 20:57:21 -04:00
Jason Felds
4586e6bef7
Forgot to remove this line.
2015-10-03 20:44:17 -04:00
Jason Felds
f9a1f728af
Reference bzip2 and iconv on Mac OS X properly.
...
This removes the need for the arbitrary other linker flags.
This is required to allow for proper building of ffmpeg (the next goal).
2015-10-03 20:38:38 -04:00
Jason Felds
12296352f7
Merge pull request #817 from Prcuvu/lua_remove_unnecessary_file
...
Remove lua.c from CMake project.
2015-10-03 00:27:05 -04:00
Jason Felds
5412fda226
Merge pull request #819 from wolfman2000/wolf-src-cmake-separation
...
Separate out the remaining files.
2015-10-02 23:42:57 -04:00
Jason Felds
ba96ab7570
Separate out the remaining files.
2015-10-02 23:14:24 -04:00
hanubeki
09d2cda3eb
ja: [ScreenEdit] save_success_no_sm_split_timing
2015-10-03 12:01:27 +09:00
Jason Felds
d14cce6654
Merge pull request #818 from wolfman2000/wolf-verstub-clean-gen
...
Generate verstub.cpp through raw cmake.
2015-10-02 22:33:30 -04:00
Jason Felds
b7c62ee645
Missed a spot on Linux.
2015-10-02 22:18:31 -04:00
Jason Felds
99b79e5410
Generate verstub.cpp through raw cmake.
...
There is no need for an extra program.
As a bonus, generate a consistent windows vdi file.
There is still an issue with actually *reading* the vdi, but that's for someone else to tackle.
2015-10-02 21:56:02 -04:00
Kyzentun Keeslala
2d64694f14
Changed Song and ScreenEdit to not save a .sm file when split timing is used.
2015-10-02 16:26:59 -06:00
Prcuvu
457adef083
Remove lua.c from CMake project.
2015-10-02 19:10:03 +08:00
Kyzentun Keeslala
751caba360
Why did I use >= originally? That makes no sense.
2015-10-02 03:09:05 -06:00
Jason Felds
429d4dbce2
Merge pull request #801 from wolfman2000/wolf-remove-ffmpeg-bundle
...
Remove no longer used ffmpeg bundle.
2015-10-01 16:14:21 -04:00
Jason Felds
5bade2b88f
Merge pull request #807 from wolfman2000/wolf-cmake-mingw-partial
...
Bring us closer to working with MinGW again.
2015-09-27 17:30:01 -04:00
Jason Felds
b3a5a82b5c
Bring us closer to working with MinGW again.
...
The biggest obstacle right now deals with FFMPEG. I insist on being able to utilize the git clone/submodule (5_1_0) section. I'm just struggling with the commands.
As part of this commit, some linux files are restored in the compilation chain. This is for consistency with the old Makefile approach.
Assistance will be needed at this point to complete MinGW support.
2015-09-27 17:07:15 -04:00
Jason Felds
5fd90b7502
Merge pull request #806 from wolfman2000/wolf-cmake-pch-windows
...
Re-enable precompiled headers for Windows.
2015-09-27 15:02:04 -04:00
Jason Felds
c7943a85ee
Re-enable precompiled headers for Windows.
...
The speed is brought back up to reasonable limits considering I work with a VM primarily.
2015-09-27 14:45:35 -04:00
Jason Felds
c10eb70cea
Merge pull request #804 from wolfman2000/wolf-cmake-cpack-template
...
Modify the NSIS template for a better installer.
2015-09-27 14:05:02 -04:00
Jason Felds
abf58e11cf
Modify the NSIS template for a better installer.
...
This brings it closer in-line to what we used prior to CMake.
2015-09-27 11:52:45 -04:00
Jason Felds
984005f9e4
Merge pull request #802 from wolfman2000/wolf-buffer-cleanup
...
Remember to fill in new char's.
2015-09-26 21:15:17 -04:00
Jason Felds
537af8d866
Remember to fill in new char's.
...
...we seriously need to use a standard <string>.
*glares at Yaniel*
2015-09-26 21:03:46 -04:00
Jason Felds
5174e6b306
Remove no longer used ffmpeg bundle.
...
We get better versions via cmake/submodules anyway.
2015-09-26 16:14:01 -04:00
Jason Felds
d878a44a9b
Merge pull request #787 from wolfman2000/wolf-rstring-buffer-dead
...
NOW all of the buffer calls should be dead.
2015-09-26 16:09:23 -04:00
Jason Felds
977845cec5
Merge pull request #799 from wolfman2000/wolf-ffmpeg-nasm
...
Restore nasm support for ffmpeg building.
2015-09-26 11:57:30 -04:00
Jason Felds
598233d72e
Restore nasm support for ffmpeg building.
2015-09-26 10:45:38 -04:00
Jason Felds
2753089e1f
Merge pull request #798 from wolfman2000/wolf-travis-enhancements-master
...
Update and enhance travis's building capabilities.
2015-09-25 21:10:17 -04:00
Jason Felds
0a6b785a9e
Master does not require c++1x stuff yet.
2015-09-25 20:46:58 -04:00
Jason Felds
559616686c
Update and enhance travis's building capabilities.
...
Borrow (proper) ideas from [ldionne's work](https://github.com/ldionne/hana/blob/c8542789946b9ff8be693301c7b57d8bd14d8c4b/.travis.yml )
2015-09-25 20:20:21 -04:00
Kyzentun Keeslala
a10c0c4f01
Added set_use_effect_clock_for_texcoords to Sprite. Updated changelog.
2015-09-21 20:42:56 -06:00
Jason Felds