Commit Graph
33201 Commits
Author SHA1 Message Date
Jason Felds eb684af2bf Ignore diff and patch files that come in. 2013-05-25 12:15:31 -04:00
Devin J. Pohly 9fb376fdad Revert "hold fix: try again?"
This reverts commit 0ef9b81e02.
2013-05-22 13:47:36 -07:00
Devin J. Pohly 27940bc572 Bump cachever from -bpm fix, and fix some EOLs 2013-05-22 13:29:02 -07:00
Shenjoku 910eafbf9f Fixed some problems introduced in ba0d2d1 that were causing joystick inputs to be
incorrectly mapped when using DirectInput.
2013-05-21 23:48:49 -07:00
Devin J. Pohly d868c7a5d6 Hack to fix movie crasher
A movie larger than the max texture size would be rendered - at its original
size - onto a smaller texture, causing an access violation.  This just ignores
the max texture size for movies.

Two better solutions:
1. Resize the movie to the texture size.  Ideal, but slow in my experiments.
2. Don't load the movie texture at all in this case.  A possibility in the
   future, but will require some refactoring first.
2013-05-21 15:31:41 -07:00
Devin J. Pohly 135d9025bc Hopefully fix error with vector iterators.
That's what I get for pretending I know how to use C++.
2013-05-21 08:53:56 -07:00
Devin J. Pohly f3240cd0dc Update changelog with neg bpm change. 2013-05-20 22:22:01 -07:00
Devin J. Pohly f6c1bd8084 Fix timing loading in SSC files
ProcessBPMsAndStops was always making the timing nonempty, which confused
StepMania into thinking every chart had steps timing.  Now we only call this
function on SSC files (1) for song timing, and (2) if the steps have at least
one BPM specified.
2013-05-20 22:17:50 -07:00
Devin J. Pohly 6a57148833 Merge in negative-bpm fix 2013-05-20 19:13:30 -07:00
Devin J. Pohly f13af2c96f Fix conversion of negative BPMs and stops.
There are still issues with loading the changed files from cache for some
reason.  However, the initial conversion is now identical to OpenITG behavior
except in some very strange edge cases.
2013-05-20 19:12:40 -07:00
Jason Felds 9c61d060f0 Fix compile, put in the right spot. Thanks Henke. 2013-05-20 18:12:36 -04:00
Jason Felds c6ec5a4390 Forced to invalidate the cache due to the commits.
Cue the hate!
2013-05-20 18:07:28 -04:00
Jason Felds eaf79353f9 Adjust Dancing Monkey modified files.
Sometimes it sucks watching over others' bugs.
2013-05-20 18:06:25 -04:00
Jason Felds d2ea94648e Ensure a decent sample length.
Apparently some versions of DWI messed this up.

Thank (or blame) confuzled if this fails.
2013-05-20 17:47:58 -04:00
Devin J. Pohly ed9fbd2c31 Filter out zero BPMs and zero-length stops in first pass
It turns out to be much cleaner to do this here than to do it later.
2013-05-19 21:42:54 -07:00
Devin J. Pohly dcb62dec88 Sort BPMs and stops before processing 2013-05-19 19:50:56 -04:00
Devin J. Pohly c04553846a "Combine" processing for BPMs and stops.
Prep for replacing with new negative-converting algorithm.
2013-05-17 16:43:53 -04:00
Devin J. Pohly 785cff2abc Remove unneeded return value from ProcessBPMs 2013-05-17 05:43:25 -04:00
Devin J. Pohly b1d2f68737 Finish moving ProcessBPMs and ProcessStops together 2013-05-17 05:34:14 -04:00
Devin J. Pohly 7df86bbf85 Update SMA loader to put bpms/stops together 2013-05-17 02:30:08 -04:00
Flameshadowxeroshin 0ef9b81e02 hold fix: try again? 2013-05-16 21:07:00 -05:00
Devin J. Pohly 3f94afafdd Revert "test: try to fix "phantom holds" when JudgeHoldNotesOnSameTogether is enabled"
This reverts commit 6999f94d38.

