[sm130futures -> default] The future is now.

.hgignore

@@ -88,3 +88,4 @@ glob:Cache/Banners/AdditionalSongs_Airspace Preview_Derailed_Derailed bn.png
 
 syntax: regexp
 Songs/.+/
+glob:*.ilk

Docs/Changelog_SSCformat.txt

@@ -6,9 +6,15 @@ a changelog is provided here between each version.
 Notice: .ssc is not a finalized format at the moment. There are plans for a
 change to JSON, but it is unsure if this will be done.
 
-/!\ Implement .ssc at your own risk. /!\
+Implement .ssc at your own risk.
 ________________________________________________________________________________
 
+[v0.59] - Wolfman2000
+* Typo fix: #RADARVALUES needed a semicolon at the end, not a colon.
+
+[v0.58] - Wolfman2000
+* Implement #LABELS tag for easier Editor work/Rock Band section mimicry.
+
 [v0.57] - AJ
 * Add #ORIGIN tag to metadata.
 

Docs/Changelog_sm5.txt

@@ -8,6 +8,27 @@ ________________________________________________________________________________
 StepMania 5.0 $NEXT | 20110xyy
 --------------------------------------------------------------------------------
 
+2011/05/03
+* [ScreenEdit] Allow changing the Beat 0 Offset, Music Sample Start, and
+  Music Sample Length via Edit Song Info menu. [Wolfman2000]
+
 2011/05/02
 ----------
-* [ScreenSelectMusic] Added NullScoreString metric. [AJ]
+* [ScreenSelectMusic] Added NullScoreString metric. [AJ]
+
+2011/04/17
+--------
+* Use lua for all primary score keeping. Course modes right now still use the
+  old fashioned system. [TeruFSX, Wolfman2000]
+
+2011/04/09
+--------
+* [Player] Force hold judgments to take place before setting the score.
+  [theDtTvB]
+
+2011/04/05
+--------
+* [NotesLoaderSSC, NotesWriterSSC] Add the #LABELS tag. This is meant for step
+  editors to label different parts of their stepcharts. Use Control + , or . to
+  jump to different labels made. [Wolfman2000]
+

Docs/Luadoc/Lua.xml

@@ -1399,6 +1399,7 @@
 			<Function name='GetBeatFromElapsedTime'/>
 			<Function name='GetDelays'/>
 			<Function name='GetElapsedTimeFromBeat'/>
+			<Function name='GetLabels'/>
 			<Function name='GetStops'/>
 			<Function name='HasBPMChanges'/>
 			<Function name='HasNegativeBPMs'/>

Docs/Luadoc/LuaDocumentation.xml

@@ -3501,6 +3501,9 @@
 	<Function name='GetDelays' sm-ssc='true' return='{string}' arguments=''>
 		Returns a table of the Delays and the times they happen as strings with the format "<code>beat=stop seconds</code>".
 	</Function>
+	<Function name='GetLabels' sm-ssc='true' return='{string}' arguments=''>
+		Returns a table of the Labels and the times they happen as strings with the format "<code>beat=label name</code>."
+	</Function>
 	<Function name='HasBPMChanges' sm-ssc='true' return='bool' arguments=''>
 		Returns <code>true</code> if the TimingData contains BPM changes.
 	</Function>

Themes/_fallback/BGAnimations/ScreenGameplay decorations/default.lua

@@ -0,0 +1,11 @@
+local t = Def.ActorFrame {};
+
+if( not GAMESTATE:IsCourseMode() ) then
+t[#t+1] = Def.Actor{
+	JudgmentMessageCommand = function(self, params)
+		Scoring[GetUserPref("UserPrefScoringMode")](params, 
+			STATSMAN:GetCurStageStats():GetPlayerStageStats(params.Player))
+	end;
+};
+end;
+return t;

Themes/_fallback/Languages/en.ini

@@ -478,6 +478,9 @@ Edit Course=Edit Course contents.
 Shuffle=Shuffle the songs around.
 #
 GamePrefDefaultFail=Immediate fail causes a player to die when their life bar reaches 0. ImmediateContinue allows you to continue playing afterwards.
+#
+UserPrefScoringMode=Select the scoring mode to be used when not in a course.
+
 [OptionNames]
 0=0
 0.25x=0.25x
@@ -787,6 +790,7 @@ Background=Background
 BarDrain=Bar Drain
 BatLives=Bat Lives
 Base Difficulty=Base Difficulty
+Beat 0 Offset=Beat 0 Offset
 Bookkeeping=Bookkeeping
 Calibrate Machine Sync=Calibrate Audio Sync
 CPUSkill=CPU Skill
@@ -846,6 +850,7 @@ Edit time signature (top)=Edit time signature (beats per measure)
 Edit time signature (bottom)=Edit time signature (single beat note value)
 Edit tickcount=Edit tickcount
 Edit combo=Edit combo
+Edit label=Edit label
 Edit warp=Edit warp
 Editor options=Options
 EditorShowBGChangesPlay=Show Backgrounds
@@ -938,6 +943,8 @@ Predicted Meter=Predicted Meter
 Preferences=Preferences
 PreloadSounds=Preload Sounds
 Premium=Premium
+Preview Length=Preview Length
+Preview Start=Preview Start
 Export Packages=Export Packages
 Profile=Profile
 Profiles=Profiles
@@ -1048,6 +1055,8 @@ Edit Course=Edit Course
 Shuffle=Shuffle
 #
 GamePrefDefaultFail=Default Fail Type
+#
+UserPrefScoringMode=Scoring Mode
 [PaneDisplay]
 Steps=Steps
 Holds=Holds
@@ -1215,6 +1224,7 @@ Enter a new Time Signature numerator value.=Enter the number of beats per measur
 Enter a new Time Signature denominator value.=Enter the note value that represents one beat.
 Enter a new Tickcount value.=Enter a new Tickcount value.
 Enter a new Combo value.=Enter a new Combo value.
+Enter a new Label value.=Enter a name for this section of the chart.
 Enter a new Warp value.=Enter the beat you will warp to when you reach this point.
 Enter a new artist transliteration.=Enter a new artist transliteration.
 Enter a new artist.=Enter a new artist.
@@ -1223,11 +1233,14 @@ Enter a new credit.=Enter a new credit.
 Enter a new description.=Enter a new description.
 Enter a new chart style.=Enter a new chart style (e.g. "Pad", "Keyboard").
 Enter the author who made this step pattern.=Enter the author who made this step pattern.
+Enter the offset for the song.=Enter the beat 0 offset for the song.
 Enter a new last beat hint.=Enter a new last beat hint.
 Enter a new main title transliteration.=Enter a new main title transliteration.
 Enter a new main title.=Enter a new main title.
 Enter a new sub title transliteration.=Enter a new sub title transliteration.
 Enter a new sub title.=Enter a new sub title.
+Enter a new preview start.=Enter when the music sample starts.
+Enter a new preview length.=Enter how long the music sample lasts.
 Enter a new min BPM.=Enter the minimum displayed BPM.
 Enter a new max BPM.=Enter the maximum displayed BPM.
 More than %d notes per measure is not allowed.  This change has been reverted.=More than %d notes per measure is not allowed.  This change has been reverted.

Themes/_fallback/Scripts/03 ThemePrefs.lua

@@ -139,3 +139,40 @@ ThemePrefs =
 -- global aliases
 GetThemePref = ThemePrefs.Get
 SetThemePref = ThemePrefs.Set
+
+
+-- bring in SpecialScoring from default.
+
+function InitUserPrefs()
+	if GetUserPref("UserPrefScoringMode") == nil then
+		SetUserPref("UserPrefScoringMode", 'DDR Extreme');
+	end;
+end;
+
+function UserPrefScoringMode()
+	local baseChoices = { 'DDR 1stMIX', 'DDR 4thMIX', 'DDR Extreme', 'DDR SuperNOVA', 'DDR SuperNOVA 2', 'MIGS' }; --'[SSC] Radar Master'
+	local t = {
+		Name = "UserPrefScoringMode";
+		LayoutType = "ShowAllInRow";
+		SelectType = "SelectOne";
+		OneChoiceForAllPlayers = true;
+		ExportOnChange = false;
+		Choices = baseChoices;
+		LoadSelections = function(self, list, pn)
+			if ReadPrefFromFile("UserPrefScoringMode") ~= nil then
+				local theValue = ReadPrefFromFile("UserPrefScoringMode");
+				local success = false;				
+				for k,v in ipairs(baseChoices) do if v == theValue then list[k] = true success = true break end end;
+				if success == false then list[1] = true end;
+			else
+				WritePrefToFile("UserPrefScoringMode", 'DDR Extreme');
+				list[1] = true;
+			end;
+		end;
+		SaveSelections = function(self, list, pn)
+			for k,v in ipairs(list) do if v then WritePrefToFile("UserPrefScoringMode", baseChoices[k]) break end end;
+		end;
+	};
+	setmetatable( t, t );
+	return t;
+end

Themes/_fallback/Scripts/04 Scoring.lua

@@ -1,6 +1,8 @@
+--internals table
+local Shared = {};
 --Special Scoring types.
 local r = {};
-local DisabledScoringModes = { 'DDR Extreme', '[SSC] Radar Master' };
+local DisabledScoringModes = { '[SSC] Radar Master' };
 --the following metatable makes any missing value in a table 0 instead of nil.
 local ZeroIfNotFound = { __index = function() return 0 end; };
 
@@ -30,25 +32,46 @@ end;
 r['DDR 1stMIX'] = function(params, pss)
 	local dCombo = math.floor((pss:GetCurrentCombo()+1)/4);
 	local bScore = (dCombo^2+1) * 100;
-	local multLookup = { ['TapNoteScore_W1']=3, ['TapNoteScore_W2']=3, ['TapNoteScore_W3']=1 };
+	local multLookup = 
+	{ 
+		['TapNoteScore_W1']=3,
+		['TapNoteScore_W2']=3,
+		['TapNoteScore_W3']=1
+	};
 	setmetatable(multLookup, ZeroIfNotFound);
 	--if score increases above the boundaries of a 32-bit signed
 	--(about 2.15 billion), it stops increasing. Conveniently,
 	--1st Mix clamped score as well.
-	pss:SetScore(clamp(pss:GetScore()+(bScore*multLookup[params.TapNoteScore]),0,999999999));
+	local capScore = 999999999;
+	local bestScore = bScore * multLookup['TapNoteScore_W1'];
+	local localScore = bScore * multLookup[params.TapNoteScore];
+	pss:SetCurMaxScore(clamp(pss:GetCurMaxScore()+(bestScore),0,capScore));
+	pss:SetScore(clamp(pss:GetScore()+(localScore),0,capScore));
+	
 end;
 -----------------------------------------------------------
 --DDR 4th Mix/Extra Mix/Konamix/GB3/DDRPC Scoring
 -----------------------------------------------------------
 r['DDR 4thMIX'] = function(params, pss)
-	local scoreLookupTable = { ['TapNoteScore_W1']=777, ['TapNoteScore_W2']=777, ['TapNoteScore_W3']=555 };
-	setmetatable(scoreLookupTable, ZeroIfNotFound); 
+	local scoreLookupTable =
+	{ 
+		['TapNoteScore_W1']=777, 
+		['TapNoteScore_W2']=777, 
+		['TapNoteScore_W3']=555 
+	};
+	setmetatable(scoreLookupTable, ZeroIfNotFound);
+	-- TODO: Modify this so that current max assumes full combo?
 	local comboBonusForThisStep = (pss:GetCurrentCombo()+1)*333;
-	pss:SetScore(clamp(pss:GetScore()+scoreLookupTable[params.TapNoteScore]+(scoreLookupTable[params.TapNoteScore] and comboBonusForThisStep or 0),0,999999999));
+	local capScore = 999999999;
+	local bestPoints = scoreLookupTable['TapNoteScore_W1'];
+	local bestCombo = bestPoints and comboBonusForThisStep or 0;
+	pss:SeCurMaxScore(clamp(pss:GeCurMaxScore()+bestPoints+bestCombo,0,capScore));
+	local localPoints = scoreLookupTable[params.TapNoteScore];
+	local localCombo = localPoints and comboBonusForThisStep or 0;
+	pss:SetScore(clamp(pss:GetScore()+localPoints+localCombo,0,capScore));
 end;
 -----------------------------------------------------------
 --DDR MAX2/Extreme Scoring
---This scoring system doesn't work and is locked out.
 -----------------------------------------------------------
 r['DDR Extreme'] = function(params, pss)
 	local judgmentBase = {
@@ -60,11 +83,17 @@ r['DDR Extreme'] = function(params, pss)
 	local steps = GAMESTATE:GetCurrentSteps(params.Player);
 	local radarValues = steps:GetRadarValues(params.Player);
 	local baseScore = (steps:IsAnEdit() and 
-		5 or steps:GetMeter()) * 10000000;
-	local currentStep = 0; -- TODO: Get current step/hold.
+		5 or steps:GetMeter()) * 1000000;
 	local totalItems = GetTotalItems(radarValues);
 	local singleStep = (1 + totalItems) * totalItems / 2;
-	local stepLast = math.floor(baseScore / singleStep) * currentStep;
+	if (not Shared.CurrentStep) then
+		Shared.CurrentStep = 0
+	end;
+	Shared.CurrentStep = Shared.CurrentStep + 1;
+	local stepValue = math.floor(baseScore /singleStep);
+	local stepLast = stepValue * Shared.CurrentStep;
+	pss:SetCurMaxScore(pss:GetCurMaxScore() + 
+		(stepLast * judgmentBase['TapNoteScore_W1']));
 	local judgeScore = 0;
 	if (params.HoldNoteScore == 'HoldNoteScore_Held') then
 		judgeScore = judgmentBase['TapNoteScore_W1'];
@@ -75,29 +104,51 @@ r['DDR Extreme'] = function(params, pss)
 		end;
 	end;
 	local stepScore = judgeScore * stepLast;
-	
 	pss:SetScore(pss:GetScore() + stepScore);
+	if (Shared.CurrentStep >= totalItems) then -- Just in case.
+		-- TODO: Implement the bonus for the last step?
+		Shared.CurrentStep = 0; -- Reset for the next song.
+	end;
 end;
 -----------------------------------------------------------
 --DDR SuperNOVA(-esque) scoring
 -----------------------------------------------------------
 r['DDR SuperNOVA'] = function(params, pss)
