Commit Graph
4347 Commits
Author SHA1 Message Date
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
Kyzentun dca80f91ae Merge pull request #846 from dguzek/MaxRegenComboAfterMiss
reinstate MaxRegenComboAfterMiss Preference
2015-10-07 15:44:59 -06:00
Kyzentun ba8d31bfbd Merge pull request #847 from dguzek/AttacksArentHandicaps
fix logic for attacks in gameplay disqualifying
2015-10-07 15:44:50 -06:00
Kyzentun Keeslala 772096151f Made ActorFrame:SetDrawByZPosition return self to lua so function chaining works with it. 2015-10-07 15:44:23 -06:00
Dan Guzek edb1273723 fix logic for attacks in gameplay disqualifying
When disqualification was turned on via Preferences, the old logic exhibited two problems:

1. charts with attacks were always disqualified from ranking
2. charts without attacks could be disqualified from ranking if the attack modifier was set to "Off"

So, this commit fixes those problems.  If a chart has attacks, and the attack modifier is used to turn them "Off", then disqualification is enforced.

Additionally, disqualification is enforced if the attack modifier is set to "Random Attacks."  This part might not be necessary, but I acted on the assumption that random attacks could theoretically make a chart easier.
2015-10-07 03:48:57 -04:00
Dan Guzek 3716468923 reinstate MaxRegenComboAfterMiss Preference
This preference existed in previous versions of StepMania (3.95, at least) and is needed to properly emulate certain games (namely, In The Groove).

This PR brings back the code as seen here: https://github.com/sigatrev/Stepmania-3.95/blob/4af304c51aeeedacd07f612d7f0e5ecaa81cce19/LifeMeterBar.cpp#L228-L233

Unlike in SM3.95, however, I've now set the default value to be 5, the same as the RegenComboAfterMiss.  If players don't change the value, they won't see any difference in behavior in SM5.

If players want, they can manually set the preference to 10 (or a value of their choosing) to emulate the game of their choice.
2015-10-07 02:53:03 -04:00
Jason Felds f441d3a6f7 Fix Mac OS X build. 2015-10-06 20:18:01 -04:00
Prcuvu 22637a0d8b Remove deprecated DLLs from CMake installation. 2015-10-06 19:32:03 +08:00
Prcuvu de5f3721ef Cleaning up deprecated binaries and VS projects. 2015-10-06 19:23:48 +08:00
Kyzentun 42b3a88516 Revert "Rewrote Sprite::ScaleToClipped and CropTo to actually work." 2015-10-06 00:53:22 -06: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
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 fdac0835b8 Use ffmpeg 2.1.3 on Windows.
Once again, thanks to Zeranoe's builds.
2015-10-04 14:39:07 -04: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
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 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 ba96ab7570 Separate out the remaining files. 2015-10-02 23:14:24 -04: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
Kyzentun Keeslala 751caba360 Why did I use >= originally? That makes no sense. 2015-10-02 03:09:05 -06: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 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 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
Kyzentun Keeslala a10c0c4f01 Added set_use_effect_clock_for_texcoords to Sprite. Updated changelog. 2015-09-21 20:42:56 -06:00
Jason Felds 0382929bd4 Build vorbis & vorbisfile in Windows now. 2015-09-20 13:13:47 -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 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 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 b85c61b89e Restore mapconv post operations.
Clearing the cmake cache may be required.
2015-09-19 10:42:46 -04: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 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 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 4feddab08e Allow VS2015 to compile StepMania. 2015-09-14 22:45:56 -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 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 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
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
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
Jason Felds 4149191b54 Attempt to fix compiling for Windows JP users. 2015-09-08 16:57:56 -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 ae83a1c6ec Fixes for Linux. 2015-09-05 13:14:44 -04:00
Jason Felds e093d204c8 Use proper cmake detection of features.
This attempts to organize all needed items and places appropriate defines
in a single location. Redundant comparisons/defines were removed when noticed.

A few caveats, however:

* This may be better targeted towards the 5_1_0 branch instead of master right now.
* Cmake will run a little slower on configuration/generation now. That's due to the sanity checks it runs.
* There are some more checks to be added later, but this should be a solid start.

Thanks to the [libical](https://github.com/libical/libical) project for inspiration.
2015-09-05 10:51:17 -04:00