Commit Graph
35122 Commits
Author SHA1 Message Date
Jason Felds 16c6e9aec3 Fix loading WORST courses. 2015-10-17 20:14:55 -04:00
Kyzentun abfff53c2b Merge pull request #875 from zardoru/bms-stuff
Make sure kb7 is the appropiate steps type.
2015-10-16 00:27:52 -06:00
zardoru d63881802a Make sure kb7 is the appropiate steps type. 2015-10-15 21:06:23 -03: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
Kyzentun Keeslala c9e7ad8b76 Fixed bug in ActorMultiVertex::DrawPrimitives that converted RageColor channels to uint8 when applying the diffuse to verts, which made any channel not 1 into 0. 2015-10-12 02:18:15 -06:00
Kyzentun Keeslala 337297f4b6 Changed blank music file check in Song::LoadFromSongDir to allow a blank music file if the song uses keysounds. The intent is to prevent bms files from triggering the condition, so they don't have to hit the song folder every time during loading. 2015-10-11 13:54:13 -06:00
Kyzentun Keeslala 66edc2d233 Changed Edit Mode to not add the global offset to the Current Second field. Updated changelog. 2015-10-10 01:06:32 -06:00
Kyzentun Keeslala 7a26044934 Changed DirectInput mouse input to use an if statement instead of a while loop to avoid input lockup. 2015-10-09 23:54:35 -06: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
Prcuvu d98a25797e Fix GCC warnings on Linux. 2015-10-08 12:51:28 +08: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
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
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
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
Prcuvu 05ae23d1c4 Read DirectX SDK path from environment variable. 2015-10-06 15:49:25 +08:00
Kyzentun 8df4931ea3 Merge pull request #838 from stepmania/revert-203-FixScaleToClipped
Revert "Rewrote Sprite::ScaleToClipped and CropTo to actually work."
2015-10-06 00:54:40 -06:00
Kyzentun 42b3a88516 Revert "Rewrote Sprite::ScaleToClipped and CropTo to actually work." 2015-10-06 00:53:22 -06: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
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