-	local multLookup = { ['TapNoteScore_W1'] = 1, ['TapNoteScore_W2'] = 1, ['TapNoteScore_W3'] = 0.5 };
+	local multLookup =
+	{
+		['TapNoteScore_W1'] = 1,
+		['TapNoteScore_W2'] = 1,
+		['TapNoteScore_W3'] = 0.5
+	};
 	setmetatable(multLookup, ZeroIfNotFound);
 	local radarValues = GetDirectRadar(params.Player);
 	local totalItems = GetTotalItems(radarValues); 
-	local buildScore = (10000000 / totalItems * multLookup[params.TapNoteScore]) + (10000000 / totalItems * (params.HoldNoteScore == 'HoldNoteScore_Held' and 1 or 0));
+	local base = 10000000 / totalItems;
+	local hold = base * (params.HoldNoteScore == 'HoldNoteScore_Held' and 1 or 0);
+	local maxScore = (base * multLookup['TapNoteScore_W1']) + hold;
+	pss:SetCurMaxScore(pss:GetCurMaxScore() + math.round(maxScore));
+	local buildScore = (base * multLookup[params.TapNoteScore]) + hold;
 	pss:SetScore(pss:GetScore() + math.round(buildScore));
 end;
 -----------------------------------------------------------
 --DDR SuperNOVA 2(-esque) scoring
 -----------------------------------------------------------
 r['DDR SuperNOVA 2'] = function(params, pss)
-	local multLookup = { ['TapNoteScore_W1'] = 1, ['TapNoteScore_W2'] = 1, ['TapNoteScore_W3'] = 0.5 };
+	local multLookup =
+	{
+		['TapNoteScore_W1'] = 1,
+		['TapNoteScore_W2'] = 1,
+		['TapNoteScore_W3'] = 0.5
+	};
 	setmetatable(multLookup, ZeroIfNotFound);
 	local radarValues = GetDirectRadar(params.Player);
 	local totalItems = GetTotalItems(radarValues); 
-	local buildScore = (100000 / totalItems * multLookup[params.TapNoteScore] - (IsW1Allowed(params.TapNoteScore) and 10 or 0)) + (100000 / totalItems * (params.HoldNoteScore == 'HoldNoteScore_Held' and 1 or 0));
+	local base = 100000 / totalItems;
+	local hold = base * (params.HoldNoteScore == 'HoldNoteScore_Held' and 1 or 0);
+	local maxScore = (base * multLookup['TapNoteScore_W1']) + hold;
+	pss:SetCurMaxScore(pss:GetCurMaxScore() + (math.round(maxScore) * 10));
+	local preW1 = base * multLookup[params.TapNoteScore];
+	local buildScore = (preW1 - (IsW1Allowed(params.TapNoteScore) and 10 or 0)) + hold;
 	pss:SetScore(pss:GetScore() + (math.round(buildScore) * 10));
 end;
 -----------------------------------------------------------
@@ -137,19 +188,28 @@ end;
 ------------------------------------------------------------
 r['MIGS'] = function(params,pss)
 	local curScore = 0;
-	local tapScoreTable = { ['TapNoteScore_W1'] = 3, ['TapNoteScore_W2'] = 2, ['TapNoteScore_W3'] = 1, ['TapNoteScore_W5'] = -4, ['TapNoteScore_Miss'] = -8 };
+	local tapScoreTable = 
+	{ 
+		['TapNoteScore_W1'] = 3,
+		['TapNoteScore_W2'] = 2,
+		['TapNoteScore_W3'] = 1,
+		['TapNoteScore_W5'] = -4,
+		['TapNoteScore_Miss'] = -8
+	};
 	for k,v in pairs(tapScoreTable) do
 		curScore = curScore + ( pss:GetTapNoteScores(k) * v );
 	end;
 	curScore = curScore + ( pss:GetHoldNoteScores('HoldNoteScore_Held') * 6 );
 	pss:SetScore(clamp(curScore,0,math.huge));
 end;
