Commit Graph

64 Commits

Author SHA1 Message Date
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 51229ad086 limit searching to 16 beats 2011-05-24 12:44:48 +07:00
Thai Pangsakulyanont 631bc3753d Revert "An attempt to make the arrows flash with the steps' timing. If it works then we can expand it to..... I don't know, lifebars?"
This reverts commit ab178b1e65.
2011-05-24 10:41:07 +07:00
Thai Pangsakulyanont 1d88598eaf Revert "finally got it to work with a another hack inside that hack."
This reverts commit 73459aae38.
2011-05-24 10:40:04 +07:00
Thai Pangsakulyanont bc35a75672 merge 2011-05-20 22:15:27 +07:00
Thai Pangsakulyanont 73459aae38 finally got it to work with a another hack inside that hack. 2011-05-20 22:15:01 +07:00
Jason Felds b074acc0cb Song timing can have warps again: show them. 2011-05-20 10:52:11 -04:00
Thai Pangsakulyanont ab178b1e65 An attempt to make the arrows flash with the steps' timing. If it works then we can expand it to..... I don't know, lifebars? 2011-05-20 21:33:42 +07:00
Jason Felds 1a41c32dd9 [splittiming] Better variable name.
ArrowEffects had a minor change, but the intent isn't up yet.
It needs to be so that when you go from the editor to the chart
for playing in Song Timing, it doesn't use the Step Timing.
2011-05-17 00:07:43 -04:00
Jason Felds 5206fa2c8c [splittiming] Show fake segments in editor. 2011-05-16 12:02:17 -04:00
Jason Felds c0e53205ea [splittiming] Don't show warps on Song Timing. 2011-05-16 11:54:58 -04:00
Thai Pangsakulyanont c11c8db883 [splittiming] it builds! time to merge. 2011-05-16 22:06:07 +07:00
Jason Felds e2766cf644 [splittiming] SpeedSegments run on Seconds now.
ScreenEdit's code probably needs to be redone.
At least, someone find a way to remove "Beats"
or "Seconds" from the text entry area.
2011-05-15 23:48:03 -04:00
Jason Felds 59febf0c27 [splittiming] Adjusted too much there. 2011-05-15 16:13:56 -04:00
Jason Felds cdd43f77f4 [splittiming] Display Speeds in Step Timing. 2011-05-15 15:37:46 -04:00
Thai Pangsakulyanont 1c4b21b181 [splittiming] ok, now it displays properly. 2011-05-13 15:19:42 +07:00
Thai Pangsakulyanont 2116525e24 [splittiming] display song timing in song timing editing mode (buggy) 2011-05-13 14:14:57 +07:00
Jason Felds 3a348123ca [splittiming] Draw certain text based on switch.
Note: the diff for this hates the indentation.
2011-05-12 22:34:16 -04:00
Jason Felds f9da743e59 [splittiming] Fix editor bug on create & no save.
Hmm...is this bug also in default?
2011-05-12 20:50:38 -04:00
Thai Pangsakulyanont a8f2d0094f [splittiming] I accidently hardcoded PLAYER_1 in NoteField 2011-05-11 22:08:38 +07:00
Thai Pangsakulyanont b8a4521f9c Move the reset code to SongPosition. 2011-05-10 21:22:01 +07:00
Thai Pangsakulyanont ab8b76b3b8 [splittiming] NoteDisplay, NoteField, Player, PlayerState (182) 2011-05-10 20:27:12 +07:00
Thai Pangsakulyanont d0e9e58030 [splittiming] make ScreenEdit edit the Steps's timing data only.
NOTES: now, newly created songs will have the default timing data (60bpm throughout the song) and
NoteFields currently doesn't work yet.
2011-05-10 16:55:00 +07:00
Jason Felds 44ee6fc0de [splittiming] Simplify. 2011-05-09 21:19:40 -04:00
Jason Felds f7d1b46f72 [splittiming] Bringing it down. (91) 2011-05-09 21:03:30 -04:00
Jason Felds 6b6b8ca3f8 [default -> sm130futures] Up to date again. 2011-04-05 19:49:03 -04:00
Jason Felds f80940a34e [sm130futures] Use the macro or lose it. 2011-04-05 19:47:07 -04:00
Jason Felds 047cec8182 We have macros: use them. 2011-04-05 19:40:25 -04:00
Jason Felds 9e6ea7b3a6 [sm130labels] Force starting label, display all.
Now to fix the keyboard command...
2011-04-05 01:04:19 -04:00
Jason Felds a6b5187856 [sm130labels] Code ready for testing.
If a mistake was made here,
let the cherry picking/blame game commence!
2011-04-05 00:35:45 -04:00
Jason Felds 9af2e96204 [warps] Already added. 2011-03-25 21:14:24 -04:00
Jason Felds db429e11cc [warps] View the list.
1) Add functions similar to the other Segments.
2) Use a better named member variable.
3) TimingData cleanup.
2011-03-25 00:54:33 -04:00
Jason Felds 621dfa050e [warps] Prepare text code. 2011-03-24 20:41:35 -04:00
Jason Felds a085d0d1da Line endings...be normalized! 2011-03-17 01:47:30 -04:00
Jason Felds d739e9a422 The nonbelievers have been purged. 2011-03-14 04:11:04 -04:00
Jason Felds e9df4832f6 Bring shadowed variables back from the dark side.
Alright Colby, happy now?
2011-03-14 02:54:11 -04:00
Jason Felds 6204de38a7 Combos branch: allow editing combo factor.
Need to check something on the default branch
before this gets pushed there: something may still
be off.
2011-03-05 01:44:58 -05:00
AJ Kelly 387bb95745 cleanup, comment 2011-03-02 14:42:27 -06:00
Jason Felds cb60f3d36e Adjust alignment based on the label's side. 2011-01-18 13:33:06 -05:00
Jason Felds 91789e4b1c Flexible horizontal TimingData labels. 2011-01-18 13:23:52 -05:00
Jason Felds 03d30faba0 Allow placing the labels on either side. 2011-01-18 13:17:32 -05:00
Jason Felds ebcea92292 Add metrics for Timing Data colors.
Note: this changes the TimeSignatureColor to be different
from the StopColor. Please do not be alarmed.
2011-01-18 13:02:30 -05:00
Jason Felds 6107d7275d Display the Tickcounts in the editor. 2011-01-18 12:29:01 -05:00
Jason Felds 4e4d91aba7 Take care of one of AJ's TODOs. 2011-01-15 15:00:13 -05:00
Flameshadowxeroshin e7330f1f66 make it work 2010-10-09 16:49:46 -05:00
Flameshadowxeroshin 9e97e9b4dc Remove a non-working "fix" for now. 2010-10-09 16:45:05 -05:00
Jason Felds 3df42d2a8e Add requested comments. 2010-10-08 20:21:44 -04:00
Jason Felds aebf234888 Temp fix for overlapping arrows.
I think roll heads are now borked with this.
Feel free to revert if this causes more problems.
2010-10-08 20:15:41 -04:00
Alberto Ramos 4aa25b6ad7 I don't feel like testing this... 2010-09-13 00:06:34 -06:00