Commit Graph
100 Commits
Author SHA1 Message Date
Jason Felds 5e6a9628d0 DOcument the previous commits. 2013-01-07 00:50:30 -05:00
Jason Felds ada0c3cdd0 Restore storing to 6 decimals. 2013-01-06 21:15:36 -05:00
Jason Felds 7bc9295508 Expand to two decimals.
The reason is due to BPMSegments and their storing of BPS rather than BPM.
2013-01-06 21:12:28 -05:00
Jason Felds 15b99c5b41 Only display decimals as needed. 2013-01-06 21:11:51 -05:00
Jason Felds b62c1509e0 ints should be reset to 0, not NULL.
I know it's a macro, but this is just begging
to be abused somehow.
2013-01-04 11:01:00 -05:00
Jason Felds 9485149903 I'm counting this as fixed.
And I'm not putting myself first.

Alphabetical order wins this time.
2013-01-03 23:51:48 -05:00
Jason Felds 3c60d3ea02 Merge (with Mercurial resolve) 2013-01-03 23:02:11 -05:00
Jason Felds 350c31102a Merge 2013-01-03 23:01:49 -05:00
Jason Felds af07e028a1 Hopefully fix routine bug. 2013-01-03 22:59:03 -05:00
Jason Felds f8865e8de3 Revert "fix file/line numbers in ASSERT_M/FAIL_M"
This reverts commit 376056a0cf.

Time to test before sending up.
2012-12-27 21:38:42 -05:00
Jason Felds c8f8d6c459 Revert "war on -Werror, part 9: static inline > macros."
This reverts commit d080c38196.

...partly. Still have to adjust things.
2012-12-27 21:36:58 -05:00
Jason Felds a15cbc431d War on -Werror, part 14: More hodgepodge. 2012-12-27 12:45:04 -05:00
Jason Felds 52df8ea981 War on -Werror, part 13: hodgehodge. 2012-12-27 12:07:02 -05:00
Jason Felds 1fc16698ba War on -Werror, part 12: explicit bool usage.
It may save a few cycles, but it's best to be
explicit on boolean operations, especially with
ASSERT.
2012-12-27 11:38:53 -05:00
Jason Felds bddbed7e7e war on -Werror, part 11: const int -> float loss.
Had to work around the inline static const int rule
to do it, but at least there is no data loss now.
2012-12-27 11:13:41 -05:00
Jason Felds e86aeb66a8 war on -Werror, part 10: more informals. 2012-12-27 11:01:51 -05:00
Jason Felds d080c38196 war on -Werror, part 9: static inline > macros.
At least, according to the new wisdom of today.
2012-12-27 11:00:06 -05:00
Jason Felds e01537405f war on -Werror, part 8: more informals.
General guide: if the parameter name and its typings
match almost exactly, the name goes away.
Otherwise, it's commented out to allow for some
documentation.
2012-12-27 00:00:28 -05:00
Jason Felds 4f07a0ea8b war on -Werror, part 7: start informal params.
I'm preserving our numbering Pohly. ;)
2012-12-26 23:23:59 -05:00
Jason Felds 2ad71548b8 war on -Werror, part 5: win macro redefinition.
Replaces commit 70b8f34.
2012-12-26 22:44:08 -05:00
Jason Felds c634460edb Merge fun. 2012-10-16 21:06:32 -04:00
Jason Felds 32d5a011ee Don't allow setting the meter to < 1. 2012-10-16 21:05:27 -04:00
Jason Felds 6d35cdddd5 Remove the partial timing copy/paste hack job. 2012-10-02 20:54:55 -04:00
Jason Felds 59eac74dd2 Fix the editor with ScreenEditorOptions. 2012-10-02 20:51:52 -04:00
Jason Felds 4ef48a2bcf Restore...one file's line endings?
...trying to clean this up is harder than I thought.
2012-06-24 09:39:09 -04:00
Jason Felds 5102c1711a Controversial feature, and of last resort. Kill. 2012-06-19 09:47:39 -04:00
Jason Felds 0e120e2376 ...ah yes. Merges. My old friends. 2012-06-19 09:45:55 -04:00
Jason Felds 3c5e72e0dc Fix some Xcode warnings.
Also, need to test committing on Mac again.
2012-06-19 09:45:18 -04:00
Jason Felds 5282645a9a Texture Font Generator for VS2010.
I will look forward to when we don't need this.
2012-05-21 22:20:08 -04:00
Jason Felds de62676daf Now, will the merged stuff work? 2012-05-21 21:48:41 -04:00
Jason Felds 00f7991759 Temporarily disable the version checker properly.
Sorry Aldo, but I still want this to point
to the proper version of SM5. ;)
2012-05-21 21:47:19 -04:00
Jason Felds 524755fad8 Minor adjustments on the VS2010 file. 2012-05-21 21:45:08 -04:00
Jason Felds 9e1e7970ef [ScreenEdit] New menu to modify attacks.
Check the Area Menu (Enter Key) to have fun.
2012-05-21 21:42:06 -04:00
Jason Felds 55e1eff14c Quick way to get the number of attacks. 2012-05-21 21:10:10 -04:00
Jason Felds db3b93f79e hgeol attack during debugging. 2012-05-21 21:09:47 -04:00
Jason Felds c549fe26f0 Make it false for now.
When the server points to check for SM5 properly
and not another build, then we can look into it.
2012-05-21 18:33:27 -04:00
Jason Felds 3148121f1f Hack: stop lua error and crash on "fixing".
v can't be concatenated: it's a boolean.
Anyone more versed in lua want to take a look?
2012-05-21 18:28:15 -04:00
Jason Felds d624ae5010 I think false was intended here. 2012-05-21 08:59:57 -04:00
Jason Felds b71caa445c hgeol I bet. 2012-05-10 02:02:37 -04:00
Jason Felds a8eca9c49c The bigger issue, of course...
...is that InitScoringModes doesn't exist.

