Commit Graph
35858 Commits
Author SHA1 Message Date
Arvaneth fbe88a9c19 Merge branch 'master' of https://github.com/stepmania/stepmania 2015-10-30 02:24:30 -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
Kyzentun Keeslala 937ce349ce Updated changelog. 2015-10-27 17:39:30 -06: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
Kyzentun Keeslala bd3da6a46d Added GetMainTitle to Song to bypass ShowNativeLanguage pref. 2015-10-26 13:38:23 -06: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
Kyzentun Keeslala da2db95365 Changed NotesLoaderBMS to not crash when trying to set StepsTypeStr for an unrecognized StepsType. Removed ConfOption for ShowSelectGroup from ScreenOptionsMasterPrefs because the preference does not exist. 2015-10-23 20:42:49 -06: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
latot 47b0f83aed Remove WITH_VERSION_INFO, version info by default 2015-10-22 21:21:47 -03:00
Kyzentun Keeslala 264ba550b7 Changed stage stats assert on ScreenEvaluation to give a more informative message and avoid crashing. 2015-10-22 18:12:37 -06:00
latot e6717903c3 WITH_SYSTEM_FFMPEG add description 2015-10-22 20:51:05 -03: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
Kyzentun Keeslala 189cf77cab Changed PlayCommandNoRecurse to check whether the command is nil before running it, so that a command metric set to a nil function isn't an error. Removed TextBannerHighScores::AfterSetCommand metric from _fallback because it pointed to a function that does not exist. 2015-10-22 12:24:04 -06:00
Kyzentun Keeslala add09bef07 Added metrics for ScreenMiniMenuTimingDataChangeInformation that dbk2 found were missing. Changed ASSERT in AddNewScreenTop to ASSERT_M. 2015-10-22 00:04:13 -06:00
Kyzentun 799eeaff6d Merge pull request #888 from Wallacoloo/armv7
Fix armv7 build errors
2015-10-21 01:39:14 -06:00
Colin Wallace dcd676b956 Don't define CPU_X86 on non-x86 processors 2015-10-21 06:28:30 +00:00
Kyzentun Keeslala a816de735a If the fallback for a noteskin doesn't exist, remove it from the list of noteskins to prevent crashing when someone tries to use it. 2015-10-20 22:57:07 -06:00
Colin Wallace 22d6f792f3 Fix CMake error when SM_COMPILE_FLAGS is empty (e.g. when compiling with cmake -DWITH_SSE2=off) 2015-10-21 04:20:09 +00:00
Kyzentun Keeslala de9ae9048b Use set_mult_attrs_with_diffuse on RollingNumbers on eval in default even though it won't have any effect until 5.1. 2015-10-18 16:27:03 -06:00
Kyzentun Keeslala 9f40c6d044 Added mult_attrs_with_diffuse to BitmapText. Added some convenience macros to LuaBinding for generic get/set functions. Updated changelog. 2015-10-18 14:09:08 -06: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
Joe 1ebf75c683 Fix notesloaderbms.cpp for real this time 2015-10-16 16:08:40 +01:00
Joe 311601dc0d Resolving merge conflicts 2015-10-16 08:15:37 +01:00