Merge branch 'master' into update-strucuture-mapserver

Author: lynconsl

[admin]/admin/client/gui/admin_main.lua

@@ -269,7 +269,7 @@ y=y+B  aTab1.VehicleHealth	= guiCreateLabel ( 0.26, y, 0.25, 0.04, "Vehicle Heal
 		aTab3.FPSCurrent	= guiCreateLabel ( 0.05, 0.65, 0.25, 0.04, "FPS Limit: 38", true, aTab3.Tab )
 		aTab3.FPS			= guiCreateEdit ( 0.35, 0.65, 0.135, 0.04, "38", true, aTab3.Tab )
 		aTab3.FPSSet		= guiCreateButton ( 0.50, 0.65, 0.10, 0.04, "Set", true, aTab3.Tab, "setfpslimit" )
-							guiCreateLabel ( 0.63, 0.65, 0.1, 0.04, "( 25-32767 )", true, aTab3.Tab )
+							guiCreateLabel ( 0.63, 0.65, 0.12, 0.04, "( 25-32767 )", true, aTab3.Tab )
 
 
 		aTab4 = {}

[editor]/edf/edf.lua

@@ -8,7 +8,7 @@ local thisResource = getThisResource()
 createResourceCallInterface("mapmanager")
 addEvent"onElementPropertyChanged"
 
-local DUMMY_ID = 3003
+local DUMMY_ID = 3045
 local DUMMY_DIMENSION = -99
 local DUMMY_INTERIOR = 14
 

[editor]/editor_gui/client/elementproperties.lua

@@ -40,6 +40,7 @@ layout.pullout = {
 	items = {
 		"Clone",
 		"Delete",
+		"CopyPOS",
 	}
 }
 layout.line = {
@@ -1046,3 +1047,9 @@ function pulloutAction.Delete()
 	move_keyboard.disable()
 end
 
+function pulloutAction.CopyPOS()
+	local x, y, z = getElementPosition(selectedElement)
+	local rx, ry, rz = getElementRotation(selectedElement)
+	setClipboard(x..","..y..","..z..","..rx..","..ry..","..rz)
+	outputChatBox("Position "..x..","..y..","..z..","..rx..","..ry..","..rz.." copied to clipboard")
+end

[editor]/editor_main/client/elementcreation.lua

@@ -39,7 +39,7 @@ function doCreateElement ( elementType, resourceName, creationParameters, attach
 	creationParameters = creationParameters or {}
 	if not creationParameters.position then
 		local targetX, targetY, targetZ = processCameraLineOfSight()
-		if not elementType == "object" or not elementType == "vehicle" then
+		if elementType ~= "object" and elementType ~= "vehicle" then
 			creationParameters.position = nil
 		else
 			creationParameters.position = {targetX, targetY, targetZ + .5}

[editor]/move_freecam/move_freecam.lua

@@ -111,7 +111,6 @@ end
 
 local function onClientRender_freecam()
 	if (selectedElement and isElement(selectedElement)) then
-		setElementVelocity(selectedElement,0,0,0) --!w
 
 	    camX, camY, camZ, targetX, targetY, targetZ = getCameraMatrix()
 

[gameplay]/freeroam/data/interiors.xml

@@ -27,8 +27,8 @@
 	<interior name="Caligulas Casino (Roof access)" posX="2264.49" posY="1619.58" posZ="1089.5" world="1"/>
 	<interior name="Cluckin' Bell" posX="365.67" posY="-11.61" posZ="1000.87" world="9"/>
 	<interior name="Colonel Fuhrberger's House" posX="2807.62" posY="-1174.1" posZ="1024.58" world="8"/>
-	<interior name="Diner 1" posX="460.1" posY="-88.43" posZ="998.62" world="4"/>
-	<interior name="Diner 2" posX="459.35" posY="-111.01" posZ="998.72" world="5"/>
+	<interior name="Diner 1" posX="448.7435" posY="-110.0457" posZ="1000.0772" world="5"/>
+	<interior name="Diner 2" posX="460.0" posY="-88.43" posZ="999.62" world="4"/>
 	<interior name="Didier Sachs" posX="204.33" posY="-168.7" posZ="999.58" world="14"/>
 	<interior name="Driving School" posX="-2029.72" posY="-119.55" posZ="1034.17" world="3"/>
 	<interior name="Francis Int. Airport (Baggage Claim)" posX="-1860.82" posY="59.74" posZ="1062.14" world="14"/>