Jason Felds
7a5475b139
[default -> splittiming] Usual updates.
2011-05-11 12:09:29 -04:00
Thai Pangsakulyanont
a478308345
[splittiming] Fix crash. I don't know what caused it and how it was caused, but this fixed it.
2011-05-11 22:57:55 +07:00
Thai Pangsakulyanont
c625f19fee
[splittiming] marge
2011-05-11 22:09:12 +07:00
Thai Pangsakulyanont
a8f2d0094f
[splittiming] I accidently hardcoded PLAYER_1 in NoteField
2011-05-11 22:08:38 +07:00
Jason Felds
33172945ea
[splittiming] Players, invalidate your caches!
2011-05-11 11:03:12 -04:00
Thai Pangsakulyanont
378b438389
[splittiming] screenedit now behaves (just moving around, charting process not tested)
...
some work need to be done on snapping and transitioning between editing and playing.
2011-05-11 21:22:18 +07:00
Thai Pangsakulyanont
1bf99bd528
[splittiming] make screenedit work with the steps' timing.
2011-05-11 20:53:40 +07:00
AJ Kelly
d2b7c26209
small cleanup + comment
2011-05-11 02:24:04 -05:00
AJ Kelly
292c8ece49
[AnnouncerManager] Add support for "gameplay combo #" for announcer.
2011-05-11 02:12:34 -05:00
AJ Kelly
f31982985c
[GameSoundManager] Added PlayAnnouncer Lua binding.
2011-05-11 02:01:42 -05:00
AJ Kelly
88640657cc
tiny cleanup
2011-05-11 00:46:42 -05:00
Jason Felds
754ce93b09
Better ordering, don't have closed branch up top.
2011-05-10 21:17:25 -04:00
AJ Kelly
12daa21a0a
ping pong, will this work?
2011-05-10 19:57:58 -05:00
Jason Felds
c19ef49bd5
Json shadows are gone.
2011-05-10 20:51:21 -04:00
Jason Felds
9da3681595
Revert, force const casting.
...
Perhaps we should use these stricter casts more often.
2011-05-10 20:50:30 -04:00
Jason Felds
8862d799fd
Add Notes*Json.* for Mac side.
2011-05-10 20:50:05 -04:00
AJ Kelly
bde4574c1c
attempt a fix for mac compiling
2011-05-10 19:46:08 -05:00
AJ Kelly
f1546b4283
change to GetTapNoteRange and use MAX_NOTE_ROW
2011-05-10 19:43:30 -05:00
AJ Kelly
5e262bec0f
add NotesLoader/WriterJson to makefile.am
2011-05-10 19:03:30 -05:00
AJ Kelly
aa58884f8f
add NotesLoader/WriterJson
2011-05-10 18:59:09 -05:00
Jason Felds
a97fca8b1d
[default -> splittiming] Staying caught up.
2011-05-10 15:53:44 -04:00
Jason Felds
6183954590
[splittiming] More work needed on this one.
2011-05-10 15:47:16 -04:00
AJ Kelly
a6ea7bdf50
attempt to get rid of some madness
2011-05-10 14:46:20 -05:00
Jason Felds
fb8b387fb7
[splittiming] Compiles and links.
...
Not guaranteed to work. Adjustments to GameState
and SongPosition may still be needed.
2011-05-10 14:53:59 -04:00
Jason Felds
7fa6620423
[splittiming] m_Position needed. (50)
2011-05-10 14:45:52 -04:00
Thai Pangsakulyanont
2c87c34899
[splittiming] ArrowEffects, BPMDisplay, Inventory, MeterDisplay
2011-05-10 21:44:25 +07:00
AJ Kelly
ce392f003c
[BPMDisplay] Added SetFromCourse Lua binding.
2011-05-10 09:30:03 -05:00
Thai Pangsakulyanont
5209585cdc
[splittiming] merge (81)
2011-05-10 21:24:34 +07:00
AJ Kelly
a867b88640
add missing endless banner
2011-05-10 09:24:31 -05:00
Thai Pangsakulyanont
b8a4521f9c
Move the reset code to SongPosition.
2011-05-10 21:22:01 +07:00
Thai Pangsakulyanont
722d22dffc
[splittiming] temporary fix for ScreenEdit. It uses song position for now. (82)
...
So once it builds we have to test it extensively to see where it could be wrong.
2011-05-10 21:21:23 +07:00
AJ Kelly
8968ccfa45
add missing strings
2011-05-10 09:13:31 -05:00
AJ Kelly
0f9a035c91
fix script error
2011-05-10 09:11:44 -05:00
Jason Felds
cb52b2b1ed
[splittiming] Forgot to merge this.
2011-05-10 10:11:43 -04:00
Jason Felds
7ba084f18b
[default -> splittiming] freem's updates.
2011-05-10 10:07:13 -04:00
AJ Kelly
6b61e8e0bb
fix vs2008 compile
2011-05-10 09:04:44 -05:00
AJ Kelly
d136d19cef
fix compile; don't add features early in the morning
2011-05-10 08:55:50 -05:00
Thai Pangsakulyanont
ab8b76b3b8
[splittiming] NoteDisplay, NoteField, Player, PlayerState (182)
2011-05-10 20:27:12 +07:00
Thai Pangsakulyanont
38a4852180
[splittiming] Fix Player.cpp (198)
2011-05-10 20:18:17 +07:00
Thai Pangsakulyanont
8c8ba93006
[default -> splittiming] and another merge.
2011-05-10 20:05:33 +07:00
Thai Pangsakulyanont
990b6cb125
[splittiming] and a merge
2011-05-10 20:04:47 +07:00
Thai Pangsakulyanont
e1e605b736
[splittiming] move bogus variables back to GameState (210)
2011-05-10 20:03:51 +07:00
Jason Felds
d8068767bb
[splittiming] Thai, your file. Your credit.
2011-05-10 09:02:31 -04:00
Jason Felds
e7e5db58c8
[splittiming] We have breakage!
2011-05-10 08:58:51 -04:00
Jason Felds
5d4c63bf5a
[splittiming] The .edit files matter too.
...
Maybe we need a new extension for edits.
2011-05-10 08:58:24 -04:00
Thai Pangsakulyanont
241738c18b
[splittiming] Let's break things again! (222)
...
We introduced a new class, called "SongPosition", that replaces some instance variables in the GameState class. (GameState::m_Position).
Then, you also have it in PlayerState class which keeps track of the position based on their steps. (PlayerState::m_Position).
Fixing the build errors:
- GAMESTATE->m_fSomething should now be:
- GAMESTATE->m_Position.m_fSomething
- pPlayerState->m_Position.m_fSomething (or m_pPlayerState for some instance!)
2011-05-10 19:54:05 +07:00
Thai Pangsakulyanont
ce91d1a431
[splittiming] load split timing from ssc files
2011-05-10 17:44: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
Thai Pangsakulyanont
b634639e8e
Write timing tags for SSC files.
...
WARN: This does not work with ScreenEdit, yet!
2011-05-10 16:00:47 +07:00
AJ Kelly
4afa85c9f9
[Sprite] Added SetSecondsIntoAnimation(float) Lua binding.
2011-05-10 02:41:02 -05:00
Jason Felds