Next, be careful with merge conflicts.

Also, keep consistent newlines.

NoteSkins/pump/delta/Center Hold Head.lua

@@ -0,0 +1,24 @@
+local t = Def.ActorFrame{}
+
+
+t[#t+1] = LoadActor("Center_blend")..{
+	InitCommand=cmd(diffuseshift;effectcolor1,color("#9b8737FF");effectcolor2,color("#9b8737FF");fadetop,0.5);
+}
+
+t[#t+1] = LoadActor("Center_blend")..{
+	InitCommand=cmd(blend,Blend.Add;diffuseshift;effectcolor1,color("#ccb752FF");effectcolor2,color("#ccb75233");effectclock,"bgm";effecttiming,1,0,0,0;);
+}
+
+t[#t+1] = LoadActor("Center_fill")..{
+	InitCommand=cmd(blend,Blend.Add;diffuseshift;effectcolor1,color("#ccb752FF");effectcolor2,color("#ccb752FF"));
+}
+
+t[#t+1] = LoadActor("Center_feet")..{
+	InitCommand=cmd(blend,Blend.Add;diffusealpha,0.6);
+}
+
+
+t[#t+1] = LoadActor("Center border");
+
+
+return t

NoteSkins/pump/delta/Center NoteHit.lua

@@ -0,0 +1,3 @@
+return LoadActor("_CenterHit")..{
+	InitCommand=cmd(x,2;y,2);
+}

NoteSkins/pump/delta/Center Tap Note.lua

@@ -0,0 +1,28 @@
+local t = Def.ActorFrame{}
+
+
+t[#t+1] = LoadActor("Center_blend")..{
+	InitCommand=cmd(diffuseshift;effectcolor1,color("#9b873766");effectcolor2,color("#9b873766"));
+}
+
+t[#t+1] = LoadActor("Center_blend")..{
+	InitCommand=cmd(blend,Blend.Add;diffuseshift;effectcolor1,color("#ccb752FF");effectcolor2,color("#ccb75266");effectclock,"bgm";effecttiming,1,0,0,0;);
+}
+
+t[#t+1] = LoadActor("Center_blend")..{
+	InitCommand=cmd(diffuseshift;effectcolor1,color("#ccb752FF");effectcolor2,color("#ccb752FF");fadetop,1);
+}
+
+t[#t+1] = LoadActor("Center_fill")..{
+	InitCommand=cmd(blend,Blend.Add;diffuseshift;effectcolor1,color("#ccb752FF");effectcolor2,color("#ccb752FF"));
+}
+
+t[#t+1] = LoadActor("Center_feet")..{
+	InitCommand=cmd(blend,Blend.Add;diffusealpha,0.6);
+}
+
+
+t[#t+1] = LoadActor("Center border");
+
+
+return t

NoteSkins/pump/delta/DownLeft Hold Head.lua

@@ -0,0 +1,20 @@
+local t = Def.ActorFrame{}
+
+
+t[#t+1] = LoadActor("DownLeft_blend")..{
+	InitCommand=cmd(diffuseshift;effectcolor1,color("#376f9bFF");effectcolor2,color("#376f9bFF");fadetop,0.5);
+}
+
+t[#t+1] = LoadActor("DownLeft_blend")..{
+	InitCommand=cmd(blend,Blend.Add;diffuseshift;effectcolor1,color("#5899ccFF");effectcolor2,color("#5899cc33");effectclock,"bgm";effecttiming,1,0,0,0;);
+}
+
+t[#t+1] = LoadActor("DownLeft_fill")..{
+	InitCommand=cmd(blend,Blend.Add;diffuseshift;effectcolor1,color("#5899ccFF");effectcolor2,color("#5899ccFF"));
+}
+
+
+t[#t+1] = LoadActor("DownLeft border");
+
+
+return t

NoteSkins/pump/delta/DownLeft NoteHit.lua

@@ -0,0 +1,3 @@
+return LoadActor("_DownLeftHit")..{
+	InitCommand=cmd(y,5;x,2);
+}

NoteSkins/pump/delta/DownLeft Tap Note.lua

@@ -0,0 +1,24 @@
+local t = Def.ActorFrame{}
+
+
+t[#t+1] = LoadActor("DownLeft_blend")..{
+	InitCommand=cmd(diffuseshift;effectcolor1,color("#376f9b66");effectcolor2,color("#376f9b66"));
+}
+
+t[#t+1] = LoadActor("DownLeft_blend")..{
+	InitCommand=cmd(blend,Blend.Add;diffuseshift;effectcolor1,color("#5899ccFF");effectcolor2,color("#5899cc66");effectclock,"bgm";effecttiming,1,0,0,0;);
+}
+
+t[#t+1] = LoadActor("DownLeft_blend")..{
+	InitCommand=cmd(diffuseshift;effectcolor1,color("#5899ccFF");effectcolor2,color("#5899ccFF");fadetop,1);
+}
+
+t[#t+1] = LoadActor("DownLeft_fill")..{
+	InitCommand=cmd(blend,Blend.Add;diffuseshift;effectcolor1,color("#5899ccFF");effectcolor2,color("#5899ccFF"));
+}
+
+
+t[#t+1] = LoadActor("DownLeft border");
+
+
+return t

NoteSkins/pump/delta/DownRight Hold Head.lua

@@ -0,0 +1,3 @@
+return NOTESKIN:LoadActor("DownLeft","Hold Head")..{
+	--InitCommand=cmd(rotationy,180);
+};

NoteSkins/pump/delta/DownRight NoteHit.lua

@@ -0,0 +1,3 @@
+return NOTESKIN:LoadActor("DownLeft","NoteHit")..{
+	OnCommand=cmd(x,-2;zoomx,-1);
+}

NoteSkins/pump/delta/DownRight Ready Receptor.lua

@@ -0,0 +1,8 @@
+return NOTESKIN:LoadActor("DownLeft", "Ready Receptor")..{
+	Frames = {
+		{ Frame = 0 };
+		{ Frame = 1 };
+		{ Frame = 2 };
+	};
+	--InitCommand=cmd(rotationy,180);
+};

NoteSkins/pump/delta/DownRight Tap Note.lua

@@ -0,0 +1,3 @@
+return NOTESKIN:LoadActor("DownLeft","Tap Note")..{
+	--InitCommand=cmd(rotationy,180);
+};

NoteSkins/pump/delta/DownRight border.redir

@@ -0,0 +1 @@
+DownLeft border

NoteSkins/pump/delta/NoteSkin.lua

@@ -0,0 +1,117 @@
+local Noteskin = {}
+
+--bBlanks:
+Noteskin.bBlanks = {
+	--["element"] = true|false;
+	["Hold Tail Active"] = true;
+	["Hold Tail Active"] = true;
+	--
+	--["Hold Head Active"] = "Tap Note";
+	--["Hold Head Inactive"] = "Tap Note";
+	--
+	["Roll Tail Inactive"] = true;
+	["Roll Tail Inactive"] = true;
+}
+Noteskin.PartsToRotate = {
+	--["elemenu"] = true|false;
+	["Roll Head Active"] = false;
+	["Roll Head Inactive"] = false;
+	["NoteHit"] = true;
+}
+Noteskin.ElementRedirs = {
+	--["element"] = "redirected_element";
+	["Hold Head Active"] = "Hold Head";
+	["Hold Head Inactive"] = "Hold Head";
+	["Roll Head Active"] = "Roll Head Active";
+	["Roll Head Inactive"] = "Roll Head Active";
+	["Tap Fake"] = "Tap Note";
+	--
+	["Hold Topcap Inactive"] = "Hold Topcap Active";
+	["Hold Body Inactive"] = "Hold Body Active";
+	["Hold Body Active"] = "Hold Body Active";
+	["Hold Bottomcap Inactive"] = "Hold Bottomcap Active";
+	["Hold Tail Inactive"] = "Hold Tail Active";
+	--
+	["Roll Topcap Active"] = "Hold Topcap Active";
+	["Roll Body Active"] = "Hold Body Active";
+	["Roll Bottomcap Active"] = "Hold Bottomcap Active";
+	["Roll Tail Active"] = "Hold Tail Active";
+	--
+	["Roll Topcap Inactive"] = "Hold Topcap Active";
+	["Roll Body Inactive"] = "Hold Body Active";
+	["Roll Bottomcap Inactive"] = "Hold Bottomcap Active";
+	["Roll Tail Inactive"] = "Hold Tail Active";
+}
+Noteskin.ButtonRedirs = {
+	Center = "Center";
+	UpLeft = "UpLeft";
+	UpRight = "UpRight";
+	DownLeft = "DownLeft";
+	DownRight = "DownRight";
+}
+Noteskin.BaseRotX = {
+	Center = 0;
+	UpLeft = 0;
+	UpRight = 0;
+	DownLeft = 0;
+	DownRight = 0;
+}
+Noteskin.BaseRotY = {
+	Center = 0;
+	UpLeft = 0;
+	UpRight = 180;
+	DownLeft = 0;
+	DownRight = 180;
+}
+
+local function func()
+	local sButton = Var "Button"
+	local sElement = Var "Element"
+	
+	if Noteskin.bBlanks[sElement] then
+		local t = Def.Actor {};
+		if Var "SpriteOnly" then
+			t = LoadActor( "_blank" );
+		end
+		return t
+	end
+	
+	--local ButtonToLoad = Noteskin.ButtonRedirs[sButton]
+	local ElementToLoad = Noteskin.ElementRedirs[sElement]
+	if not ElementToLoad then
+		ElementToLoad = sElement
+	end
+	
+	--update: ahora receptor también
+	if sElement == "Explosion"
+	or sElement == "Tap Lift"
+	or sElement == "Tap Mine"
+	or sElement == "Receptor"
+	then
+		sButton = "UpLeft"
+	end
+	local path = NOTESKIN:GetPath(Noteskin.ButtonRedirs[sButton],ElementToLoad)
+	--Graficos separados para holds y rolls
+	--if string.find(sElement,"Hold") or string.find(sElement,"Roll") then
+	if ( string.find(sElement,"Hold") or string.find(sElement,"Roll") ) and not ( string.find(sElement,"Head") or string.find(sElement,"Tail") ) then
+	--if ( string.find(sElement,"Hold") or string.find(sElement,"Roll") ) and ( string.find(sElement,"Body") ) then
+		path = NOTESKIN:GetPath(sButton,ElementToLoad)
+	end
+	
+	local t = LoadActor(path)
+	
+	local bRotate = Noteskin.PartsToRotate[ElementToLoad]
+	--rotate by default
+	if bRotate == nil then bRotate = true end
+	if bRotate then
+		t.BaseRotationX=Noteskin.BaseRotX[sButton]
+		t.BaseRotationY=Noteskin.BaseRotY[sButton]
+	end
+	
+	return t
+end
+
+Noteskin.Load = func
+Noteskin.CommonLoad = func
+
+return Noteskin

NoteSkins/pump/delta/UpLeft Explosion.lua

@@ -0,0 +1,40 @@
+return Def.ActorFrame {
+
+	NOTESKIN:LoadActor(Var "Button","NoteHit") .. {
+		InitCommand=cmd(animate,0;blend,Blend.Add;diffusealpha,0);
+
+		NoneCommand=cmd(playcommand,"Glow");
+		PressCommand=cmd(playcommand,"Glow");
+		W1Command=cmd(setstate,0;playcommand,"W2");
+		W2Command=cmd(setstate,0;playcommand,"Glow");
+		W3Command=cmd(setstate,1;playcommand,"Glow");
+		W4Command=cmd(setstate,2;playcommand,"Glow");
+		W5Command=cmd();
+		HitMineCommand=cmd(playcommand,"Glow");
+		HeldCommand=cmd(setstate,0;playcommand,"Glow");
+		GlowCommand=cmd(stoptweening,zoom,1.05;diffusealpha,1;linear,0.25;zoom,1.1;diffusealpha,0);
+	};
+
+	NOTESKIN:LoadActor(Var "Button","NoteHit") .. {
+		InitCommand=cmd(animate,0;blend,Blend.Add;diffusealpha,0);
+
+		NoneCommand=cmd(playcommand,"Glow");
+		PressCommand=cmd(playcommand,"Glow");
+		W1Command=cmd(setstate,0;playcommand,"W2");
+		W2Command=cmd(setstate,0;playcommand,"Glow");
+		W3Command=cmd(setstate,1;playcommand,"Glow");
+		W4Command=cmd(setstate,2;playcommand,"Glow");
+		W5Command=cmd();
+		HitMineCommand=cmd(playcommand,"Glow");
+		HeldCommand=cmd(setstate,0;playcommand,"Glow");
+		GlowCommand=cmd(stoptweening,zoom,1;diffusealpha,0.4;linear,0.3;zoom,1.2;diffusealpha,0);
+	};
+
+	NOTESKIN:LoadActor(Var "Button","NoteHit") .. {
+		InitCommand=cmd(animate,0;zoom,1.1;blend,Blend.Add;visible,false);
+		HoldingOnCommand=cmd(visible,true);
+		HoldingOffCommand=cmd(visible,false);
+	};
+
+
+}

NoteSkins/pump/delta/UpLeft Hold Head.lua

@@ -0,0 +1,21 @@
+
+local t = Def.ActorFrame{}
+
+
+t[#t+1] = LoadActor("UpLeft_blend")..{
+	InitCommand=cmd(diffuseshift;effectcolor1,color("#9b376dFF");effectcolor2,color("#9b376dFF");fadetop,0.5);
+}
+
+t[#t+1] = LoadActor("UpLeft_blend")..{
+	InitCommand=cmd(blend,Blend.Add;diffuseshift;effectcolor1,color("#cc5176FF");effectcolor2,color("#cc517633");effectclock,"bgm";effecttiming,1,0,0,0;);
+}
+
+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

NoteSkins/pump/delta/UpLeft NoteHit.lua

@@ -0,0 +1,3 @@
+return NOTESKIN:LoadActor("DownLeft","NoteHit")..{
+	InitCommand=cmd(rotationy,180;rotationz,180;y,-6;x,2);
+}

NoteSkins/pump/delta/UpLeft Receptor.lua

@@ -0,0 +1,22 @@
+return Def.ActorFrame {
+
+
+	NOTESKIN:LoadActor(Var "Button", "Ready Receptor")..{
+		Name="Base";
+		InitCommand=cmd(animate,0;setstate,0);
+	};
+
+	NOTESKIN:LoadActor(Var "Button", "Ready Receptor")..{
+		Name="Glow";
+		InitCommand=cmd(animate,0;setstate,1);
+		OnCommand=cmd(effectclock,"bgm";diffuseshift;effectcolor1,color("#FFFFFFFF");effectcolor2,color("#FFFFFF00");effecttiming,1,0,0,0);
+	};
+
+	NOTESKIN:LoadActor(Var "Button", "Ready Receptor")..{
+		Name="Tap";
+		InitCommand=cmd(animate,0;setstate,2;zoom,1;diffusealpha,0;blend,'BlendMode_Add');
+		PressCommand=cmd(diffuse,color("#FFFFAA");stoptweening;zoom,1.1;linear,0.1;diffusealpha,0.6;zoom,1);
+		LiftCommand=cmd(diffuse,color("#FFFFAA");stoptweening;diffusealpha,0.6;zoom,1;linear,0.15;zoom,1.2;diffusealpha,0);
+	};
+
+}

NoteSkins/pump/delta/UpLeft Tap Note.lua

@@ -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

NoteSkins/pump/delta/UpRight Hold Head.lua

@@ -0,0 +1,4 @@
+return NOTESKIN:LoadActor("UpLeft","Hold Head")..{
+	--InitCommand=cmd(rotationy,180);
+	--BaseRotationY=180;
+};

NoteSkins/pump/delta/UpRight NoteHit.lua

@@ -0,0 +1,3 @@
+return NOTESKIN:LoadActor("DownLeft","NoteHit")..{
+	InitCommand=cmd(rotationy,180;rotationz,180;y,-6;x,-2);
+}

NoteSkins/pump/delta/UpRight Ready Receptor.lua

@@ -0,0 +1,8 @@
+return NOTESKIN:LoadActor("UpLeft", "Ready Receptor")..{
+	Frames = {
+		{ Frame = 0 };
+		{ Frame = 1 };
+		{ Frame = 2 };
+	};
+	--InitCommand=cmd(rotationy,180);
+};

NoteSkins/pump/delta/UpRight Tap Note.lua

@@ -0,0 +1,4 @@
+return NOTESKIN:LoadActor("UpLeft","Tap Note")..{
+	--InitCommand=cmd(rotationy,180);
+	--BaseRotationY=180;
+};

NoteSkins/pump/delta/UpRight border.redir

@@ -0,0 +1 @@
+UpLeft border

NoteSkins/pump/delta/metrics.ini

@@ -0,0 +1,30 @@
+[NoteDisplay]
+AnimationIsBeatBased=0
+
+TapNoteAnimationLength=0.25
+TapMineAnimationLength=0.25
+TapLiftAnimationLength=0.25
+TapFakeAnimationLength=0.25
+HoldHeadAnimationLength=0.25
+HoldTopCapAnimationLength=0.25
+HoldBottomCapAnimationLength=0.25
+HoldBodyAnimationLength=0.25
+HoldTailAnimationLength=0.25
+
+HoldLetGoGrayPercent=1
+
+FlipHeadAndTailWhenReverse=1
+FlipHoldBodyWhenReverse=1
+TopHoldAnchorWhenReverse=0
+HoldActiveIsAddLayer=0
+
+[Center]
+
+[DownLeft]
+
+[DownRight]
+
+[UpLeft]
+
+[UpRight]
+

src/arch/LoadingWindow/LoadingWindow_Win32.cpp

@@ -92,7 +92,7 @@ INT_PTR CALLBACK LoadingWindow_Win32::DlgProc( HWND hWnd, UINT msg, WPARAM wPara
 		self=(LoadingWindow_Win32 *)GetWindowLong(hWnd,DWL_USER);
 	}
 
-#if(WINVER >= 0x0601)
+#ifdef PROGRESS_IN_TASKBUTTON
 	if (self && msg == self->taskbarCreatedEvent && !self->pTaskbarList) {
 		HRESULT hr = CoCreateInstance(CLSID_TaskbarList, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARGS(&self->pTaskbarList));
 		if (SUCCEEDED(hr)) {
@@ -142,7 +142,7 @@ INT_PTR CALLBACK LoadingWindow_Win32::DlgProc( HWND hWnd, UINT msg, WPARAM wPara
 
 	case WM_DESTROY:
 
-#if(WINVER >= 0x0601)
+#ifdef PROGRESS_IN_TASKBUTTON
 		if (self->pTaskbarList) {
 			self->pTaskbarList->Release();
 			self->pTaskbarList = NULL;
@@ -205,7 +205,7 @@ LoadingWindow_Win32::LoadingWindow_Win32()
 	cceData.dwICC=ICC_PROGRESS_CLASS;
 	InitCommonControlsEx(&cceData);
 
-#if(WINVER >= 0x0601)
+#ifdef PROGRESS_IN_TASKBUTTON
 	pTaskbarList=NULL;
 
 	taskbarCreatedEvent=RegisterWindowMessage("TaskbarButtonCreated");
@@ -281,11 +281,13 @@ void LoadingWindow_Win32::SetProgress(const int progress)
 	m_progress=progress;
 	HWND hwndItem = ::GetDlgItem( hwnd, IDC_PROGRESS );
 	::SendMessage(hwndItem,PBM_SETPOS,progress,0);
-#if(WINVER >= 0x0601)
+
+#ifdef PROGRESS_IN_TASKBUTTON
 	if(pTaskbarList) {
 		pTaskbarList->SetProgressValue(hwnd, m_progress, m_totalWork);
 	}
 #endif
+
 }
 
 void LoadingWindow_Win32::SetTotalWork(const int totalWork)
@@ -293,11 +295,13 @@ void LoadingWindow_Win32::SetTotalWork(const int totalWork)
 	m_totalWork=totalWork;
 	HWND hwndItem = ::GetDlgItem( hwnd, IDC_PROGRESS );
 	SendMessage(hwndItem,PBM_SETRANGE32,0,totalWork);
-#if(WINVER >= 0x0601)
+
+#ifdef PROGRESS_IN_TASKBUTTON
 	if(pTaskbarList) {
 		pTaskbarList->SetProgressValue(hwnd, m_progress, m_totalWork);
 	}
 #endif
+
 }
 
 void LoadingWindow_Win32::SetIndeterminate(bool indeterminate) {
@@ -306,7 +310,8 @@ void LoadingWindow_Win32::SetIndeterminate(bool indeterminate) {
 	HWND hwndItem = ::GetDlgItem( hwnd, IDC_PROGRESS );
 
 	if(indeterminate) {
-#if(WINVER >= 0x0601)
+
+#ifdef PROGRESS_IN_TASKBUTTON
 		if(pTaskbarList) {
 			pTaskbarList->SetProgressState(hwnd, TBPF_INDETERMINATE);
 		}
@@ -316,7 +321,7 @@ void LoadingWindow_Win32::SetIndeterminate(bool indeterminate) {
 	} else {
 		SendMessage(hwndItem,PBM_SETMARQUEE,0,0);
 		SetWindowLong(hwndItem,GWL_STYLE, (~PBS_MARQUEE) & GetWindowLong(hwndItem,GWL_STYLE));
-#if(WINVER >= 0x0601)
+#ifdef PROGRESS_IN_TASKBUTTON
 		if(pTaskbarList) {
 			pTaskbarList->SetProgressState(hwnd, TBPF_NORMAL);
 		}

src/arch/LoadingWindow/LoadingWindow_Win32.h

@@ -10,6 +10,10 @@
 #include "archutils/Win32/AppInstance.h"
 
 #if(WINVER >= 0x0601)
+#define PROGRESS_IN_TASKBUTTON
+#endif
+
+#ifdef PROGRESS_IN_TASKBUTTON
 #include "Shobjidl.h"
 #endif
 
@@ -35,7 +39,7 @@ private:
 	DWORD pumpThreadId;
 	HANDLE guiReadyEvent;
 
-#if(WINVER >= 0x0601)
+#ifdef PROGRESS_IN_TASKBUTTON
 	UINT taskbarCreatedEvent;
 	ITaskbarList3 *pTaskbarList;
 #endif