-SpecialScoring = {};
-setmetatable(SpecialScoring, { 
+
+-- Formulas end here.
+Scoring = {};
+setmetatable(Scoring, { 
 	__metatable = { "Letting you change the metatable sort of defeats the purpose." };
 	__index = function(tbl, key)
 			for v in ivalues(DisabledScoringModes) do
-				if key == v then return r['DDR 1stMIX']; end;
+				if key == v then return r['DDR Extreme']; end;
 			end;
 			return r[key];
 		end;

Themes/_fallback/metrics.ini

@@ -1,6 +1,5 @@
 # This probably is hard to understand from the way it was made in the first 
-# place, so instead just pay attention to each group, which has tons of
-# notes
+# place, so instead just pay attention to each group, which has tons of notes.
 
 # 01 # Global
 # 02 # Managers
@@ -476,33 +475,6 @@ PumpRoutineString="Routine"
 # Difficulty_Edit-StepsType_Pump_Double=Edit
 # Course=Progressive
 
-[CustomScoring]
-# Custom scoring, usually good for custom games.
-
-# Various tweakers
-ComboAboveThresholdAddsToScoreBonus=0
-ComboScoreBonusThreshold=50
-ComboScoreBonusValue=+1000
-
-ComboMultiplier=0.0
-
-DoubleNoteScoreMultiplier=2.0
-TripleNoteScoreMultiplier=3.0
-QuadOrHigherNoteScoreMultiplier=4.0
-# And what they award you
-PointsW1=+50
-PointsW2=+20
-PointsW3=+10
-PointsW4=+5
-PointsW5=0
-PointsMiss=-5
-PointsHitMine=-5
-PointsCheckpointHit=+5
-PointsCheckpointMiss=-5
-PointsNone=0
-PointsHoldHeld=+5
-PointsHoldLetGo=-5
-
 [DifficultyList]
 # A list that shows difficulties in a song.
 CapitalizeDifficultyNames=false
@@ -1012,6 +984,7 @@ WarpColor=color("1,0,0.5,1")
 TimeSignatureColor=color("1,0.55,0,1")
 TickcountColor=color("0,1,0,1")
 ComboColor=color("0.55,1,0,1")
+LabelColor=color("1,0,0,1")
 #
 BPMIsLeftSide=true
 StopIsLeftSide=true
@@ -1020,6 +993,7 @@ WarpIsLeftSide=false
 TimeSignatureIsLeftSide=true
 TickcountIsLeftSide=false
 ComboIsLeftSide=false
+LabelIsLeftSide=false
 #
 BPMOffsetX=60
 StopOffsetX=50
@@ -1028,6 +1002,7 @@ WarpOffsetX=60
 TimeSignatureOffsetX=30
 TickcountOffsetX=10
 ComboOffsetX=30
+LabelOffsetX=80
 
 [PlayerStageStats]
 # Original CVS Grading
@@ -2350,10 +2325,10 @@ Mines,4="mod,attackmines;name,AttackMines"
 # Mines,4="mod,attackmines;name,AttackMines"
 
 Attacks="3"
-AttacksDefault="mod,no randomattacks,no songattacks"
-Attacks,1="name,Off"
+AttacksDefault="mod,songattacks"
+Attacks,3="mod,no randomattacks,no songattacks;name,Off"
 Attacks,2="mod,randomattacks;name,RandomAttacks"
-Attacks,3="mod,songattacks;name,SongAttacks"
+Attacks,1="name,SongAttacks"
 
 PlayerAutoPlay="2"
 PlayerAutoPlayDefault="mod,no playerautoplay"
@@ -2741,8 +2716,9 @@ Line20="conf,VisualDelaySeconds"
 Fallback="ScreenOptionsServiceChild"
 NextScreen="ScreenOptionsExtended"
 PrevScreen="ScreenOptionsExtended"
-LineNames="2,3,4,8,11,13,14,15,16,28,29,30"
-Line2="conf,ScoringType"
+LineNames="Score,3,4,8,11,13,14,15,16,28,29,30"
+#Line2="conf,ScoringType"
+LineScore="lua,UserPrefScoringMode()"
 Line3="conf,TimingWindowScale"
 Line4="conf,LifeDifficulty"
 Line8="lua,GamePrefDefaultFail()"
@@ -3691,7 +3667,7 @@ CancelTransitionsOut=true
 PlayMusic=false
 TimerSeconds=-1
 ShowStyleIcon=false
-LineNames="1,2,3,4,5,6,R,7,8,9,10,11,12,13,14,15,16"
+LineNames="1,2,3,4,5,6,R,7,8,9,10,Attacks,11,12,13,14,15,16"
 Line1="list,Speed"
 Line2="list,Accel"
 Line3="list,Effect"
@@ -3703,6 +3679,7 @@ Line7="list,Scroll"
 Line8="list,NoteSkins"
 Line9="list,Holds"
 Line10="list,Mines"
+LineAttacks="list,Attacks"
 Line11="list,Hide"
 Line12="list,Persp"
 Line13="list,Assist"
@@ -4249,4 +4226,4 @@ TimerSeconds=40
 TimerStealth=true
 ForceTimer=true
 TimerMetricsGroup="MenuTimerNoSound"
-TimerOnCommand=visible,false
+TimerOnCommand=visible,false

Themes/_portKit-sm4/metrics.ini

@@ -4406,30 +4406,6 @@ BodyHeight=38
 [ComboGraph]
 BodyWidth=140
 
-[CustomScoring]
-ComboAboveThresholdAddsToScoreBonus=0
-ComboScoreBonusThreshold=50
-ComboScoreBonusValue=1000
-# this was removed in SM4
-ComboMultiplier=0.0
-
-DoubleNoteScoreMultiplier=1.0
-TripleNoteScoreMultiplier=1.0
-QuadOrHigherNoteScoreMultiplier=1.0
-
-PointsW1=1000
-PointsW2=1000
-PointsW3=500
-PointsW4=100
-PointsW5=-200
-PointsMiss=-500
-PointsHitMine=-500
-PointsCheckpointHit=1000
-PointsCheckpointMiss=-200
-PointsNone=0
-PointsHoldHeld=1000
-PointsHoldLetGo=-500
-
 [CustomDifficulty]
 #See pump theme for an example
 Names=""

Themes/_themekit-piu/metrics.ini

@@ -88,29 +88,6 @@ BackInEventMode=""
 ;Screwy
 Names=""
 
-[CustomScoring]
-ComboAboveThresholdAddsToScoreBonus=0
-ComboMultiplier=0.0
-ComboScoreBonusThreshold=50
-ComboScoreBonusValue=+1000
-
-DoubleNoteScoreMultiplier=1.0
-TripleNoteScoreMultiplier=1.5
-QuadOrHigherNoteScoreMultiplier=2
-
-PointsW1=+1000
-PointsW2=+1000
-PointsW3=+500
-PointsW4=+100
-PointsW5=-200
-PointsMiss=-500
-PointsHitMine=-1000
-PointsCheckpointHit=+1000
-PointsCheckpointMiss=-200
-PointsNone=0
-PointsHoldHeld=+1000
-PointsHoldLetGo=-500
-
 [Gameplay]
 ComboIsPerRow=true
 MinScoreToContinueCombo="TapNoteScore_W3"
@@ -550,4 +527,4 @@ PrevScreen="ScreenTitleMenu"
 [ScreenOptionsSystemDirection]
 Fallback="ScreenOptionsServiceChild"
 PrevScreen="ScreenOptionsService"
-NextScreen="ScreenOptionsService"
+NextScreen="ScreenOptionsService"

Themes/default/BGAnimations/ScreenGameplay decorations/default.lua

@@ -168,11 +168,13 @@ t[#t+1] = Def.ActorFrame {
 	};
 	CreateStops();
 };
-if PREFSMAN:GetPreference("ScoringType") == 'ScoringType_Custom' then
-	t[#t+1] = Def.Actor{
-		JudgmentMessageCommand = function(self, params)
-			SpecialScoring[GetUserPref("UserPrefSpecialScoringMode")](params, STATSMAN:GetCurStageStats():GetPlayerStageStats(params.Player))
-		end;
-	};
+if( not GAMESTATE:IsCourseMode() ) then
+t[#t+1] = Def.Actor{
+	JudgmentMessageCommand = function(self, params)
+		Scoring[GetUserPref("UserPrefScoringMode")](params, 
+			STATSMAN:GetCurStageStats():GetPlayerStageStats(params.Player))
+	end;
+};
 end;
+
 return t

Themes/default/Languages/en.ini

@@ -78,7 +78,6 @@ TimingDifficulty=Timing Difficulty: %s
 
 [OptionTitles]
 UserPrefAutoSetStyle=Auto Set Style
-UserPrefSpecialScoringMode=Special Scoring Mode
 UserPrefNotePosition=Note Positions
 UserPrefComboOnRolls=Rolls Increment Combo
 UserPrefComboUnderField=Combo Under Field
@@ -97,7 +96,6 @@ UserPrefComboOnRolls=Choose if rolls should increment the combo or not.
 UserPrefComboUnderField=Determine if the combo should display under the notes or not.
 
 UserPrefGameplayShowScore=Show or Hide the score display in gameplay.
-UserPrefSpecialScoringMode=Select the scoring mode to be used if the Special scoring type is selected.
 UserPrefGameplayShowStepsDisplay=Show or Hide the step information display in gameplay.
 UserPrefShowLotsaOptions=Choose how many lines/rows of options to choose from. &oq;Few&cq; keeps the list to a minimum. &oq;Many&cq; adds various show-off mods.
 UserPrefLongFail=Choose between the original sm-ssc fail (Long) or the new sm-ssc fail (Short).

Themes/default/Scripts/03 ThemePrefs.lua

@@ -21,8 +21,8 @@ function InitUserPrefs()
 	if GetUserPref("UserPrefGameplayShowScore") == nil then
 		SetUserPref("UserPrefGameplayShowScore", false);
 	end;
-	if GetUserPref("UserPrefSpecialScoringMode") == nil then
-		SetUserPref("UserPrefSpecialScoringMode", 'DDR 1st Mix');
+	if GetUserPref("UserPrefScoringMode") == nil then
+		SetUserPref("UserPrefScoringMode", 'DDR Extreme');
 	end;
 	if GetUserPrefB("UserPrefShowLotsaOptions") == nil then
 		SetUserPref("UserPrefShowLotsaOptions", true);
@@ -230,34 +230,6 @@ function UserPrefShowLotsaOptions()
 	return t;
 end
 
-function UserPrefSpecialScoringMode()
-	local baseChoices = { 'DDR 1stMIX', 'DDR 4thMIX', 'DDR SuperNOVA', 'DDR SuperNOVA 2', 'MIGS' }; --'[SSC] Radar Master'
-	local t = {
-		Name = "UserPrefSpecialScoringMode";
-		LayoutType = "ShowAllInRow";
-		SelectType = "SelectOne";
-		OneChoiceForAllPlayers = true;
-		ExportOnChange = false;
-		Choices = baseChoices;
-		LoadSelections = function(self, list, pn)
-			if ReadPrefFromFile("UserPrefSpecialScoringMode") ~= nil then
-				local theValue = ReadPrefFromFile("UserPrefSpecialScoringMode");
-				local success = false;				
-				for k,v in ipairs(baseChoices) do if v == theValue then list[k] = true success = true break end end;
-				if success == false then list[1] = true end;
-			else
-				WritePrefToFile("UserPrefSpecialScoringMode", 'DDR 1stMIX');
-				list[1] = true;
-			end;
-		end;
-		SaveSelections = function(self, list, pn)
-			for k,v in ipairs(list) do if v then WritePrefToFile("UserPrefSpecialScoringMode", baseChoices[k]) break end end;
-		end;
-	};
-	setmetatable( t, t );
-	return t;
-end
-
 function GetDefaultOptionLines()
 	local LineSets = {
 		"1,8,14,2,3,4,5,6,R,7,9,10,11,12,13,15,16,17,18", -- All

Themes/default/metrics.ini

@@ -107,28 +107,6 @@ TextPulseCommand=finishtweening;diffusealpha,1;zoom,0.5*1.025;decelerate,0.05;zo
 
 [CustomDifficulty]
 
-[CustomScoring]
-# So special scoring works properly, we zero this out
-ComboAboveThresholdAddsToScoreBonus=0
-ComboScoreBonusThreshold=0
-ComboScoreBonusValue=0
-ComboMultiplier=0
-DoubleNoteScoreMultiplier=0
-TripleNoteScoreMultiplier=0
-QuadOrHigherNoteScoreMultiplier=0
-PointsW1=0
-PointsW2=0
-PointsW3=0
-PointsW4=0
-PointsW5=0
-PointsMiss=0
-PointsHitMine=0
-PointsCheckpointHit=0
-PointsCheckpointMiss=0
-PointsNone=0
-PointsHoldHeld=0
-PointsHoldLetGo=0
-
 [DifficultyList]
 ItemsSpacingY=24
 NumShownItems=8
@@ -1252,7 +1230,7 @@ LineFlashyCombo="lua,UserPrefFlashyCombo()"
 [ScreenOptionsGraphicsSound]
 
 [ScreenOptionsAdvanced]
-LineNames="2,3,4,8,11,13,14,15,16,28,29,30,RollCombo"
+LineNames="Score,3,4,8,11,13,14,15,16,28,29,30,RollCombo"
 LineRollCombo="lua,UserPrefComboOnRolls()"
 
 [ScreenAppearanceOptions]
@@ -1267,10 +1245,9 @@ LineRollCombo="lua,UserPrefComboOnRolls()"
 Fallback="ScreenOptionsServiceChild"
 NextScreen="ScreenOptionsExtended"
 PrevScreen="ScreenOptionsExtended"
-LineNames="gNotePos,gAuto,gScore,gSScore,gSDisp,gOpts,gLongFail,gComboUnderField,FlashyCombo,GameplayFooter"
+LineNames="gNotePos,gAuto,gScore,gSDisp,gOpts,gLongFail,gComboUnderField,FlashyCombo,GameplayFooter"
 LinegNotePos="lua,UserPrefNotePosition()"
 LinegScore="lua,UserPrefGameplayShowScore()"
-LinegSScore="lua,UserPrefSpecialScoringMode()"
 LinegSDisp="lua,UserPrefGameplayShowStepsDisplay()"
 LinegOpts="lua,UserPrefShowLotsaOptions()"
 LinegAuto="lua,UserPrefAutoSetStyle()"

Themes/themekit/Graphics/MusicWheelItem Song ColorPart.lua

@@ -0,0 +1,14 @@
+return Def.ActorFrame {
+	Def.Quad {
+		InitCommand=cmd(x,-128+4;zoomto,4,46);
+-- 		OnCommand=cmd(diffuse,color("0,0,0,0.5"));
+	};
+--[[ 	Def.Quad {
+		InitCommand=cmd(x,-128+16+6;zoomto,32,46);
+-- 		OnCommand=cmd(faderight,1;diffusealpha,0.5);
+	}; --]]
+--[[ 	Def.Quad {
+		InitCommand=cmd(x,2;y,23;zoomto,320,1);
+-- 		OnCommand=cmd(diffuse,color("0,0,0,0.5"));
+	}; --]]
+};

Themes/themekit/Graphics/MusicWheelItem Song NormalPart.lua

@@ -0,0 +1,6 @@
+return Def.ActorFrame {
+	Def.Quad {
+		InitCommand=cmd(x,4;zoomto,256-4,46);
+		OnCommand=cmd(diffuse,color("0,0,0,0.5"));
+	};
+};

Utils/Font generation/smfontgen.py

@@ -12,7 +12,7 @@ def smfontgen(fontname, fontsize, glyphsizex, glyphsizey, sstartcode, sendcode,
 	texindex = 0
 	metricsfd = 0
 	atglyph = startcode
-
+	
 	metrics = open(filename+".ini", "w")
 	metrics.write("\xEF\xBB\xBF") # Unicode BOM
 	metrics.write("[common]\n")
@@ -24,7 +24,7 @@ def smfontgen(fontname, fontsize, glyphsizex, glyphsizey, sstartcode, sendcode,
 	metrics.write("DrawExtraPixelsRight=0\n")
 	metrics.write("AdvanceExtraPixels=0\n")
 	metrics.write("\n")
-
+	
 	while(atglyph <= endcode):
 		atglyph = maketex(texindex, fontname, fontsize, glyphsizex, glyphsizey, atglyph, endcode, charsperrow, rowspertex, metrics, border, filename)
 		texindex+=1
@@ -34,9 +34,9 @@ def smfontgen(fontname, fontsize, glyphsizex, glyphsizey, sstartcode, sendcode,
 def maketex(texindex, fontname, fontsize, glyphsizex, glyphsizey, startcode, endcode, charsperrow, rowspertex, metrics, border, filename):
 	totalx = glyphsizex * charsperrow # We'll crop it down later if needed
 	totaly = glyphsizey*rowspertex # See above
-
+	
 	metrics.write("["+str(texindex)+"]\n")
-
+	
 	img = pdb.gimp_image_new(totalx, totaly, RGB)
 	# DEBUG: show the image
 	#pdb.gimp_display_new(img)
@@ -69,7 +69,7 @@ def maketex(texindex, fontname, fontsize, glyphsizex, glyphsizey, startcode, end
 			pdb.gimp_selection_layer_alpha(charlyr)
 			# Merge the layer down (the selection stays):
 			glyphlyr = pdb.gimp_image_merge_down(img, charlyr, CLIP_TO_IMAGE)
-
+		
 		# And finally, test if the selection is empty. If it is, there's no glyph.
 		# If it isn't, we got a glyph.
 		# If no floating selection was created, nothing was drawn,
@@ -87,9 +87,9 @@ def maketex(texindex, fontname, fontsize, glyphsizex, glyphsizey, startcode, end
 				if celly >= rowspertex: break
 				metrics.write("\n")
 				metrics.write("Line "+str(celly)+"=")
-
+		
 		atglyph+=1
-
+	
 	# If we didn't use all the rows/columns, crop off the excess
 	if(celly == 0): # Only one row
 		assert atglyph >= endcode
@@ -97,9 +97,9 @@ def maketex(texindex, fontname, fontsize, glyphsizex, glyphsizey, startcode, end
 	elif ( (celly+1)*glyphsizey < totaly):
 		assert atglyph >= endcode
 		pdb.gimp_image_crop(img, totalx, (celly+1)*glyphsizey, 0, 0)
-
+	
 	# Here is where you put your code for dressing the glyphs up. gimp_selection_layer_alpha is your friend.
-
+	
 	# Outline
 	#otlnlyr = pdb.gimp_layer_copy(glyphlyr, False)
 	#pdb.gimp_drawable_set_name(otlnlyr, "Outlines")
@@ -108,10 +108,10 @@ def maketex(texindex, fontname, fontsize, glyphsizex, glyphsizey, startcode, end
 	#pdb.gimp_selection_layer_alpha(otlnlyr)
 	#pdb.gimp_selection_grow(img, 3)
 	#pdb.gimp_edit_bucket_fill(otlnlyr, BG_BUCKET_FILL, NORMAL_MODE,100, 255, False, 0, 0)
-
+	
 	# Rename the ("new") glyph layer
 	pdb.gimp_drawable_set_name(glyphlyr, "Glyphs")
-
+	
 	# Save the texture.
 	if(celly == rowspertex): # Full texture
 		finalfilename = filename+" ["+str(texindex)+"] "+str(charsperrow)+"x"+str(rowspertex)+".png"
@@ -119,21 +119,21 @@ def maketex(texindex, fontname, fontsize, glyphsizex, glyphsizey, startcode, end
 		finalfilename = filename+" ["+str(texindex)+"] "+str(charsperrow)+"x"+str(celly+1)+".png"
 	else: # Only one row
 		finalfilename = filename+" ["+str(texindex)+"] "+str(cellx+1)+"x1.png"
-
+	
 	drwbl = pdb.gimp_image_merge_visible_layers(img, CLIP_TO_IMAGE)
 	pdb.gimp_file_save(img, drwbl, finalfilename, finalfilename)
-
+	
 	# All saved up. Blow it out of RAM.
 	pdb.gimp_image_delete(img)
-
+	
 	# Wrap up metrics for this tex.
 	metrics.write("\n")
 	metrics.write("\n")
 	metrics.write(charlenout)
 	metrics.write("\n")
-
+	
 	charlenout = ""
-
+	
 	return atglyph
 
 register(
@@ -161,4 +161,4 @@ register(
 	smfontgen,
 	"<Image>/File/Create/Misc/")
 
-main()
+main()

Xcode/stepmania.xcodeproj/project.pbxproj

@@ -31,6 +31,68 @@
 		2BA7925F1304F20D002BD8E1 /* NotesLoaderSSC.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BA7925B1304F20D002BD8E1 /* NotesLoaderSSC.h */; };
 		2BA792601304F20D002BD8E1 /* NotesWriterSSC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BA7925C1304F20D002BD8E1 /* NotesWriterSSC.cpp */; };
 		2BA792611304F20D002BD8E1 /* NotesWriterSSC.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BA7925D1304F20D002BD8E1 /* NotesWriterSSC.h */; };
+		2BD06FEE137242680018CB9F /* json_batchallocator.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BD06FDD137240CF0018CB9F /* json_batchallocator.h */; };
+		2BD06FEF137242680018CB9F /* json_internalarray.inl in Resources */ = {isa = PBXBuildFile; fileRef = 2BD06FDE137240CF0018CB9F /* json_internalarray.inl */; };
+		2BD06FF0137242680018CB9F /* json_internalmap.inl in Resources */ = {isa = PBXBuildFile; fileRef = 2BD06FDF137240CF0018CB9F /* json_internalmap.inl */; };
+		2BD06FF1137242680018CB9F /* json_reader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BD06FE0137240CF0018CB9F /* json_reader.cpp */; };
+		2BD06FF2137242680018CB9F /* json_value.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BD06FE1137240CF0018CB9F /* json_value.cpp */; };
+		2BD06FF3137242680018CB9F /* json_valueiterator.inl in Resources */ = {isa = PBXBuildFile; fileRef = 2BD06FE2137240CF0018CB9F /* json_valueiterator.inl */; };
+		2BD06FF4137242680018CB9F /* json_writer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BD06FE3137240CF0018CB9F /* json_writer.cpp */; };
+		2BDB88E9137201F700E6FD3A /* lapi.c in Sources */ = {isa = PBXBuildFile; fileRef = 2BDB88B2137201F700E6FD3A /* lapi.c */; };
+		2BDB88EA137201F700E6FD3A /* lapi.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BDB88B3137201F700E6FD3A /* lapi.h */; };
+		2BDB88EB137201F700E6FD3A /* lauxlib.c in Sources */ = {isa = PBXBuildFile; fileRef = 2BDB88B4137201F700E6FD3A /* lauxlib.c */; };
+		2BDB88EC137201F700E6FD3A /* lauxlib.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BDB88B5137201F700E6FD3A /* lauxlib.h */; };
+		2BDB88ED137201F700E6FD3A /* lbaselib.c in Sources */ = {isa = PBXBuildFile; fileRef = 2BDB88B6137201F700E6FD3A /* lbaselib.c */; };
+		2BDB88EE137201F700E6FD3A /* lcode.c in Sources */ = {isa = PBXBuildFile; fileRef = 2BDB88B7137201F700E6FD3A /* lcode.c */; };
+		2BDB88EF137201F700E6FD3A /* lcode.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BDB88B8137201F700E6FD3A /* lcode.h */; };
+		2BDB88F0137201F700E6FD3A /* ldblib.c in Sources */ = {isa = PBXBuildFile; fileRef = 2BDB88B9137201F700E6FD3A /* ldblib.c */; };
+		2BDB88F1137201F700E6FD3A /* ldebug.c in Sources */ = {isa = PBXBuildFile; fileRef = 2BDB88BA137201F700E6FD3A /* ldebug.c */; };
+		2BDB88F2137201F700E6FD3A /* ldebug.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BDB88BB137201F700E6FD3A /* ldebug.h */; };
+		2BDB88F3137201F700E6FD3A /* ldo.c in Sources */ = {isa = PBXBuildFile; fileRef = 2BDB88BC137201F700E6FD3A /* ldo.c */; };
+		2BDB88F4137201F700E6FD3A /* ldo.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BDB88BD137201F700E6FD3A /* ldo.h */; };
+		2BDB88F5137201F700E6FD3A /* ldump.c in Sources */ = {isa = PBXBuildFile; fileRef = 2BDB88BE137201F700E6FD3A /* ldump.c */; };
+		2BDB88F6137201F700E6FD3A /* lfunc.c in Sources */ = {isa = PBXBuildFile; fileRef = 2BDB88BF137201F700E6FD3A /* lfunc.c */; };
+		2BDB88F7137201F700E6FD3A /* lfunc.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BDB88C0137201F700E6FD3A /* lfunc.h */; };
+		2BDB88F8137201F700E6FD3A /* lgc.c in Sources */ = {isa = PBXBuildFile; fileRef = 2BDB88C1137201F700E6FD3A /* lgc.c */; };
+		2BDB88F9137201F700E6FD3A /* lgc.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BDB88C2137201F700E6FD3A /* lgc.h */; };
+		2BDB88FA137201F700E6FD3A /* linit.c in Sources */ = {isa = PBXBuildFile; fileRef = 2BDB88C3137201F700E6FD3A /* linit.c */; };
+		2BDB88FB137201F700E6FD3A /* liolib.c in Sources */ = {isa = PBXBuildFile; fileRef = 2BDB88C4137201F700E6FD3A /* liolib.c */; };
+		2BDB88FC137201F700E6FD3A /* llex.c in Sources */ = {isa = PBXBuildFile; fileRef = 2BDB88C5137201F700E6FD3A /* llex.c */; };
+		2BDB88FD137201F700E6FD3A /* llex.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BDB88C6137201F700E6FD3A /* llex.h */; };
+		2BDB88FE137201F700E6FD3A /* llimits.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BDB88C7137201F700E6FD3A /* llimits.h */; };
+		2BDB88FF137201F700E6FD3A /* lmathlib.c in Sources */ = {isa = PBXBuildFile; fileRef = 2BDB88C8137201F700E6FD3A /* lmathlib.c */; };
+		2BDB8900137201F700E6FD3A /* lmem.c in Sources */ = {isa = PBXBuildFile; fileRef = 2BDB88C9137201F700E6FD3A /* lmem.c */; };
+		2BDB8901137201F700E6FD3A /* lmem.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BDB88CA137201F700E6FD3A /* lmem.h */; };
+		2BDB8902137201F700E6FD3A /* loadlib.c in Sources */ = {isa = PBXBuildFile; fileRef = 2BDB88CB137201F700E6FD3A /* loadlib.c */; };
+		2BDB8903137201F700E6FD3A /* lobject.c in Sources */ = {isa = PBXBuildFile; fileRef = 2BDB88CC137201F700E6FD3A /* lobject.c */; };
+		2BDB8904137201F700E6FD3A /* lobject.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BDB88CD137201F700E6FD3A /* lobject.h */; };
+		2BDB8905137201F700E6FD3A /* lopcodes.c in Sources */ = {isa = PBXBuildFile; fileRef = 2BDB88CE137201F700E6FD3A /* lopcodes.c */; };
+		2BDB8906137201F700E6FD3A /* lopcodes.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BDB88CF137201F700E6FD3A /* lopcodes.h */; };
+		2BDB8907137201F700E6FD3A /* loslib.c in Sources */ = {isa = PBXBuildFile; fileRef = 2BDB88D0137201F700E6FD3A /* loslib.c */; };
+		2BDB8908137201F700E6FD3A /* lparser.c in Sources */ = {isa = PBXBuildFile; fileRef = 2BDB88D1137201F700E6FD3A /* lparser.c */; };
+		2BDB8909137201F700E6FD3A /* lparser.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BDB88D2137201F700E6FD3A /* lparser.h */; };
+		2BDB890A137201F700E6FD3A /* lstate.c in Sources */ = {isa = PBXBuildFile; fileRef = 2BDB88D3137201F700E6FD3A /* lstate.c */; };
+		2BDB890B137201F700E6FD3A /* lstate.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BDB88D4137201F700E6FD3A /* lstate.h */; };
+		2BDB890C137201F700E6FD3A /* lstring.c in Sources */ = {isa = PBXBuildFile; fileRef = 2BDB88D5137201F700E6FD3A /* lstring.c */; };
+		2BDB890D137201F700E6FD3A /* lstring.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BDB88D6137201F700E6FD3A /* lstring.h */; };
+		2BDB890E137201F700E6FD3A /* lstrlib.c in Sources */ = {isa = PBXBuildFile; fileRef = 2BDB88D7137201F700E6FD3A /* lstrlib.c */; };
+		2BDB890F137201F700E6FD3A /* ltable.c in Sources */ = {isa = PBXBuildFile; fileRef = 2BDB88D8137201F700E6FD3A /* ltable.c */; };
+		2BDB8910137201F700E6FD3A /* ltable.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BDB88D9137201F700E6FD3A /* ltable.h */; };
+		2BDB8911137201F700E6FD3A /* ltablib.c in Sources */ = {isa = PBXBuildFile; fileRef = 2BDB88DA137201F700E6FD3A /* ltablib.c */; };
+		2BDB8912137201F700E6FD3A /* ltm.c in Sources */ = {isa = PBXBuildFile; fileRef = 2BDB88DB137201F700E6FD3A /* ltm.c */; };
+		2BDB8913137201F700E6FD3A /* ltm.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BDB88DC137201F700E6FD3A /* ltm.h */; };
+		2BDB8914137201F700E6FD3A /* lua.c in Sources */ = {isa = PBXBuildFile; fileRef = 2BDB88DD137201F700E6FD3A /* lua.c */; };
+		2BDB8915137201F700E6FD3A /* lua.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BDB88DE137201F700E6FD3A /* lua.h */; };
+		2BDB8916137201F700E6FD3A /* luac.c in Sources */ = {isa = PBXBuildFile; fileRef = 2BDB88DF137201F700E6FD3A /* luac.c */; };
+		2BDB8917137201F700E6FD3A /* luaconf.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BDB88E0137201F700E6FD3A /* luaconf.h */; };
+		2BDB8918137201F700E6FD3A /* lualib.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BDB88E1137201F700E6FD3A /* lualib.h */; };
+		2BDB8919137201F700E6FD3A /* lundump.c in Sources */ = {isa = PBXBuildFile; fileRef = 2BDB88E2137201F700E6FD3A /* lundump.c */; };
+		2BDB891A137201F700E6FD3A /* lundump.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BDB88E3137201F700E6FD3A /* lundump.h */; };
+		2BDB891B137201F700E6FD3A /* lvm.c in Sources */ = {isa = PBXBuildFile; fileRef = 2BDB88E4137201F700E6FD3A /* lvm.c */; };
+		2BDB891C137201F700E6FD3A /* lvm.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BDB88E5137201F700E6FD3A /* lvm.h */; };
+		2BDB891D137201F700E6FD3A /* lzio.c in Sources */ = {isa = PBXBuildFile; fileRef = 2BDB88E6137201F700E6FD3A /* lzio.c */; };
+		2BDB891E137201F700E6FD3A /* lzio.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BDB88E7137201F700E6FD3A /* lzio.h */; };
+		2BDB891F137201F700E6FD3A /* print.c in Sources */ = {isa = PBXBuildFile; fileRef = 2BDB88E8137201F700E6FD3A /* print.c */; };
 		3659B56F0F902143002B6B68 /* CommandLineActions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3659B56D0F902143002B6B68 /* CommandLineActions.cpp */; };
 		3659B5700F902143002B6B68 /* CommandLineActions.h in Headers */ = {isa = PBXBuildFile; fileRef = 3659B56E0F902143002B6B68 /* CommandLineActions.h */; };
 		367D575B0EDE56F200B46814 /* ScreenHighScores.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 367D57590EDE56F200B46814 /* ScreenHighScores.cpp */; };
