Colby Klein
5cf68a2f76
[opengl] Remove all references to RageDisplay_OGL (changed to _Legacy). Start removing old D3D stuff.
2011-03-13 23:36:20 -07:00
Colby Klein
7ace19776d
merge again.
2011-03-13 23:22:22 -07:00
Colby Klein
066695a5a7
sync branch with 1.2.3
2011-03-13 23:18:08 -07:00
Jason Felds
650653b4d2
Multiple warning fixes dealing with casts.
...
Yes, I am using static_casts. Generally safer.
2011-03-14 02:09:58 -04:00
Jason Felds
1dfb1c6143
Answer AJ's question. (comment update)
2011-03-14 01:34:10 -04:00
Jason Felds
4d074f3b81
Fix g++ warnings.
2011-03-14 01:21:30 -04:00
Jason Felds
d4972e1c86
Update sm124futures with defaults 1.2.3.
2011-03-13 23:55:13 -04:00
AJ Kelly
66333aa6c0
sm-ssc v1.2.3
2011-03-13 22:50:43 -05:00
Colby Klein
aef8661bb6
[opengl] Remove D3D, rename RageDisplay_OGL to RageDisplay_Legacy
2011-03-13 20:00:32 -07:00
Jason Felds
247782b726
sm124futures: simplify attempt.
...
Caveat: recording mode is back to basics:
taps and holds. If demand is high, this can
be restored.
2011-03-13 22:45:19 -04:00
AJ Kelly
ed72f533bd
things still work with these commented out, but the libs still need to be there...
2011-03-13 21:33:01 -05:00
AJ Kelly
56f96a50d8
I guess it fixed whitespace
2011-03-13 21:32:11 -05:00
Jason Felds
f951a87068
sm124futures: Working tap note cycling.
...
The code in NoteTypes could use a review:
perhaps the Type definition should be taken out of
the struct to try to make it more consistent?
2011-03-13 22:24:43 -04:00
AJ Kelly
de77a3ac1f
fix grade sorts too
2011-03-13 20:33:42 -05:00
AJ Kelly
919279938e
Revert "Previously, we didn't create MusicWheel sorts when the screen loads"
...
This reverts commit 0dc297ba76508bb7244ed70f9f72761087e1f177.
It didn't work out so well.
2011-03-13 20:23:07 -05:00
AJ Kelly
e89ddce064
small cleanup
2011-03-13 20:21:44 -05:00
Jason Felds
ca1bd8345d
sm124futures: Add TapNoteType to string function.
...
This will be needed for the Editor.
2011-03-13 20:52:03 -04:00
Jason Felds
e988bba855
sm124futures: Enhanced editor stuff in progress.
...
Cycle between the different types of Tap Notes.
Hold/Roll heads do not count on this.
Obviously still being worked on, but the code
compiles at this point.
2011-03-13 20:03:54 -04:00
Jason Felds
cec55f1aed
sm124futures: doxygen for the next version.
2011-03-13 19:47:39 -04:00
Jason Felds
c435129078
sm124futures: Allow choosing which field to use.
...
Either the #DESCRIPTION or #CREDIT tag can be used for SM files.
By default, the old behavior is still used.
2011-03-13 19:35:57 -04:00
Jason Felds
e14cb3ce6e
new branch: sm124futures. So far:
...
Have both description and author credit be filled in
from a .sm file.
2011-03-13 19:25:55 -04:00
Jason Felds
b4c9106bf8
doxygen confusing autogen code.
...
TODO: Look into a more intelligent mapping based
on the individual styles...if possible.
2011-03-13 13:46:51 -04:00
AJ Kelly
ff5cef88f0
whoops again!
2011-03-13 12:32:35 -05:00
AJ Kelly
983c2cd56f
whoops, forgot a line.
2011-03-13 12:30:47 -05:00
AJ Kelly
b0398a3b4f
sm5svn 2527d15
2011-03-13 12:30:22 -05:00
AJ Kelly
5d61b73157
whoops.
2011-03-13 00:18:51 -06:00
AJ Kelly
48856adc15
remove redundant line for EDIT_BUTTON_SCROLL_SELECT
2011-03-13 00:17:36 -06:00
Jason Felds
619481be4c
Add doxygen comment.
...
TODO (maybe): make this a metric?
2011-03-09 21:06:53 -05:00
AJ Kelly
e890bd446c
fix bugs, for real this time
2011-03-09 19:12:15 -06:00
AJ Kelly
7e99570ddb
fix a bug
2011-03-09 17:34:49 -06:00
AJ Kelly
319efa9060
o
...
o _____,
.iiiii>`
() .=ii||i+` .,
=iii|ii|; =_
_-~~~~~~~` -|i
o .__=iiii|i|i|i||=_______ ii|
._iiiiiiiii||i|i|i|iiiililiiiii|=_ i|i|;
o .=iiii|||i|i|i|i|i|i|i||i|i|i|i|i|iiii__ i|i|;
_iii|i|iii|i|i|i|i|i|i|ii|i|i|i|i|i|i||ii=, i|i|i;
_ac, ~~ii|i|i|||i|i|i|i|i|i|i|i|i|i|i|i|i|i|i|iii=_. .i|i|i;
]P\awQQma/+i|i|ii|i|i|i|i|i|i|i|i|i|i|i|i|i|i|i||iii= =|i|i|;
?4QQQQQQWW6/i|i|i|i|i|i|i|i|i|i|i|i|i|i|i|i|i|i|i||i|_ .=i|i|i;
')4P?QQQQQQQ_"i|i|i|i|i|i|i|i|i|i|i|i|i|i|i|i|i|iii|ii__._=li|i|i;
() QQQQQQQQ i|i|i|i|i|i|i+~_ ~i|i|i|i|i|i|i|i|i||i||iiiiii|i|i;
, QQQQQQQH i|i|i|i|i|i+==ii| <|i|i|i|i|i|i|i|i|i|ii|i|i|i|i|i`
)46ajQQQQQQ@ i|i|i|i|i|i:=ii|i|| :i|i|i|i|i|i|i|i|i|i|i|i|i|i|i|
-` )??QQ@P\=ii|i_,-~<|i|iii|i|i| =|i|i|i|i|i|i|i|i|i|i|i|i|i|i|i;
-~___=|i||i|+||=/||i+i|i|i| :i|i|i|i|i|i|i|i|i|ii|i|i|i|i|i|;
_, -<|||i|=/+|i|~ =ii|i|i|i|i|ii|ii|i|i|i|i|i|i|i|=,
]f]ggS .. _____,-=ii|ii|==~~ _ii|i|i|i|i|i|i|i|i|i|i~~~+|i|i|ii;
]f]QQS __=l|iiiii=,:|i|i|iiii__ii|i|i|i|i+~~~i|i|i|i| :i|i|i|;
]f]QQS iii>~_i|i|i=,:i|i|i|i|iii|i|i|i|i|i|i|_______, =|i|i|;
]f]QQS .=ii|i|ii==ii|i|i|i|i|i|i|i|_~i|i|iiiiiiii> -|i|i;
)']QQX iiiii|i|>+|iii|i|i|i|i|i|i|ii|ii=/+i|i|i|>` i|i|;
]QQX -~<||i|~:i|i|i|i|i|i|i|i|i|i|i|ii|=/||i~` i|i|`
)?" i|i|i|i|i|i|i|i|i|i|i|i||i+` ~ i|i~
-~<|i|i|i|i|i|i|i|+~~~ .i~
~~~~~~~~~` -
2011-03-09 17:27:28 -06:00
AJ Kelly
8ddf4d49ea
small cleanup
2011-03-09 17:25:31 -06:00
AJ Kelly
a906aac6b9
fix warning
2011-03-09 13:55:55 -06:00
AJ Kelly
52f57d8d03
Change SongGroup to Text in SetCommand, add Label param too.
2011-03-09 13:14:18 -06:00
Thai Pangsakulyanont
742304fb73
fix crash
2011-03-10 00:36:23 +07:00
Thai Pangsakulyanont
c1f4967f1c
merge
...
+ support o2mania style BMS (7 keys)
+ move notes to autokeysound when reducing tracks
2011-03-09 19:24:15 +07:00
AJ Kelly
56bb3e8445
sm5svn 0dc297b [Glenn Maynard]
...
"Previously, we didn't create MusicWheel sorts when the screen loads; it was delayed until the
screen begins. This allowed preloading before the style is set. However, it caused a
major skip when the screen starts, because creating the sorts is fairly expensive.
Refactor this. Load the sorts when the screen is loaded, and then go through them
and quickly filter out unplayable data and handle other initialization on begin.
This is much faster, so we can more easily transition seamlessly from the previous
menu.
One known limitation: the sorts are created before we know the style, so we have to
guess. This means if you're in a style like dance-solo or pump-halfdouble, sorts will
still be based on regular mode. This affects the difficulty, top grade and roulette sorts."
2011-03-08 21:09:38 -06:00
AJ Kelly
a71a6cc1be
[MeterDisplay] Add Lua binding. "Allow setting and changing the width dynamically. Phase out the "StreamWidth" node property; set it with SetStreamWidth instead." [Glenn Maynard]
2011-03-08 20:21:08 -06:00
AJ Kelly
c28845a8dc
Added custom MusicWheel items.
...
[ScreenSelectMusic] Add GetMusicWheel Lua binding.
2011-03-08 19:28:40 -06:00
AJ Kelly
8fa1aa09b6
[WheelBase] Add GetCurrentIndex and GetNumItems Lua bindings.
2011-03-08 19:26:08 -06:00
AJ Kelly
de45576905
add comment about bonus bars
2011-03-08 19:12:39 -06:00
AJ Kelly
e69c3d127d
fix cel shading functions
2011-03-08 13:13:53 -06:00
Colby Klein
72134f3fa6
woops, merge.
2011-03-08 11:01:41 -08:00
Colby Klein
704c7bff1d
Update Cel shading. Note, RageDisplay_D3D will need to be fixed for this.
2011-03-08 11:00:32 -08:00
Colby Klein
bcd87f8c17
Disable setting texture states, leave a comment.
2011-03-08 10:58:35 -08:00
Colby Klein
70d59c1c9b
Revert my original font change. I did mostly fix my optimization for it but it really was problematic. This whole block would probably have to be written differently.
2011-03-08 10:21:21 -08:00
AJ Kelly
4e0dd3dce4
change comment style
2011-03-07 15:28:45 -06:00
AJ Kelly
828e36219f
remove another todo of mine
2011-03-07 15:22:41 -06:00
AJ Kelly
ba6ab436e5
small whitespace killing
2011-03-07 15:21:03 -06:00
AJ Kelly
c4622d375b
remove a todo of mine that made no sense
2011-03-07 15:19:37 -06:00