Commit Graph

106 Commits

Author SHA1 Message Date
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 489a9312fc Forced a merge. Should be good. 2013-04-18 22:58:30 -04:00
Devin J. Pohly 0ae7b0da85 TimingData: add allowEmpty parameter to TidyUpData. always false for now... 2013-01-23 14:38:57 -05:00
Devin J. Pohly 9fd6768f49 TimingData: fix constness on getters 2013-01-21 22:52:36 -05:00
Jason Felds 2031cbb366 Put in vyhd's patch for proper TD comparisons. 2012-04-08 14:26:28 -04:00
Jason Felds 40965d3c8d Restore F9/F10 for stops in the editor. 2011-11-26 13:33:21 -05:00
Mark Cannon f0880d6fd2 fix memory leak in TimingData, remove unnecessary structure copies in ScoreKeeperNormal 2011-09-18 19:07:39 +00:00
Mark Cannon 8099e25dcc stage 3 of TimingData changes: changed external interface, enforce encapsulation more strictly 2011-09-15 03:28:58 +00:00
Mark Cannon df9c4d8142 segment renovation stage 2: redefine TimingSegments as simple structs, standardize names and functions, use only rows for constructors (we'll limit allocation through TimingData::AddSegment in the near future) 2011-09-11 17:13:10 +00:00
Mark Cannon 0d4e43f9e3 stage 1 of TimingSegment cleanup: consolidate genericizable code in TimingData, use a proper variable name 2011-09-10 03:08:59 +00:00
AJ Kelly ad9cec03aa [TimingData] Add HasDelays() Lua binding; HasStops() now only checks stops. 2011-08-07 13:48:42 -05:00
Jason Felds 114a5de8ad Only write step timing/attack tags when needed. 2011-08-02 22:30:54 -04:00
Jason Felds e854b79b84 Trying to reduce tags for non split timing.
Need assistance to finish the task.

Please bump SSC version to 0.78 when completed.
2011-07-31 23:44:48 -04:00
Jason Felds 18ff542910 [timing] All but the Beat <-> Time functions.
Alright Thai...let's see if I can modify your work properly.
2011-07-27 23:32:37 -04:00
Jason Felds b6fe8a0de0 [timing] Notes* mostly covered. 2011-07-27 22:33:50 -04:00
Jason Felds bf5c3791cc This can be const: no members changed. 2011-07-26 14:13:10 -04:00
Jason Felds 480cda836e Allow for checking if the TimingData is empty.
AKA, no segments in use.

Again, this is mainly for the editor.

As for why a lowercase empty? Blame vectors.
2011-07-26 14:10:51 -04:00
Jason Felds 75b3a67e2a Add a function to copy TimingData over a range.
This is primarily for the editor. Still, it may
have other uses.
2011-07-26 13:41:41 -04:00
Jason Felds 48226f2027 No longer store #NOTES in cache.
Use the #STEPFILENAME tag to access the files
as appropriate.

To the betting pool fans: file cache version is 192.
2011-07-17 16:06:40 -04:00
Jason Felds 4e7c3282ec [timing] Caveat #2 fixed.
Caveat #1 won't be until we make Delays their own
segment...and somehow don't screw up the timing.
2011-07-15 00:14:13 -04:00
Jason Felds 01dacd9746 [timing] More abstraction.
This commit has 2 caveats.

1) Stops and Delays are treated the same in the editor right now.
2) TimingSegments.cpp: XToString should not require NUM_TimingSegmentTypes.