@@ -1052,11 +1114,8 @@
 		AA77E76508B64B9A00FA24CA /* ScreenOptionsManageCourses.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA77E75B08B64B9A00FA24CA /* ScreenOptionsManageCourses.cpp */; };
 		AA77E76708B64B9A00FA24CA /* ScreenOptionsManageProfiles.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA77E75D08B64B9A00FA24CA /* ScreenOptionsManageProfiles.cpp */; };
 		AA77E8B108B6ABD500FA24CA /* vecLib.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AA77E8A108B6ABD500FA24CA /* vecLib.framework */; };
-		AA7A2BA00AE09BC90054C5BA /* lua.c in Sources */ = {isa = PBXBuildFile; fileRef = AA7A2B9D0AE09BC80054C5BA /* lua.c */; };
 		AA7A2BAF0AE09CEC0054C5BA /* liblua-5.1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = AAE7817E0AC7E37B00AEFC64 /* liblua-5.1.a */; };
 		AA7A2BB00AE09CF10054C5BA /* liblua-5.1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = AAE7817E0AC7E37B00AEFC64 /* liblua-5.1.a */; };
-		AA7A2BB10AE09CF80054C5BA /* print.c in Sources */ = {isa = PBXBuildFile; fileRef = AA7A2B9F0AE09BC90054C5BA /* print.c */; };
-		AA7A2BB20AE09CF90054C5BA /* luac.c in Sources */ = {isa = PBXBuildFile; fileRef = AA7A2B9E0AE09BC90054C5BA /* luac.c */; };
 		AA7ADC27072CAB7F00C50A7F /* RageSoundReader_Chain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA7ADC23072CAB7F00C50A7F /* RageSoundReader_Chain.cpp */; };
 		AA7ADC29072CAB7F00C50A7F /* RageSoundUtil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA7ADC25072CAB7F00C50A7F /* RageSoundUtil.cpp */; };
 		AA7C8AFC0B6744F700FD9940 /* bn_error.c in Sources */ = {isa = PBXBuildFile; fileRef = AA7C8A800B6744F600FD9940 /* bn_error.c */; };
@@ -1525,58 +1584,6 @@
 		AAE7804B060814AC0034E65F /* NetworkSyncManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAE78049060814AC0034E65F /* NetworkSyncManager.cpp */; };
 		AAE7808706081A000034E65F /* ezsockets.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAE7808506081A000034E65F /* ezsockets.cpp */; };
 		AAE7812D0608249E0034E65F /* ActiveAttackList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAE7812B0608249E0034E65F /* ActiveAttackList.cpp */; };
-		AAE781BF0AC7E53500AEFC64 /* lapi.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE7818B0AC7E53400AEFC64 /* lapi.c */; };
-		AAE781C00AC7E53500AEFC64 /* lapi.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE7818C0AC7E53400AEFC64 /* lapi.h */; };
-		AAE781C10AC7E53500AEFC64 /* lauxlib.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE7818D0AC7E53400AEFC64 /* lauxlib.c */; };
-		AAE781C20AC7E53500AEFC64 /* lauxlib.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE7818E0AC7E53400AEFC64 /* lauxlib.h */; };
-		AAE781C30AC7E53500AEFC64 /* lbaselib.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE7818F0AC7E53400AEFC64 /* lbaselib.c */; };
-		AAE781C40AC7E53500AEFC64 /* lcode.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE781900AC7E53400AEFC64 /* lcode.c */; };
-		AAE781C50AC7E53500AEFC64 /* lcode.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE781910AC7E53400AEFC64 /* lcode.h */; };
-		AAE781C60AC7E53500AEFC64 /* ldblib.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE781920AC7E53400AEFC64 /* ldblib.c */; };
-		AAE781C70AC7E53500AEFC64 /* ldebug.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE781930AC7E53400AEFC64 /* ldebug.c */; };
-		AAE781C80AC7E53500AEFC64 /* ldebug.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE781940AC7E53400AEFC64 /* ldebug.h */; };
-		AAE781C90AC7E53500AEFC64 /* ldo.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE781950AC7E53400AEFC64 /* ldo.c */; };
-		AAE781CA0AC7E53500AEFC64 /* ldo.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE781960AC7E53400AEFC64 /* ldo.h */; };
-		AAE781CB0AC7E53500AEFC64 /* ldump.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE781970AC7E53400AEFC64 /* ldump.c */; };
-		AAE781CC0AC7E53500AEFC64 /* lfunc.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE781980AC7E53400AEFC64 /* lfunc.c */; };
-		AAE781CD0AC7E53500AEFC64 /* lfunc.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE781990AC7E53400AEFC64 /* lfunc.h */; };
-		AAE781CE0AC7E53500AEFC64 /* lgc.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE7819A0AC7E53400AEFC64 /* lgc.c */; };
-		AAE781CF0AC7E53500AEFC64 /* lgc.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE7819B0AC7E53400AEFC64 /* lgc.h */; };
-		AAE781D00AC7E53500AEFC64 /* linit.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE7819C0AC7E53400AEFC64 /* linit.c */; };
-		AAE781D10AC7E53500AEFC64 /* liolib.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE7819D0AC7E53400AEFC64 /* liolib.c */; };
-		AAE781D20AC7E53500AEFC64 /* llex.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE7819E0AC7E53400AEFC64 /* llex.c */; };
-		AAE781D30AC7E53500AEFC64 /* llex.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE7819F0AC7E53400AEFC64 /* llex.h */; };
-		AAE781D40AC7E53500AEFC64 /* llimits.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE781A00AC7E53400AEFC64 /* llimits.h */; };
-		AAE781D50AC7E53500AEFC64 /* lmathlib.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE781A10AC7E53400AEFC64 /* lmathlib.c */; };
-		AAE781D60AC7E53500AEFC64 /* lmem.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE781A20AC7E53400AEFC64 /* lmem.c */; };
-		AAE781D70AC7E53500AEFC64 /* lmem.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE781A30AC7E53400AEFC64 /* lmem.h */; };
-		AAE781D80AC7E53500AEFC64 /* loadlib.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE781A40AC7E53400AEFC64 /* loadlib.c */; };
-		AAE781D90AC7E53500AEFC64 /* lobject.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE781A50AC7E53400AEFC64 /* lobject.c */; };
-		AAE781DA0AC7E53500AEFC64 /* lobject.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE781A60AC7E53400AEFC64 /* lobject.h */; };
-		AAE781DB0AC7E53500AEFC64 /* lopcodes.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE781A70AC7E53400AEFC64 /* lopcodes.c */; };
-		AAE781DC0AC7E53500AEFC64 /* lopcodes.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE781A80AC7E53400AEFC64 /* lopcodes.h */; };
-		AAE781DD0AC7E53500AEFC64 /* loslib.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE781A90AC7E53400AEFC64 /* loslib.c */; };
-		AAE781DE0AC7E53500AEFC64 /* lparser.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE781AA0AC7E53400AEFC64 /* lparser.c */; };
-		AAE781DF0AC7E53500AEFC64 /* lparser.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE781AB0AC7E53400AEFC64 /* lparser.h */; };
-		AAE781E00AC7E53500AEFC64 /* lstate.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE781AC0AC7E53400AEFC64 /* lstate.c */; };
-		AAE781E10AC7E53500AEFC64 /* lstate.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE781AD0AC7E53400AEFC64 /* lstate.h */; };
-		AAE781E20AC7E53500AEFC64 /* lstring.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE781AE0AC7E53400AEFC64 /* lstring.c */; };
-		AAE781E30AC7E53500AEFC64 /* lstring.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE781AF0AC7E53400AEFC64 /* lstring.h */; };
-		AAE781E40AC7E53500AEFC64 /* lstrlib.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE781B00AC7E53400AEFC64 /* lstrlib.c */; };
-		AAE781E50AC7E53500AEFC64 /* ltable.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE781B10AC7E53400AEFC64 /* ltable.c */; };
-		AAE781E60AC7E53500AEFC64 /* ltable.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE781B20AC7E53400AEFC64 /* ltable.h */; };
-		AAE781E70AC7E53500AEFC64 /* ltablib.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE781B30AC7E53400AEFC64 /* ltablib.c */; };
-		AAE781E80AC7E53500AEFC64 /* ltm.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE781B40AC7E53400AEFC64 /* ltm.c */; };
-		AAE781E90AC7E53500AEFC64 /* ltm.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE781B50AC7E53400AEFC64 /* ltm.h */; };
-		AAE781EA0AC7E53500AEFC64 /* lua.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE781B60AC7E53400AEFC64 /* lua.h */; };
-		AAE781EB0AC7E53500AEFC64 /* luaconf.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE781B70AC7E53400AEFC64 /* luaconf.h */; };
-		AAE781EC0AC7E53500AEFC64 /* lualib.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE781B80AC7E53400AEFC64 /* lualib.h */; };
-		AAE781ED0AC7E53500AEFC64 /* lundump.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE781B90AC7E53400AEFC64 /* lundump.c */; };
-		AAE781EE0AC7E53500AEFC64 /* lundump.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE781BA0AC7E53400AEFC64 /* lundump.h */; };
-		AAE781EF0AC7E53500AEFC64 /* lvm.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE781BB0AC7E53400AEFC64 /* lvm.c */; };
-		AAE781F00AC7E53500AEFC64 /* lvm.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE781BC0AC7E53400AEFC64 /* lvm.h */; };
-		AAE781F10AC7E53500AEFC64 /* lzio.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE781BD0AC7E53400AEFC64 /* lzio.c */; };
-		AAE781F20AC7E53500AEFC64 /* lzio.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE781BE0AC7E53400AEFC64 /* lzio.h */; };
 		AAE782030AC7E64D00AEFC64 /* liblua-5.1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = AAE7817E0AC7E37B00AEFC64 /* liblua-5.1.a */; };
 		AAE782040AC7E65200AEFC64 /* liblua-5.1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = AAE7817E0AC7E37B00AEFC64 /* liblua-5.1.a */; };
 		AAEBC6CC07A20AFE00793F0E /* RageSurface_Save_JPEG.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAEBC6C607A20AFE00793F0E /* RageSurface_Save_JPEG.cpp */; };