Comment out the block of code for now.
2012-05-10 02:02:16 -04:00
Jason Felds ae95752408 I'm guessing more HGEOL crap. 2012-05-04 21:58:21 -04:00
Jason Felds 1cbbf08c58 Reduce warnings on external projects. 2012-05-04 17:13:55 -04:00
Jason Felds f31372c7d6 Almost half a year late on copyright update?
Man, we've fallen behind here.
2012-05-04 16:30:52 -04:00
Jason Felds 54aff5282a No universal support for Xcode 4.3. 2012-05-04 16:28:34 -04:00
Jason Felds 9f2b9e4853 Minimum build we (try to) support is 10.5.0.
Best to not lie about it unintensionally.
2012-05-04 16:26:59 -04:00
Jason Felds 26f5e8d78c Replace Steps:UseSplitTiming.
Instead, use Song:IsStepsUsingDifferentTiming.
2012-04-08 23:56:28 -04:00
Jason Felds 2031cbb366 Put in vyhd's patch for proper TD comparisons. 2012-04-08 14:26:28 -04:00
Jason Felds ee8fd495a5 Due for a merge. 2012-04-08 13:47:56 -04:00
Jason Felds 392e7fac25 Programmers, start your debuggers! 2012-04-08 13:47:23 -04:00
Jason Felds 217cfa7350 Fix nonexistant techno-double8.
The game mode never existed people!

......you know what? Forget it. Enjoy playing
with 16 arrows that are hard to read.
2012-04-06 19:03:52 -04:00
Jason Felds 587a5961ed Some improvements on the techno side. 2012-04-06 17:32:40 -04:00
Jason Felds 226b79cbe1 Fix techno double 5.
I wonder if someone previously mixed up double 5
with double 8 here.

Even though there shouldn't need to be a double 8...
2012-04-06 16:45:04 -04:00
Jason Felds 759ee2c28b Add a rhythm based technomotion skin.
This is based off of Jousway's _Editor skin.

If anyone wants pad colors, it's up to you
to set those up.
2012-04-06 16:07:48 -04:00
Jason Felds a021f01b91 Add Techno Double 8...wait, what?!?
I don't recall Technomotion having this mode
for doubles play!

