Commit Graph
100 Commits
Author SHA1 Message Date
Jason Felds 7dd4869344 [default -> splittiming] DisplayBPM. 2011-05-11 17:09:55 -04: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
Jason Felds 33172945ea [splittiming] Players, invalidate your caches! 2011-05-11 11:03:12 -04:00
Jason Felds 754ce93b09 Better ordering, don't have closed branch up top. 2011-05-10 21:17:25 -04: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
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
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
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
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
Jason Felds fab4cda5ff [splittiming] Comment cleanup. 2011-05-09 23:35:21 -04:00
Jason Felds 1ea093cd5f [splittiming] Cleanup, more prepwork. 2011-05-09 23:16:56 -04:00
Jason Felds 2ad3b729f1 [splittiming] Define far ahead version.
This will let other branches develop .ssc if needed
while this branch takes its time.
2011-05-09 22:49:47 -04:00
Jason Felds f629f06c34 [splittiming] Abstract functionality for later.
I don't want to repeat code for Steps.
2011-05-09 22:42:46 -04:00
Jason Felds 44ee6fc0de [splittiming] Simplify. 2011-05-09 21:19:40 -04:00
Jason Felds cd9fc83029 [splittiming] We can build now.
How effective the build is, though...that's the question.
Time to risk breaking more parts.
2011-05-09 21:17:24 -04:00
Jason Felds 9cb41af5f4 [splittiming] All but ScreenEdit. (67) 2011-05-09 21:11:33 -04:00
Jason Felds f7d1b46f72 [splittiming] Bringing it down. (91) 2011-05-09 21:03:30 -04:00
Jason Felds 71bf72e964 [splittiming] More error fixes. (153)
Nothing has been tied to the steps yet.
2011-05-09 20:48:23 -04:00
Jason Felds 4784e544a4 [default -> splittiming] Catch up is a pain. 2011-05-09 15:29:56 -04:00
Jason Felds aeb1f5e816 Holdover from older commit: didn't have to sub 1. 2011-05-09 14:44:19 -04:00
Jason Felds c4c9d0c997 Adjust the scoring formulas for prev commit. 2011-05-09 14:40:49 -04:00
Jason Felds 06a6e9991a Possible misnomer: Lifts aren't "taps".
I know, you can cycle to lifts as a tap type.

I think we need a better naming scheme here.
2011-05-09 14:39:13 -04:00
Jason Felds a1bf5d99f7 More doxygen catchup. 2011-05-09 14:23:05 -04:00
Jason Felds c5156ccaa7 Attempted Windows fixes for libpng.
I was NOT on Windows while doing this.
Any mistakes here, blame on me.
2011-05-08 17:35:36 -04:00
Jason Felds 008ac8a1cf Trying to get Linux consistent with libpng. 2011-05-08 17:24:31 -04:00
Jason Felds 1657ed4dee Add the other libpng stuff.
We can remove and strip each on a case by case basis.

MAC OS X builds now. Time to get the others.
2011-05-08 17:16:18 -04:00
Jason Felds 880e1bfbec Right, the Windows typo. 2011-05-08 17:00:39 -04:00
Jason Felds dd03c176b1 Start unifying png versions. 1.5.2 in this case. 2011-05-08 17:00:06 -04:00
Jason Felds 0601a5ce3b Funny how I can add metrics but not modify them. 2011-05-07 22:42:30 -04:00
Jason Felds a6500a0dc1 Don't clamp meter on write.
Here's yet another cache refresh for the trouble.
2011-05-07 19:34:53 -04:00
Jason Felds cba408f92b Include excludes for consistency. 2011-05-07 19:28:23 -04:00
Jason Felds b6eb2f0106 Minor fix. 2011-05-07 19:24:44 -04:00
Jason Felds 799bbc0a5c Make this use ScreenTextEntry.
The rest will be fixed once I find out why I'm having compilation issues.
2011-05-07 19:18:03 -04:00
Jason Felds ac9d938cb4 Right, never moved libtom* yet. 2011-05-07 14:37:06 -04:00
Jason Felds 33bd307041 [splittiming] another attempt, so branch reopened.
fork of 848de97
shadows 5ed5cb4
2011-05-07 13:42:01 -04:00
Jason Felds 724fb20ca0 I know, I'm behind on doxygen. 2011-05-05 14:20:35 -04:00
Jason Felds fddda1d11e [sm130futures -> default] The future is now. 2011-05-05 14:10:42 -04:00
Jason Felds 72518ee41a [sm130futures] Attempt consistency with net200*. 2011-05-05 14:02:51 -04:00
Jason Felds 8a1c3bd86e [sm130futures] Irrelevant change.
I just don't want a closed branch to show up
on Google Code by default.
2011-05-05 13:52:02 -04:00
Jason Felds 2491372019 [sm130attacks -> sm130futures] Bringing it in.
Help will be needed to make Song Attacks work by default.

