Merge remote branch 'origin/master' into qt

Conflicts:
	data/base/script/text/cam1a.slo
	lib/exceptionhandler/exceptionhandler.vcxproj
	lib/exceptionhandler/exchndl.h
	lib/framework/framework.vcxproj
	lib/gamelib/gamelib.vcxproj
	lib/iniparser/iniparser.vcxproj
	lib/ivis_opengl/ivis_common.vcproj
	lib/ivis_opengl/ivis_opengl.vcxproj
	lib/netplay/netplay.vcxproj
	lib/script/script.vcxproj
	lib/sequence/sequence.vcxproj
	lib/sound/sound.vcxproj
	lib/widget/widget.vcxproj
	macosx/README.BUILD.txt
	macosx/Warzone.xcodeproj/project.pbxproj
	src/Warzone2100.vcxproj
	src/main.cpp

.gitattributes

@@ -1 +1,3 @@
 *.pbxproj -crlf -merge
+*.xcworkspacedata -crlf -merge
+*.xcscheme -crlf -merge

.gitignore

@@ -182,10 +182,14 @@ tools/qwzm/ui_qwzm.h
 .DS_Store
 *.pbxuser
 *.perspectivev3
+macosx/Warzone.xcodeproj/xcuserdata/*
+macosx/Warzone.xcodeproj/project.xcworkspace/xcuserdata/*
+macosx/Warzone.xcworkspace/xcuserdata/*
 macosx/configs/codeident
 
 # build folders
 /macosx/build/
+/macosx/Build/
 /macosx/external/
 /macosx/prebuilt/
 /build

data/base/sequenceaudio/cam3/c003.txa

@@ -2,7 +2,7 @@
 254	420	0	100	_("NORTHERN SECTOR")
 
 20	20	113	479	_("TRANSPORT MISSION: Northern Sector")
-20	447	113	479	_("Congratulations your successful evacuation of Beta Base.")
+20	447	113	479	_("Congratulations on your successful evacuation of Beta Base.")
 0	0	113	479	_("NEXUS has gained access to nuclear weapons and is determined to destroy the Project.")
 
 20	20	1000	1225	_("Dusk, December 3rd, 2100")

data/base/wrf/cam2/cam2change.wrf

@@ -8,7 +8,7 @@
 
 directory	"texpages"
 file		TERTILES	"tertilesc2hw"
-file		TEXPAGE	"page-6-features-urban.png"
+file		TEXPAGE	"page-31-features-urban.png"
 file		TEXPAGE	"page-7-barbarians-urban.png"
 file		TEXPAGE	"page-8-player-buildings-bases-urban.png"
 file		TEXPAGE	"page-9-player-buildings-bases-urban.png"

data/base/wrf/cam3/cam3change.wrf

@@ -8,7 +8,7 @@
 
 directory	"texpages"
 file		TERTILES	"tertilesc3hw"
-file		TEXPAGE	"page-6-features-rockies.png"
+file		TEXPAGE	"page-31-features-rockies.png"
 file		TEXPAGE	"page-7-barbarians-kevlar.png"
 file		TEXPAGE	"page-8-player-buildings-bases-rockies.png"
 file		TEXPAGE	"page-9-player-buildings-bases-rockies.png"

data/mods/multiplay/old-1.10-balance/messages/strings/names.txt

@@ -523,7 +523,7 @@ Mortar1Mk1-Pit			"Mortar Emplacement"
 Mortar2Mk1				"Bombard"
 Mortar2Mk1-Pit			"Bombard Emplacement"
 Mortar3ROTARYMk1			"Pepperpot"
-Mortar3ROTARYMk1-Pit		"Peperpot Emplacement"
+Mortar3ROTARYMk1-Pit		"Pepperpot Emplacement"
 RailGun1Mk1				"Needle Gun"
 RailGun2Mk1				"Rail Gun"
 RailGun3Mk1				"Gauss Cannon"
@@ -1959,3 +1959,54 @@ SK-Retre-VTOL-Plasmite	_("Plasmite Retribution VTOL")
 //Added for mp.wz (templates.txt)
 SK-Veng-Hover-Seraph           "*SK-Veng-Hover-Seraph*"
 Dragon-Hover-SeraphGauss       "*SK-Dragon-Hover-SeraphGauss*"
+MP-SuperTransport			_("Super Transport")
+MP-SuperTransportBody			_("Super Transport Body")
+
+// new features by Mysteryem
+arizonabush1				"*ArizonaBush1*"
+arizonabush2				"*ArizonaBush2*"
+arizonabush3				"*ArizonaBush3*"
+arizonabush4				"*ArizonaBush4*"
+arizonatree1        "*ArizonaTree1*"
+arizonatree2        "*ArizonaTree2*"
+arizonatree3        "*ArizonaTree3*"
+arizonatree4        "*ArizonaTree4*"
+arizonatree5        "*ArizonaTree5*"
+arizonatree6        "*ArizonaTree6*"
+trapstraight        "*TrapStraight*"
+trapcorner          "*TrapCorner*"
+hoverwreck          "*WreckedHoverProp*"
+barrier             "*Barrier*"
+bridgeend           "*BridgeEnd*"
+bridgemiddle        "*BridgeMiddle*"
+bridgefull         "*FullBridge*"
+bigcooltowr         "*LargeCoolingTower*"
+nukepowstat         "*NuclearPowerStation*"
+Pipe1A              "*PipeFull*"
+Pipe2A              "*PipeEnd*"
+Pipe3A              "*PipeCollapsed*"
+Ruin6               "*Ruin6*"
+Ruin7               "*Ruin7*"
+Ruin8               "*Ruin8*"
+Ruin9               "*Ruin9*"
+Ruin10              "*Ruin10*"
+Wreck0              "*Wreck0*"
+Wreck1              "*Wreck1*"
+Wreck2              "*Wreck2*"
+Wreck3              "*Wreck3*"
+Wreck4              "*Wreck4*"
+Wreck5              "*Wreck5*"
+BaBaHorizontalWall  "*Babahrzwall*"
+BabaCornerWall      "*Babacrnwall*"
+Powlab              "Powerlab"
+Indirectlab         "Indirectweaponslab"
+Nanolab             "Nanolab"
+Aerodynamicslab     "Aerodynamicslab"
+Advmaterialslab     "Advancedmaterialslab"
+Heavywepslab        "Heavyweaponslab"
+Rotarywepslab       "Rotaryweaponslab"
+Laseropticslab      "Laseropticslab"
+Wall                "Wall"
+WallCorner          "Wallcorner"
+WallSmashed         "Smashedwall"
+WallCornerSmashed   "Smashedcornerwall"

data/mods/multiplay/old-1.10-balance/stats/body.txt

@@ -1,6 +1,7 @@
 ZNULLBODY,Level All,LIGHT,0,0,0,0,MIBNKBOD.PIE,20,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 TransporterBody,Level All,MEDIUM,325,637,250,200,drcytran.pie,100,1,2000,20,9,20,9,20,9,20,9,20,9,20,9,0,0
 Superbody,Level All,HEAVY,10,10,2700,9000,DRHBOD11.PIE,500,1,40000,999,999,999,999,999,999,999,999,999,999,999,999,0,0
+MP-SuperTransportBody,Level All,HEAVY,500,1000,1850,1000,drtrans.pie,100,1,6100,200,200,200,200,200,200,200,200,200,200,200,200,0,0
 FireBody,Level One,LIGHT,4,75,3000,200,EXFIRE.PIE,50,1,4000,4,1,4,1,4,1,4,1,4,1,4,1,0,0
 CybRotMgGrd,Level All,LIGHT,25,100,150,200,cybd_std.pie,100,1,600,12,6,12,6,12,6,12,6,12,6,12,6,0,0
 CyborgRkt1Ground,Level All,LIGHT,30,125,150,200,cybd_std.pie,100,1,500,12,6,12,6,12,6,12,6,12,6,12,6,0,0

lib/exceptionhandler/exceptionhandler.cpp

@@ -775,9 +775,9 @@ void setupExceptionHandler(int argc, const char ** argv)
 bool OverrideRPTDirectory(char *newPath)
 {
 # if defined(WZ_CC_MINGW)
-	TCHAR buf[MAX_PATH];
+	wchar_t buf[MAX_PATH];
 
-	if (!MultiByteToWideChar(CP_UTF8, 0, newPath, strlen(newPath), (WCHAR *)buf, 0))
+	if (!MultiByteToWideChar(CP_UTF8, 0, newPath, -1, buf, MAX_PATH))
 	{
 		//conversion failed-- we won't use the user's directory.
 
@@ -802,10 +802,9 @@ bool OverrideRPTDirectory(char *newPath)
 
 		return false;
 	}
-	_tcscpy(buf, newPath);
-	PathRemoveFileSpec(buf);
-	_tcscat(buf, _T("\\logs\\")); // stuff it in the logs directory
-	_tcscat(buf, _T("Warzone2100.RPT"));
+	PathRemoveFileSpecW(buf);
+	wcscat(buf, L"\\logs\\"); // stuff it in the logs directory
+	wcscat(buf, L"Warzone2100.RPT");
 	ResetRPTDirectory(buf);
 #endif
 	return true;