Ideas?
2011-07-14 23:54:06 -04:00
Jason Felds 6f5ab98dec [timing] More respect of pointers.
Again going to trust virtual functions to do the right thing.
2011-07-14 23:15:48 -04:00
Jason Felds 6255a84be4 [timing] More abstractions of common functions. 2011-07-14 21:51:09 -04:00
Jason Felds 2c85e902b4 [timing] Better be sure we clean up afterwards.
If this is going a bit too far, feel free
to leave a little bit more mess.
2011-07-14 19:29:52 -04:00
Jason Felds 199af25f31 Get inserts working via passing TimingSegments.
Unsure if this is the right way:
code review may be needed.
2011-07-14 19:01:12 -04:00
Jason Felds da291c2097 Temp branch [timing] for conversion process.
May need some help with Notes*Json.
2011-07-14 12:31:42 -04:00
Jason Felds 4f91b5ddbe Remove unused attribute. 2011-07-14 11:09:49 -04:00
Jason Felds 08d5f8f722 Add Miss Combo support in #COMBOS tag. 2011-07-09 02:28:15 -04:00
Jason Felds b115a875de Fix the other mMod corner case. 2011-07-03 13:57:22 -04:00
Jason Felds 1d5f9830a3 Get Next and Previous other segments.
...we need to find a way to template these if possible.
2011-06-26 22:24:22 -04:00
Jason Felds 8019654956 shakesoda was right. 2011-06-08 18:14:50 -04:00
Jason Felds 06efa5c726 Simple solutions are smart. 2011-06-08 15:33:40 -04:00
Jason Felds 5216d6be45 Simplify checks for unjudgable rows.
This way, we can add more segments later
and now have to change the logic in many places.
2011-06-08 13:03:07 -04:00
Jason Felds df6a00b53e Stops (and Delays) now templated.
This is all of them at this present time.

At some point in the future, we should make
DelaySegments separate from StopSegments.
2011-06-01 09:50:34 -04:00
Jason Felds 50e93045cc Scroll Segments Satisfied.
Just the Stops and Delays...in one segment.
Yeah, maybe those should be split up at some point.
2011-06-01 08:44:09 -04:00
Jason Felds f9eb6fb387 Speed Segments Satisfied. 2011-05-31 15:27:27 -04:00
Jason Felds b1eab10594 Time Signatures, the other big one. :D 2011-05-31 14:27:55 -04:00
Thai Pangsakulyanont 1d2dd19ab1 Yeah, BPM segments, big one :D 2011-05-31 23:41:39 +07:00
Jason Felds 714427f154 ComboSegments brought in.
Five to go I believe.
2011-05-31 11:45:25 -04:00
Jason Felds da73396895 Labels templated.
Six more to go.
2011-05-31 11:22:21 -04:00
Jason Felds 1fcf290571 Warps are properly templated.
Seven more to go I believe.
2011-05-31 10:59:18 -04:00
Jason Felds 8a315634dc Bring TickcountSegments to refactored level.
I wonder how many of the 8 will be claimed upon wakeup.
2011-05-31 01:20:22 -04:00
Jason Felds 1d3000e520 FakeSegments refactored.
Few things of note:

1) Slowly going away from hungarian notation.
2) Trying to respect public/private members.
2a) Yes, structs can work like this.
3) Trying to not require horizontal scrolling.

If anyone else wants a crack, go ahead:
we have 9 segments left. :)
2011-05-31 00:51:25 -04:00
Jason Felds 62365ee9e9 Get this code ready.
Future commits may be in big batches as segments
are brought in one at a time. This is going to take
until at least the next night.
2011-05-31 00:24:23 -04:00
Thai Pangsakulyanont d9f936190a [default -> scroll] merge 2011-05-25 22:56:26 +07:00
Thai Pangsakulyanont fe9573975c [scroll] 90% of scroll segments 2011-05-25 22:44:41 +07:00
Thai Pangsakulyanont 5cde717547 GetDisplayedSpeedPercent should be const 2011-05-24 12:27:03 +07:00
Thai Pangsakulyanont aa0eb7f5d7 GetSpeedMultiplier in ArrowEffects becomes TimingData::GetDisplayedSpeedPercent.
We might need to use it later in other parts (NoteField).
2011-05-24 11:43:08 +07:00
Jason Felds 966dc33e3f Can't forget theme stuff. 2011-05-23 20:28:01 -04:00
Jason Felds 004a01b306 doxygen fixes. 2011-05-23 20:27:31 -04:00