Yes, that means I want no activated attacks to mean DQ.
2011-05-05 13:48:04 -04:00
Jason Felds 8f24b6c5b7 [sm130futures] Right...Mac wants vorbis. 2011-05-05 01:09:23 -04:00
Jason Felds e93e5d4181 [sm130futures] Move warning disabling to .vcproj.
Also, found where vorbis is used on Windows.
2011-05-05 00:32:00 -04:00
Jason Felds 77297daff4 [sm130futures] zlib covered. vorbis not used...? 2011-05-05 00:04:07 -04:00
Jason Felds 4e8d4e7392 [sm130futures] Move zlib and vorbis. 2011-05-04 23:56:33 -04:00
Jason Felds fddd26ce01 [sm130futures] Mac end got 403'ed on commit. 2011-05-04 23:52:25 -04:00
Jason Felds 6da88e19be [sm130futures] I thought I moved these already. 2011-05-04 23:51:00 -04:00
Jason Felds a90f0beba5 [sm130futures] argh... 2011-05-04 23:44:50 -04:00
Jason Felds f941519e87 [sm130futures] Move the crypto stuff over.
This right now isn't used by us, but just in case...
2011-05-04 23:42:14 -04:00
Jason Felds cf220cb921 [sm130futures] Minor Windows fix. 2011-05-04 23:40:30 -04:00
Jason Felds 48a558e357 [sm130futures] Forgot non windows exclusive code. 2011-05-04 23:28:48 -04:00
Jason Felds b89dcc548f [sm130futures] Good on Windows...and Mac too?
We'll see if I'm lucky here.
2011-05-04 23:22:51 -04:00
Jason Felds 94d6cd9eb3 [sm130futures] png and jpeg at once. 2011-05-04 23:16:39 -04:00
Jason Felds 336c7276da [sm130futures] mad at simple Xcode tricks. 2011-05-04 23:10:34 -04:00
Jason Felds 4dedf4f3d2 [sm130futures] Well, Windows was easy on mad. 2011-05-04 23:07:57 -04:00
Jason Felds 7d88d88aad [sm130futures] mad's turn. 2011-05-04 23:00:20 -04:00
Jason Felds 3c75dd3e82 [sm130futures] Incremental Link Files excluded. 2011-05-04 22:49:06 -04:00
Jason Felds a8848d18aa [sm130futures] Mac caught up with pcre. 2011-05-04 22:46:34 -04:00
Jason Felds c2cdf0c763 [sm130futures] Not as much to change with pcre. 2011-05-04 22:42:23 -04:00
Jason Felds 765b3a7975 [sm130futures] Moving pcre now. 2011-05-04 22:33:51 -04:00
Jason Felds 060547d0ac [sm130futures] json covered. 2011-05-04 22:30:04 -04:00
Jason Felds 5e872ece44 [sm130futures] Apply 4996 commit to all builds. 2011-05-04 22:18:18 -04:00
Jason Felds 7e39f24cc1 [sm130futures] Disable C4996 in the vcproj.
I think we can start removing the pragmas now.
2011-05-04 22:16:13 -04:00
Jason Felds d8f2e2ed20 [sm130futures] json good on Windows. 2011-05-04 22:11:55 -04:00
Jason Felds 83df0ad3d6 [sm130futures] jsoncpp -> extern
This won't build on Windows or Mac OS X yet.
2011-05-04 22:00:52 -04:00
Jason Felds b17536b649 [sm130futures] Windows builds fine w/Lua location.
Linux side needs to be updated...but still more to move.
2011-05-04 21:23:09 -04:00
Jason Felds 98896cc948 [sm130futures] Bring Helpers out of Rage.
...no, I don't know why they got in there.
2011-05-04 19:38:09 -04:00
Jason Felds 808f67e9f0 [sm130futures] Start moving externs to consistent location. 2011-05-04 17:56:36 -04:00
Jason Felds 4e8b475377 [sm130futures] Remove constructor hiding warning.
We had a struct called "Theme" that was throwing things off.
2011-05-04 17:24:03 -04:00
Jason Felds 1e6a4d4ef0 [sm130futures] Organize externs in the project file.
Due up: organize externs in the hard drive.
2011-05-04 17:19:06 -04:00
Jason Felds 9c1084b63e [default -> sm130futures] Bring in GLEW. 2011-05-04 17:08:57 -04:00
Jason Felds 1aef2c25d4 Manual attempts at updating old VS projects.
Again, I'll ask. Do we need to keep VS2003 support?
2011-05-04 17:05:32 -04:00
Jason Felds befef92624 Right, the recent GLEW fixes. Can't forget those. 2011-05-04 16:49:18 -04:00
Jason Felds 6ae77039c9 Consistent measure comments with internals.
For some time, we had the text file use // measure 1
when it was measure 0 internally.