This was causing a crash when warping past holds at the end of a chart.
2013-05-16 21:21:40 -04:00
Devin J. Pohly 6fadd3a727 Start moving ProcessBPMs and ProcessStops next to each other 2013-05-15 19:57:57 -04:00
Flameshadowxeroshin 6999f94d38 test: try to fix "phantom holds" when JudgeHoldNotesOnSameTogether is enabled 2013-05-14 22:54:20 -05:00
Devin J. Pohly 8eb76829fb Don't allow edits with no valid #NOTES 2013-05-09 17:45:25 -04:00
Devin J. Pohly adb0d5d4a1 Separate functions for BPM/stop parsing and processing 2013-05-09 00:00:14 -04:00
Devin J. Pohly 536768c91b Split parsing from processing for BPMs/stops 2013-05-08 23:46:54 -04:00
Devin J. Pohly e16104058b fix some neg-bpm -> warp problems 2013-05-02 20:55:05 -04:00
Flameshadowxeroshin 78d5be779f Add metric [Gameplay] UseInternalScoring.
Turn it off to prevent the game from touching custom scoring stuff. It is by default on.
2013-05-01 22:11:27 -05:00
Devin J. Pohly 7e8c75a71b remove check for ancient llabs() bug 2013-04-29 20:24:07 -04:00
Jason Felds 15eaad8c86 Don't include the internal header.
Use a standard header to include instead.
2013-04-29 19:17:30 -04:00
Shenjoku 1d1f37380e Make sure StreamDisplay children are deleted 2013-04-29 16:38:37 -04:00
Shenjoku 91b1892d09 Fix leak in MenuTimer 2013-04-29 16:33:32 -04:00
Shenjoku 569ca0f984 fix leak in LifeMeterTime 2013-04-29 16:30:54 -04:00
Shenjoku aac47c9777 Fix potential leak in Font 2013-04-29 16:29:55 -04:00
Devin J. Pohly feb919f0bf Revert memory leak commits
5f7001e: "Added a new branch"
01456ed: "Fixed a lot of memory leaks"
dac4493: "Fixed all remaining memory leaks that I could figure out"
0792db7: "Removed the smnew macro and the call to _CrtSetDbgFlag()"

Some of these caused destructor-time problems due to static initialization
order fiasco and related issues.  Notably, the program would no longer exit on
OSX and had to be killed.

There were probably legitimate fixes in here, but since these are monolithic
commits it's too much work to extract them now.  Let's reapply them
individually and in the forward direction.
2013-04-27 00:05:14 -04:00
Jason Felds ef9c5294a0 Simple merge for once. 2013-04-23 21:21:25 -04:00
Jason Felds 6761a3f33a I was wondering when this commit would happen. 2013-04-23 21:21:13 -04:00
Shenjoku b59d3e9a8f Fixed the non-const definition of the TimingData::GetSegmentAtRow() function,
which was missing the class specifier and casting the data wrong.
2013-04-22 22:20:40 -07:00
Jason Felds 0c4fe367cc Fix duplication symbol issue on Mac.
This may have affected Linux as well.
2013-04-21 09:31:45 -04:00
Jason Felds c7b8664604 Consider this transplanted.
Plus, default should be the left-most branch in graphical viewing.
2013-04-21 00:09:35 -04:00
Jason Felds b3ecde1eb9 Disable committing any sdf based files. 2013-04-20 23:48:48 -04:00
Shenjoku fea35b5486 Merge with memoryLeakDetection branch. 2013-04-19 20:36:59 -07:00
Shenjoku 0792db752a Removed the smnew macro and the call to _CrtSetDbgFlag() to get ready for
merging with the main branch.
2013-04-19 20:34:11 -07:00
Jason Felds 20d94d4b7e Cat is back in the bag. Revert commits.
A-mods need to be tested more.

...and this is what happens when you forget to
stash changes before a merge. Lesson learned.
2013-04-19 21:49:55 -04:00
Jason Felds 459ffe027f Somehow the other options didn't get set. 2013-04-19 21:30:28 -04:00
Shenjoku dac4493fe5 Fixed all remaining memory leaks that I could figure out except for a 4 byte
leak that isn't being caught by the smnew macro for some reason. It might be in
one of the third party libraries or something, I'm not sure.
2013-04-18 22:27:24 -07:00
Shenjoku 01456ed0b9 Fixed a lot of memory leaks caused by static globals never getting
deleted and some other objects not getting deleted properly due to missing
destructors.
2013-04-18 21:17:57 -07:00
Jason Felds 3b7d5716a7 ...well, cat's out of the bag. a-mod tryout. 2013-04-18 23:05:23 -04:00
Jason Felds 489a9312fc Forced a merge. Should be good. 2013-04-18 22:58:30 -04:00