Did we borrow something from pyDance here?
2012-04-06 15:37:09 -04:00
Jason Felds 6782efb80f Fix setting some mods that always used drunk.
Thanks to TaroNuke for the assist.
2012-04-03 00:07:04 -04:00
Jason Felds 9b78490059 Fix minor warning, make it not take a whole line. 2012-03-31 13:49:22 -04:00
Jason Felds 73cc1bdaae [sm5a2futures -> default] Not that much changed...
Mainly minor stuff. Time this gets brought in.

The other multi chain branches...
unsure of their fate. May need to be redone again
since not everyone is happy with its progress.
2012-03-18 22:05:07 -04:00
Jason Felds 9258d923e3 Make this run in 2010.
Hmm...didn't I do this in the futures branch?
2012-03-18 15:52:07 -04:00
Jason Felds 354a345c4d Again, why the linux hate?
I know the functionality is busted, but still.
2012-03-12 15:12:55 -04:00
Jason Felds 56d1bd12fb Any reason this was excluded from the linux side?
It's on both Mac and Windows as far as I can tell.
Feel free to revert if there was a reason.
2012-03-12 15:01:05 -04:00
Jason Felds ea9aa92a4e Ignore VS2010 specific files. 2012-03-09 11:35:59 -05:00
Jason Felds 0c82c7e3d6 [default -> sm5a2futures] Due for this now. 2012-03-02 01:08:44 -05:00
Jason Felds 9970c117d7 [sm5a2futures] Add missing multimap const.
I don't think we're using this yet, but
it's best to be prepared just in case.
2012-02-29 00:11:51 -05:00
Jason Felds a384a7d8d0 [cleanNoteData] Silly typo. 2012-02-27 13:46:12 -05:00
Jason Felds 1b071cb057 [cleanNoteData] We don't change step types here. 2012-02-27 13:45:12 -05:00
Jason Felds d581f8b4c5 [cleanNoteData] Typo fix and simplification.
No need for the switch if we're only acting on
one value.
2012-02-27 13:42:15 -05:00
Jason Felds 078512913a [cleanNoteData] More of the formatting.
Note to self: move some of the static menus to
their own file or something.
2012-02-27 13:39:35 -05:00
Jason Felds 12bdc9e7b1 [cleanNoteData] Get consistent formatting.
This could be a candidate for transplanting.
2012-02-27 13:31:15 -05:00
Jason Felds 4042ff06c6 [sm5a2futures] Ignore these files.
Hmm...wonder if they were being put in the
wrong spot here. *shrugs*
2012-02-26 21:18:15 -05:00
Jason Felds a5ac3b0b2d [sm5a2futures] Guess this was a mistake.
Always ensure an internal scoring system is in
place to avoid these problems in the future.

Note: replace the internal scoring system at
some point to be simpler. Can't always rely
on the old style formulas in C++.
2012-02-25 12:15:47 -05:00
Jason Felds 244e06ae03 [sm5a2futures] Fix linker warnings at end.
This is probably not the best way to do it.

Anyone have a better plan?
2012-02-23 23:28:53 -05:00
Jason Felds bca4b19a27 [sm5a2futures] Fix linker warnings at end.
This is probably not the best way to do it.

Anyone have a better plan?
2012-02-23 23:28:53 -05:00
Jason Felds 08d3abbe44 New branch: [sm5a2futures]
Want to make sure we don't cause conflicts for future 1a builds.

This commit: change the sentinel for launching attacks immediately.

This way, songs with negative gaps can have attacks work here.

Thanks to Saturn for the assist.
2012-02-23 22:50:03 -05:00
Jason Felds d3e9cea312 [editorKeysounds -> default] Let's do this.
I expect there to be issues, bugs, etc.