As usual, revert if this is a bad idea. It's just bugging me.
2011-05-04 16:48:48 -04:00
Jason Felds ca68672e01 FILE, not DIRECTORY! 2011-05-03 22:31:08 -04:00
Jason Felds fa536fd24b Looks like I missed a few environments. 2011-05-03 22:23:16 -04:00
Jason Felds e281fd7183 lua had " put it here to see. 2011-05-03 22:20:37 -04:00
Jason Felds 4e22702026 Try different variable name, only one <Filter>.
We'll get this figured out...
2011-05-03 22:09:15 -04:00
Jason Felds d19de4ed1e shakesoda's suggestions for more glew stuff.
Again, revert if a terrible idea.
2011-05-03 21:59:59 -04:00
Jason Felds 0d911c535b My attempt at fixing VS2008 compilation.
Revert this if it proves to be broken beyond repair.
2011-05-03 21:53:51 -04:00
Jason Felds 279194713d [sm130futures] Scale the LabelSegments. 2011-05-03 12:58:08 -04:00
Jason Felds 630168d64b [sm130futures] Allow editing more Song Info in menus.
In this case, Beat 0 Offset, Music Sample Start,
and Music Sample Length can be edited via Edit Song Info.
2011-05-03 09:18:31 -04:00
Jason Felds 04c151b436 [sm130futures] Need to get used to calling this sm5. 2011-05-03 09:11:51 -04:00
Jason Felds 39d5e8f676 [sm130futures] Typo fix; force version update. 2011-05-02 22:36:20 -04:00
Jason Felds 70e944a959 [sm130futures] Deal with blank lines on write.
Yes, it's another cache restarter.
2011-05-02 22:15:14 -04:00
Jason Felds deadd99699 [sm130futures] Restore label jumping. 2011-05-02 21:54:20 -04:00
Jason Felds 89dafe6fe1 [sm130futures] Ensure tabs lined up right.
Shouldn't we use spaces instead?
2011-05-02 21:20:32 -04:00
Jason Felds 7df88b21f1 ...maybe I should have never introduced .hgeol. 2011-05-02 21:17:08 -04:00
Jason Felds e2c8ab809b Umm...had another empty merge here. 2011-05-02 21:16:27 -04:00