Next, be careful with merge conflicts.

Also, keep consistent newlines.
This commit is contained in:
Jason Felds
2011-07-30 13:47:09 -04:00
51 changed files with 417 additions and 8 deletions
+27
View File
@@ -0,0 +1,27 @@
local t = Def.ActorFrame{}
t[#t+1] = LoadActor("UpLeft_blend")..{
InitCommand=cmd(diffuseshift;effectcolor1,color("#9b376d66");effectcolor2,color("#9b376d66"));
}
t[#t+1] = LoadActor("UpLeft_blend")..{
InitCommand=cmd(blend,Blend.Add;diffuseshift;effectcolor1,color("#cc5176FF");effectcolor2,color("#cc517666");effectclock,"bgm";effecttiming,1,0,0,0;);
}
t[#t+1] = LoadActor("UpLeft_blend")..{
InitCommand=cmd(diffuseshift;effectcolor1,color("#cc5176FF");effectcolor2,color("#cc5176FF");fadetop,1);
}
t[#t+1] = LoadActor("UpLeft_fill")..{
InitCommand=cmd(blend,Blend.Add;diffuseshift;effectcolor1,color("#cc5176FF");effectcolor2,color("#cc5176FF"));
}
t[#t+1] = LoadActor("UpLeft border");
return t