editor: fixes, random rotation func, getCurrentMapName func, updated scale func

[admin]/admin/conf/messages.xml

@@ -249,6 +249,10 @@
       <all>Chatbox cleared$by_admin_4all.</all>
       <log>ADMIN: $admin has cleared the chatbox.</log>
     </group>
+    <group action="setfpslimit" r="225" g="170" b="90">
+      <all>FPS limit set to '$data'$by_admin_4all.</all>
+      <log>ADMIN: $admin has set FPS limit to '$data'</log>
+    </group>
   </server>
   <bans>
 

[admin]/admin/server/admin_server.lua

@@ -608,9 +608,9 @@ function aAction ( type, action, admin, player, data, more )
 
         if ( node ) then
             local r, g, b = node["r"], node["g"], node["b"]
-            if ( node["all"] ) then outputChatBox ( aStripString ( node["all"] ), root, r, g, b ) end
-            if ( node["admin"] ) and ( admin ~= player ) then outputChatBox ( aStripString ( node["admin"] ), admin, r, g, b ) end
-            if ( node["player"] ) then outputChatBox ( aStripString ( node["player"] ), player, r, g, b ) end
+            if ( node["all"] ) then outputChatBox ( aStripString ( node["all"] ), root, r, g, b, true ) end
+            if ( node["admin"] ) and ( admin ~= player ) then outputChatBox ( aStripString ( node["admin"] ), admin, r, g, b, true ) end
+            if ( node["player"] ) then outputChatBox ( aStripString ( node["player"] ), player, r, g, b, true ) end
             if ( node["log"] ) then outputServerLog ( aStripString ( node["log"] ) ) end
         end
     end

[editor]/edf/edf.lua

@@ -884,23 +884,29 @@ end
 
 --Returns an element's scale, or its scale element data, or false
 function edfGetElementScale(element)
-    local etype = getElementType(element)
-    if etype == "object" then
-        scale = getObjectScale(element)
-    else
-        local handle = edfGetHandle(element)
-        if handle then
-            scale = getObjectScale(handle)
-        else
-            scale = tonumber(getElementData(element,"scale"))
-        end
-    end
-
-    if scale then
-        return scale
-    else
-        return false
-    end
+	local etype = getElementType(element)
+	if etype == "object" then
+		scale = getObjectScale(element)
+		if type(scale) ~= "table" then
+			scale = select(1, scale) or 1
+		end
+	else
+		local handle = edfGetHandle(element)
+		if handle then
+			scale = getObjectScale(handle)
+			if type(scale) == "table" then
+				scale = select(1, scale) or 1
+			end
+		else
+			scale = tonumber(getElementData(element,"scale"))
+		end
+	end
+
+	if scale then
+		return scale
+	else
+		return false
+	end
 end
 
 --Sets an element's position, or its posX/Y/Z element data
@@ -965,28 +971,31 @@ end
 
 --Sets an element's scale, or its scale element data
 function edfSetElementScale(element, scale)
-    local ancestor = edfGetAncestor(element) or element
-    setElementData(ancestor, "scale", scale)
-    local etype = getElementType(element)
-    if etype == "object" then
-        if setObjectScale(element, scale) then
-            triggerEvent ( "onElementPropertyChanged", ancestor, "scale" )
-            return true
-        end
-    else
-        local handle = edfGetHandle(element)
-        if handle then
-            if setObjectScale(handle, scale) then
-                triggerEvent ( "onElementPropertyChanged", ancestor, "scale" )
-                return true
-            end
-        else
-            setElementData(element, "scale", scale or 1)
-            triggerEvent ( "onElementPropertyChanged", ancestor, "scale" )
-            return true
-        end
-    end
-    return false
+	local ancestor = edfGetAncestor(element) or element
+	setElementData(ancestor, "scale", scale)
+	local etype = getElementType(element)
+	if type(scale) == "table" then
+		scale = scale[1]
+	end
+	if etype == "object" then
+		if setObjectScale(element, scale) then
+			triggerEvent ( "onElementPropertyChanged", ancestor, "scale" )
+			return true
+		end
+	else
+		local handle = edfGetHandle(element)
+		if handle then
+			if setObjectScale(handle, scale) then
+				triggerEvent ( "onElementPropertyChanged", ancestor, "scale" )
+				return true
+			end
+		else
+			setElementData(element, "scale", scale or 1)
+			triggerEvent ( "onElementPropertyChanged", ancestor, "scale" )
+			return true
+		end
+	end
+	return false
 end
 
 function edfGetElementInterior(element)