@@ -1635,13 +1642,6 @@
 		EE879BC3132E06C50078FDDC /* glew.c in Sources */ = {isa = PBXBuildFile; fileRef = EE879BAA132E06C50078FDDC /* glew.c */; };
 		EE906F6612BF3A1B00146C96 /* ScreenInstallOverlay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE906F6412BF3A1B00146C96 /* ScreenInstallOverlay.cpp */; };
 		EE906F6712BF3A1B00146C96 /* ScreenInstallOverlay.h in Headers */ = {isa = PBXBuildFile; fileRef = EE906F6512BF3A1B00146C96 /* ScreenInstallOverlay.h */; };
-		EE906F7712BF3A6900146C96 /* json_batchallocator.h in Headers */ = {isa = PBXBuildFile; fileRef = EE906F7012BF3A6900146C96 /* json_batchallocator.h */; };
-		EE906F7812BF3A6900146C96 /* json_internalarray.inl in Resources */ = {isa = PBXBuildFile; fileRef = EE906F7112BF3A6900146C96 /* json_internalarray.inl */; };
-		EE906F7912BF3A6900146C96 /* json_internalmap.inl in Resources */ = {isa = PBXBuildFile; fileRef = EE906F7212BF3A6900146C96 /* json_internalmap.inl */; };
-		EE906F7A12BF3A6900146C96 /* json_reader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE906F7312BF3A6900146C96 /* json_reader.cpp */; };
-		EE906F7B12BF3A6900146C96 /* json_value.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE906F7412BF3A6900146C96 /* json_value.cpp */; };
-		EE906F7C12BF3A6900146C96 /* json_valueiterator.inl in Resources */ = {isa = PBXBuildFile; fileRef = EE906F7512BF3A6900146C96 /* json_valueiterator.inl */; };
-		EE906F7D12BF3A6900146C96 /* json_writer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE906F7612BF3A6900146C96 /* json_writer.cpp */; };
 		EE906F8212BF3AF800146C96 /* JsonUtil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE906F8012BF3AF800146C96 /* JsonUtil.cpp */; };
 		EE906F8312BF3AF800146C96 /* JsonUtil.h in Headers */ = {isa = PBXBuildFile; fileRef = EE906F8112BF3AF800146C96 /* JsonUtil.h */; };
 		EE906F8A12BF3C7C00146C96 /* FileDownload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE906F8812BF3C7C00146C96 /* FileDownload.cpp */; };
@@ -1782,6 +1782,68 @@
 		2BA7925B1304F20D002BD8E1 /* NotesLoaderSSC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NotesLoaderSSC.h; path = ../src/NotesLoaderSSC.h; sourceTree = SOURCE_ROOT; };
 		2BA7925C1304F20D002BD8E1 /* NotesWriterSSC.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = NotesWriterSSC.cpp; path = ../src/NotesWriterSSC.cpp; sourceTree = SOURCE_ROOT; };
 		2BA7925D1304F20D002BD8E1 /* NotesWriterSSC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NotesWriterSSC.h; path = ../src/NotesWriterSSC.h; sourceTree = SOURCE_ROOT; };
+		2BD06FDD137240CF0018CB9F /* json_batchallocator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = json_batchallocator.h; path = ../extern/jsoncpp/src/lib_json/json_batchallocator.h; sourceTree = SOURCE_ROOT; };
+		2BD06FDE137240CF0018CB9F /* json_internalarray.inl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = json_internalarray.inl; path = ../extern/jsoncpp/src/lib_json/json_internalarray.inl; sourceTree = SOURCE_ROOT; };
+		2BD06FDF137240CF0018CB9F /* json_internalmap.inl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = json_internalmap.inl; path = ../extern/jsoncpp/src/lib_json/json_internalmap.inl; sourceTree = SOURCE_ROOT; };
+		2BD06FE0137240CF0018CB9F /* json_reader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = json_reader.cpp; path = ../extern/jsoncpp/src/lib_json/json_reader.cpp; sourceTree = SOURCE_ROOT; };
+		2BD06FE1137240CF0018CB9F /* json_value.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = json_value.cpp; path = ../extern/jsoncpp/src/lib_json/json_value.cpp; sourceTree = SOURCE_ROOT; };
+		2BD06FE2137240CF0018CB9F /* json_valueiterator.inl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = json_valueiterator.inl; path = ../extern/jsoncpp/src/lib_json/json_valueiterator.inl; sourceTree = SOURCE_ROOT; };
+		2BD06FE3137240CF0018CB9F /* json_writer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = json_writer.cpp; path = ../extern/jsoncpp/src/lib_json/json_writer.cpp; sourceTree = SOURCE_ROOT; };
+		2BDB88B2137201F700E6FD3A /* lapi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lapi.c; path = "../extern/lua-5.1/src/lapi.c"; sourceTree = SOURCE_ROOT; };
+		2BDB88B3137201F700E6FD3A /* lapi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lapi.h; path = "../extern/lua-5.1/src/lapi.h"; sourceTree = SOURCE_ROOT; };
+		2BDB88B4137201F700E6FD3A /* lauxlib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lauxlib.c; path = "../extern/lua-5.1/src/lauxlib.c"; sourceTree = SOURCE_ROOT; };
+		2BDB88B5137201F700E6FD3A /* lauxlib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lauxlib.h; path = "../extern/lua-5.1/src/lauxlib.h"; sourceTree = SOURCE_ROOT; };
+		2BDB88B6137201F700E6FD3A /* lbaselib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lbaselib.c; path = "../extern/lua-5.1/src/lbaselib.c"; sourceTree = SOURCE_ROOT; };
+		2BDB88B7137201F700E6FD3A /* lcode.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lcode.c; path = "../extern/lua-5.1/src/lcode.c"; sourceTree = SOURCE_ROOT; };
+		2BDB88B8137201F700E6FD3A /* lcode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lcode.h; path = "../extern/lua-5.1/src/lcode.h"; sourceTree = SOURCE_ROOT; };
+		2BDB88B9137201F700E6FD3A /* ldblib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ldblib.c; path = "../extern/lua-5.1/src/ldblib.c"; sourceTree = SOURCE_ROOT; };
+		2BDB88BA137201F700E6FD3A /* ldebug.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ldebug.c; path = "../extern/lua-5.1/src/ldebug.c"; sourceTree = SOURCE_ROOT; };
+		2BDB88BB137201F700E6FD3A /* ldebug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ldebug.h; path = "../extern/lua-5.1/src/ldebug.h"; sourceTree = SOURCE_ROOT; };
+		2BDB88BC137201F700E6FD3A /* ldo.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ldo.c; path = "../extern/lua-5.1/src/ldo.c"; sourceTree = SOURCE_ROOT; };
+		2BDB88BD137201F700E6FD3A /* ldo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ldo.h; path = "../extern/lua-5.1/src/ldo.h"; sourceTree = SOURCE_ROOT; };
+		2BDB88BE137201F700E6FD3A /* ldump.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ldump.c; path = "../extern/lua-5.1/src/ldump.c"; sourceTree = SOURCE_ROOT; };
+		2BDB88BF137201F700E6FD3A /* lfunc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lfunc.c; path = "../extern/lua-5.1/src/lfunc.c"; sourceTree = SOURCE_ROOT; };
+		2BDB88C0137201F700E6FD3A /* lfunc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lfunc.h; path = "../extern/lua-5.1/src/lfunc.h"; sourceTree = SOURCE_ROOT; };
+		2BDB88C1137201F700E6FD3A /* lgc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lgc.c; path = "../extern/lua-5.1/src/lgc.c"; sourceTree = SOURCE_ROOT; };
+		2BDB88C2137201F700E6FD3A /* lgc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lgc.h; path = "../extern/lua-5.1/src/lgc.h"; sourceTree = SOURCE_ROOT; };
+		2BDB88C3137201F700E6FD3A /* linit.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = linit.c; path = "../extern/lua-5.1/src/linit.c"; sourceTree = SOURCE_ROOT; };
+		2BDB88C4137201F700E6FD3A /* liolib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = liolib.c; path = "../extern/lua-5.1/src/liolib.c"; sourceTree = SOURCE_ROOT; };
+		2BDB88C5137201F700E6FD3A /* llex.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = llex.c; path = "../extern/lua-5.1/src/llex.c"; sourceTree = SOURCE_ROOT; };
+		2BDB88C6137201F700E6FD3A /* llex.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = llex.h; path = "../extern/lua-5.1/src/llex.h"; sourceTree = SOURCE_ROOT; };
+		2BDB88C7137201F700E6FD3A /* llimits.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = llimits.h; path = "../extern/lua-5.1/src/llimits.h"; sourceTree = SOURCE_ROOT; };
+		2BDB88C8137201F700E6FD3A /* lmathlib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lmathlib.c; path = "../extern/lua-5.1/src/lmathlib.c"; sourceTree = SOURCE_ROOT; };
+		2BDB88C9137201F700E6FD3A /* lmem.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lmem.c; path = "../extern/lua-5.1/src/lmem.c"; sourceTree = SOURCE_ROOT; };
+		2BDB88CA137201F700E6FD3A /* lmem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lmem.h; path = "../extern/lua-5.1/src/lmem.h"; sourceTree = SOURCE_ROOT; };
+		2BDB88CB137201F700E6FD3A /* loadlib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = loadlib.c; path = "../extern/lua-5.1/src/loadlib.c"; sourceTree = SOURCE_ROOT; };
+		2BDB88CC137201F700E6FD3A /* lobject.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lobject.c; path = "../extern/lua-5.1/src/lobject.c"; sourceTree = SOURCE_ROOT; };
+		2BDB88CD137201F700E6FD3A /* lobject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lobject.h; path = "../extern/lua-5.1/src/lobject.h"; sourceTree = SOURCE_ROOT; };
+		2BDB88CE137201F700E6FD3A /* lopcodes.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lopcodes.c; path = "../extern/lua-5.1/src/lopcodes.c"; sourceTree = SOURCE_ROOT; };
+		2BDB88CF137201F700E6FD3A /* lopcodes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lopcodes.h; path = "../extern/lua-5.1/src/lopcodes.h"; sourceTree = SOURCE_ROOT; };
+		2BDB88D0137201F700E6FD3A /* loslib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = loslib.c; path = "../extern/lua-5.1/src/loslib.c"; sourceTree = SOURCE_ROOT; };
+		2BDB88D1137201F700E6FD3A /* lparser.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lparser.c; path = "../extern/lua-5.1/src/lparser.c"; sourceTree = SOURCE_ROOT; };
+		2BDB88D2137201F700E6FD3A /* lparser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lparser.h; path = "../extern/lua-5.1/src/lparser.h"; sourceTree = SOURCE_ROOT; };
+		2BDB88D3137201F700E6FD3A /* lstate.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lstate.c; path = "../extern/lua-5.1/src/lstate.c"; sourceTree = SOURCE_ROOT; };
+		2BDB88D4137201F700E6FD3A /* lstate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lstate.h; path = "../extern/lua-5.1/src/lstate.h"; sourceTree = SOURCE_ROOT; };
+		2BDB88D5137201F700E6FD3A /* lstring.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lstring.c; path = "../extern/lua-5.1/src/lstring.c"; sourceTree = SOURCE_ROOT; };
+		2BDB88D6137201F700E6FD3A /* lstring.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lstring.h; path = "../extern/lua-5.1/src/lstring.h"; sourceTree = SOURCE_ROOT; };
+		2BDB88D7137201F700E6FD3A /* lstrlib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lstrlib.c; path = "../extern/lua-5.1/src/lstrlib.c"; sourceTree = SOURCE_ROOT; };
+		2BDB88D8137201F700E6FD3A /* ltable.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ltable.c; path = "../extern/lua-5.1/src/ltable.c"; sourceTree = SOURCE_ROOT; };
+		2BDB88D9137201F700E6FD3A /* ltable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ltable.h; path = "../extern/lua-5.1/src/ltable.h"; sourceTree = SOURCE_ROOT; };
+		2BDB88DA137201F700E6FD3A /* ltablib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ltablib.c; path = "../extern/lua-5.1/src/ltablib.c"; sourceTree = SOURCE_ROOT; };
+		2BDB88DB137201F700E6FD3A /* ltm.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ltm.c; path = "../extern/lua-5.1/src/ltm.c"; sourceTree = SOURCE_ROOT; };
+		2BDB88DC137201F700E6FD3A /* ltm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ltm.h; path = "../extern/lua-5.1/src/ltm.h"; sourceTree = SOURCE_ROOT; };
+		2BDB88DD137201F700E6FD3A /* lua.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lua.c; path = "../extern/lua-5.1/src/lua.c"; sourceTree = SOURCE_ROOT; };
+		2BDB88DE137201F700E6FD3A /* lua.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lua.h; path = "../extern/lua-5.1/src/lua.h"; sourceTree = SOURCE_ROOT; };
+		2BDB88DF137201F700E6FD3A /* luac.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = luac.c; path = "../extern/lua-5.1/src/luac.c"; sourceTree = SOURCE_ROOT; };
+		2BDB88E0137201F700E6FD3A /* luaconf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = luaconf.h; path = "../extern/lua-5.1/src/luaconf.h"; sourceTree = SOURCE_ROOT; };
+		2BDB88E1137201F700E6FD3A /* lualib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lualib.h; path = "../extern/lua-5.1/src/lualib.h"; sourceTree = SOURCE_ROOT; };
+		2BDB88E2137201F700E6FD3A /* lundump.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lundump.c; path = "../extern/lua-5.1/src/lundump.c"; sourceTree = SOURCE_ROOT; };
+		2BDB88E3137201F700E6FD3A /* lundump.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lundump.h; path = "../extern/lua-5.1/src/lundump.h"; sourceTree = SOURCE_ROOT; };
+		2BDB88E4137201F700E6FD3A /* lvm.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lvm.c; path = "../extern/lua-5.1/src/lvm.c"; sourceTree = SOURCE_ROOT; };
+		2BDB88E5137201F700E6FD3A /* lvm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lvm.h; path = "../extern/lua-5.1/src/lvm.h"; sourceTree = SOURCE_ROOT; };
+		2BDB88E6137201F700E6FD3A /* lzio.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lzio.c; path = "../extern/lua-5.1/src/lzio.c"; sourceTree = SOURCE_ROOT; };
+		2BDB88E7137201F700E6FD3A /* lzio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lzio.h; path = "../extern/lua-5.1/src/lzio.h"; sourceTree = SOURCE_ROOT; };
+		2BDB88E8137201F700E6FD3A /* print.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = print.c; path = "../extern/lua-5.1/src/print.c"; sourceTree = SOURCE_ROOT; };
 		3659B56D0F902143002B6B68 /* CommandLineActions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CommandLineActions.cpp; sourceTree = "<group>"; };
 		3659B56E0F902143002B6B68 /* CommandLineActions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CommandLineActions.h; sourceTree = "<group>"; };
 		367D57590EDE56F200B46814 /* ScreenHighScores.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ScreenHighScores.cpp; path = ../src/ScreenHighScores.cpp; sourceTree = SOURCE_ROOT; };
@@ -2274,9 +2336,6 @@
 		AA77E75E08B64B9A00FA24CA /* ScreenOptionsManageProfiles.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; name = ScreenOptionsManageProfiles.h; path = ../src/ScreenOptionsManageProfiles.h; sourceTree = "<group>"; };
 		AA77E8A108B6ABD500FA24CA /* vecLib.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = vecLib.framework; path = /System/Library/Frameworks/vecLib.framework; sourceTree = "<absolute>"; };
 		AA7A2B940AE09B520054C5BA /* lua */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = lua; sourceTree = BUILT_PRODUCTS_DIR; };
