Commit Graph
100 Commits
Author SHA1 Message Date
Glenn Maynard 7f88f072a0 do autogen icon in xml 2006-08-16 20:32:46 +00:00
Glenn Maynard 8270568b17 autogen icon in xml 2006-08-16 20:31:40 +00:00
Glenn Maynard 70e7740f71 split ScreenSelectMusic::TweenOnScreen 2006-08-16 20:10:37 +00:00
Glenn Maynard e591a1ffb0 remove ShowCourseContents, fixes 2006-08-16 20:06:48 +00:00
Glenn Maynard 3715e5b4c4 remove ShowCourseContents 2006-08-16 20:06:07 +00:00
Glenn Maynard 47493d970e don't tween; let commands do that 2006-08-16 18:57:51 +00:00
Glenn Maynard 7bc51fc0b0 optional attribute 2006-08-16 18:44:16 +00:00
Glenn Maynard 2db64b116e remove param 2006-08-16 18:43:38 +00:00
Glenn Maynard e0a23cfbd4 vc7 fix 2006-08-16 18:43:13 +00:00
Glenn Maynard 47a62d7db6 phase out param 2006-08-16 18:31:00 +00:00
Glenn Maynard 2877e7ef0f cleanup 2006-08-16 18:25:13 +00:00
Glenn Maynard 11372f28bf remove param 2006-08-16 18:23:56 +00:00
Glenn Maynard ba92d2cb49 phase out param 2006-08-16 18:20:42 +00:00
Glenn Maynard c7a6c80b14 use SetLoop 2006-08-16 18:19:38 +00:00
Glenn Maynard ce81254e53 add SetLoop 2006-08-16 18:19:16 +00:00
Glenn Maynard 2c673fb13d optional attributes; prefer to set via commands 2006-08-16 18:12:39 +00:00
Glenn Maynard 67b091454c remove no-op 2006-08-16 18:10:18 +00:00
Glenn Maynard b13a165303 remove more pre-ActorScroller cruft 2006-08-16 18:07:45 +00:00
Glenn Maynard 91c560ad74 remove pre-ActorScroller cruft 2006-08-16 18:07:25 +00:00
Glenn Maynard f8468d3e34 set directly 2006-08-16 07:21:28 +00:00
Glenn Maynard 5a0370c582 derive from BitmapText 2006-08-16 07:20:45 +00:00
Glenn Maynard 30f53de68c LoadFromFont 2006-08-16 07:19:41 +00:00
Glenn Maynard fa38d7d0ee remove the label element; do this separately 2006-08-16 07:09:24 +00:00
Glenn Maynard 563b1c65b9 remove BPMDisplay 2006-08-16 07:04:56 +00:00
Glenn Maynard 0af7df7f32 bpm in xml 2006-08-16 07:03:35 +00:00
Glenn Maynard 9f2d170317 bind, add SetFromGameState 2006-08-16 07:02:46 +00:00
Glenn Maynard 9de17517d1 fix crash 2006-08-16 06:44:24 +00:00
Glenn Maynard 3f71e59d96 unused 2006-08-16 06:19:22 +00:00
Glenn Maynard 7d2bea627a remove CourseHasMods; use xml 2006-08-16 06:18:34 +00:00
Glenn Maynard 3f9cf31e59 unused 2006-08-16 06:06:13 +00:00
Glenn Maynard aa0830c198 remove unused GenreDisplay 2006-08-16 06:03:55 +00:00
Glenn Maynard 241ad288be do clear if no song or course 2006-08-16 06:02:01 +00:00
Glenn Maynard ff7e273c56 remove unused 2006-08-16 05:56:35 +00:00
Glenn Maynard 44d9580626 Remove ArtistDisplay. Do this with XML. 2006-08-16 05:52:57 +00:00
Glenn Maynard c022522fa8 simplify HelpDisplay 2006-08-16 05:52:24 +00:00
Glenn Maynard d0872d4459 HelpDisplay:setfromsongorcourse 2006-08-16 05:38:25 +00:00
Glenn Maynard aa525eeb44 add GetArtists 2006-08-16 05:36:40 +00:00
Glenn Maynard 6996b06df7 fix up HelpDisplay in xml 2006-08-16 05:26:49 +00:00
Glenn Maynard a822e8cb45 GetRadarValues() binding 2006-08-16 05:11:32 +00:00
Glenn Maynard f48af0bbe6 lua bindings 2006-08-16 05:11:01 +00:00
Glenn Maynard dbf65f06ee set parent 2006-08-16 02:18:52 +00:00
Glenn Maynard 30963ab843 all dialogs are warnings 2006-08-16 01:58:44 +00:00
Glenn Maynard bf3d73fcef unwrap 2006-08-16 01:56:54 +00:00
Glenn Maynard 4ab47c8f0c Throw -> Dialog 2006-08-16 01:56:16 +00:00
Glenn Maynard 8c7c5aff37 show the name, not the size (always 51) 2006-08-16 00:57:16 +00:00
Glenn Maynard efa8ef90c9 finishtweening 2006-08-16 00:56:14 +00:00
Glenn Maynard 5622dba40e set names 2006-08-16 00:53:47 +00:00
Glenn Maynard af574d7a4c pop screens first, so we don't ResetGame while the screen is still
on the stack
2006-08-15 22:27:27 +00:00
Glenn Maynard 45ea7b05ed don't overload this 2006-08-15 19:37:44 +00:00
Glenn Maynard 7ca60464b3 cleanup 2006-08-15 19:34:41 +00:00
Glenn Maynard 6370afb746 cleanup 2006-08-15 19:26:00 +00:00
Glenn Maynard 8af826fc3f set parent before calling LoadFromNode 2006-08-15 19:25:45 +00:00
Glenn Maynard cbc69ea550 remove unused parameter 2006-08-15 19:24:29 +00:00
Glenn Maynard 832679370b remove unused params 2006-08-15 19:19:59 +00:00
Glenn Maynard 29eb1f6ccb don't pass parent; m_pParent is used, which is set by AddChild 2006-08-15 19:16:39 +00:00
Glenn Maynard d2a4a2fa76 use m_pParent 2006-08-15 19:12:09 +00:00
Glenn Maynard ec683e54d9 remove InitDefaults 2006-08-15 19:06:26 +00:00
Glenn Maynard 6b7e45f0c8 remove unused overload. (Actors are too potentially complex to simply have a "reset to default" overload, anyway.) 2006-08-15 19:05:22 +00:00
Glenn Maynard a872952b8b store parent 2006-08-15 19:02:31 +00:00
Glenn Maynard 27718a78f2 still an ugly cast 2006-08-15 18:58:54 +00:00
Glenn Maynard 91e0961958 fix depth buffer cleared when it shouldn't be 2006-08-15 00:39:41 +00:00
Glenn Maynard 051b559437 dupe command 2006-08-14 22:52:26 +00:00
Glenn Maynard a0200e8de4 add ActorProxy 2006-08-14 22:51:54 +00:00
Glenn Maynard e46231aae3 remove unused m_MusicWheelUnder 2006-08-14 22:49:23 +00:00
Glenn Maynard 5f614f128d move the banner, frame and mask into the overlay
remove size metrics; crop it yourself
2006-08-14 22:46:48 +00:00
Glenn Maynard b63d8ec48c move the banner, frame and mask into the overlay 2006-08-14 22:46:16 +00:00
Glenn Maynard cc2974edb6 Ideally, actors should be standalone: instanced and maintained in XML
without the screen knowing about it.  That's not always feasible, for actors
with more complicated interactions, such as SSMusic's MusicWheel, Banner,
and so on.

