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
Glenn Maynard
eebaa57c5b
cleanup
2006-08-09 22:40:35 +00:00
Glenn Maynard
c55c3b1615
remove WheelItemOnDelayCenter, WheelItemOffDelayCenter
2006-08-09 22:39:03 +00:00
Glenn Maynard
ded811325c
remove WheelItemOffDelayCenter
2006-08-09 22:36:06 +00:00
Glenn Maynard
ebfb855334
remove WheelItemOnDelayCenter
2006-08-09 22:35:01 +00:00
Glenn Maynard
36ecadb215
bind
2006-08-09 21:49:06 +00:00
Glenn Maynard
ea879be3e9
delete all screens when reloading
2006-08-09 03:29:24 +00:00
Glenn Maynard
7e05abc111
always delete old screens on PopAllScreens
2006-08-09 03:28:25 +00:00
Glenn Maynard
beef1efa87
partial ARRAYSIZE -> ARRAYLEN
2006-08-08 18:57:00 +00:00
Glenn Maynard
2d9b15746f
If the selected language doesn't exist, eg. default selection picked
...
Macedonian and the theme doesn't support that language, we'll actually
use BASE_LANGUAGE, so show that language as selected in
options, not the one that sorts to the top.
2006-08-08 18:55:16 +00:00
Glenn Maynard
21cd26308e
remove unused
2006-08-02 04:50:29 +00:00
Glenn Maynard
47e601cd4a
unrelated comment
2006-08-02 04:21:54 +00:00
Glenn Maynard
4b209ff64d
remove transition
2006-08-02 04:16:21 +00:00
Glenn Maynard
61a11c267a
LuaFunction_NoArgs -> LuaFunction
2006-08-02 04:15:45 +00:00
Glenn Maynard
31eac27fd0
unneeded
2006-08-02 04:11:54 +00:00
Glenn Maynard
43aedd84a9
unneeded
2006-08-02 04:11:20 +00:00
Glenn Maynard
0d12c69795
ReloadMetrics always calls FlushDirCache
2006-08-01 23:40:35 +00:00
Glenn Maynard
c98fabf1f2
consistency
2006-08-01 20:39:36 +00:00
Glenn Maynard
45c114590e
don't ignore specified effect period if the effect is already running
2006-08-01 20:36:19 +00:00
Glenn Maynard
a3ffee63b6
remove GetCommandsLengthSeconds
2006-08-01 20:32:16 +00:00
Glenn Maynard
cea07f5e2c
Actor::GetCommandsLengthSeconds is evil; don't use it. (Commands
...
can have side-effects.)
2006-08-01 20:25:13 +00:00
Glenn Maynard
43ee08ff62
cleanup
2006-08-01 19:57:24 +00:00
Glenn Maynard
b7db1c7e4d
remove unused
2006-08-01 19:45:59 +00:00
Glenn Maynard
9636939d6b
remove ActorCollision.h
2006-08-01 19:44:40 +00:00
Glenn Maynard
c830a04da6
remove ActorCollision.h; used only for old BGALayer stuff
2006-08-01 19:43:02 +00:00
Glenn Maynard
81ccde1eba
cleanup
2006-08-01 19:36:19 +00:00
Glenn Maynard
cc61f09264
unneeded
2006-07-30 19:08:43 +00:00
Glenn Maynard
f424072441
simplify
2006-07-30 18:43:09 +00:00
Glenn Maynard
4b647827a8
don't need to Close explicitly here
2006-07-30 18:40:26 +00:00
Glenn Maynard
0b6f9ab4b5
remove comment
2006-07-29 19:29:19 +00:00
Glenn Maynard
e550a0fcb5
cleanup, less random order
2006-07-29 06:18:09 +00:00
Glenn Maynard
e57aa00b2a
invert RenderTarget_FramebufferObject
...
set viewport
2006-07-29 00:23:44 +00:00
Glenn Maynard
3c15c15aa2
AddImageCoords
2006-07-29 00:16:57 +00:00
Glenn Maynard
ad0e9c3105
remove; access the texture directly
2006-07-28 23:29:37 +00:00
Glenn Maynard
3e7679b64b
compaibility helpers
2006-07-28 23:26:22 +00:00
Glenn Maynard
ba66d3f4b3
remove bindings; use eg. sprite:GetTexture():loop( f )
2006-07-28 23:25:45 +00:00
Glenn Maynard
6009e1febb
fixup
2006-07-28 23:25:11 +00:00
Glenn Maynard
e136191439
bind GetTexture
2006-07-28 23:19:36 +00:00
Glenn Maynard
413e4acd26
bind
2006-07-28 23:19:16 +00:00
Glenn Maynard
c6aa765685
cleanup
2006-07-28 21:51:40 +00:00
Glenn Maynard
184a2fa37e
cleanup
2006-07-28 21:48:52 +00:00
Glenn Maynard
eeed70ea55
cleanup
2006-07-28 21:43:35 +00:00
Glenn Maynard
3324ec1a85
old
2006-07-28 21:42:15 +00:00
Glenn Maynard
2f149ffb6a
fix warning
2006-07-28 21:08:29 +00:00
Glenn Maynard
e91c291e05
type
2006-07-28 21:08:02 +00:00
Glenn Maynard
3197d4ead9
unused params
2006-07-28 21:06:13 +00:00
Glenn Maynard
98591e9fc1
call Create() in CreateRenderTarget
2006-07-28 21:03:57 +00:00
Glenn Maynard
82497e4111
Create() virtual
2006-07-28 21:01:58 +00:00