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
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
731bc0984a
Merge pull request #791 from wolfman2000/wolf-vorbis-windows-build
...
Build vorbis & vorbisfile in Windows now.
2015-09-20 16:39:09 -04:00
Jason Felds
0382929bd4
Build vorbis & vorbisfile in Windows now.
2015-09-20 13:13:47 -04:00
Jason Felds
1fb7993f9f
Merge pull request #790 from wolfman2000/wolf-ogg-windows-build
...
Enable static compiling of ogg.
2015-09-20 11:48:04 -04:00
Jason Felds
baebe951b8
Enable static compiling of ogg.
...
Using "newogg" as the directory since I wish to reserve libogg for eventual `git submodule`-ing.
2015-09-20 09:36:38 -04:00
Jason Felds
f2d24aa0e3
Merge pull request #788 from wolfman2000/wolf-fadvise-headers
...
Utilize the headers that POSIX_FADVISE requires.
2015-09-19 20:50:27 -04:00
Jason Felds
eac97a4b47
Utilize the headers that POSIX_FADVISE requires.
2015-09-19 20:37:15 -04:00
Jason Felds
8512665f27
NOW all of the buffer calls should be dead.
2015-09-19 20:06:33 -04:00
Jason Felds
f112234655
Merge pull request #786 from wolfman2000/wolf-posix-fadvise
...
Re-implement the check for HAVE_POSIX_FADVISE.
2015-09-19 12:38:44 -04:00
Jason Felds
5313a880e2
Re-implement the check for HAVE_POSIX_FADVISE.
...
It is unclear why this was removed.
If this needs to be removed again, either do so through the config file or the definition checks.
2015-09-19 11:30:38 -04:00
Jason Felds
7535961cc1
Merge pull request #785 from wolfman2000/wolf-windows-post-build
...
Restore mapconv post operations.
2015-09-19 10:57:30 -04:00
Jason Felds
b85c61b89e
Restore mapconv post operations.
...
Clearing the cmake cache may be required.
2015-09-19 10:42:46 -04:00
Jason Felds
8ed5305581
Merge pull request #783 from Prcuvu/remove_jpeg_lib
...
Since libjpeg is built from source on Windows, the old jpeg.lib should be removed.
2015-09-19 07:02:47 -04:00
Prcuvu
4ca2ea289f
Remove old jpeg.lib.
2015-09-19 15:40:13 +08:00
Kyzentun
bb99481363
Merge pull request #772 from waiei/fix_hold/0609
...
fix draw hold body inactive texture bug
2015-09-18 18:35:32 -06:00
Jason Felds
59499a7f6b
Merge pull request #782 from wolfman2000/wolf-rstring-buffer-removal
...
Remove the need for the RString buffer.
2015-09-17 22:32:23 -04:00
Jason Felds
cf545a3c01
Remove the need for the RString buffer.
...
For most areas, the call to `c_str()` is plenty.
For `RageUtil`, it's just a matter of new and delete.
2015-09-16 22:29:53 -04:00
Jason Felds
b87af92a6b
Merge pull request #476 from forsureitsme/patch-1
...
Removed redundant code at Noteskins/pump/default/Noteskin.lua
2015-09-16 06:28:57 -04:00
Jason Felds
9140b836cc
Merge pull request #778 from wolfman2000/wolf-libjpeg-jconfig
...
Allow proper compiling of libjpeg for windows.
2015-09-15 18:29:18 -04:00
Jason Felds
381ab3b655
Merge pull request #780 from wolfman2000/wolf-vs2015-snprintf-compile
...
Allow VS2015 to compile StepMania.
2015-09-15 06:49:54 -04:00
Jason Felds
4feddab08e
Allow VS2015 to compile StepMania.
2015-09-14 22:45:56 -04:00
Jason Felds
95d73e9df1
...these other files were command line programs.
...
They are not needed here.
2015-09-13 13:30:41 -04:00
Jason Felds
66b371a6bb
Corrections to the jpeg compilation fix.
...
* Only compile one memory manager.
* Remove the no longer used jpeg.dll file.
2015-09-13 13:27:06 -04:00
Jason Felds
68b3620bac
Allow proper compiling of libjpeg for windows.
...
This expands on #777 to work with jconfig.h properly.
To facilitate these operations, a new macro was added for doing compile tests.
Note that this commit does NOT bring in the other files associated with this version of libjpeg.
At some point, it would be desirable to automatically get the files as part of the cmake configuration step, similar to ffmpeg.
2015-09-13 13:10:58 -04:00
Jason Felds
34ba6e37c4
Merge pull request #775 from wolfman2000/wolf-with-other-audio-off
...
Allow changing WAV and OGG settings for all OSes.
2015-09-12 12:12:05 -04:00
Jason Felds
91361e5d29
Allow changing WAV and OGG settings for all OSes.
...
As before, set WITH_WAV and WITH_OGG to off to limit your playing experience. Why this would be done is beyond me, but it's available.
2015-09-12 11:58:57 -04:00
Jason Felds
e103bf286f
Merge pull request #774 from wolfman2000/wolf-with-mp3-off
...
Improve and enhance WITH_MP3.
2015-09-12 11:36:49 -04:00
Jason Felds
b143f5afca
Improve and enhance WITH_MP3.
...
* All OSes can now take advantage of it.
* Mad is not linked if not utilized.
* Mac OS X side has a cleaner library list setup now.
2015-09-12 11:23:45 -04:00
Jason Felds
e7b3011058
Merge pull request #773 from wolfman2000/wolf-tomcrypt-portable
...
Switch portable tomcrypt to ON by default.
2015-09-11 17:03:28 -04:00
Kyzentun Keeslala
493751c6d2
Changed WheelBase::SetItemPosition to make it send the item index and num items args to the transform function.
2015-09-10 21:39:39 -06:00
Jason Felds
2448e67641
Switch portable tomcrypt to ON by default.
2015-09-09 20:47:46 -04:00
A.C
3d838a81a2
Merge remote-tracking branch 'origin/fix_hold/0609' into fix_hold/0609
...
Conflicts:
src/NoteDisplay.cpp
2015-09-10 01:23:53 +09:00
A.C
1d61989ccb
fix draw hold body inactive texture bug
...
If hold body, draw texture to the outside screen.
2015-09-10 01:17:54 +09:00
A.C
4d13ab304b
fix draw hold body inactive texture bug
...
If hold body, draw texture to the outside screen.
2015-09-10 00:06:19 +09:00
A.C
dfff5ae2da
Merge branch 'master' into fix_hold/0609
2015-09-09 22:53:47 +09:00
Jason Felds
0d5a3fdfc1
Merge pull request #769 from wolfman2000/wolf-locale-chaos
...
Attempt to fix compiling for Windows JP users.
2015-09-08 17:15:31 -04:00
Jason Felds
4149191b54
Attempt to fix compiling for Windows JP users.
2015-09-08 16:57:56 -04:00
Jason Felds
0b2a31491c
Merge pull request #768 from wolfman2000/prcuvu-libmad-windows-src
...
Allow libmad to be compiled in Windows.
2015-09-08 16:55:21 -04:00
Jason Felds
381870f9ea
Allow libmad to be compiled in Windows.
...
This removes the need for an externally built library, thus officially removing the deprecated Xbox projects.
Other minimal changes were made to ensure consistency. Comments will be made in the PR.
Thanks to @Prcuvu for the initial push.
2015-09-07 09:50:01 -04:00
Kyzentun Keeslala
e1eceda031
Moved AxisFix to GamePreferences so that the preference exists on all platforms and doesn't cause a crash on the Advanced Input Options screen on OS X. Preference does nothing on OS X for now.
2015-09-06 14:10:26 -06:00
Jason Felds
b3c8f28c9d
Merge pull request #765 from wolfman2000/wolf-cmake-feature-detection
...
Use proper cmake detection of features.
2015-09-06 09:08:13 -04:00
Jason Felds