However, if we instance those from the screen itself, then it's pulled outside
of the standard XML heirarchy: it has to go around the major layers (overlay,
underlay).  That's a pain.

Create ActorProxy.  This simply points to and draws another actor.  To use,
hide the main actor (hidden,1), create an ActorProxy in XML, and point it
at the actor you want.  The actor is still controlled by and owned by the screen,
but can be layered in any place, and instanced multiple times.

(This does not propagate things like ActorFrame; that would cause the
target actor to be updated and receive commands multiple times, once
for each proxy.  The owner, and path for those calls, is still the screen.)
2006-08-14 22:32:19 +00:00
Glenn Maynard c50b1bddaf different metrics for banner and mask 2006-08-14 22:05:53 +00:00
Glenn Maynard 3003a426ae remove StopTweening 2006-08-14 20:03:54 +00:00
Glenn Maynard 519331d383 stoptweening 2006-08-14 20:02:19 +00:00
Glenn Maynard 548e1528da remove unused 2006-08-14 18:58:19 +00:00
Glenn Maynard a7f6c564a1 const 2006-08-14 18:57:30 +00:00
Glenn Maynard 4ca893b9fc remove unused 2006-08-14 18:56:18 +00:00
Glenn Maynard 149fb8b4ff cleanup 2006-08-14 18:56:00 +00:00
Glenn Maynard aef53c1225 simplify indent 2006-08-14 18:28:02 +00:00
Glenn Maynard ea7297dde5 fix PCH; /YX is slow (http://blogs.msdn.com/branbray/archive/2005/07/08/437078.aspx). 2006-08-13 20:34:32 +00:00
Glenn Maynard 2e0785b5c4 don't exclude global.h 2006-08-13 20:22:43 +00:00
Glenn Maynard 5f92feea7a global.h 2006-08-13 20:13:07 +00:00
Glenn Maynard 42cae05fc6 fix highlight 2006-08-13 01:59:24 +00:00
Glenn Maynard 38909c9d1c remove PaneDisplay
update
2006-08-10 21:29:02 +00:00
Glenn Maynard 9a220de83a remove PaneDisplay 2006-08-10 21:28:13 +00:00
Glenn Maynard bdb7b58250 fixup XML use 2006-08-10 21:26:57 +00:00
Glenn Maynard 727f4cfcc1 Actor:player 2006-08-10 21:25:37 +00:00
Glenn Maynard b25bff7edd cleanup 2006-08-10 20:45:44 +00:00
Glenn Maynard 652d8ab903 cleanup 2006-08-10 20:45:10 +00:00
Glenn Maynard a222a01508 simplify 2006-08-10 20:43:49 +00:00
Glenn Maynard cf4616a6eb add DebugLineRestartCurrentScreen 2006-08-10 17:49:40 +00:00
Glenn Maynard bcae91dca4 bind DifficultyList. Remove it from SSM; do it in XML instead. 2006-08-10 17:44:11 +00:00
Glenn Maynard 3d85b7a02b update, fix, simplify ... 2006-08-10 17:42:28 +00:00
Glenn Maynard 3226434976 wheel updates 2006-08-10 17:37:04 +00:00
Glenn Maynard b37fe30b31 updates 2006-08-10 07:21:52 +00:00
Glenn Maynard c82810b12b tween normally 2006-08-10 06:28:52 +00:00
Glenn Maynard 208c5b0061 Make wheel items regular children (no special update/drawing);
remove "staggered tween" hack and set the offset in the
context so this can be done in commands; fix sections;
do OnCommand/OffCommand normally and rename TweenOn/OffScreen
to TweenOn/OffScreenForSort; other fixes/cleanups (metric
updates to come in a bit)
2006-08-10 06:27:47 +00:00
Glenn Maynard a5253821a3 more wheel fixes 2006-08-10 05:09:14 +00:00
Glenn Maynard 16e51def6e update 2006-08-10 05:08:45 +00:00
Glenn Maynard caa29a14fa MusicWheel update 2006-08-10 04:29:48 +00:00
Glenn Maynard 35618be535 Fix up MusicWheel. This code was a mess: huge blocks of copy-and-pasted
code, duplicated arrays in base classes that were never used ...

(It's still ugly, but at least WheelBase is actually a real base class now.)
2006-08-10 04:27:46 +00:00
Glenn Maynard ca11c62b58 cleanup 2006-08-10 00:04:14 +00:00
Glenn Maynard 2dc13e16a7 pActor->SetParent 2006-08-09 23:23:56 +00:00
Glenn Maynard 89ab444693 Add parent links to actors.
For each actor, create a context table, with an __index link to the
parent's.  This can be used to propagate information down complex
actor trees.

Code needs to be changed to do AddChild() calls before loading,
rather than after, so context links are available during loads.
This will be done as necessary.
2006-08-09 23:22:54 +00:00