[editor]/edf/edf_client.lua

@@ -189,6 +189,9 @@ end
 --Sets an element's scale, or its scale element data
 function edfSetElementScale(element, scale)
 	if scale then
+		if type(scale) == "table" then
+			scale = scale[1]
+		end
 		if isBasic[getElementType(element)] then
 			return setElementData(element, "scale", scale)
 		else

[editor]/editor_gui/client/elementproperties.lua

@@ -448,7 +448,7 @@ local function addPropertyControl( controlType, controlLabelName, controlDescrip
 		if selectedElement then
 			if newControl:getLabel() == "model" and (elementType == "object" or elementType == "vehicle") then
 				local minX, minY, minZ = getElementBoundingBox(selectedElement)
-				g_minZ = minZ
+				g_minZ = minZ or 0
 				local handlerFunction = function ()
 					local minX2, minY2, minZ2 = getElementBoundingBox(selectedElement)
 					if minX2 and minY2 and minZ2 then

[editor]/editor_gui/client/load.lua

@@ -75,8 +75,9 @@ function openSearch()
 			guiGridListSetItemText ( loadDialog.mapsList, row, 3, res["version"], false, false )
 		end
 	else
+		local escapedText = string.gsub(string.lower(text), "([%-%.%+%*%?%[%]%^%$%(%)%%])", "%%%1")
 		for i,res in ipairs(openResources) do
-			if string.find(res["friendlyName"],text) then
+			if string.find(res["friendlyName"], escapedText) then
 				local row = guiGridListAddRow ( loadDialog.mapsList )
 				guiGridListSetItemText ( loadDialog.mapsList, row, 1, res["friendlyName"], false, false )
 				guiGridListSetItemText ( loadDialog.mapsList, row, 2, res["gamemodes"], false, false )

[editor]/editor_gui/client/mapsettings_gamemodesettings.lua

@@ -45,7 +45,10 @@ function refreshGamemodeSettings()
 			mapsettings.rowValues[subRow] = dataInfo.default
 			if currentMapSettings.newSettings and currentMapSettings.newSettings[dataName] then
 				mapsettings.rowValues[subRow] = currentMapSettings.newSettings[dataName]
-				mapsettings.gamemodeSettings = copyTable ( mapsettings.rowValues )
+			end
+
+			if currentMapSettings.gamemodeSettings and currentMapSettings.gamemodeSettings[subRow] then
+				mapsettings.rowValues[subRow] = currentMapSettings.gamemodeSettings[subRow]
 			end
 		end
 		if count == 0 then
@@ -58,7 +61,7 @@ function refreshGamemodeSettings()
 		local row = guiGridListAddRow ( mapsettings.settingsList )
 		guiGridListSetItemText ( mapsettings.settingsList, row, 1, "No Settings definitions", true, false )
 	end
-	currentMapSettings.newSettings = nil
+	mapsettings.gamemodeSettings = copyTable ( mapsettings.rowValues )
 end
 
 local requiredText = { [true]="REQUIRED" }

[editor]/editor_gui/client/options_action.lua

@@ -35,6 +35,14 @@ function optionsActions.elemScalingSnap(value)
 	optionsData.elemScalingSnap = tonumber(value)
 end
 
+function optionsActions.randomizeRotation(value)
+	optionsData.randomizeRotation = value
+end
+
+function optionsActions.randomizeRotationAxis(value)
+	optionsData.randomizeRotationAxis = value
+end
+
 function optionsActions.enableColPatch(value)
 	local success, isLoaded = editor_main.toggleColPatch(value)
 	if success then
@@ -170,7 +178,7 @@ function setEditorMoveSpeeds()
 	move_cursor.setRotateSpeeds ( dialog.slowElemRotate:getValue(), dialog.normalElemRotate:getValue(), dialog.fastElemRotate:getValue() )
 	move_freecam.setRotateSpeeds ( dialog.slowElemRotate:getValue(), dialog.normalElemRotate:getValue(), dialog.fastElemRotate:getValue() )
 
-	move_keyboard.setScaleIncrement ( dialog.elemScaling:getValue() )
+	move_keyboard.setScalingSpeeds ( dialog.slowElemScale:getValue(), dialog.normalElemScale:getValue(), dialog.fastElemScale:getValue() )
 
 	move_keyboard.toggleAxesLock ( dialog.lockToAxes:getValue() )
 end