Jason Felds
b3122072a8
Merge pull request #1131 from djpohly/check-pthread-functions
...
CMake: check for timed pthreads functions
2016-06-02 06:56:32 -04:00
Jason Felds
8cb746d0cf
Merge pull request #1132 from djpohly/release-the-music-i-mean-lua
...
Release Lua locks responsibly; fix a USB profile crash
2016-05-25 18:45:23 -04:00
Jason Felds
935dd71527
Merge pull request #1099 from wolfman2000/wolf-minimaid-connection-exception
...
Prevent crashes from unconnected Mimimaid devices.
2016-05-12 19:28:31 -04:00
Jason Felds
6102c0dab9
Prevent crashes from unconnected Mimimaid devices.
...
This only affects Windows.
2016-05-11 20:49:01 -04:00
Jason Felds
c302f14ca9
Merge pull request #1073 from wolfman2000/wolf-trevor-lights-fix
...
Don't reset lights due to settings.
2016-04-14 22:43:51 -04:00
Jason Felds
55913d1a23
Don't reset lights due to settings.
...
Thank Trevor Barribeau for the fix.
This is required for the BlinkGameplayButtonLightsOnNote setting, particularly if it's set to 0 instead of 1.
2016-04-14 22:04:04 -04:00
Jason Felds
b5405bfc72
Merge pull request #1053 from wolfman2000/wolf-neobeat-songs-played
...
Properly translate # songs played.
2016-04-10 20:27:11 -04:00
Jason Felds
599d1e64c6
Merge pull request #1054 from wolfman2000/wolf-windows-pedantic-touchups
...
Fix minor windows pedantic warnings.
2016-04-02 20:20:46 -04:00
Jason Felds
bec18a0d36
Fix minor windows pedantic warnings.
2016-03-27 22:03:15 -04:00
Jason Felds
9ba2baf8d6
Properly translate # songs played.
...
No line ending shenanigans this time.
2016-03-27 16:55:17 -04:00
Jason Felds
b2f777106a
Merge pull request #1045 from wolfman2000/wolf-warning-cleanup
...
Clean up three sets of warnings:
2016-03-24 19:07:33 -04:00
Jason Felds
edabf4605b
Clean up three sets of warnings:
...
* Ensure all switches have a default when working with enums.
* Match defined new[] calls with delete[] calls.
* Respect variable initialization order.
2016-03-24 18:30:29 -04:00
Jason Felds
02022d27bc
Merge pull request #1039 from wolfman2000/wolf-travis-udev
...
Attempt to fix Travis with libudev-dev.
2016-03-15 22:26:35 -04:00
Jason Felds
ff41bbf8d6
Attempt to fix Travis with libudev-dev.
2016-03-15 22:12:09 -04:00
Jason Felds
132fd8ed55
Merge pull request #1009 from rfkrocktk/feature/ffmpeg-pic
...
Compile FFMPEG in PIC when configured as such.
2016-02-12 16:35:22 -05:00
Jason Felds
5eca1f8f62
Merge pull request #976 from kyzentun/ignore_osx_files
...
Ignore OS X special files
2015-12-28 21:36:09 -05:00
Jason Felds
92724cd627
Merge pull request #966 from drewbarbs/db_fix_png_write
...
Fix Texture Font Generator PNG write
2015-12-20 22:25:25 -05:00
Jason Felds
d6667f858c
Merge pull request #954 from Flameshadowxeroshin/master
...
remove guitar cruft
2015-12-06 12:39:02 -05:00
Jason Felds
1adada6f77
Fix CreateZip typo.
...
I guess someone else culdn't do this? (sic)
2015-11-13 17:13:34 -05:00
Jason Felds
cbb76cf22f
Merge pull request #931 from wolfman2000/wolf-travis-cmake
...
Restore compilation with Travis.
2015-11-03 20:06:59 -05:00
Jason Felds
9f35238a07
Restore compilation with Travis.
...
Thanks to [opencor](https://github.com/opencor/opencor ) for the idea.
2015-11-03 19:06:56 -05:00
Jason Felds
a7ed2d33d9
Merge pull request #929 from wolfman2000/wolf-irc-bots
...
Put the bots back in #stepmania.
2015-11-02 19:58:09 -05:00
Jason Felds
fba1cf2975
Put the bots back in #stepmania.
...
Apparently #stepmania-devs is for discussion only.
...is this backwards?
2015-11-02 19:05:32 -05:00
Jason Felds
46eadae43a
Merge pull request #924 from Prcuvu/texture_font_generator_remove_vs_projects
...
Remove deprecated VS projects for Texture Font Generator.
2015-11-01 19:45:15 -05:00
Jason Felds
e6aa840af4
Merge pull request #921 from wolfman2000/wolf-timing-logging
...
Allow optional logging of timing segment mods.
2015-11-01 07:02:36 -05:00
Jason Felds
166e4c8287
Allow optional logging of timing segment mods.
...
For those with many songs, it gets annoying.
2015-11-01 06:49:31 -05:00
Jason Felds
020ecf64ae
Merge pull request #919 from Prcuvu/appveyor_build_with_v140_xp
...
[Windows] Build using platform toolset "v140_xp" on AppVeyor.
2015-10-31 14:20:52 -04:00
Jason Felds
4b3937511d
Merge pull request #920 from wolfman2000/wolf-cpack-uninstall
...
Have users uninstall older versions first.
2015-10-31 10:34:55 -04:00
Jason Felds
79d4f45096
Have users uninstall older versions first.
2015-10-31 10:31:22 -04:00
Jason Felds
9c4db4b9f0
Merge pull request #918 from Prcuvu/update_readme_md
...
[Windows] Update README.md.
2015-10-31 08:17:43 -04:00
Jason Felds
c85ab459c0
Merge pull request #912 from nigue/i686_recognition
...
i686 -> x64 recognition before make
2015-10-31 08:11:49 -04:00
Jason Felds
4b0b672e30
Merge pull request #908 from wolfman2000/wolf-version-bump-5-0-10
...
Bump up the version to 5.0.10.
2015-10-27 20:43:47 -04:00
Jason Felds
63ff523360
Bump up the version.
...
...I am aware of the duplicated variable. That will be fixed for the version after.
2015-10-27 20:42:04 -04:00
Jason Felds
18fabca8a4
Only use _AFXDLL on dynamic linking.
2015-10-27 20:31:08 -04:00
Jason Felds
ec48830be0
Merge pull request #907 from wolfman2000/wolf-windows-mt
...
Default to linking with /MT instead of /MD for VS.
2015-10-27 20:18:34 -04:00
Jason Felds
47d59c9dd7
Default to linking with /MT instead of /MD for VS.
2015-10-27 19:33:05 -04:00
Jason Felds
ace6d9a1ad
Merge pull request #905 from wolfman2000/wolf-texture-gen-redo
...
Compile the Texture Font Generator with cmake.
2015-10-27 19:18:51 -04:00
Jason Felds
afa68ecd72
Only install Texture Font Generator when built.
2015-10-27 18:38:23 -04:00
Jason Felds
e0290fc856
Compile the Texture Font Generator with cmake.
...
This program is not built by default. Enable one of the following options to utilize it:
* WITH_FULL_RELEASE
* WITH_TEXTURE_GENERATOR
It is heavily advised to make sure the MFC library is installed for Visual Studio and the computer is restarted afterwards.
As a bonus, `zlib1.dll` can go away now.
The old visual studio projects are still in play in case others still struggle with the code fixes.
2015-10-27 18:11:37 -04:00
Jason Felds
cf5656ac3d
Temporary: Add Texture Font Generator to NSIS.
2015-10-26 21:53:45 -04:00
Jason Felds
0a886f3f2e
Made in haste. Revert.
2015-10-26 18:40:37 -04:00
Jason Felds
7d56f79cf3
Force Windows to use the Unicode character set.
2015-10-26 18:22:53 -04:00
Jason Felds
31b4066c3c
Merge pull request #903 from stepmania/revert-902-wolf-windows-zlib-no-dll
...
Revert "We compile zlib: don't use the old dll."
2015-10-25 20:40:06 -04:00
Jason Felds
de9fc48a1a
Revert "We compile zlib: don't use the old dll."
2015-10-25 20:39:56 -04:00
Jason Felds
4cf5b769c7
Merge pull request #902 from wolfman2000/wolf-windows-zlib-no-dll
...
We compile zlib: don't use the old dll.
2015-10-25 16:29:16 -04:00
Jason Felds
84afd9bc9c
We compile zlib: don't use the old dll.
2015-10-25 16:03:56 -04:00
Jason Felds
52d897e3b6
Merge pull request #901 from wolfman2000/wolf-appveyor-artifacts
...
Try out artifacts for windows StepMania.
2015-10-25 15:57:42 -04:00
Jason Felds
1d099750f7
Generate Windows binaries once more.
...
Also: make sure people attempt to get the redist files.
2015-10-25 15:51:29 -04:00
Jason Felds
950c91490f
Merge pull request #900 from wolfman2000/wolf-appveyor-irc
...
Add IRC feedback from Windows build servers. (Redo)
2015-10-25 13:24:49 -04:00
Jason Felds
3dd2f54678
Add IRC feedback from Windows build servers.
2015-10-25 13:12:14 -04:00
Jason Felds
9041939b6f
...have a link to the PROPER build.
2015-10-25 08:06:12 -04:00
Jason Felds
7cbefe0c33
Merge pull request #898 from wolfman2000/wolf-appveyor-flexible-repo
...
Attempt Appveyor checks on stepmania/stepmania.
2015-10-25 08:04:21 -04:00
Jason Felds
f85dd025da
Attempt Appveyor checks on stepmania/stepmania.
2015-10-25 07:40:52 -04:00
Jason Felds
ca524d51fa
Merge pull request #897 from wolfman2000/wolf-ffmpeg-jobs
...
Allow customizing the number of jobs for ffmpeg.
2015-10-25 07:26:20 -04:00
Jason Felds
131e3264b7
Alright Travis, DON'T use the cores.
2015-10-25 07:13:31 -04:00
Jason Felds
d0df75205f
Allow customizing the number of jobs for ffmpeg.
...
Yes, it is now possible to use a different number of jobs for ffmpeg and stepmania proper.
2015-10-25 07:07:48 -04:00
Jason Felds
7ed09304d0
Merge pull request #895 from latot/master
...
Remove WITH_VERSION_INFO, version info by default
2015-10-22 20:53:44 -04:00
Jason Felds
f102dab4ac
Merge pull request #894 from latot/upstream
...
WITH_SYSTEM_FFMPEG add description
2015-10-22 20:32:30 -04:00
Jason Felds
500300d337
Merge pull request #891 from wolfman2000/wolf-music-less-compilation
...
Allow WITH_MP3=OFF and WITH_WAV=OFF to compile.
2015-10-22 17:22:33 -04:00
Jason Felds
d3131e0350
Allow WITH_MP3=OFF and WITH_WAV=OFF to compile.
2015-10-22 17:07:21 -04:00
Jason Felds
3d6ef83a88
Ensure we get properly ranked courses.
2015-10-18 09:19:56 -04:00
Jason Felds
a38c042dfd
Merge pull request #885 from wolfman2000/wolf-sextet-all-oses
...
Allow all OSes to use the Sextet light drivers.
2015-10-17 23:12:51 -04:00
Jason Felds
8f902bed7d
Allow all OSes to use the Sextet light drivers.
...
This is meant to enhance #343 .
2015-10-17 22:49:44 -04:00
Jason Felds
16c6e9aec3
Fix loading WORST courses.
2015-10-17 20:14:55 -04:00
Jason Felds
af29d7dab2
Bring from 5_1_0: don't use insert with RString.
2015-10-14 20:23:40 -04:00
Jason Felds
849df4975b
Fix appveyor for sending failure noticifcations.
2015-10-12 19:03:30 -04:00
Jason Felds
de1313ab4d
Merge pull request #855 from wolfman2000/wolf-linux-backtrace
...
Backtrace stuff ahoy!
2015-10-08 20:10:29 -04:00
Jason Felds
56ebd4cd08
Merge pull request #856 from wolfman2000/wolf-ffmpeg-attribute-deprecation
...
FINALLY shut ffmpeg up!
2015-10-08 20:10:16 -04:00
Jason Felds
f372df0d2c
Allow building with backtrace symbols.
2015-10-08 19:46:52 -04:00
Jason Felds
c05e38c0aa
...I forgot to commit the new file.
2015-10-08 19:33:52 -04:00
Jason Felds
41a2d829e4
FINALLY shut ffmpeg up!
...
In all seriousness, no need for this definition anymore.
2015-10-08 19:06:26 -04:00
Jason Felds
98bf0d739b
Merge pull request #852 from Prcuvu/linux_fix_warnings
...
Fix GCC warnings on Linux.
2015-10-08 18:54:16 -04:00
Jason Felds
6f53f1c3e5
Backtrace stuff ahoy!
...
* Properly detect and utilize libdl.
* Set the backtrace method appropriately.
* Remove an unused backtrace format. No references existed.
2015-10-08 18:42:44 -04:00
Jason Felds
143347a873
Merge pull request #854 from wolfman2000/wolf-wav-buffer
...
Fix keysounds (and other WAV files).
2015-10-08 17:26:48 -04:00
Jason Felds
e0b32ad3db
Fix keysounds (and other WAV files).
...
Bloody off by one error.
2015-10-08 17:13:33 -04:00
Jason Felds
0b52c51eab
Merge pull request #850 from wolfman2000/wolf-windows-song-caching
...
Backport "for each" loop to restore AppData cache.
2015-10-07 21:20:41 -04:00
Jason Felds
63387dc352
Backport "for each" loop to restore AppData cache.
2015-10-07 21:07:09 -04:00
Jason Felds
cb11d9aee9
Merge pull request #848 from wolfman2000/wolf-windows-stricmp-removal
...
Use cmake to determine which string func we need.
2015-10-07 19:11:21 -04:00
Jason Felds
d9a3c9cf97
Use cmake to determine which string func we need.
...
On a side note, better to default to linux names when possible.
2015-10-07 19:00:16 -04:00
Jason Felds
f441d3a6f7
Fix Mac OS X build.
2015-10-06 20:18:01 -04:00
Jason Felds
d9dbb854d2
Merge pull request #841 from wolfman2000/wolf-appveyor-fork-url
...
Try being more flexible with appveyor's URLs.
2015-10-06 19:48:27 -04:00
Jason Felds
3aa74b221d
Try being more flexible with appveyor's URLs.
2015-10-06 19:38:46 -04:00
Jason Felds
20170a6e95
Merge pull request #840 from wolfman2000/wolf-appveyor-sanity-rev2
...
Get continuous integration working on windows.
2015-10-06 17:41:38 -04:00
Jason Felds
4a4175ce9a
Get continuous integration working on windows.
...
Using appveyor for the initial tryout. Currently dealing with issues on getting github to recognize the pull request commits.
The token in place is a double secured token: it can be replaced quickly if necessary.
2015-10-06 16:55:38 -04:00
Jason Felds
74fb2a1a53
Merge pull request #803 from Prcuvu/binaries_cleanup
...
Cleaning up deprecated binaries and VS projects.
2015-10-06 16:47:59 -04:00
Jason Felds
dd0d2ed67f
Merge pull request #839 from Prcuvu/read_dxsdk_dir_env
...
Read DirectX SDK path from environment variable.
2015-10-06 16:43:09 -04:00
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
Jason Felds
67a52139f7
Merge pull request #331 from lthls/ffmpeg-fix
...
FFMpeg: Fix uninitialized AVFrame
2015-10-04 16:40:08 -04: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
Jason Felds
b8700f11a7
Finally bring ffmpeg 2.1.3 to Mac OS X.
...
This replaces #611 .
2015-10-03 22:32:14 -04:00