-		AA7A2B9D0AE09BC80054C5BA /* lua.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = lua.c; path = src/lua.c; sourceTree = "<group>"; };
-		AA7A2B9E0AE09BC90054C5BA /* luac.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = luac.c; path = src/luac.c; sourceTree = "<group>"; };
-		AA7A2B9F0AE09BC90054C5BA /* print.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = print.c; path = src/print.c; sourceTree = "<group>"; };
 		AA7A2BAB0AE09CD50054C5BA /* luac */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = luac; sourceTree = BUILT_PRODUCTS_DIR; };
 		AA7ADC23072CAB7F00C50A7F /* RageSoundReader_Chain.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; name = RageSoundReader_Chain.cpp; path = ../src/RageSoundReader_Chain.cpp; sourceTree = "<group>"; };
 		AA7ADC24072CAB7F00C50A7F /* RageSoundReader_Chain.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; name = RageSoundReader_Chain.h; path = ../src/RageSoundReader_Chain.h; sourceTree = "<group>"; };
@@ -2833,58 +2892,6 @@
 		AAE7812B0608249E0034E65F /* ActiveAttackList.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; name = ActiveAttackList.cpp; path = ../src/ActiveAttackList.cpp; sourceTree = "<group>"; };
 		AAE7812C0608249E0034E65F /* ActiveAttackList.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; name = ActiveAttackList.h; path = ../src/ActiveAttackList.h; sourceTree = "<group>"; };
 		AAE7817E0AC7E37B00AEFC64 /* liblua-5.1.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "liblua-5.1.a"; sourceTree = BUILT_PRODUCTS_DIR; };
-		AAE7818B0AC7E53400AEFC64 /* lapi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lapi.c; path = src/lapi.c; sourceTree = "<group>"; };
-		AAE7818C0AC7E53400AEFC64 /* lapi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lapi.h; path = src/lapi.h; sourceTree = "<group>"; };
-		AAE7818D0AC7E53400AEFC64 /* lauxlib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lauxlib.c; path = src/lauxlib.c; sourceTree = "<group>"; };
-		AAE7818E0AC7E53400AEFC64 /* lauxlib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lauxlib.h; path = src/lauxlib.h; sourceTree = "<group>"; };
-		AAE7818F0AC7E53400AEFC64 /* lbaselib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lbaselib.c; path = src/lbaselib.c; sourceTree = "<group>"; };
-		AAE781900AC7E53400AEFC64 /* lcode.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lcode.c; path = src/lcode.c; sourceTree = "<group>"; };
-		AAE781910AC7E53400AEFC64 /* lcode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lcode.h; path = src/lcode.h; sourceTree = "<group>"; };
-		AAE781920AC7E53400AEFC64 /* ldblib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ldblib.c; path = src/ldblib.c; sourceTree = "<group>"; };
-		AAE781930AC7E53400AEFC64 /* ldebug.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ldebug.c; path = src/ldebug.c; sourceTree = "<group>"; };
-		AAE781940AC7E53400AEFC64 /* ldebug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ldebug.h; path = src/ldebug.h; sourceTree = "<group>"; };
-		AAE781950AC7E53400AEFC64 /* ldo.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ldo.c; path = src/ldo.c; sourceTree = "<group>"; };
-		AAE781960AC7E53400AEFC64 /* ldo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ldo.h; path = src/ldo.h; sourceTree = "<group>"; };
-		AAE781970AC7E53400AEFC64 /* ldump.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ldump.c; path = src/ldump.c; sourceTree = "<group>"; };
-		AAE781980AC7E53400AEFC64 /* lfunc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lfunc.c; path = src/lfunc.c; sourceTree = "<group>"; };
-		AAE781990AC7E53400AEFC64 /* lfunc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lfunc.h; path = src/lfunc.h; sourceTree = "<group>"; };
-		AAE7819A0AC7E53400AEFC64 /* lgc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lgc.c; path = src/lgc.c; sourceTree = "<group>"; };
-		AAE7819B0AC7E53400AEFC64 /* lgc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lgc.h; path = src/lgc.h; sourceTree = "<group>"; };
-		AAE7819C0AC7E53400AEFC64 /* linit.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = linit.c; path = src/linit.c; sourceTree = "<group>"; };
-		AAE7819D0AC7E53400AEFC64 /* liolib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = liolib.c; path = src/liolib.c; sourceTree = "<group>"; };
-		AAE7819E0AC7E53400AEFC64 /* llex.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = llex.c; path = src/llex.c; sourceTree = "<group>"; };
-		AAE7819F0AC7E53400AEFC64 /* llex.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = llex.h; path = src/llex.h; sourceTree = "<group>"; };
-		AAE781A00AC7E53400AEFC64 /* llimits.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = llimits.h; path = src/llimits.h; sourceTree = "<group>"; };
-		AAE781A10AC7E53400AEFC64 /* lmathlib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lmathlib.c; path = src/lmathlib.c; sourceTree = "<group>"; };
-		AAE781A20AC7E53400AEFC64 /* lmem.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lmem.c; path = src/lmem.c; sourceTree = "<group>"; };
-		AAE781A30AC7E53400AEFC64 /* lmem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lmem.h; path = src/lmem.h; sourceTree = "<group>"; };
-		AAE781A40AC7E53400AEFC64 /* loadlib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = loadlib.c; path = src/loadlib.c; sourceTree = "<group>"; };
-		AAE781A50AC7E53400AEFC64 /* lobject.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lobject.c; path = src/lobject.c; sourceTree = "<group>"; };
-		AAE781A60AC7E53400AEFC64 /* lobject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lobject.h; path = src/lobject.h; sourceTree = "<group>"; };
-		AAE781A70AC7E53400AEFC64 /* lopcodes.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lopcodes.c; path = src/lopcodes.c; sourceTree = "<group>"; };
-		AAE781A80AC7E53400AEFC64 /* lopcodes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lopcodes.h; path = src/lopcodes.h; sourceTree = "<group>"; };
-		AAE781A90AC7E53400AEFC64 /* loslib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = loslib.c; path = src/loslib.c; sourceTree = "<group>"; };
-		AAE781AA0AC7E53400AEFC64 /* lparser.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lparser.c; path = src/lparser.c; sourceTree = "<group>"; };
-		AAE781AB0AC7E53400AEFC64 /* lparser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lparser.h; path = src/lparser.h; sourceTree = "<group>"; };
-		AAE781AC0AC7E53400AEFC64 /* lstate.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lstate.c; path = src/lstate.c; sourceTree = "<group>"; };
-		AAE781AD0AC7E53400AEFC64 /* lstate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lstate.h; path = src/lstate.h; sourceTree = "<group>"; };
-		AAE781AE0AC7E53400AEFC64 /* lstring.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lstring.c; path = src/lstring.c; sourceTree = "<group>"; };
-		AAE781AF0AC7E53400AEFC64 /* lstring.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lstring.h; path = src/lstring.h; sourceTree = "<group>"; };
-		AAE781B00AC7E53400AEFC64 /* lstrlib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lstrlib.c; path = src/lstrlib.c; sourceTree = "<group>"; };
-		AAE781B10AC7E53400AEFC64 /* ltable.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ltable.c; path = src/ltable.c; sourceTree = "<group>"; };
-		AAE781B20AC7E53400AEFC64 /* ltable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ltable.h; path = src/ltable.h; sourceTree = "<group>"; };
-		AAE781B30AC7E53400AEFC64 /* ltablib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ltablib.c; path = src/ltablib.c; sourceTree = "<group>"; };
-		AAE781B40AC7E53400AEFC64 /* ltm.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ltm.c; path = src/ltm.c; sourceTree = "<group>"; };
-		AAE781B50AC7E53400AEFC64 /* ltm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ltm.h; path = src/ltm.h; sourceTree = "<group>"; };
-		AAE781B60AC7E53400AEFC64 /* lua.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lua.h; path = src/lua.h; sourceTree = "<group>"; };
-		AAE781B70AC7E53400AEFC64 /* luaconf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = luaconf.h; path = src/luaconf.h; sourceTree = "<group>"; };
-		AAE781B80AC7E53400AEFC64 /* lualib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lualib.h; path = src/lualib.h; sourceTree = "<group>"; };
-		AAE781B90AC7E53400AEFC64 /* lundump.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lundump.c; path = src/lundump.c; sourceTree = "<group>"; };
-		AAE781BA0AC7E53400AEFC64 /* lundump.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lundump.h; path = src/lundump.h; sourceTree = "<group>"; };
-		AAE781BB0AC7E53400AEFC64 /* lvm.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lvm.c; path = src/lvm.c; sourceTree = "<group>"; };
-		AAE781BC0AC7E53400AEFC64 /* lvm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lvm.h; path = src/lvm.h; sourceTree = "<group>"; };
-		AAE781BD0AC7E53400AEFC64 /* lzio.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lzio.c; path = src/lzio.c; sourceTree = "<group>"; };
-		AAE781BE0AC7E53400AEFC64 /* lzio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lzio.h; path = src/lzio.h; sourceTree = "<group>"; };
 		AAEBC6C607A20AFE00793F0E /* RageSurface_Save_JPEG.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; name = RageSurface_Save_JPEG.cpp; path = ../src/RageSurface_Save_JPEG.cpp; sourceTree = "<group>"; };
 		AAEBC6C707A20AFE00793F0E /* RageSurface_Save_JPEG.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; name = RageSurface_Save_JPEG.h; path = ../src/RageSurface_Save_JPEG.h; sourceTree = "<group>"; };
 		AAEBC6C807A20AFE00793F0E /* RageSurfaceUtils_Dither.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; name = RageSurfaceUtils_Dither.cpp; path = ../src/RageSurfaceUtils_Dither.cpp; sourceTree = "<group>"; };
@@ -2978,13 +2985,6 @@
 		EE879BAA132E06C50078FDDC /* glew.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = glew.c; path = src/glew.c; sourceTree = "<group>"; };
 		EE906F6412BF3A1B00146C96 /* ScreenInstallOverlay.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ScreenInstallOverlay.cpp; path = ../src/ScreenInstallOverlay.cpp; sourceTree = SOURCE_ROOT; };
 		EE906F6512BF3A1B00146C96 /* ScreenInstallOverlay.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ScreenInstallOverlay.h; path = ../src/ScreenInstallOverlay.h; sourceTree = SOURCE_ROOT; };
-		EE906F7012BF3A6900146C96 /* json_batchallocator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = json_batchallocator.h; path = ../src/jsoncpp/src/lib_json/json_batchallocator.h; sourceTree = SOURCE_ROOT; };
-		EE906F7112BF3A6900146C96 /* json_internalarray.inl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = json_internalarray.inl; path = ../src/jsoncpp/src/lib_json/json_internalarray.inl; sourceTree = SOURCE_ROOT; };
-		EE906F7212BF3A6900146C96 /* json_internalmap.inl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = json_internalmap.inl; path = ../src/jsoncpp/src/lib_json/json_internalmap.inl; sourceTree = SOURCE_ROOT; };
-		EE906F7312BF3A6900146C96 /* json_reader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = json_reader.cpp; path = ../src/jsoncpp/src/lib_json/json_reader.cpp; sourceTree = SOURCE_ROOT; };
-		EE906F7412BF3A6900146C96 /* json_value.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = json_value.cpp; path = ../src/jsoncpp/src/lib_json/json_value.cpp; sourceTree = SOURCE_ROOT; };
-		EE906F7512BF3A6900146C96 /* json_valueiterator.inl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = json_valueiterator.inl; path = ../src/jsoncpp/src/lib_json/json_valueiterator.inl; sourceTree = SOURCE_ROOT; };
-		EE906F7612BF3A6900146C96 /* json_writer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = json_writer.cpp; path = ../src/jsoncpp/src/lib_json/json_writer.cpp; sourceTree = SOURCE_ROOT; };
 		EE906F8012BF3AF800146C96 /* JsonUtil.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JsonUtil.cpp; path = ../src/JsonUtil.cpp; sourceTree = SOURCE_ROOT; };
 		EE906F8112BF3AF800146C96 /* JsonUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JsonUtil.h; path = ../src/JsonUtil.h; sourceTree = SOURCE_ROOT; };
 		EE906F8812BF3C7C00146C96 /* FileDownload.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FileDownload.cpp; path = ../src/FileDownload.cpp; sourceTree = SOURCE_ROOT; };
@@ -3143,12 +3143,7 @@
 		29B97314FDCFA39411CA2CEA /* SDL App */ = {
 			isa = PBXGroup;
 			children = (
-				EE879B8E132E06C50078FDDC /* glew-1.5.8 */,
-				EE906F6F12BF3A5B00146C96 /* json */,
-				AAA070B20CE7B3AD005A3060 /* mad-0.15.1b */,
-				AA7C8B920B67467C00FD9940 /* libtomcrypt */,
-				AA7C8A7F0B6744F600FD9940 /* libtommath */,
-				AAE781870AC7E46E00AEFC64 /* lua-5.1 */,
+				2BDB87261371F7FF00E6FD3A /* extern */,
 				AA6EFF7404770F8B005F316C /* Actors */,
 				AA6EFEFA04770E84005F316C /* ActorsInGameplay */,
 				AA6EFE6D04770D3E005F316C /* ActorsInMenus */,
@@ -3159,7 +3154,6 @@
 				AA6E00FE047711FF005F316C /* GlobalSingletons */,
 				2B766980132FF62B00586512 /* NoteParsing */,
 				29B97315FDCFA39411CA2CEA /* Other Source */,
-				AA8B6C7804AFD82B00D02EE9 /* pcre */,
 				AA6EFDBB04770A83005F316C /* Rage */,
 				AA6EFE6A04770D01005F316C /* StepMania */,
 				AA6E00090477103E005F316C /* Screens */,
@@ -3236,6 +3230,20 @@
 			name = NoteParsing;
 			sourceTree = "<group>";
 		};
+		2BDB87261371F7FF00E6FD3A /* extern */ = {
+			isa = PBXGroup;
+			children = (
+				EE879B8E132E06C50078FDDC /* glew-1.5.8 */,
+				EE906F6F12BF3A5B00146C96 /* json */,
+				AA7C8A7F0B6744F600FD9940 /* libtommath */,
+				AA7C8B920B67467C00FD9940 /* libtomcrypt */,
+				AAE781870AC7E46E00AEFC64 /* lua-5.1 */,
+				AAA070B20CE7B3AD005A3060 /* mad-0.15.1b */,
+				AA8B6C7804AFD82B00D02EE9 /* pcre */,
+			);
+			name = extern;
+			sourceTree = "<group>";
+		};
 		AA60E0BB067992D7008ADC41 /* Threads */ = {
 			isa = PBXGroup;
 			children = (
@@ -4708,7 +4716,7 @@
 				AA8B6C7F04AFD87300D02EE9 /* study.c */,
 			);
 			name = pcre;
-			path = ../src/pcre;
+			path = ../extern/pcre;
 			sourceTree = "<group>";
 		};
 		AAA070B20CE7B3AD005A3060 /* mad-0.15.1b */ = {
@@ -4740,7 +4748,7 @@
 				AAA070F10CE7B3AE005A3060 /* version.h */,
 			);
 			name = "mad-0.15.1b";
-			path = "../src/mad-0.15.1b";
+			path = "../extern/mad-0.15.1b";
 			sourceTree = "<group>";
 		};
 		AAA3741C09099ADA00141131 /* Libraries */ = {
@@ -4851,64 +4859,64 @@
 		AAE781870AC7E46E00AEFC64 /* lua-5.1 */ = {
 			isa = PBXGroup;
 			children = (
-				AAE7818B0AC7E53400AEFC64 /* lapi.c */,
-				AAE7818C0AC7E53400AEFC64 /* lapi.h */,
-				AAE7818D0AC7E53400AEFC64 /* lauxlib.c */,
-				AAE7818E0AC7E53400AEFC64 /* lauxlib.h */,
-				AAE7818F0AC7E53400AEFC64 /* lbaselib.c */,
-				AAE781900AC7E53400AEFC64 /* lcode.c */,
-				AAE781910AC7E53400AEFC64 /* lcode.h */,
-				AAE781920AC7E53400AEFC64 /* ldblib.c */,
-				AAE781930AC7E53400AEFC64 /* ldebug.c */,
-				AAE781940AC7E53400AEFC64 /* ldebug.h */,
-				AAE781950AC7E53400AEFC64 /* ldo.c */,
-				AAE781960AC7E53400AEFC64 /* ldo.h */,
-				AAE781970AC7E53400AEFC64 /* ldump.c */,
-				AAE781980AC7E53400AEFC64 /* lfunc.c */,
-				AAE781990AC7E53400AEFC64 /* lfunc.h */,
-				AAE7819A0AC7E53400AEFC64 /* lgc.c */,
-				AAE7819B0AC7E53400AEFC64 /* lgc.h */,
-				AAE7819C0AC7E53400AEFC64 /* linit.c */,
-				AAE7819D0AC7E53400AEFC64 /* liolib.c */,
-				AAE7819E0AC7E53400AEFC64 /* llex.c */,
-				AAE7819F0AC7E53400AEFC64 /* llex.h */,
-				AAE781A00AC7E53400AEFC64 /* llimits.h */,
-				AAE781A10AC7E53400AEFC64 /* lmathlib.c */,
-				AAE781A20AC7E53400AEFC64 /* lmem.c */,
-				AAE781A30AC7E53400AEFC64 /* lmem.h */,
-				AAE781A40AC7E53400AEFC64 /* loadlib.c */,
-				AAE781A50AC7E53400AEFC64 /* lobject.c */,
-				AAE781A60AC7E53400AEFC64 /* lobject.h */,
-				AAE781A70AC7E53400AEFC64 /* lopcodes.c */,
-				AAE781A80AC7E53400AEFC64 /* lopcodes.h */,
-				AAE781A90AC7E53400AEFC64 /* loslib.c */,
-				AAE781AA0AC7E53400AEFC64 /* lparser.c */,
-				AAE781AB0AC7E53400AEFC64 /* lparser.h */,
-				AAE781AC0AC7E53400AEFC64 /* lstate.c */,
-				AAE781AD0AC7E53400AEFC64 /* lstate.h */,
-				AAE781AE0AC7E53400AEFC64 /* lstring.c */,
-				AAE781AF0AC7E53400AEFC64 /* lstring.h */,
-				AAE781B00AC7E53400AEFC64 /* lstrlib.c */,
-				AAE781B10AC7E53400AEFC64 /* ltable.c */,
-				AAE781B20AC7E53400AEFC64 /* ltable.h */,
-				AAE781B30AC7E53400AEFC64 /* ltablib.c */,
-				AAE781B40AC7E53400AEFC64 /* ltm.c */,
-				AAE781B50AC7E53400AEFC64 /* ltm.h */,
-				AA7A2B9D0AE09BC80054C5BA /* lua.c */,
-				AAE781B60AC7E53400AEFC64 /* lua.h */,
-				AA7A2B9E0AE09BC90054C5BA /* luac.c */,
-				AAE781B70AC7E53400AEFC64 /* luaconf.h */,
-				AAE781B80AC7E53400AEFC64 /* lualib.h */,
-				AAE781B90AC7E53400AEFC64 /* lundump.c */,
-				AAE781BA0AC7E53400AEFC64 /* lundump.h */,
-				AAE781BB0AC7E53400AEFC64 /* lvm.c */,
-				AAE781BC0AC7E53400AEFC64 /* lvm.h */,
-				AAE781BD0AC7E53400AEFC64 /* lzio.c */,
-				AAE781BE0AC7E53400AEFC64 /* lzio.h */,
-				AA7A2B9F0AE09BC90054C5BA /* print.c */,
+				2BDB88B2137201F700E6FD3A /* lapi.c */,
+				2BDB88B3137201F700E6FD3A /* lapi.h */,
+				2BDB88B4137201F700E6FD3A /* lauxlib.c */,
+				2BDB88B5137201F700E6FD3A /* lauxlib.h */,
+				2BDB88B6137201F700E6FD3A /* lbaselib.c */,
+				2BDB88B7137201F700E6FD3A /* lcode.c */,
+				2BDB88B8137201F700E6FD3A /* lcode.h */,
+				2BDB88B9137201F700E6FD3A /* ldblib.c */,
+				2BDB88BA137201F700E6FD3A /* ldebug.c */,
+				2BDB88BB137201F700E6FD3A /* ldebug.h */,
+				2BDB88BC137201F700E6FD3A /* ldo.c */,
+				2BDB88BD137201F700E6FD3A /* ldo.h */,
+				2BDB88BE137201F700E6FD3A /* ldump.c */,
+				2BDB88BF137201F700E6FD3A /* lfunc.c */,
+				2BDB88C0137201F700E6FD3A /* lfunc.h */,
+				2BDB88C1137201F700E6FD3A /* lgc.c */,
+				2BDB88C2137201F700E6FD3A /* lgc.h */,
+				2BDB88C3137201F700E6FD3A /* linit.c */,
+				2BDB88C4137201F700E6FD3A /* liolib.c */,
+				2BDB88C5137201F700E6FD3A /* llex.c */,
+				2BDB88C6137201F700E6FD3A /* llex.h */,
+				2BDB88C7137201F700E6FD3A /* llimits.h */,
+				2BDB88C8137201F700E6FD3A /* lmathlib.c */,
+				2BDB88C9137201F700E6FD3A /* lmem.c */,
+				2BDB88CA137201F700E6FD3A /* lmem.h */,
+				2BDB88CB137201F700E6FD3A /* loadlib.c */,
+				2BDB88CC137201F700E6FD3A /* lobject.c */,
+				2BDB88CD137201F700E6FD3A /* lobject.h */,
+				2BDB88CE137201F700E6FD3A /* lopcodes.c */,
+				2BDB88CF137201F700E6FD3A /* lopcodes.h */,
+				2BDB88D0137201F700E6FD3A /* loslib.c */,
+				2BDB88D1137201F700E6FD3A /* lparser.c */,
+				2BDB88D2137201F700E6FD3A /* lparser.h */,
+				2BDB88D3137201F700E6FD3A /* lstate.c */,
+				2BDB88D4137201F700E6FD3A /* lstate.h */,
+				2BDB88D5137201F700E6FD3A /* lstring.c */,
+				2BDB88D6137201F700E6FD3A /* lstring.h */,
+				2BDB88D7137201F700E6FD3A /* lstrlib.c */,
+				2BDB88D8137201F700E6FD3A /* ltable.c */,
+				2BDB88D9137201F700E6FD3A /* ltable.h */,
+				2BDB88DA137201F700E6FD3A /* ltablib.c */,
+				2BDB88DB137201F700E6FD3A /* ltm.c */,
+				2BDB88DC137201F700E6FD3A /* ltm.h */,
+				2BDB88DD137201F700E6FD3A /* lua.c */,
+				2BDB88DE137201F700E6FD3A /* lua.h */,
+				2BDB88DF137201F700E6FD3A /* luac.c */,
+				2BDB88E0137201F700E6FD3A /* luaconf.h */,
+				2BDB88E1137201F700E6FD3A /* lualib.h */,
+				2BDB88E2137201F700E6FD3A /* lundump.c */,
+				2BDB88E3137201F700E6FD3A /* lundump.h */,
+				2BDB88E4137201F700E6FD3A /* lvm.c */,
+				2BDB88E5137201F700E6FD3A /* lvm.h */,
+				2BDB88E6137201F700E6FD3A /* lzio.c */,
+				2BDB88E7137201F700E6FD3A /* lzio.h */,
+				2BDB88E8137201F700E6FD3A /* print.c */,
 			);
 			name = "lua-5.1";
-			path = "../src/lua-5.1";
+			path = "../extern/lua-5.1";
 			sourceTree = "<group>";
 		};
 		EE879B8E132E06C50078FDDC /* glew-1.5.8 */ = {
@@ -4923,13 +4931,13 @@
 		EE906F6F12BF3A5B00146C96 /* json */ = {
 			isa = PBXGroup;
 			children = (
-				EE906F7012BF3A6900146C96 /* json_batchallocator.h */,
-				EE906F7112BF3A6900146C96 /* json_internalarray.inl */,
-				EE906F7212BF3A6900146C96 /* json_internalmap.inl */,
-				EE906F7312BF3A6900146C96 /* json_reader.cpp */,
-				EE906F7412BF3A6900146C96 /* json_value.cpp */,
-				EE906F7512BF3A6900146C96 /* json_valueiterator.inl */,
-				EE906F7612BF3A6900146C96 /* json_writer.cpp */,
+				2BD06FDD137240CF0018CB9F /* json_batchallocator.h */,
+				2BD06FDE137240CF0018CB9F /* json_internalarray.inl */,
+				2BD06FDF137240CF0018CB9F /* json_internalmap.inl */,
+				2BD06FE0137240CF0018CB9F /* json_reader.cpp */,
+				2BD06FE1137240CF0018CB9F /* json_value.cpp */,
+				2BD06FE2137240CF0018CB9F /* json_valueiterator.inl */,
+				2BD06FE3137240CF0018CB9F /* json_writer.cpp */,
 			);
 			name = json;
 			sourceTree = "<group>";
@@ -4950,7 +4958,6 @@
 				36C6888411297FFE00453295 /* RageFileDriverReadAhead.h in Headers */,
 				36C6888611297FFE00453295 /* RageFileManager_ReadAhead.h in Headers */,
 				EE906F6712BF3A1B00146C96 /* ScreenInstallOverlay.h in Headers */,
-				EE906F7712BF3A6900146C96 /* json_batchallocator.h in Headers */,
 				EE906F8312BF3AF800146C96 /* JsonUtil.h in Headers */,
 				EE906F8B12BF3C7C00146C96 /* FileDownload.h in Headers */,
 				2BA7925F1304F20D002BD8E1 /* NotesLoaderSSC.h in Headers */,
@@ -4959,6 +4966,7 @@
 				EE879B61132DEE720078FDDC /* RageDisplay_Legacy_Helpers.h in Headers */,
 				EE879B63132DEE720078FDDC /* RageDisplay_Legacy.h in Headers */,
 				2B76698B132FF71500586512 /* NotesLoaderSMA.h in Headers */,
+				2BD06FEE137242680018CB9F /* json_batchallocator.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -5427,29 +5435,29 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				AAE781C00AC7E53500AEFC64 /* lapi.h in Headers */,
-				AAE781C20AC7E53500AEFC64 /* lauxlib.h in Headers */,
-				AAE781C50AC7E53500AEFC64 /* lcode.h in Headers */,
-				AAE781C80AC7E53500AEFC64 /* ldebug.h in Headers */,
-				AAE781CA0AC7E53500AEFC64 /* ldo.h in Headers */,
-				AAE781CD0AC7E53500AEFC64 /* lfunc.h in Headers */,
-				AAE781CF0AC7E53500AEFC64 /* lgc.h in Headers */,
-				AAE781D30AC7E53500AEFC64 /* llex.h in Headers */,
-				AAE781D40AC7E53500AEFC64 /* llimits.h in Headers */,
-				AAE781D70AC7E53500AEFC64 /* lmem.h in Headers */,
-				AAE781DA0AC7E53500AEFC64 /* lobject.h in Headers */,
-				AAE781DC0AC7E53500AEFC64 /* lopcodes.h in Headers */,
-				AAE781DF0AC7E53500AEFC64 /* lparser.h in Headers */,
-				AAE781E10AC7E53500AEFC64 /* lstate.h in Headers */,
-				AAE781E30AC7E53500AEFC64 /* lstring.h in Headers */,
-				AAE781E60AC7E53500AEFC64 /* ltable.h in Headers */,
-				AAE781E90AC7E53500AEFC64 /* ltm.h in Headers */,
-				AAE781EA0AC7E53500AEFC64 /* lua.h in Headers */,
-				AAE781EB0AC7E53500AEFC64 /* luaconf.h in Headers */,
-				AAE781EC0AC7E53500AEFC64 /* lualib.h in Headers */,
-				AAE781EE0AC7E53500AEFC64 /* lundump.h in Headers */,
-				AAE781F00AC7E53500AEFC64 /* lvm.h in Headers */,
-				AAE781F20AC7E53500AEFC64 /* lzio.h in Headers */,
+				2BDB88EA137201F700E6FD3A /* lapi.h in Headers */,
+				2BDB88EC137201F700E6FD3A /* lauxlib.h in Headers */,
+				2BDB88EF137201F700E6FD3A /* lcode.h in Headers */,
+				2BDB88F2137201F700E6FD3A /* ldebug.h in Headers */,
+				2BDB88F4137201F700E6FD3A /* ldo.h in Headers */,
+				2BDB88F7137201F700E6FD3A /* lfunc.h in Headers */,
+				2BDB88F9137201F700E6FD3A /* lgc.h in Headers */,
+				2BDB88FD137201F700E6FD3A /* llex.h in Headers */,
+				2BDB88FE137201F700E6FD3A /* llimits.h in Headers */,
+				2BDB8901137201F700E6FD3A /* lmem.h in Headers */,
+				2BDB8904137201F700E6FD3A /* lobject.h in Headers */,
+				2BDB8906137201F700E6FD3A /* lopcodes.h in Headers */,
+				2BDB8909137201F700E6FD3A /* lparser.h in Headers */,
+				2BDB890B137201F700E6FD3A /* lstate.h in Headers */,
+				2BDB890D137201F700E6FD3A /* lstring.h in Headers */,
+				2BDB8910137201F700E6FD3A /* ltable.h in Headers */,
+				2BDB8913137201F700E6FD3A /* ltm.h in Headers */,
+				2BDB8915137201F700E6FD3A /* lua.h in Headers */,
+				2BDB8917137201F700E6FD3A /* luaconf.h in Headers */,
+				2BDB8918137201F700E6FD3A /* lualib.h in Headers */,
+				2BDB891A137201F700E6FD3A /* lundump.h in Headers */,
+				2BDB891C137201F700E6FD3A /* lvm.h in Headers */,
+				2BDB891E137201F700E6FD3A /* lzio.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -5675,9 +5683,9 @@
 				AA29CD3E0558741A00961A51 /* smicon.icns in Resources */,
 				AAF6A2F909B695BA00D5C614 /* Localizable.strings in Resources */,
 				AA1DE9580C5468CE00D59F20 /* Hardware.plist in Resources */,
-				EE906F7812BF3A6900146C96 /* json_internalarray.inl in Resources */,
-				EE906F7912BF3A6900146C96 /* json_internalmap.inl in Resources */,
-				EE906F7C12BF3A6900146C96 /* json_valueiterator.inl in Resources */,
+				2BD06FEF137242680018CB9F /* json_internalarray.inl in Resources */,
+				2BD06FF0137242680018CB9F /* json_internalmap.inl in Resources */,
+				2BD06FF3137242680018CB9F /* json_valueiterator.inl in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -6191,9 +6199,6 @@
 				36C6888311297FFE00453295 /* RageFileDriverReadAhead.cpp in Sources */,
 				36C6888511297FFE00453295 /* RageFileManager_ReadAhead.cpp in Sources */,
 				EE906F6612BF3A1B00146C96 /* ScreenInstallOverlay.cpp in Sources */,
-				EE906F7A12BF3A6900146C96 /* json_reader.cpp in Sources */,
-				EE906F7B12BF3A6900146C96 /* json_value.cpp in Sources */,
-				EE906F7D12BF3A6900146C96 /* json_writer.cpp in Sources */,
 				EE906F8212BF3AF800146C96 /* JsonUtil.cpp in Sources */,
 				EE906F8A12BF3C7C00146C96 /* FileDownload.cpp in Sources */,
 				2BA7925E1304F20D002BD8E1 /* NotesLoaderSSC.cpp in Sources */,
@@ -6203,6 +6208,9 @@
 				EE879B62132DEE720078FDDC /* RageDisplay_Legacy.cpp in Sources */,
 				EE879BC3132E06C50078FDDC /* glew.c in Sources */,
 				2B76698C132FF71500586512 /* NotesLoaderSMA.cpp in Sources */,
+				2BD06FF1137242680018CB9F /* json_reader.cpp in Sources */,
+				2BD06FF2137242680018CB9F /* json_value.cpp in Sources */,
+				2BD06FF4137242680018CB9F /* json_writer.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -6608,7 +6616,6 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				AA7A2BA00AE09BC90054C5BA /* lua.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -6616,8 +6623,6 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				AA7A2BB10AE09CF80054C5BA /* print.c in Sources */,
-				AA7A2BB20AE09CF90054C5BA /* luac.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -6919,35 +6924,38 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				AAE781BF0AC7E53500AEFC64 /* lapi.c in Sources */,
-				AAE781C10AC7E53500AEFC64 /* lauxlib.c in Sources */,
-				AAE781C30AC7E53500AEFC64 /* lbaselib.c in Sources */,
-				AAE781C40AC7E53500AEFC64 /* lcode.c in Sources */,
-				AAE781C60AC7E53500AEFC64 /* ldblib.c in Sources */,
-				AAE781C70AC7E53500AEFC64 /* ldebug.c in Sources */,
-				AAE781C90AC7E53500AEFC64 /* ldo.c in Sources */,
-				AAE781CB0AC7E53500AEFC64 /* ldump.c in Sources */,
-				AAE781CC0AC7E53500AEFC64 /* lfunc.c in Sources */,
-				AAE781CE0AC7E53500AEFC64 /* lgc.c in Sources */,
-				AAE781D00AC7E53500AEFC64 /* linit.c in Sources */,
-				AAE781D10AC7E53500AEFC64 /* liolib.c in Sources */,
-				AAE781D20AC7E53500AEFC64 /* llex.c in Sources */,
-				AAE781D50AC7E53500AEFC64 /* lmathlib.c in Sources */,
-				AAE781D60AC7E53500AEFC64 /* lmem.c in Sources */,
-				AAE781D80AC7E53500AEFC64 /* loadlib.c in Sources */,
-				AAE781D90AC7E53500AEFC64 /* lobject.c in Sources */,
-				AAE781DB0AC7E53500AEFC64 /* lopcodes.c in Sources */,
-				AAE781DD0AC7E53500AEFC64 /* loslib.c in Sources */,
-				AAE781DE0AC7E53500AEFC64 /* lparser.c in Sources */,
-				AAE781E00AC7E53500AEFC64 /* lstate.c in Sources */,
-				AAE781E20AC7E53500AEFC64 /* lstring.c in Sources */,
-				AAE781E40AC7E53500AEFC64 /* lstrlib.c in Sources */,
-				AAE781E50AC7E53500AEFC64 /* ltable.c in Sources */,
-				AAE781E70AC7E53500AEFC64 /* ltablib.c in Sources */,
-				AAE781E80AC7E53500AEFC64 /* ltm.c in Sources */,
-				AAE781ED0AC7E53500AEFC64 /* lundump.c in Sources */,
-				AAE781EF0AC7E53500AEFC64 /* lvm.c in Sources */,
-				AAE781F10AC7E53500AEFC64 /* lzio.c in Sources */,
+				2BDB88E9137201F700E6FD3A /* lapi.c in Sources */,
+				2BDB88EB137201F700E6FD3A /* lauxlib.c in Sources */,
+				2BDB88ED137201F700E6FD3A /* lbaselib.c in Sources */,
+				2BDB88EE137201F700E6FD3A /* lcode.c in Sources */,
+				2BDB88F0137201F700E6FD3A /* ldblib.c in Sources */,
+				2BDB88F1137201F700E6FD3A /* ldebug.c in Sources */,
+				2BDB88F3137201F700E6FD3A /* ldo.c in Sources */,
+				2BDB88F5137201F700E6FD3A /* ldump.c in Sources */,
+				2BDB88F6137201F700E6FD3A /* lfunc.c in Sources */,
+				2BDB88F8137201F700E6FD3A /* lgc.c in Sources */,
+				2BDB88FA137201F700E6FD3A /* linit.c in Sources */,
+				2BDB88FB137201F700E6FD3A /* liolib.c in Sources */,
+				2BDB88FC137201F700E6FD3A /* llex.c in Sources */,
+				2BDB88FF137201F700E6FD3A /* lmathlib.c in Sources */,
+				2BDB8900137201F700E6FD3A /* lmem.c in Sources */,
+				2BDB8902137201F700E6FD3A /* loadlib.c in Sources */,
+				2BDB8903137201F700E6FD3A /* lobject.c in Sources */,
+				2BDB8905137201F700E6FD3A /* lopcodes.c in Sources */,
+				2BDB8907137201F700E6FD3A /* loslib.c in Sources */,
+				2BDB8908137201F700E6FD3A /* lparser.c in Sources */,
+				2BDB890A137201F700E6FD3A /* lstate.c in Sources */,
+				2BDB890C137201F700E6FD3A /* lstring.c in Sources */,
+				2BDB890E137201F700E6FD3A /* lstrlib.c in Sources */,
+				2BDB890F137201F700E6FD3A /* ltable.c in Sources */,
+				2BDB8911137201F700E6FD3A /* ltablib.c in Sources */,
+				2BDB8912137201F700E6FD3A /* ltm.c in Sources */,
+				2BDB8914137201F700E6FD3A /* lua.c in Sources */,
+				2BDB8916137201F700E6FD3A /* luac.c in Sources */,
+				2BDB8919137201F700E6FD3A /* lundump.c in Sources */,
+				2BDB891B137201F700E6FD3A /* lvm.c in Sources */,
+				2BDB891D137201F700E6FD3A /* lzio.c in Sources */,
+				2BDB891F137201F700E6FD3A /* print.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

extern/jsoncpp/src/lib_json/json_reader.cpp

@@ -1,5 +1,5 @@
-#include <jsoncpp/include/json/reader.h>
-#include <jsoncpp/include/json/value.h>
+#include <../extern/jsoncpp/include/json/reader.h>
+#include <../extern/jsoncpp/include/json/value.h>
 #include <utility>
 #include <cstdio>
 #include <cassert>

extern/jsoncpp/src/lib_json/json_value.cpp

@@ -1,6 +1,6 @@
 #include <iostream>
-#include <jsoncpp/include/json/value.h>
-#include <jsoncpp/include/json/writer.h>
+#include <../extern/jsoncpp/include/json/value.h>
+#include <../extern/jsoncpp/include/json/writer.h>
 #include <utility>
 #include <stdexcept>
 #include <cstring>

extern/jsoncpp/src/lib_json/json_writer.cpp

@@ -1,4 +1,4 @@
-#include <jsoncpp/include/json/writer.h>
+#include <../extern/jsoncpp/include/json/writer.h>
 #include <utility>
 #include <assert.h>
 #include <stdio.h>

extern/libpng/include/png.h

@@ -388,7 +388,7 @@
 
 #ifndef PNG_VERSION_INFO_ONLY
 /* Include the compression library's header */
-#include "zlib/zlib.h"
+#include "../extern/zlib/zlib.h"
 #endif
 
 /* Include all user configurable info, including optional assembler routines */