Thai Pangsakulyanont
83c5b67647
[splittiming]
...
- #include "global.h" in SongPosition.cpp to make it build in MSVC.
- Add SongPosition.cpp to VC2008 project.
2011-05-12 23:34:57 +07:00
Thai Pangsakulyanont
1501924780
[default -> splittiming] merge
2011-05-12 23:28:55 +07:00
Thai Pangsakulyanont
469edbc73c
Merge
2011-05-12 23:25:54 +07:00
Thai Pangsakulyanont
b22bd332f5
Disable the use of precompiled headers for libpng.
2011-05-12 23:23:15 +07:00
Jason Felds
7c0ea4cc8a
Fake note fix by Jousway.
2011-05-12 12:21:17 -04:00
Jason Felds
24ddc948ed
Stops and Delays need length, not BPMs.
2011-05-12 11:18:21 -04:00
Thai Pangsakulyanont
a09e3d51c2
[splittiming]
...
- calculate m_fFirstBeat and m_fLastBeat correctly
- fix a crash caused by calculating by tidying the timing first.
- make editor go back to right place after playing (the editor should be fairly working now!)
2011-05-12 19:07:41 +07:00
Thai Pangsakulyanont
6847ef9087
[splittiming] Now that we have split timing, Compress/Expand in ScreenEdit no longer need to affect any other notes anymore.
2011-05-12 17:11:54 +07:00
Thai Pangsakulyanont
e9ba0103b6
[default -> splittiming] and another merge
2011-05-12 16:56:41 +07:00
Thai Pangsakulyanont
2507cf7c0a
[splittiming] merge
2011-05-12 16:56:15 +07:00
Thai Pangsakulyanont
eda727ddf9
[splittiming]
...
- load split timing from BMS files
- fix a crash because autogen'd steps don't inherit the timing from parent
- be more verbose in UpdateSongPosition
2011-05-12 16:44:24 +07:00
AJ Kelly
fbfbace87d
fix crash on start
2011-05-12 00:57:16 -05:00
Jason Felds
ae6dbaa9e2
Linux compiles again. Needs help linking.
2011-05-12 00:31:52 -04:00
Jason Felds
0e9de47cf6
Patch by codebrainz for linux assistance.
...
Linux users, you may want to make clean
&& sh ./autogen.sh && ./configure before
running make again.
2011-05-12 00:19:01 -04:00
Jason Felds
57aa17bb51
Slightly desparate, and don't want to lose this.
2011-05-11 22:48:19 -04:00
Jason Felds
4866c126b1
Curious commit here...windows test really.
2011-05-11 22:01:18 -04:00
Jason Felds
071616033b
Never commit code at restaurants again.
2011-05-11 21:05:56 -04:00
Jason Felds
0d57fff5e6
Get some paths adjusted properly.
2011-05-11 20:26:47 -04:00
Jason Felds
b1d501bf38
Fix linker warning by hand.
...
Library Search Paths weren't showing in Xcode for some reason.
2011-05-11 20:19:36 -04:00
Jason Felds
68b391481d
[splittiming] Rewritten to be more modular.
...
Guess I'll have some fun with this tonight.
2011-05-11 18:19:39 -04:00
Jonathan Payne
da8017f91e
coming close to a point where working on this will be a breeze IMO.
2011-05-11 14:34:02 -07:00
Jason Felds
04d45bca1c
[splittiming] Right, we store ints.
2011-05-11 17:13:22 -04:00
Jason Felds
7dd4869344
[default -> splittiming] DisplayBPM.
2011-05-11 17:09:55 -04:00
AJ Kelly
90469f0f25
.c_str()
2011-05-11 16:08:29 -05:00
Jason Felds
8de6ddb7e3
[default -> splittiming] Cleanliness.
2011-05-11 17:07:20 -04:00
Jason Felds
750b688de4
Consistent insensitive string comparisons.
...
This seems to reduce the need for a #define,
but I need someone on the Windows side to check.
2011-05-11 16:48:51 -04:00
Jason Felds
52f3bdf7a6
Remove duplicate metrics.
2011-05-11 16:07:35 -04:00
Jason Felds
da51e26d07
Standardize conversion processes.
...
Too many arguments for or against the many methods:
stick to one inside a common function.
This commit will force recompilation of many files.
2011-05-11 15:58:31 -04:00
Jason Felds
212a3b971f
Allow beat versus to take place.
...
Made sure to cover 5 and 7 styles.
2011-05-11 14:33:04 -04:00
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
Thai Pangsakulyanont