I cannot find all of them. Let the people do that.
2012-02-12 14:53:14 -05:00
Jason Felds 0f3647d917 <skyward scream>HGEOL!!!!!</skyward scream> 2012-02-12 14:52:10 -05:00
Jason Felds 35b418af27 [editorKeysounds] Add the changelog message. 2012-02-12 14:51:34 -05:00
Jason Felds cdaaeeafd6 [editorKeysounds] This shouldn't crash I think.
This should also be in default.
2012-02-12 14:20:37 -05:00
Jason Felds 0a32b9c440 [editorKeysounds] Okay freem, .hgeol sucks.
Seriously, how'd I have to commit this here?!?
2012-02-12 14:19:33 -05:00
Jason Felds baae57d9d5 [editorKeysounds] No KSes in this mode, thanks. 2012-02-11 15:16:34 -05:00
Jason Felds 4151f20327 [editorKeysounds] Removing Keysounds successful. 2012-02-11 15:11:44 -05:00
Jason Felds 216286c3f1 [editorKeysounds] keep keysound names unique. 2012-02-11 14:52:41 -05:00
Jason Felds 0bf91fffd3 [editorKeysound] Add menu to remove keysounds.
Next up: the actual removing.
2012-02-11 14:45:09 -05:00
Jason Felds 1f68f7afe4 [editorKeysounds] minor comment. 2012-02-11 14:40:24 -05:00
Jason Felds fb7bc1edcb [editorKeysounds] Don't show AKs in gameplay.
We still need a better editor noteskin for
the auto keysounds though.
2012-02-11 02:07:57 -05:00
Jason Felds effa33eaec [editorKeysounds] autoKeys shouldn't be pressed. 2012-02-11 01:30:08 -05:00
Jason Felds 8deb166ab2 [editorKeysounds] Judgments are back.
Still could use someone to check it over though.
2012-02-11 01:27:13 -05:00
Jason Felds d7d56f525e [editorKeysounds] Right, doesn't hit here either. 2012-02-11 01:21:22 -05:00
Jason Felds b2f4365fe5 [editorKeysounds] Right, never hits here. 2012-02-11 01:10:11 -05:00
Jason Felds 22033113a5 [editorKeysounds] More attempts, need help.
Anyone want a stab?

Main issue: tap + autoKeysound means skipped judgment.
2012-02-10 23:16:00 -05:00
Jason Felds 2f6240d372 [editorKeysounds] autoKeysounds is auto now. 2012-02-10 21:30:48 -05:00
Jason Felds a353e659d0 [editorKeysounds] Can add KS, but...
1) A physical note is shown in the editor.
We do need a separate graphic for auto keysounds.
2) The keysound only plays if you "hit" the note.
Auto keysound notes should play regardless of hit or miss.

Time to make this branch public.
Anyone want to help tackle this?
2012-02-10 19:49:53 -05:00
Jason Felds e1af1eb2b6 [editorKeysounds] Stop an editor closing crash.
If you close the program while in the editor
in debug mode, it can occasionally cause
a bad access violation with the mutexes.

If someone really wants this back, go ahead and
put it back in.

...this really should have gone in default first.
2012-02-10 19:18:40 -05:00
Jason Felds f3d260bc88 [editorKeysounds] Modifying KS works. 2012-02-10 19:17:00 -05:00
Jason Felds 3b3e8df2f4 [editorKeysounds] Removing KS successful. 2012-02-10 19:07:13 -05:00
Jason Felds 84a20cf6da [editorKeysounds] Right, answers based on start. 2012-02-10 18:47:24 -05:00
Jason Felds baa9b20e6a [editorKeysounds] Prepare screen message. 2012-02-10 14:44:48 -05:00
Jason Felds 5757247144 [editorKeysounds] First menu is working. 2012-02-10 14:29:11 -05:00
Jason Felds 616f0742be [editorKeysounds] Allow pushing string vectors.
This will save me a headache for later.
2012-02-10 14:14:42 -05:00
Jason Felds a25fa01b34 [editorKeysounds] Some of the menu code. 2012-02-10 14:09:12 -05:00
Jason Felds 8a98bcdff7 [editorKeysounds] Prepare the eventual menu. 2012-02-10 13:51:29 -05:00