to upstream

LuaMenu/Addons/timeFunctions.lua

@@ -348,3 +348,20 @@ end
 function Spring.Utilities.ArchaicUtcToLocal(utcTimeString, translator)
 	return Spring.Utilities.ArchaicFormatDate(Spring.Utilities.UtcToLocal(utcTimeString), translator)
 end
+
+function Spring.Utilities.ArchaicUtcToLocal(utcTimeString, translator)
+	return Spring.Utilities.ArchaicFormatDate(Spring.Utilities.UtcToLocal(utcTimeString), translator)
+end
+
+function Spring.Utilities.GetCurrentUtc()
+	local t = {
+		tonumber(os.date("!%S")),
+		tonumber(os.date("!%M")),
+		tonumber(os.date("!%H")),
+		tonumber(os.date("!%d")),
+		tonumber(os.date("!%m")),
+		tonumber(os.date("!%Y")),
+	}
+
+	return string.format("%04d-%02d-%02dT%02d:%02d:%02d", t[6], t[5], t[4], t[3], t[2], t[1])
+end

LuaMenu/configs/gameConfig/zk/gameUnitInformation.lua

@@ -172,6 +172,7 @@ local nameList = {
 	[171] = "shieldarty",
 	[172] = "shieldaa",
 	[173] = "shieldbomb",
+	[174] = "amphlaunch",
 }
 
 local categories = {
@@ -623,21 +624,27 @@ local humanNames = {
 		description = "Heavy Amphibious Assault Walker",
 		humanName = "Grizzly",
 	},
-	amphaa = {
+	amphlaunch = {
 		category = "amph",
 		order = 8,
+		description = "Amphibious Launcher Bot",
+		humanName = "Lobster",
+	},
+	amphaa = {
+		category = "amph",
+		order = 9,
 		description = "Amphibious Anti-Air Bot",
 		humanName = "Angler",
 	},
 	amphbomb = {
 		category = "amph",
-		order = 9,
+		order = 10,
 		description = "Amphibious Slow Bomb",
 		humanName = "Limpet",
 	},
 	amphtele = {
 		category = "amph",
-		order = 10,
+		order = 11,
 		description = "Amphibious Teleport Bridge",
 		humanName = "Djinn",
 	},
@@ -688,7 +695,7 @@ local humanNames = {
 	jumpsumo = {
 		category = "jump",
 		order = 8,
-		description = "Heavy Riot Jumper - On to Repulse, Off to Attract",
+		description = "Heavy Riot Jumper",
 		humanName = "Jugglenaut",
 	},
 	jumparty = {
@@ -1176,7 +1183,7 @@ local humanNames = {
 	turretimpulse = {
 		category = "defence",
 		order = 12,
-		description = "Gravity Turret - On to Repulse, Off to Attract",
+		description = "Gravity Turret",
 		humanName = "Newton",
 	},
 	turrettorp = {

LuaMenu/configs/gameConfig/zk/settingsMenu.lua

@@ -45,6 +45,7 @@ local settingsConfig = {
 					VegetationDetail = "Minimal",
 					FeatureFade = "On",
 					CompatibilityMode = "On",
+					AtiIntelCompatibility_2 = "Automatic",
 					AntiAliasing = "Off",
 					ShaderDetail = "Minimal",
 					LupsAirJet = "Off",
@@ -67,6 +68,7 @@ local settingsConfig = {
 					VegetationDetail = "Low",
 					FeatureFade = "Off",
 					CompatibilityMode = "Off",
+					AtiIntelCompatibility_2 = "Automatic",
 					AntiAliasing = "Low",
 					ShaderDetail = "Low",
 					LupsAirJet = "Off",
@@ -89,6 +91,7 @@ local settingsConfig = {
 					VegetationDetail = "Low",
 					FeatureFade = "Off",
 					CompatibilityMode = "Off",
+					AtiIntelCompatibility_2 = "Automatic",
 					AntiAliasing = "Low",
 					ShaderDetail = "Low",
 					LupsAirJet = "Off",
@@ -111,6 +114,7 @@ local settingsConfig = {
 					VegetationDetail = "Medium",
 					FeatureFade = "Off",
 					CompatibilityMode = "Off",
+					AtiIntelCompatibility_2 = "Automatic",
 					AntiAliasing = "Low",
 					ShaderDetail = "Medium",
 					LupsAirJet = "On",
@@ -133,6 +137,7 @@ local settingsConfig = {
 					VegetationDetail = "High",
 					FeatureFade = "Off",
 					CompatibilityMode = "Off",
+					AtiIntelCompatibility_2 = "Automatic",
 					AntiAliasing = "High",
 					ShaderDetail = "High",
 					LupsAirJet = "On",
@@ -155,6 +160,7 @@ local settingsConfig = {
 					VegetationDetail = "Ultra",
 					FeatureFade = "Off",
 					CompatibilityMode = "Off",
+					AtiIntelCompatibility_2 = "Automatic",
 					AntiAliasing = "High",
 					ShaderDetail = "Ultra",
 					LupsAirJet = "On",
@@ -681,27 +687,38 @@ local settingsConfig = {
 				},
 			},
 			{
-				name = "AtiIntelCompatibility",
+				name = "AtiIntelCompatibility_2",
 				humanName = "ATI/Intel Compatibility",
 				options = {
 					{
 						name = "On",
-						applyFunction = function()
-							WG.Chobby.Configuration:SetConfigValue("atiIntelCompat", true)
+						applyFunction = function(_, conf)
+							conf:UpdateFixedSettings(conf.AtiIntelSettingsOverride)
+							Spring.Echo("Set ATI/intel/other non-nvidia compatibility state: Enabled")
+							return
+						end
+					},
+					{
+						name = "Automatic",
+						applyFunction = function(_, conf)
+							if conf:GetIsNotRunningNvidia() then
+								conf:UpdateFixedSettings(conf.AtiIntelSettingsOverride)
+								Spring.Echo("Set ATI/intel/other non-nvidia compatibility state: Enabled")
+								return
+							end
+							Spring.Echo("Set ATI/intel/other non-nvidia compatibility state: Disabled")
 							return
 						end
 					},
 					{
 						name = "Off",
-						applyFunction = function()
-							WG.Chobby.Configuration:SetConfigValue("atiIntelCompat", false)
+						applyFunction = function(_, conf)
+							conf:UpdateFixedSettings()
+							Spring.Echo("Set ATI/intel/other non-nvidia compatibility state: Enabled")
 							return
 						end
 					},
 				},
-				defaultFunction = function ()
-					return (WG.Chobby.Configuration.atiIntelCompat and "On") or "Off"
-				end,
 			},
 			{
 				name = "AntiAliasing",
@@ -875,6 +892,7 @@ local settingsDefault = {
 	VegetationDetail = "High",
 	FeatureFade = "Off",
 	CompatibilityMode = "Off",
+	AtiIntelCompatibility_2 = "Automatic",
 	AntiAliasing = "High",
 	ShaderDetail = "High",
 	LupsAirJet = "On",

LuaMenu/configs/gameConfig/zk/singleplayerMenu.lua

@@ -1,85 +1,98 @@
-local FEEDBACK_LINK = "http://zero-k.info/Forum/Thread/24566"
+local FEEDBACK_LINK = "http://zero-k.info/Forum/Thread/24614"
 
 local planetWhitelist = {
-	-- Tutorial Cloaky
+	-- Tutorial Cloaky http://zero-k.info/Forum/Thread/24417
 	[69] = true,
 	[1] = true,
 	[2] = true,
 	[3] = true,
 	[5] = true,
-	-- Adv. Cloaky
+	-- Adv. Cloaky http://zero-k.info/Forum/Thread/24429
 	[4] = true,
 	[6] = true,
 	[7] = true,
 	[8] = true,
 	[20] = true,
-	-- Shield
+	-- Shield http://zero-k.info/Forum/Thread/24441
 	[13] = true,
 	[14] = true,
 	[15] = true,
 	[16] = true,
 	[17] = true,
 	[19] = true,
-	-- Rover
+	-- Rover http://zero-k.info/Forum/Thread/24457
 	[9] = true,
 	[10] = true,
 	[11] = true,
 	[12] = true,
 	[43] = true,
 	[52] = true,
-	-- Amph and Hover
+	-- Amph and Hover http://zero-k.info/Forum/Thread/24469
 	[22] = true,
 	[23] = true,
 	[24] = true,
 	[25] = true,
 	[26] = true,
 	[27] = true,
 	[28] = true,
-	-- Tank, Terraform, Dante
+	-- Tank, Terraform, Dante http://zero-k.info/Forum/Thread/24489
 	[18] = true,
 	[21] = true,
 	[29] = true,
 	[40] = true,
 	[41] = true,
 	[42] = true,
 	[71] = true,
-	-- Gunship, Firewalker, Skuttle, Athena
+	-- Gunship, Firewalker, Skuttle, Athena http://zero-k.info/Forum/Thread/24510
 	[36] = true,
 	[37] = true,
 	[38] = true,
 	[39] = true,
 	[53] = true,
 	[54] = true,
 	[56] = true,
-	-- Spider and Ships
+	-- Spider and Ships http://zero-k.info/Forum/Thread/24530
 	[30] = true,
 	[31] = true,
 	[32] = true,
 	[44] = true,
 	[45] = true,
 	[46] = true,
 	[47] = true,
-	-- Planes, Behemoth, Bertha, Missile Silo, Scorpion
+	-- Planes, Behemoth, Bertha, Missile Silo, Scorpion http://zero-k.info/Forum/Thread/24566
 	[33] = true,
 	[34] = true,
 	[35] = true,
 	[48] = true,
 	[49] = true,
 	[62] = true,
 	[70] = true,
+	-- Jumps, Nuke, Sea Striders http://zero-k.info/Forum/Thread/24594
+	[50] = true,
+	[51] = true,
+	[55] = true,
+	[57] = true,
+	[60] = true,
+	-- Land Striders and Heavy Defences http://zero-k.info/Forum/Thread/24614
+	[58] = true,
+	[59] = true,
+	[61] = true,
+	[63] = true,
+	-- Paladin, Detriment and Superweapons http://zero-k.info/Forum/Thread/24642
+	[64] = true,
+	[65] = true,
+	[66] = true,
+	[67] = true,
+	[68] = true,
 }
 
 return {
-	{
-		name = "tutorials", 
-		control = WG.MissionHandler.GetControl(),
-	},
 	{
 		name = "campaign",
 		entryCheck = WG.CampaignSaveWindow.PromptInitialSaveName,
 		entryCheckBootMode = true,
 		submenuData = {
-			submenuControl = WG.CampaignHandler.GetControl(true, planetWhitelist, FEEDBACK_LINK),
+			submenuControl = WG.CampaignHandler.GetControl(true),
 			tabs = {
 				{
 					name = "technology", 
@@ -105,5 +118,9 @@ return {
 		control = WG.BattleRoomWindow.GetSingleplayerControl(VFS.Include(LUA_DIRNAME .. "configs/gameConfig/zk/singleplayerQuickSkirmish.lua")),
 		entryCheck = WG.BattleRoomWindow.SetSingleplayerGame,
 	},
+	{
+		name = "instruction", 
+		control = WG.MissionHandler.GetControl(),
+	},
 }
 

LuaMenu/configs/gameConfig/zkdev/singleplayerMenu.lua

@@ -1,8 +1,4 @@
 local menuItems = {
-	{
-		name = "tutorials", 
-		control = WG.MissionHandler.GetControl(),
-	},
 	{
 		name = "campaign",
 		entryCheck = WG.CampaignSaveWindow.PromptInitialSaveName,
@@ -34,6 +30,10 @@ local menuItems = {
 		control = WG.BattleRoomWindow.GetSingleplayerControl(VFS.Include(LUA_DIRNAME .. "configs/gameConfig/zk/singleplayerQuickSkirmish.lua")),
 		entryCheck = WG.BattleRoomWindow.SetSingleplayerGame,
 	},
+	{
+		name = "instruction", 
+		control = WG.MissionHandler.GetControl(),
+	},
 	{
 		name = "load",
 		control = WG.LoadGameWindow.GetControl(),

LuaMenu/configs/springsettings/springsettings.lua

@@ -65,7 +65,7 @@ local settings = {
 	SmoothPoints = 3,
 	SplashScreenDir = "./MenuLoadscreens",
 	TreeRadius = 1500,
-	UnitIconDist = 151,
+	--UnitIconDist = 151, -- Stored in springsettings.cfg and interacted with directly.
 	UnitLodDist = 9999,
 	UseDistToGroundForIcons = 1.1,
 	UsePBO = 0,

LuaMenu/configs/springsettings/springsettingsChanges.lua

@@ -5,6 +5,7 @@ local settings = {
 	ROAM = 1,
 	SplashScreenDir = "./MenuLoadscreens",
 	UseDistToGroundForIcons = 1.1,
+	UseLuaMemPools = 0,
 }
 
 local onlyIfMissingSettings = {