diff --git a/[admin]/admin/client/admin_gui.lua b/[admin]/admin/client/admin_gui.lua
index 13d0b59ee..939c67d30 100644
--- a/[admin]/admin/client/admin_gui.lua
+++ b/[admin]/admin/client/admin_gui.lua
@@ -56,7 +56,7 @@ end
function guiCreateList(x, y, w, h, tabHeight, header, relative, parent, right)
local list = guiCreateButton(x, y, w, h, header, relative, parent, right)
-
+
local parentWidth, parentHeight = guiGetSize(parent, false)
local absoluteWidth = parentWidth * w
@@ -64,7 +64,7 @@ function guiCreateList(x, y, w, h, tabHeight, header, relative, parent, right)
local dropDown = guiCreateStaticImage(absoluteWidth - 20, 0, 20, 20, "client\\images\\dropdown.png", false, list)
guiSetProperty(dropDown, 'AlwaysOnTop', 'True')
-
+
addEventHandler('onClientGUIClick', dropDown, function()
guiListSetVisible(list, true)
end, false)
@@ -75,7 +75,7 @@ function guiCreateList(x, y, w, h, tabHeight, header, relative, parent, right)
local edit = guiCreateEdit(0, 0, absoluteWidth - 20, 20, '', false, bg)
guiSetProperty(edit, 'AlwaysOnTop', 'True')
-
+
addEventHandler('onClientGUIChanged', edit, function()
guiListLoadItems(list)
end)
@@ -87,7 +87,7 @@ function guiCreateList(x, y, w, h, tabHeight, header, relative, parent, right)
local close = guiCreateButton(absoluteWidth-20, 0, 20, 20, 'X', false, bg)
guiSetProperty(close, 'AlwaysOnTop', 'True')
guiSetAlpha(close, 1)
-
+
addEventHandler('onClientGUIClick', close, function()
guiListSetVisible(list, false)
end, false)
diff --git a/[admin]/admin/client/gui/admin_acl.lua b/[admin]/admin/client/gui/admin_acl.lua
index e8a85f54b..198219757 100644
--- a/[admin]/admin/client/gui/admin_acl.lua
+++ b/[admin]/admin/client/gui/admin_acl.lua
@@ -49,7 +49,7 @@ function aManageACL ()
aACLSetRight = guiCreateButton ( 0.55, 0.40, 0.40, 0.04, "Enable Selected Right", true, aAclForm )
aACLRemoveRight = guiCreateButton ( 0.55, 0.45, 0.40, 0.04, "Disable Selected Right", true, aAclForm )
aACLDeleteRight = guiCreateButton ( 0.55, 0.55, 0.40, 0.04, "Delete Right", true, aAclForm )
-
+
aACLExit = guiCreateButton ( 0.75, 0.90, 0.27, 0.04, "Close", true, aAclForm )
aclDisplayOptions ( "", "" )
diff --git a/[admin]/admin/client/gui/admin_main.lua b/[admin]/admin/client/gui/admin_main.lua
index 4e4315d0f..dde203741 100644
--- a/[admin]/admin/client/gui/admin_main.lua
+++ b/[admin]/admin/client/gui/admin_main.lua
@@ -165,7 +165,7 @@ y=y+B aTab1.VehicleHealth = guiCreateLabel ( 0.26, y, 0.25, 0.04, "Vehicle Heal
aTab1.VehicleCustomize = guiCreateButton ( 0.85, 0.89, 0.13, 0.04, "Customize", true, aTab1.Tab, "customize" )
aTab1.AnonAdmin = guiCreateCheckBox (0.745, 0.942, 0.20, 0.04, "Anonymous Admin", isAnonAdmin(), true, aTab1.Tab )
aTab1.GiveVehicle = guiCreateList( 0.71, 0.710, 0.27, 0.04, 0.275, "Give: "..getVehicleNameFromModel ( aCurrentVehicle ), true, aTab1.Tab, 'givevehicle')
-
+
local vehicles = {}
for i = 400, 611 do
local vehName = getVehicleNameFromModel(i)
@@ -495,7 +495,7 @@ function aAdminRefresh ()
local player = getPlayerFromName ( guiGridListGetItemPlayerName ( aTab1.PlayerList, guiGridListGetSelectedItem( aTab1.PlayerList ), 1 ) )
if ( player and aPlayers[player] ) then
local playerName = aPlayers[player]["name"]
-
+
if isColorCodeHidden() then
playerName = removeColorCoding(playerName)
else
@@ -525,11 +525,11 @@ function aAdminRefresh ()
if ( getElementInterior ( player ) ) then guiSetText ( aTab1.Interior, "Interior: "..getElementInterior ( player ) ) end
guiSetText ( aTab1.JetPack, iif ( isPedWearingJetpack ( player ), "Remove JetPack", "Give JetPack" ) )
if ( getPedWeapon ( player ) ) then guiSetText ( aTab1.Weapon, "Weapon: "..getWeaponNameFromID ( getPedWeapon ( player ) ).." (ID: "..getPedWeapon ( player )..")" ) end
-
+
local x, y, z = getElementPosition ( player )
local zoneName = getZoneName ( x, y, z, false )
local cityName = getZoneName ( x, y, z, true )
-
+
guiSetText ( aTab1.Area, "Area: "..getSensitiveText( iif ( zoneName == cityName, zoneName, zoneName.." ("..cityName..")" ) ) )
x = getSensitiveText('%.3f'):format(x)
@@ -1092,7 +1092,7 @@ function aClientClick ( button )
guiGridListClear ( aTab2.ResourceList )
triggerServerEvent ( "aSync", localPlayer, "resources" )
end
-
+
-- TAB 3, WORLD
elseif ( getElementParent ( source ) == aTab3.Tab ) then
if ( source == aTab3.SetGameType ) then aInputBox ( "Game Type", "Enter game type:", "", "setGameType" )
diff --git a/[admin]/admin/client/gui/admin_permissions.lua b/[admin]/admin/client/gui/admin_permissions.lua
index 52e8422da..5eff31abd 100644
--- a/[admin]/admin/client/gui/admin_permissions.lua
+++ b/[admin]/admin/client/gui/admin_permissions.lua
@@ -20,7 +20,7 @@ function aPermissions.Show(player)
local x, y = guiGetScreenSize()
aPermissions.Form = guiCreateWindow(x / 2 - 200, y / 2 - 125, 400, 250, '', false)
guiSetAlpha(aPermissions.Form, 1)
-
+
aPermissions.LabelYourPerms = guiCreateLabel(0.03, 0.1, 0.35, 0.07, '', true, aPermissions.Form)
aPermissions.PlayerGroups = guiCreateGridList(0.03, 0.18, 0.35, 0.68, true, aPermissions.Form)
guiGridListAddColumn(aPermissions.PlayerGroups, "Group Name", 0.85)
@@ -35,11 +35,11 @@ function aPermissions.Show(player)
aPermissions.Update = guiCreateButton(0.03, 0.88, 0.435, 0.09, "Refresh", true, aPermissions.Form)
aPermissions.Hide = guiCreateButton(0.535, 0.88, 0.435, 0.09, "Close", true, aPermissions.Form)
-
+
addEventHandler('aPermissionsSync', localPlayer, aPermissions.onSync)
addEventHandler('aOnPermissionsChange', localPlayer, aPermissions.Refresh)
addEventHandler("onClientGUIClick", aPermissions.Form, aPermissions.onClick)
-
+
--Register With Admin Form
aRegister("PlayerPermissions", aPermissions.Form, aPermissions.Show, aPermissions.Close)
end
@@ -105,13 +105,13 @@ function aPermissions.ConfirmChange(add)
end
local gridlist = add and aPermissions.AllGroups or aPermissions.PlayerGroups
-
+
local selected = guiGridListGetSelectedItem(gridlist)
if (selected <= -1) then
return
end
-
+
local groupName = guiGridListGetItemText(gridlist, selected, 1)
local str = add and 'Are you sure you want to add "%s" to the "%s" group?' or 'Are you sure you want to remove "%s" from the "%s" group?'
diff --git a/[admin]/admin/client/gui/admin_spectator.lua b/[admin]/admin/client/gui/admin_spectator.lua
index a9af74d8a..297bbe6cc 100644
--- a/[admin]/admin/client/gui/admin_spectator.lua
+++ b/[admin]/admin/client/gui/admin_spectator.lua
@@ -301,7 +301,7 @@ function aSpectator.CheckCollision(x, y, z)
end
end
end
-
+
return nearest_distance or false
end
diff --git a/[admin]/admin/client/gui/admin_warp.lua b/[admin]/admin/client/gui/admin_warp.lua
index ce8033d05..a124cf113 100644
--- a/[admin]/admin/client/gui/admin_warp.lua
+++ b/[admin]/admin/client/gui/admin_warp.lua
@@ -160,7 +160,7 @@ function aClientWarpClick ( button, state, absX, absY )
aPlayerWarpClose ( false )
elseif ( source == aWarpToPosition ) then
aPlayerWarpToPosition ( )
-
+
-- Player Warp To Position Map
elseif ( source == aWarpToPositionMap ) then
calculatePosition ( absX, absY )
diff --git a/[admin]/admin/meta.xml b/[admin]/admin/meta.xml
index 69de3ce01..872cba402 100644
--- a/[admin]/admin/meta.xml
+++ b/[admin]/admin/meta.xml
@@ -154,14 +154,14 @@
group="_fake packets"
accept="true,false"
desc="Ban IPs that attempt to send fake admin packets."
- />
-
+ />
+
+ />
px + sx2) or (y2 < py or y2 > py + sy2) then
+ function(button2, clickState, x2, y2)
+ local sx2, sy2 = guiGetSize(menu, false)
+ local px, py = guiGetPosition(menu, false)
+ if (x2 < px or x2 > px + sx2) or (y2 < py or y2 > py + sy2) then
guiSetVisible(menu, false)
removeEventHandler("onClientClick", root, debug.getinfo(1, "f").func)
end
@@ -243,18 +243,18 @@ function guiSetContextMenu(element, menu)
end,
false
)
- addEventHandler(
- "onClientGUIClick",
- menu,
- function(button, state)
- if (state ~= "up") then
- return
- end
-
- guiSetVisible(menu, false)
- end
- )
-end
+ addEventHandler(
+ "onClientGUIClick",
+ menu,
+ function(button, state)
+ if (state ~= "up") then
+ return
+ end
+
+ guiSetVisible(menu, false)
+ end
+ )
+end
function guiContextMenuAddItem(element, text)
local height = 16
diff --git a/[admin]/admin2/client/admin_session.lua b/[admin]/admin2/client/admin_session.lua
index 31db0e2b3..f6050699c 100644
--- a/[admin]/admin2/client/admin_session.lua
+++ b/[admin]/admin2/client/admin_session.lua
@@ -23,7 +23,7 @@ addEventHandler(
aSession = data
aMap.UpdatePermissions()
-
+
if (hasPermissionTo("general.adminpanel")) then
outputChatBox("Press 'p' to open your admin panel", player)
bindKey("p", "down", "adminpanel")
diff --git a/[admin]/admin2/client/main/admin_acl.lua b/[admin]/admin2/client/main/admin_acl.lua
index 6b3952d54..631e7073e 100644
--- a/[admin]/admin2/client/main/admin_acl.lua
+++ b/[admin]/admin2/client/main/admin_acl.lua
@@ -144,10 +144,10 @@ function aAclTab.onClick(key, state)
local group = guiGridListGetItemText(aAclTab.Groups, selectedGroup, 1)
local result = messageBox("Are you sure you want to remove the user '"..object.."' from the '"..group.."' ACL group?", MB_QUESTION, MB_YESNO)
-
+
if (result) then
triggerServerEvent(EVENT_ACL, localPlayer, ACL_USERS, ACL_REMOVE, group, 'user.'..object)
-
+
aAclTab.Cache.Users[group] = nil
aAclTab.RefreshUsersList()
end
@@ -163,7 +163,7 @@ function aAclTab.onClick(key, state)
if (nick) then
local group = guiGridListGetItemText(aAclTab.Groups, selected, 1)
triggerServerEvent(EVENT_ACL, localPlayer, ACL_USERS, ACL_ADD, group, nick)
-
+
aAclTab.Cache.Users[group] = nil
aAclTab.RefreshUsersList()
end
@@ -179,7 +179,7 @@ function aAclTab.onClick(key, state)
if (name) then
local group = guiGridListGetItemText(aAclTab.Groups, selected, 1)
triggerServerEvent(EVENT_ACL, localPlayer, ACL_RESOURCES, ACL_ADD, group, name)
-
+
aAclTab.Cache.Resources[group] = nil
aAclTab.RefreshResourcesList()
end
@@ -195,10 +195,10 @@ function aAclTab.onClick(key, state)
local group = guiGridListGetItemText(aAclTab.Groups, selectedGroup, 1)
local result = messageBox("Are you sure you want to remove the resource '"..object.."' from the '"..group.."' ACL group?", MB_QUESTION, MB_YESNO)
-
+
if (result) then
triggerServerEvent(EVENT_ACL, localPlayer, ACL_RESOURCES, ACL_REMOVE, group, 'resource.'..object)
-
+
aAclTab.Cache.Resources[group] = nil
aAclTab.RefreshResourcesList()
end
diff --git a/[admin]/admin2/client/main/admin_bans.lua b/[admin]/admin2/client/main/admin_bans.lua
index fe0ee20bb..cde92aa68 100644
--- a/[admin]/admin2/client/main/admin_bans.lua
+++ b/[admin]/admin2/client/main/admin_bans.lua
@@ -36,9 +36,9 @@ function aBansTab.Create(tab)
sync(SYNC_BANS)
end
-function aBansTab.onClientClick(button, state)
- if (button == "left" and state == "up") then
- if (source == aBansTab.Details) then
+function aBansTab.onClientClick(button, state)
+ if (button == "left" and state == "up") then
+ if (source == aBansTab.Details) then
if (guiGridListGetSelectedItem(aBansTab.BansList) == -1) then
messageBox("No ban selected!", MB_ERROR, MB_OK)
else
diff --git a/[admin]/admin2/client/widgets/admin_ban.lua b/[admin]/admin2/client/widgets/admin_ban.lua
index c121a5e44..ed81e22ea 100644
--- a/[admin]/admin2/client/widgets/admin_ban.lua
+++ b/[admin]/admin2/client/widgets/admin_ban.lua
@@ -24,7 +24,7 @@ function aBan.Show(player)
if not aBan.Form then
aBan.Create()
end
-
+
-- If a player was selected, auto-fill the form with the player's info
if player then
aBan.playerName = getPlayerName(player)
@@ -224,7 +224,7 @@ function aBan.verifyForm()
else
banDuration = aBan.defaultDurations[durationSelection][2]
end
-
+
-- Verify ban IP
local banIP = ""
if guiCheckBoxGetSelected(aBan.IPCheckBox) then
diff --git a/[admin]/admin2/client/widgets/admin_ban_details.lua b/[admin]/admin2/client/widgets/admin_ban_details.lua
index 47d3e203c..7e9386235 100644
--- a/[admin]/admin2/client/widgets/admin_ban_details.lua
+++ b/[admin]/admin2/client/widgets/admin_ban_details.lua
@@ -14,7 +14,7 @@ function aBanDetails.Show(banID, showUnban)
if not aBanDetails.Form then
aBanDetails.Create()
end
-
+
aBanDetails.banID = banID
local data = aBansTab.List[banID]
guiSetText(aBanDetails.NickText, "Player name: "..(data.nick or "Unknown"))
diff --git a/[admin]/admin2/client/widgets/admin_color.lua b/[admin]/admin2/client/widgets/admin_color.lua
index 99720c8fc..9157f1b2a 100644
--- a/[admin]/admin2/client/widgets/admin_color.lua
+++ b/[admin]/admin2/client/widgets/admin_color.lua
@@ -82,7 +82,7 @@ function aColor.Open(x, y, r, g, b, relative, parent)
aColor.Picking = false
guiSetVisible(aColor.Form, true)
- addEventHandler("onClientGUIClick", aColor.Ok, aColor.onGuiClickClose)
+ addEventHandler("onClientGUIClick", aColor.Ok, aColor.onGuiClickClose)
addEventHandler("onClientRender", root, aColor.onRender)
addEventHandler("onClientGUIChanged", aColor.Form, aColor.onChanged)
addEventHandler("onClientGUIBlur", aColor.Form, aColor.onBlur)
@@ -107,7 +107,7 @@ end
function aColor.Close(destroy)
guiSetInputEnabled(false)
if (aColor.Form) then
- removeEventHandler("onClientGUIClick", aColor.Ok, aColor.onGuiClickClose)
+ removeEventHandler("onClientGUIClick", aColor.Ok, aColor.onGuiClickClose)
removeEventHandler("onClientGUIBlur", aColor.Form, aColor.onBlur)
removeEventHandler("onClientGUIChanged", aColor.Form, aColor.onChanged)
removeEventHandler("onClientClick", root, aColor.onClick)
@@ -122,15 +122,15 @@ function aColor.Close(destroy)
coroutine.resume(aColor.Thread)
end
end
-end
-
-function aColor.onGuiClickClose(button, state)
- if (button == "left" and state == "up") then
- aColor.Close()
- end
-end
-
-function aColor.onClick(button, state, x, y)
+end
+
+function aColor.onGuiClickClose(button, state)
+ if (button == "left" and state == "up") then
+ aColor.Close()
+ end
+end
+
+function aColor.onClick(button, state, x, y)
local px, py = guiGetPosition(aColor.Form, false)
if (state == "up") then
if (aColor.Picking) then
diff --git a/[admin]/admin2/client/widgets/admin_inputbox.lua b/[admin]/admin2/client/widgets/admin_inputbox.lua
index 7fc91b922..7f9667ed8 100644
--- a/[admin]/admin2/client/widgets/admin_inputbox.lua
+++ b/[admin]/admin2/client/widgets/admin_inputbox.lua
@@ -79,9 +79,9 @@ function aInputBox.onAccepted()
aInputBox.Close(false)
end
-function aInputBox.onClick(button, state)
- if (button == "left" and state == "up") then
- if (source == aInputBox.Ok) then
+function aInputBox.onClick(button, state)
+ if (button == "left" and state == "up") then
+ if (source == aInputBox.Ok) then
aInputBox.Result = true
aInputBox.Close(false)
elseif (source == aInputBox.Cancel) then
diff --git a/[admin]/admin2/client/widgets/admin_interior.lua b/[admin]/admin2/client/widgets/admin_interior.lua
index eff46814c..c220a4b2f 100644
--- a/[admin]/admin2/client/widgets/admin_interior.lua
+++ b/[admin]/admin2/client/widgets/admin_interior.lua
@@ -75,9 +75,9 @@ function aInterior.onGUIChange()
aInterior.Refresh()
end
-function aInterior.onClick(button, state)
- if (button == "left" and state == "up") then
- if (source == aInterior.Select) then
+function aInterior.onClick(button, state)
+ if (button == "left" and state == "up") then
+ if (source == aInterior.Select) then
if (guiGridListGetSelectedItem(aInterior.List) ~= -1) then
triggerServerEvent(
"aPlayer",
diff --git a/[admin]/admin2/client/widgets/admin_messagebox.lua b/[admin]/admin2/client/widgets/admin_messagebox.lua
index 826e9c3d0..c34875c27 100644
--- a/[admin]/admin2/client/widgets/admin_messagebox.lua
+++ b/[admin]/admin2/client/widgets/admin_messagebox.lua
@@ -66,7 +66,7 @@ function aMessageBox.Show(message, icon, type)
guiSetText(aMessageBox.Label, tostring(message))
local mbX, mbY = guiGetSize(aMessageBox.Form, false)
-
+
guiSetPosition(aMessageBox.Form, x / 2 - mbX / 2, y / 2 - mbY / 2, false)
guiSetVisible(aMessageBox.Form, true)
guiBringToFront(aMessageBox.Form)
diff --git a/[admin]/admin2/client/widgets/admin_messages.lua b/[admin]/admin2/client/widgets/admin_messages.lua
index 7b2f4f217..92893437e 100644
--- a/[admin]/admin2/client/widgets/admin_messages.lua
+++ b/[admin]/admin2/client/widgets/admin_messages.lua
@@ -97,13 +97,13 @@ end
function aMessages.View(id)
if (id) then
local message = aMessages.Messages[id]
-
+
guiSetText(aMessages.Author, "Author: "..message.author)
guiSetText(aMessages.Subject, "Subject: "..message.subject)
guiSetText(aMessages.Category, "Category: "..message.category)
guiSetText(aMessages.Date, "Date: "..message.time)
guiSetText(aMessages.Text, message.text)
-
+
if (not message.read) then
triggerServerEvent("aMessage", localPlayer, "read", id)
end
diff --git a/[admin]/admin2/client/widgets/admin_mute_details.lua b/[admin]/admin2/client/widgets/admin_mute_details.lua
index 08a8d1911..4c5e2be50 100644
--- a/[admin]/admin2/client/widgets/admin_mute_details.lua
+++ b/[admin]/admin2/client/widgets/admin_mute_details.lua
@@ -16,7 +16,7 @@ function aMuteDetails.Show(Serial, showUnmtue)
if not aMuteDetails.Form then
aMuteDetails.Create()
end
-
+
aMuteDetails.Serial = Serial
local data = aMuteTab.List[Serial]
diff --git a/[admin]/admin2/client/widgets/admin_permissions.lua b/[admin]/admin2/client/widgets/admin_permissions.lua
index 13d44154e..235198b0a 100644
--- a/[admin]/admin2/client/widgets/admin_permissions.lua
+++ b/[admin]/admin2/client/widgets/admin_permissions.lua
@@ -20,7 +20,7 @@ function aPermissions.Show(player)
local x, y = guiGetScreenSize()
aPermissions.Form = guiCreateWindow(x / 2 - 200, y / 2 - 125, 400, 250, '', false)
guiSetAlpha(aPermissions.Form, 1)
-
+
aPermissions.LabelYourPerms = guiCreateLabel(0.03, 0.1, 0.35, 0.07, '', true, aPermissions.Form)
aPermissions.PlayerGroups = guiCreateGridList(0.03, 0.18, 0.35, 0.68, true, aPermissions.Form)
guiGridListAddColumn(aPermissions.PlayerGroups, "Group Name", 0.85)
@@ -35,10 +35,10 @@ function aPermissions.Show(player)
aPermissions.Update = guiCreateButton(0.03, 0.88, 0.435, 0.09, "Refresh", true, aPermissions.Form)
aPermissions.Hide = guiCreateButton(0.535, 0.88, 0.435, 0.09, "Close", true, aPermissions.Form)
-
+
addEventHandler(EVENT_SYNC, localPlayer, aPermissions.onSync)
addEventHandler("onClientGUIClick", aPermissions.Form, aPermissions.onClick)
-
+
--Register With Admin Form
aRegister("PlayerPermissions", aPermissions.Form, aPermissions.Show, aPermissions.Close)
end
@@ -110,13 +110,13 @@ function aPermissions.ConfirmChange(add)
end
local gridlist = add and aPermissions.AllGroups or aPermissions.PlayerGroups
-
+
local selected = guiGridListGetSelectedItem(gridlist)
if (selected <= -1) then
return
end
-
+
local groupName = guiGridListGetItemText(gridlist, selected, 1)
local str = add and 'Are you sure you want to add "%s" to the "%s" group?' or 'Are you sure you want to remove "%s" from the "%s" group?'
diff --git a/[admin]/admin2/client/widgets/admin_server_conf.lua b/[admin]/admin2/client/widgets/admin_server_conf.lua
index a9bf5a691..136c5ff35 100644
--- a/[admin]/admin2/client/widgets/admin_server_conf.lua
+++ b/[admin]/admin2/client/widgets/admin_server_conf.lua
@@ -25,7 +25,7 @@ function aServerConfig.Open()
aServerConfig.Form = guiCreateWindow(x/2 - 240, y/2 - 215, 480, 430, "Server Configuration", false)
guiCreateHeader(0.05, 0.052, 0.3, 0.04, "Connection:", true, aServerConfig.Form)
-
+
aServerConfig.minVersion = guiCreateLabel(0.1, 0.089, 0.5, 0.04, "Minimum Client Version:", true, aServerConfig.Form)
aServerConfig.minVersionField = guiCreateEdit(0.725, 0.089, 0.25, 0.04, "", true, aServerConfig.Form)
@@ -82,7 +82,7 @@ function aServerConfig.Open()
addEventHandler("onClientGUIClick", aServerConfig.Form, aServerConfig.onClientClick)
addEventHandler('onClientGUIChanged', aServerConfig.Form, aServerConfig.onClientChanged)
addEventHandler("onAdminRefresh", aServerConfig.Form, aServerConfig.Refresh)
-
+
aServerConfig.Refresh()
end
diff --git a/[admin]/admin2/client/widgets/admin_skin.lua b/[admin]/admin2/client/widgets/admin_skin.lua
index b2f61b576..253a69350 100644
--- a/[admin]/admin2/client/widgets/admin_skin.lua
+++ b/[admin]/admin2/client/widgets/admin_skin.lua
@@ -92,9 +92,9 @@ function aSkin.onGUIChange()
end
end
-function aSkin.onClick(button, state)
- if (button == "left" and state == "up") then
- if (source == aSkin.Accept) then
+function aSkin.onClick(button, state)
+ if (button == "left" and state == "up") then
+ if (source == aSkin.Accept) then
if (tonumber(guiGetText(aSkin.ID))) then
triggerServerEvent("aPlayer", localPlayer, aSkin.Select, "setskin", tonumber(guiGetText(aSkin.ID)))
aSkin.Close(false)
diff --git a/[admin]/admin2/client/widgets/admin_spectator.lua b/[admin]/admin2/client/widgets/admin_spectator.lua
index 7981e7f1a..d87c35893 100644
--- a/[admin]/admin2/client/widgets/admin_spectator.lua
+++ b/[admin]/admin2/client/widgets/admin_spectator.lua
@@ -329,7 +329,7 @@ function aSpectator.CheckCollision(x, y, z)
end
end
end
-
+
return nearest_distance or false
end
diff --git a/[admin]/admin2/client/widgets/admin_weapon.lua b/[admin]/admin2/client/widgets/admin_weapon.lua
index 904d5dc04..ab88f5622 100644
--- a/[admin]/admin2/client/widgets/admin_weapon.lua
+++ b/[admin]/admin2/client/widgets/admin_weapon.lua
@@ -24,7 +24,7 @@ function aWeapon.Show(player)
guiCreateLabel(0.03, 0.09, 0.94, 0.07, "Select a weapon from the list or enter the id", true, aWeapon.Form)
guiLabelSetHorizontalAlign(aWeapon.Label, "center")
guiLabelSetColor(aWeapon.Label, 255, 0, 0)
-
+
aWeapon.Edit = guiCreateEdit(0.03, 0.18, 0.70, 0.09, '', true, aWeapon.Form)
guiCreateInnerImage("client\\images\\search.png", aWeapon.Edit)
diff --git a/[admin]/admin2/conf/messages.xml b/[admin]/admin2/conf/messages.xml
index 1762c1730..2b401d458 100644
--- a/[admin]/admin2/conf/messages.xml
+++ b/[admin]/admin2/conf/messages.xml
@@ -219,26 +219,26 @@
Waves height set to '$data' by $adminADMIN: $admin has set waves height to '$data'
-
- FPS limit set to '$data' by $admin
- ADMIN: $admin has set fps limit to '$data'
-
-
- Ping kicker set to '$data'
- ADMIN: $admin has set ping kicker to '$data'
-
-
- FPS kicker set to '$data'
- ADMIN: $admin has set fps kicker to '$data'
-
-
- Idle kicker set to '$data'
- ADMIN: $admin has set idle kicker to '$data'
-
-
- Blur level set to '$data' by $admin
- ADMIN: $admin has set blur level to '$data'
-
+
+ FPS limit set to '$data' by $admin
+ ADMIN: $admin has set fps limit to '$data'
+
+
+ Ping kicker set to '$data'
+ ADMIN: $admin has set ping kicker to '$data'
+
+
+ FPS kicker set to '$data'
+ ADMIN: $admin has set fps kicker to '$data'
+
+
+ Idle kicker set to '$data'
+ ADMIN: $admin has set idle kicker to '$data'
+
+
+ Blur level set to '$data' by $admin
+ ADMIN: $admin has set blur level to '$data'
+ Heat haze level set to '$data' by $adminADMIN: $admin has set heat haze level to '$data'
diff --git a/[admin]/admin2/meta.xml b/[admin]/admin2/meta.xml
index e1769264b..294aa888c 100644
--- a/[admin]/admin2/meta.xml
+++ b/[admin]/admin2/meta.xml
@@ -5,16 +5,16 @@
WARNING: We give no support for edited
versions of the admin system.
-->
-
+
true
-
+
-
+
@@ -70,14 +70,14 @@
-
+
-
+
-
+
-
+
@@ -105,7 +105,7 @@
-
+
diff --git a/[admin]/admin2/server/admin_ACL.lua b/[admin]/admin2/server/admin_ACL.lua
index 9976f0adf..d7c615bde 100644
--- a/[admin]/admin2/server/admin_ACL.lua
+++ b/[admin]/admin2/server/admin_ACL.lua
@@ -14,7 +14,7 @@ function aSetupACL()
local node = xmlLoadFile("conf\\ACL.xml")
if (not node) then
- outputDebugString("Vanilla ACL not found! Please reinstall the admin resource")
+ outputDebugString("Vanilla ACL not found! Please reinstall the admin resource")
return false
end
@@ -170,7 +170,7 @@ local aACLFunctions = {
if (action == ACL_ADD) then
if (name and type(name) == "string") then
if (aclCreateGroup(name)) then
- messageBox(client, "Successfully created group '" .. name .. "'", MB_INFO)
+ messageBox(client, "Successfully created group '" .. name .. "'", MB_INFO)
else
messageBox(client, "Failed to create group '" .. name .. "'", MB_INFO)
end
@@ -181,7 +181,7 @@ local aACLFunctions = {
if (aclDestroyGroup(name)) then
messageBox(client, "Successfully removed group '" .. name .. "'", MB_INFO)
else
- messageBox(client, "Failed to remove group '" .. name .. "'", MB_INFO)
+ messageBox(client, "Failed to remove group '" .. name .. "'", MB_INFO)
end
end
messageBox(client, "Invalid group name", MB_INFO)
@@ -206,13 +206,13 @@ local aACLFunctions = {
if (aclGroupRemoveObject(aclGetGroup(group), object)) then
messageBox(client, "Successfully removed user '"..object:gsub('user.','').."' from the '"..group.."' ACL group", MB_INFO)
else
- messageBox(client, "Failed to remove user '"..object:gsub('user.','').."' from the '"..group.."' ACL group", MB_INFO)
+ messageBox(client, "Failed to remove user '"..object:gsub('user.','').."' from the '"..group.."' ACL group", MB_INFO)
end
elseif (action == ACL_ADD) then
if (aclGroupAddObject(aclGetGroup(group), 'user.'..object)) then
messageBox(client, "Successfully added user '"..object:gsub('user.','').."' to the '"..group.."' ACL group", MB_INFO)
else
- messageBox(client, "Failed to add user '"..object:gsub('user.','').."' to the '"..group.."' ACL group", MB_INFO)
+ messageBox(client, "Failed to add user '"..object:gsub('user.','').."' to the '"..group.."' ACL group", MB_INFO)
end
end
end,
@@ -230,13 +230,13 @@ local aACLFunctions = {
if (aclGroupRemoveObject(aclGetGroup(group), object)) then
messageBox(client, "Successfully removed resource '"..object:gsub('resource.','').."' from the '"..group.."' ACL group", MB_INFO)
else
- messageBox(client, "Failed to remove resource '"..object:gsub('resource.','').."' from the '"..group.."' ACL group", MB_INFO)
+ messageBox(client, "Failed to remove resource '"..object:gsub('resource.','').."' from the '"..group.."' ACL group", MB_INFO)
end
elseif (action == ACL_ADD) then
if (aclGroupAddObject(aclGetGroup(group), 'resource.'..object)) then
messageBox(client, "Successfully added resource '"..object:gsub('resource.','').."' to the '"..group.."' ACL group", MB_INFO)
else
- messageBox(client, "Failed to add resource '"..object:gsub('resource.','').."' to the '"..group.."' ACL group", MB_INFO)
+ messageBox(client, "Failed to add resource '"..object:gsub('resource.','').."' to the '"..group.."' ACL group", MB_INFO)
end
end
end,
diff --git a/[admin]/admin2/server/admin_bans.lua b/[admin]/admin2/server/admin_bans.lua
index b5e0814e4..6af5aeb50 100644
--- a/[admin]/admin2/server/admin_bans.lua
+++ b/[admin]/admin2/server/admin_bans.lua
@@ -113,7 +113,7 @@ local function handleBanRequest(action, data)
if client and source ~= client then
return
end
-
+
-- Permissions check
if not hasObjectPermissionTo(source, "command."..action, false) then
outputChatBox("Access denied for '" .. tostring(action) .. "'", source, 255, 168, 0)
diff --git a/[admin]/admin2/server/admin_mute.lua b/[admin]/admin2/server/admin_mute.lua
index 1034048d0..374b25e56 100644
--- a/[admin]/admin2/server/admin_mute.lua
+++ b/[admin]/admin2/server/admin_mute.lua
@@ -84,7 +84,7 @@ addEventHandler ( "onResourceStart", resourceRoot,
aMutedList[value.serial].admin = value.admin
aMutedList[value.serial].reason = value.reason
aMutedList[value.serial].time = value.time
-
+
for _, player in ipairs( getElementsByType( "player" ) ) do
if ( getPlayerSerial(player) == value.serial ) then
-- Silent mute
@@ -99,7 +99,7 @@ function aSetPlayerMuted ( player, state, time, admin, reason )
if isElement(player) and getElementType(player) == "player" then
setPlayerMuted ( player, state )
end
-
+
if not state then
local serial = getPlayerSerial( player )
aRemoveUnmuteTimer( serial )
@@ -210,7 +210,7 @@ function handleMuteRequest(action, data)
if ( client and source ~= client ) then
return
end
-
+
-- Permissions check
if ( not hasObjectPermissionTo(source, "command."..action, false) ) then
outputChatBox( "Access denied for '" .. tostring(action) .. "'", source, 255, 168, 0 )
@@ -233,7 +233,7 @@ function handleMuteRequest(action, data)
else
time = secondsToTimeDesc( data.duration / 1000 )
end
-
+
aSetPlayerMuted( data.player, true, data.duration, source, data.reason )
aAction( "player", "mute", source, data.player, time )
-- Remove mute
diff --git a/[admin]/admin2/server/admin_server.lua b/[admin]/admin2/server/admin_server.lua
index 7951b811d..b5fec7ffd 100644
--- a/[admin]/admin2/server/admin_server.lua
+++ b/[admin]/admin2/server/admin_server.lua
@@ -143,7 +143,7 @@ function aHandleIP2CUpdate()
local hasAdminPermission = hasObjectPermissionTo(playerElement, "general.adminpanel", false)
if hasAdminPermission then
-
+
for playerToUpdateID = 1, #playersToUpdate do
local playerToUpdate = playersToUpdate[playerToUpdateID]
@@ -579,7 +579,7 @@ addEventHandler(
if not pX or not pY or not pZ then
return
end
-
+
if (not hasObjectPermissionTo(client, "general.adminMapWarp", false)) then
return
end
diff --git a/[admin]/admin2/server/admin_sync.lua b/[admin]/admin2/server/admin_sync.lua
index 763353444..69e6f2296 100644
--- a/[admin]/admin2/server/admin_sync.lua
+++ b/[admin]/admin2/server/admin_sync.lua
@@ -145,21 +145,21 @@ addEventHandler(
end
end
- elseif (type == SYNC_SERVER) then
- if not hasClientPermissionTo("general.tab_server") then
- return
- end
-
- tableOut["name"] = getServerName()
- tableOut["players"] = getMaxPlayers()
- tableOut["game"] = getGameType()
- tableOut["map"] = getMapName()
- tableOut["password"] = getServerPassword()
- tableOut["pingkicker"] = tonumber(get("#pingkicker")) or 0
- tableOut["fpskicker"] = tonumber(get("#fpskicker")) or 0
- tableOut["idlekicker"] = tonumber(get("#idlekicker")) or 0
-
- elseif (type == SYNC_BAN) then
+ elseif (type == SYNC_SERVER) then
+ if not hasClientPermissionTo("general.tab_server") then
+ return
+ end
+
+ tableOut["name"] = getServerName()
+ tableOut["players"] = getMaxPlayers()
+ tableOut["game"] = getGameType()
+ tableOut["map"] = getMapName()
+ tableOut["password"] = getServerPassword()
+ tableOut["pingkicker"] = tonumber(get("#pingkicker")) or 0
+ tableOut["fpskicker"] = tonumber(get("#fpskicker")) or 0
+ tableOut["idlekicker"] = tonumber(get("#idlekicker")) or 0
+
+ elseif (type == SYNC_BAN) then
if client then
return
end
diff --git a/[admin]/admin2/shared/utils.lua b/[admin]/admin2/shared/utils.lua
index f1005e1f1..9e547633e 100644
--- a/[admin]/admin2/shared/utils.lua
+++ b/[admin]/admin2/shared/utils.lua
@@ -46,7 +46,7 @@ end
local weekDays = { "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday" }
function formatDate(format, escaper, timestamp)
--check("formatDate", "string", format, "format", {"nil","string"}, escaper, "escaper", {"nil","string"}, timestamp, "timestamp")
-
+
escaper = (escaper or "'"):sub(1, 1)
local time = getRealTime(timestamp)
local formattedDate = ""
@@ -54,14 +54,14 @@ function formatDate(format, escaper, timestamp)
time.year = time.year + 1900
time.month = time.month + 1
-
+
local datetime = { d = ("%02d"):format(time.monthday), h = ("%02d"):format(time.hour), i = ("%02d"):format(time.minute), m = ("%02d"):format(time.month), s = ("%02d"):format(time.second), w = weekDays[time.weekday+1]:sub(1, 2), W = weekDays[time.weekday+1], y = tostring(time.year):sub(-2), Y = time.year }
-
+
for char in format:gmatch(".") do
if (char == escaper) then escaped = not escaped
else formattedDate = formattedDate..(not escaped and datetime[char] or char) end
end
-
+
return formattedDate
end
diff --git a/[admin]/ip2c/meta.xml b/[admin]/ip2c/meta.xml
index 74d9f3158..beb985a92 100644
--- a/[admin]/ip2c/meta.xml
+++ b/[admin]/ip2c/meta.xml
@@ -1,7 +1,7 @@
-
+
@@ -11,7 +11,7 @@
-
+
diff --git a/[admin]/security/logging.lua b/[admin]/security/logging.lua
index 273f82899..430157dd4 100644
--- a/[admin]/security/logging.lua
+++ b/[admin]/security/logging.lua
@@ -3,16 +3,16 @@ function logViolation(uPlayer, strMessage)
local strPlayerName, strPlayerIP, strPlayerSerial = getPlayerName(uPlayer), getPlayerIP(uPlayer), getPlayerSerial(uPlayer);
local strLogFileName = "violations.txt";
local uFileHandle = fileExists(strLogFileName) and fileOpen(strLogFileName);
-
+
if(not uFileHandle) then
uFileHandle = fileCreate(strLogFileName);
fileFlush(uFileHandle);
else
fileSetPos(uFileHandle, fileGetSize(uFileHandle));
end
-
+
local strViolationMessage = getDateTime().." CLIENT: "..strPlayerName.." | IP: "..strPlayerIP.." | SERIAL: "..strPlayerSerial.." | "..strMessage;
-
+
outputDebugString(strViolationMessage, 4, 255, 255, 255);
outputServerLog(strViolationMessage);
fileWrite(uFileHandle, strViolationMessage.."\n");
@@ -25,16 +25,16 @@ end
function logAction(strMessage)
local strLogFileName = "actions.txt";
local uFileHandle = fileExists(strLogFileName) and fileOpen(strLogFileName);
-
+
if(not uFileHandle) then
uFileHandle = fileCreate(strLogFileName);
fileFlush(uFileHandle);
else
fileSetPos(uFileHandle, fileGetSize(uFileHandle));
end
-
+
local strActionMessage = getDateTime().." "..strMessage;
-
+
outputDebugString(strActionMessage, 4, 255, 255, 255);
outputServerLog(strActionMessage);
fileWrite(uFileHandle, strActionMessage.."\n");
@@ -52,12 +52,12 @@ function getDateTime()
local iHour = tblRealTime.hour;
local iMinute = tblRealTime.minute;
local iSecond = tblRealTime.second;
-
+
if(iDay < 10) then iDay = "0"..iDay end;
if(iMonth < 10) then iMonth = "0"..iMonth end;
if(iHour < 10) then iHour = "0"..iHour end;
if(iMinute < 10) then iMinute = "0"..iMinute end;
if(iSecond < 10) then iSecond = "0"..iSecond end;
-
+
return "["..tostring(iDay).."."..tostring(iMonth).."."..tostring(iYear).." - "..tostring(iHour)..":"..tostring(iMinute)..":"..tostring(iSecond).."]";
end
\ No newline at end of file
diff --git a/[admin]/security/meta.xml b/[admin]/security/meta.xml
index a255356de..c65b9984c 100644
--- a/[admin]/security/meta.xml
+++ b/[admin]/security/meta.xml
@@ -1,8 +1,8 @@
-
+
-
+
diff --git a/[admin]/security/players.lua b/[admin]/security/players.lua
index 7f2f87973..79f2be2b5 100644
--- a/[admin]/security/players.lua
+++ b/[admin]/security/players.lua
@@ -137,21 +137,21 @@ setTimer(function()
logViolation(uPlayer, "Exceeded projectile threshold "..tostring(iPlayerProjectileThreshold).." - Count: "..tostring(iCounter));
end
end
-
+
for uPlayer, iCounter in pairs(tblRegularExplosions) do
if(iCounter >= iRegularExplosionThreshold) then
logViolation(uPlayer, "Exceeded regular explosions threshold "..tostring(iRegularExplosionThreshold).." - Count: "..tostring(iCounter));
end
end
-
+
for uPlayer, iCounter in pairs(tblVehicleExplosions) do
if(iCounter >= iVehicleExplosionThreshold) then
logViolation(uPlayer, "Exceeded vehicle explosions threshold "..tostring(iVehicleExplosionThreshold).." - Count: "..tostring(iCounter));
end
end
-
+
tblPlayerProjectiles = {};
tblRegularExplosions = {};
tblVehicleExplosions = {};
-
+
end, iExplosionCheckInterval, 0);
\ No newline at end of file
diff --git a/[admin]/security/utils.lua b/[admin]/security/utils.lua
index fa7bee82a..71583a294 100644
--- a/[admin]/security/utils.lua
+++ b/[admin]/security/utils.lua
@@ -4,11 +4,11 @@ function isPlayerNameValid(strPlayerName)
if(not tostring(strPlayerName)) then return false end;
if(#strPlayerName == 0) then return false end;
if(#strPlayerName > 22) then return false end;
-
+
for i = 1, #strPlayerName do
local strChar = strPlayerName:sub(i, i);
local iCharByte = strChar:byte();
-
+
if(iCharByte < 33 or iCharByte > 126) then return false end;
end
diff --git a/[editor]/edf/edf_client.lua b/[editor]/edf/edf_client.lua
index ae0517331..3d4903d85 100644
--- a/[editor]/edf/edf_client.lua
+++ b/[editor]/edf/edf_client.lua
@@ -170,7 +170,7 @@ function edfSetElementRotation(element, rx, ry, rz)
if etype == "object" or etype == "vehicle" or etype == "player" or etype == "ped" then
-- Clear the quat rotation when set manually
exports.editor_main:clearElementQuat(element)
-
+
return setElementRotation(element, rx, ry, rz)
else
local handle = edfGetHandle(element)
diff --git a/[editor]/editor_gui/client/currentbrowser.lua b/[editor]/editor_gui/client/currentbrowser.lua
index 6f746564a..3fa190fd0 100644
--- a/[editor]/editor_gui/client/currentbrowser.lua
+++ b/[editor]/editor_gui/client/currentbrowser.lua
@@ -474,7 +474,7 @@ function restoreSelectedElement()
if cSelectedElement then
editor_main.destroySelectedElement()
closeCurrentBrowser()
-
+
setTimer(function()
showCurrentBrowser()
end, 100, 1)
diff --git a/[editor]/editor_gui/client/elementproperties.lua b/[editor]/editor_gui/client/elementproperties.lua
index 4a4a6a974..5914ffef4 100644
--- a/[editor]/editor_gui/client/elementproperties.lua
+++ b/[editor]/editor_gui/client/elementproperties.lua
@@ -771,7 +771,7 @@ function openPropertiesBox( element, resourceName, shortcut )
if isPropertiesOpen then
return false
end
-
+
selectedElement = nil
--Tutorial hook
if tutorialVars.detectPropertiesBox then
@@ -800,10 +800,10 @@ function openPropertiesBox( element, resourceName, shortcut )
setPropertiesChanged(true)
else
selectedElement = element
-
+
local elementID = getElementID(selectedElement)
elementID = (type(elementID) == "string" and elementID) or "false" -- rollback
-
+
guiSetText( wndProperties, "PROPERTIES: " .. elementID)
guiSetText( edtID, elementID )
diff --git a/[editor]/editor_gui/client/options_action.lua b/[editor]/editor_gui/client/options_action.lua
index 85594fe36..d911b00ef 100644
--- a/[editor]/editor_gui/client/options_action.lua
+++ b/[editor]/editor_gui/client/options_action.lua
@@ -7,17 +7,17 @@ function optionsActions.enableSounds (value)
enableSound = value
end
-function optionsActions.enableBox(value)
- optionsData.enableBox = value
-end
-
-function optionsActions.enableHoverBoundingBox(value)
- optionsData.enableHoverBoundingBox = value
-end
-
-function optionsActions.enableXYZlines(value)
- optionsData.enableXYZlines = value
-end
+function optionsActions.enableBox(value)
+ optionsData.enableBox = value
+end
+
+function optionsActions.enableHoverBoundingBox(value)
+ optionsData.enableHoverBoundingBox = value
+end
+
+function optionsActions.enableXYZlines(value)
+ optionsData.enableXYZlines = value
+end
function optionsActions.enablePrecisionRotation(value)
optionsData.enablePrecisionRotation = value
diff --git a/[editor]/editor_gui/client/options_backend.lua b/[editor]/editor_gui/client/options_backend.lua
index 5d2f07541..d2b620ffd 100644
--- a/[editor]/editor_gui/client/options_backend.lua
+++ b/[editor]/editor_gui/client/options_backend.lua
@@ -22,10 +22,10 @@ local xmlVariants = {
["slowElemScale"]="scaling_slow_speed",
["lockToAxes"]="movement_lock_to_axes",
["autosnap"]="currentbrowser_autosnap",
-["tutorialOnStart"]="tutorial_on_start",
-["enableBox"]="enablebox",
-["enableHoverBoundingBox"]="enablehoverboundingbox",
-["enableXYZlines"]="enablexyzlines",
+["tutorialOnStart"]="tutorial_on_start",
+["enableBox"]="enablebox",
+["enableHoverBoundingBox"]="enablehoverboundingbox",
+["enableXYZlines"]="enablexyzlines",
["precisionLevel"]="precisionlevel",
["precisionRotLevel"]="precisionrotlevel",
["elemScalingSnap"]="elemscalingsnap",
@@ -60,10 +60,10 @@ local nodeTypes = {
["lockToAxes"]="bool",
["autosnap"]="bool",
["tutorialOnStart"]="bool",
-["enableDumpSave"]="bool",
-["enableBox"]="bool",
-["enableHoverBoundingBox"]="bool",
-["precisionLevel"]={"10","5","2","1","0.1","0.01","0.001","0.0001"},
+["enableDumpSave"]="bool",
+["enableBox"]="bool",
+["enableHoverBoundingBox"]="bool",
+["precisionLevel"]={"10","5","2","1","0.1","0.01","0.001","0.0001"},
["precisionRotLevel"]={"180","90","45","30","20","10","5","1"},
["elemScalingSnap"]={"1","0.1","0.01","0.001","0.0001"},
["enablePrecisionSnap"]="bool",
@@ -97,10 +97,10 @@ local defaults = {
["slowElemScale"]=0.01,
["lockToAxes"]=false,
["autosnap"]=true,
-["tutorialOnStart"]=true,
-["enableBox"]=true,
-["enableHoverBoundingBox"]=false,
-["precisionLevel"]="0.1",
+["tutorialOnStart"]=true,
+["enableBox"]=true,
+["enableHoverBoundingBox"]=false,
+["precisionLevel"]="0.1",
["precisionRotLevel"]="30",
["elemScalingSnap"]="0.0001",
["enablePrecisionSnap"]=true,
diff --git a/[editor]/editor_gui/client/options_gui.lua b/[editor]/editor_gui/client/options_gui.lua
index d2ef17c1d..0af1a6e52 100644
--- a/[editor]/editor_gui/client/options_gui.lua
+++ b/[editor]/editor_gui/client/options_gui.lua
@@ -32,9 +32,9 @@ function createOptionsDialog()
dialog.tutorialOnStart = editingControl.boolean:create{["x"]=0.02,["y"]=0.8,["width"]=0.35,["height"]=0.1,["relative"]=true,["parent"]=dialog.generalTab,["label"]="Query for tutorial on start"}
---------------------------------
- dialog.enableBox = editingControl.boolean:create{["x"]=0.43,["y"]=0.02,["width"]=0.25,["height"]=0.1,["relative"]=true,["parent"]=dialog.generalTab,["label"]="Enable Bounding Box"}
- dialog.enableHoverBoundingBox = editingControl.boolean:create{["x"]=0.68,["y"]=0.02,["width"]=0.31,["height"]=0.1,["relative"]=true,["parent"]=dialog.generalTab,["label"]="Bounding box on hover over"}
- dialog.enableXYZlines = editingControl.boolean:create{["x"]=0.60,["y"]=0.12,["width"]=0.35,["height"]=0.1,["relative"]=true,["parent"]=dialog.generalTab,["label"]="Enable XYZ Lines"}
+ dialog.enableBox = editingControl.boolean:create{["x"]=0.43,["y"]=0.02,["width"]=0.25,["height"]=0.1,["relative"]=true,["parent"]=dialog.generalTab,["label"]="Enable Bounding Box"}
+ dialog.enableHoverBoundingBox = editingControl.boolean:create{["x"]=0.68,["y"]=0.02,["width"]=0.31,["height"]=0.1,["relative"]=true,["parent"]=dialog.generalTab,["label"]="Bounding box on hover over"}
+ dialog.enableXYZlines = editingControl.boolean:create{["x"]=0.60,["y"]=0.12,["width"]=0.35,["height"]=0.1,["relative"]=true,["parent"]=dialog.generalTab,["label"]="Enable XYZ Lines"}
---------------------------------
dialog.enablePrecisionSnap = editingControl.boolean:create{["x"]=0.60,["y"]=0.22,["width"]=0.35,["height"]=0.1,["relative"]=true,["parent"]=dialog.generalTab,["label"]="Enable Snap - Precise Position"}
guiCreateLabel ( 0.47, 0.34, 70, 17, "Position Snap Level:", true, dialog.generalTab )
diff --git a/[editor]/editor_gui/client/test.lua b/[editor]/editor_gui/client/test.lua
index 37fc7c469..0eb381928 100644
--- a/[editor]/editor_gui/client/test.lua
+++ b/[editor]/editor_gui/client/test.lua
@@ -153,7 +153,7 @@ function disableColPatchInTesting()
g_colPatchSetting = sx_getOptionData("enableColPatch")
-- Already disabled?
if not g_colPatchSetting then return end
-
+
-- Disable
guiCheckBoxSetSelected(dialog.enableColPatch.GUI.checkbox, false)
doActions()
@@ -162,7 +162,7 @@ end
function enableColPatchAfterTesting()
-- Wasnt enabled?
if not g_colPatchSetting then return end
-
+
-- Enable
guiCheckBoxSetSelected(dialog.enableColPatch.GUI.checkbox, true)
confirmSettings()
@@ -202,7 +202,7 @@ addEventHandler("onClientResourceStart", root, freeroamStarting)
function freeroamStopping(resource)
if resource ~= getResourceFromName("freeroam") then return end
-
+
enableColPatchAfterTesting()
end
addEventHandler("onClientResourceStop", root, freeroamStopping)
@@ -231,7 +231,7 @@ function basicTest()
for i, obj in pairs(getElementsByType("object")) do
setElementCollisionsEnabled(obj, true)
end
-
+
enableColPatchAfterTesting()
else
editor_main.dropElement()
@@ -257,7 +257,7 @@ function basicTest()
setElementCollisionsEnabled(obj, false)
end
end
-
+
disableColPatchInTesting()
end
end
diff --git a/[editor]/editor_main/client/colpatch.lua b/[editor]/editor_main/client/colpatch.lua
index 90dc6ea04..d19688e66 100644
--- a/[editor]/editor_main/client/colpatch.lua
+++ b/[editor]/editor_main/client/colpatch.lua
@@ -18,7 +18,7 @@ local function threadHandler()
if coroutine.status(g_threadCoroutine) == "suspended" then
return coroutine.resume(g_threadCoroutine)
end
-
+
killTimer(g_threadTimer)
g_threadCoroutine = nil
g_threadTimer = nil
@@ -47,14 +47,14 @@ function toggleColPatch(value)
-- Are we busy
if g_threadCoroutine then return false, isLoaded end
-
+
if value then
-- Already loaded?
if g_colElements then return false, isLoaded end
-
+
return initThread(loadAndReplaceCollision)
end
-
+
-- Not loaded?
if not g_colElements then return false, isLoaded end
return initThread(restoreAndDestroyCollision)
@@ -63,13 +63,13 @@ end
function createColPatchObjects()
g_placementObjs = {}
g_placementIDObjs = {}
-
+
if g_placementData then
for k,v in ipairs(g_placementData) do
if k % COL_CREATE_FRAME == 0 then
coroutine.yield()
end
-
+
local obj = createObject(v.id, v.x, v.y, v.z, v.rx, v.ry, v.rz)
if obj then
setElementDimension(obj, getWorkingDimension())
@@ -78,7 +78,7 @@ function createColPatchObjects()
setElementInterior(obj, v.int)
end
g_placementObjs[obj] = v
-
+
if not g_placementIDObjs[v.id] then
g_placementIDObjs[v.id] = {}
end
@@ -86,7 +86,7 @@ function createColPatchObjects()
end
end
end
-
+
applyRemovedColPatches()
return true
end
@@ -106,7 +106,7 @@ function destroyColPatchObjects()
i = i + 1
end
end
-
+
g_placementObjs = nil
g_placementIDObjs = nil
return true
@@ -115,11 +115,11 @@ end
function loadColPatchPlacements()
local file = fileOpen(PLACEMENT_FILENAME, true)
if not file then return false end
-
+
g_placementData = {}
local fileStr = fileRead(file, fileGetSize(file))
fileClose(file)
-
+
local fileLines = split(fileStr, "\n")
for k,v in ipairs(fileLines) do
v = split(v, ",")
@@ -137,17 +137,17 @@ function loadColPatchPlacements()
table.insert(g_placementData, pl)
end
end
-
+
return true
end
function loadColPatchArchive()
local file = fileOpen(COL_FILENAME, true)
if not file then return false end
-
+
g_colData = {}
local fileSize = fileGetSize(file)
-
+
local filePos = 0
while true do
-- Are we at EOF
@@ -168,11 +168,11 @@ function loadColPatchArchive()
fileSetPos(file, filePos)
local colFile = fileRead(file, colSize + 8)
filePos = fileGetPos(file)
-
+
local id = engineGetModelIDFromName(colName)
table.insert(g_colData, {["colName"] = colName, ["colID"] = id, ["colFile"] = colFile})
end
-
+
fileClose(file)
return true
end
@@ -184,7 +184,7 @@ function loadAndReplaceCollision()
if k % COL_LOAD_FRAME == 0 then
coroutine.yield()
end
-
+
local col = engineLoadCOL(colData.colFile)
if col then
if engineReplaceCOL(col, colData.colID) then
diff --git a/[editor]/editor_main/client/gridlines.lua b/[editor]/editor_main/client/gridlines.lua
index 463fd55ce..42cab4340 100644
--- a/[editor]/editor_main/client/gridlines.lua
+++ b/[editor]/editor_main/client/gridlines.lua
@@ -217,29 +217,29 @@ function drawObjectMoveLines()
local worldX, worldY, worldZ = getPositionFromElementAtOffset(attachedToElement, relCorner[1], relCorner[2], relCorner[3])
corners[i] = {worldX + movementAnimationOffset[1], worldY + movementAnimationOffset[2], worldZ + movementAnimationOffset[3]}
end
-
+
local boxColor = tocolor(255, 255, 255, 100)
local lineWidth = 2
-
+
-- Bottom face (z = minZ)
dxDrawLine3D(corners[1][1], corners[1][2], corners[1][3], corners[2][1], corners[2][2], corners[2][3], boxColor, lineWidth)
dxDrawLine3D(corners[2][1], corners[2][2], corners[2][3], corners[3][1], corners[3][2], corners[3][3], boxColor, lineWidth)
dxDrawLine3D(corners[3][1], corners[3][2], corners[3][3], corners[4][1], corners[4][2], corners[4][3], boxColor, lineWidth)
dxDrawLine3D(corners[4][1], corners[4][2], corners[4][3], corners[1][1], corners[1][2], corners[1][3], boxColor, lineWidth)
-
+
-- Top face (z = maxZ)
dxDrawLine3D(corners[5][1], corners[5][2], corners[5][3], corners[6][1], corners[6][2], corners[6][3], boxColor, lineWidth)
dxDrawLine3D(corners[6][1], corners[6][2], corners[6][3], corners[7][1], corners[7][2], corners[7][3], boxColor, lineWidth)
dxDrawLine3D(corners[7][1], corners[7][2], corners[7][3], corners[8][1], corners[8][2], corners[8][3], boxColor, lineWidth)
dxDrawLine3D(corners[8][1], corners[8][2], corners[8][3], corners[5][1], corners[5][2], corners[5][3], boxColor, lineWidth)
-
+
-- Vertical edges connecting bottom to top
dxDrawLine3D(corners[1][1], corners[1][2], corners[1][3], corners[5][1], corners[5][2], corners[5][3], boxColor, lineWidth)
dxDrawLine3D(corners[2][1], corners[2][2], corners[2][3], corners[6][1], corners[6][2], corners[6][3], boxColor, lineWidth)
dxDrawLine3D(corners[3][1], corners[3][2], corners[3][3], corners[7][1], corners[7][2], corners[7][3], boxColor, lineWidth)
dxDrawLine3D(corners[4][1], corners[4][2], corners[4][3], corners[8][1], corners[8][2], corners[8][3], boxColor, lineWidth)
end
-
+
-- Draw the bounding box at the destination position
do
local corners = {}
@@ -247,22 +247,22 @@ function drawObjectMoveLines()
local worldX, worldY, worldZ = getPositionFromElementAtOffset(attachedToElement, relCorner[1], relCorner[2], relCorner[3])
corners[i] = {worldX + offsetX, worldY + offsetY, worldZ + offsetZ}
end
-
+
local boxColor = tocolor(255, 255, 0, 200)
local lineWidth = 2
-
+
-- Bottom face (z = minZ)
dxDrawLine3D(corners[1][1], corners[1][2], corners[1][3], corners[2][1], corners[2][2], corners[2][3], boxColor, lineWidth)
dxDrawLine3D(corners[2][1], corners[2][2], corners[2][3], corners[3][1], corners[3][2], corners[3][3], boxColor, lineWidth)
dxDrawLine3D(corners[3][1], corners[3][2], corners[3][3], corners[4][1], corners[4][2], corners[4][3], boxColor, lineWidth)
dxDrawLine3D(corners[4][1], corners[4][2], corners[4][3], corners[1][1], corners[1][2], corners[1][3], boxColor, lineWidth)
-
+
-- Top face (z = maxZ)
dxDrawLine3D(corners[5][1], corners[5][2], corners[5][3], corners[6][1], corners[6][2], corners[6][3], boxColor, lineWidth)
dxDrawLine3D(corners[6][1], corners[6][2], corners[6][3], corners[7][1], corners[7][2], corners[7][3], boxColor, lineWidth)
dxDrawLine3D(corners[7][1], corners[7][2], corners[7][3], corners[8][1], corners[8][2], corners[8][3], boxColor, lineWidth)
dxDrawLine3D(corners[8][1], corners[8][2], corners[8][3], corners[5][1], corners[5][2], corners[5][3], boxColor, lineWidth)
-
+
-- Vertical edges connecting bottom to top
dxDrawLine3D(corners[1][1], corners[1][2], corners[1][3], corners[5][1], corners[5][2], corners[5][3], boxColor, lineWidth)
dxDrawLine3D(corners[2][1], corners[2][2], corners[2][3], corners[6][1], corners[6][2], corners[6][3], boxColor, lineWidth)
diff --git a/[editor]/editor_main/client/main.lua b/[editor]/editor_main/client/main.lua
index 3f36f99cd..0f33df0fb 100644
--- a/[editor]/editor_main/client/main.lua
+++ b/[editor]/editor_main/client/main.lua
@@ -425,7 +425,7 @@ function processFreecamClick(key, keyState)
local drop
if (not g_suspended) then
local clickedElement, targetX, targetY, targetZ = getTargetedElement()
-
+
local camX, camY, camZ, lookX, lookY, lookZ = getCameraMatrix()
local distance = math.sqrt((targetX - camX)^2 + (targetY - camY)^2 + (targetZ - camZ)^2)
@@ -735,7 +735,7 @@ function selectElement(element, submode, shortcut, dropreleaseLock, dropclonedro
submode = submode or g_submode
if not isElement(element) then return end
-
+
if isColPatchObject(element) then return end
if getElementType(element) == "vehicle" and getVehicleType(element) == "Train" then
@@ -811,7 +811,7 @@ function selectElement(element, submode, shortcut, dropreleaseLock, dropclonedro
-- fix for local elements
if not isElementLocal(element) then
triggerServerEvent("doLockElement", element)
-
+
-- trigger server selection events
triggerServerEvent("onElementSelect", element)
end
@@ -886,7 +886,7 @@ function dropElement(releaseLock,clonedrop)
-- trigger server selection events
triggerServerEvent("onElementDrop", g_selectedElement)
end
-
+
-- Clear rotation as it can be rotated by other players
clearElementQuat(g_selectedElement)
@@ -908,7 +908,7 @@ function setMode(newMode)
if g_suspended then
return
end
-
+
if not isElement(g_selectedElement) then
g_selectedElement = nil
end
@@ -1000,13 +1000,13 @@ function destroySelectedElement(key)
if g_selectedElement then
local element = g_selectedElement
dropElement(false)
-
+
-- fix for local elements
if isElementLocal(element) then
outputDebugString("Cannot destroy local element.")
return false
end
-
+
return triggerServerEvent("doDestroyElement", element)
end
end
@@ -1203,7 +1203,7 @@ function processCameraLineOfSight()
nx, ny, nz, material, lighting, piece,
buildingId, bx, by, bz, brx, bry, brz, buildingLOD
= processLineOfSight(camX, camY, camZ, endX, endY, endZ, true, true, true, true, true, false, false, false, localPlayer, true)
-
+
-- Is this a collision patch object
if targetElement and isColPatchObject(targetElement) then
local cp = isColPatchObject(targetElement)
@@ -1211,7 +1211,7 @@ function processCameraLineOfSight()
buildingId, bx, by, bz, brx, bry, brz = cp.id, cp.x, cp.y, cp.z, cp.rx, cp.ry, cp.rz
targetElement = nil
end
-
+
-- if there is none, use the end point of the vector as the collision point
if not surfaceFound then
targetX, targetY, targetZ = endX, endY, endZ
diff --git a/[editor]/editor_main/meta.xml b/[editor]/editor_main/meta.xml
index 6845c49cb..f913a9d5d 100644
--- a/[editor]/editor_main/meta.xml
+++ b/[editor]/editor_main/meta.xml
@@ -84,10 +84,10 @@
-
+
-
+
@@ -152,7 +152,7 @@
-
+
diff --git a/[editor]/editor_main/server/saveloadtest_server.lua b/[editor]/editor_main/server/saveloadtest_server.lua
index 02ff7d5b0..5e82cd74b 100644
--- a/[editor]/editor_main/server/saveloadtest_server.lua
+++ b/[editor]/editor_main/server/saveloadtest_server.lua
@@ -273,7 +273,7 @@ function openResource( resourceName, onStart )
newEDF.addedEDF = split(usedDefinitions, 44)
-- Remove the added EDFs from the available
table.subtract(newEDF.availEDF, newEDF.addedEDF)
- -- Un/Load the necessary definitions
+ -- Un/Load the necessary definitions
reloadEDFDefinitions(newEDF,true)
end
local mapElement = loadMapData ( mapNode, mapContainer, false )
@@ -1179,7 +1179,7 @@ local function onPlayerResourceStart(resourceElement)
if not mapResource then
return
end
-
+
triggerClientEvent(source, "setLODsClient", resourceRoot, usedLODModels)
end
addEventHandler("onPlayerResourceStart", root, onPlayerResourceStart)
@@ -1212,4 +1212,4 @@ LOD_MAP = {
fileWrite(fh, out)
fileClose(fh)
return true
-end
+end
diff --git a/[editor]/move_cursor/move_cursor.lua b/[editor]/move_cursor/move_cursor.lua
index d13c4950d..672e4443f 100644
--- a/[editor]/move_cursor/move_cursor.lua
+++ b/[editor]/move_cursor/move_cursor.lua
@@ -166,7 +166,7 @@ local function rotateWithMouseWheel(key, keyState)
if (key == "quick_rotate_decrease") then
speed = speed * -1
end
-
+
local elementType = getElementType(selectedElement)
if (elementType == "vehicle") or (elementType == "object") then
rotX, rotY, rotZ = exports.editor_main:applyIncrementalRotation(selectedElement, "yaw", speed)
@@ -218,13 +218,13 @@ function attachElement(element)
camX, camY, camZ = getCameraMatrix()
-- get element info
selectedElement = element
-
+
-- do not attach if it's not really an element
if not (selectedElement and isElement(selectedElement)) then
selectedElement = nil
return false
end
-
+
--EDF implementation
if getResourceFromName"edf" and exports.edf:edfGetParent(element) ~= element then
if (getElementType(element) == "object") then
@@ -266,12 +266,12 @@ function detachElement()
-- remove events, unbind keys
disable()
-
+
-- fix for local elements
if not isElementLocal(selectedElement) then
-- sync position/rotation
local tempPosX, tempPosY, tempPosZ = getElementPosition(selectedElement)
-
+
triggerServerEvent("syncProperty", localPlayer, "position", {tempPosX, tempPosY, tempPosZ}, exports.edf:edfGetAncestor(selectedElement))
if hasRotation[getElementType(selectedElement)] then
rotX, rotY, rotZ = getElementRotation(selectedElement, "ZYX")
diff --git a/[editor]/move_freecam/move_freecam.lua b/[editor]/move_freecam/move_freecam.lua
index 65dd85c69..cce68da1e 100644
--- a/[editor]/move_freecam/move_freecam.lua
+++ b/[editor]/move_freecam/move_freecam.lua
@@ -235,13 +235,13 @@ function detachElement()
if (selectedElement) then
-- remove events, unbind keys
disable()
-
+
-- fix for local elements
if not isElementLocal(selectedElement) then
-
+
-- sync position/rotation
local tempPosX, tempPosY, tempPosZ = getElementPosition(selectedElement)
-
+
triggerServerEvent("syncProperty", localPlayer, "position", {tempPosX, tempPosY, tempPosZ}, exports.edf:edfGetAncestor(selectedElement))
if hasRotation[getElementType(selectedElement)] then
triggerServerEvent("syncProperty", localPlayer, "rotation", {rotX, rotY, rotZ}, exports.edf:edfGetAncestor(selectedElement))
diff --git a/[editor]/move_keyboard/move_keyboard.lua b/[editor]/move_keyboard/move_keyboard.lua
index 2a1c14ee1..61fdc76ef 100644
--- a/[editor]/move_keyboard/move_keyboard.lua
+++ b/[editor]/move_keyboard/move_keyboard.lua
@@ -192,9 +192,9 @@ local function onClientRender_keyboard()
else
local tempRotX, tempRotY, tempRotZ = rotX, rotY, rotZ
if (not tempRotX) then return false end
-
+
local yaw, pitch, roll = 0, 0, 0
-
+
-- yaw
if (getCommandTogSTATE("element_move_right")) then
yaw = speed
@@ -208,14 +208,14 @@ local function onClientRender_keyboard()
elseif (getCommandTogSTATE("element_move_downwards")) then
pitch = -speed
end
-
+
-- roll
if (getCommandTogSTATE("element_move_forward")) then
roll = speed
elseif (getCommandTogSTATE("element_move_backward")) then
roll = -speed
end
-
+
-- Perform rotation about one axis at a time
if yaw ~= 0 then
tempRotX, tempRotY, tempRotZ = exports.editor_main:applyIncrementalRotation(selectedElement, "yaw", yaw, world_space)
@@ -289,7 +289,7 @@ local function onClientRender_keyboard()
if (not tempRotX) then return false end
local yaw, pitch, roll = 0, 0, 0
-
+
-- yaw
if (getCommandTogSTATE("element_move_right")) then
yaw = speed
@@ -303,14 +303,14 @@ local function onClientRender_keyboard()
elseif (getCommandTogSTATE("element_move_downwards")) then
pitch = -speed
end
-
+
-- roll
if (getCommandTogSTATE("element_move_forward")) then
roll = speed
elseif (getCommandTogSTATE("element_move_backward")) then
roll = -speed
end
-
+
-- Perform rotation about one axis at a time
if yaw ~= 0 then
tempRotX, tempRotY, tempRotZ = exports.editor_main:applyIncrementalRotation(selectedElement, "yaw", yaw, world_space)
diff --git a/[gamemodes]/[assault]/[maps]/as-area51/as-area51.map b/[gamemodes]/[assault]/[maps]/as-area51/as-area51.map
index d49670d32..3bcc68c4e 100644
--- a/[gamemodes]/[assault]/[maps]/as-area51/as-area51.map
+++ b/[gamemodes]/[assault]/[maps]/as-area51/as-area51.map
@@ -58,7 +58,7 @@
diff --git a/[gamemodes]/[briefcaserace]/briefcaserace/server/br.server.game.lua b/[gamemodes]/[briefcaserace]/briefcaserace/server/br.server.game.lua
index d0df4e3b9..0b72b3205 100644
--- a/[gamemodes]/[briefcaserace]/briefcaserace/server/br.server.game.lua
+++ b/[gamemodes]/[briefcaserace]/briefcaserace/server/br.server.game.lua
@@ -16,7 +16,7 @@
-- add FF option in settings (done)
-- add briefcases to places inaccessible by cars.. rooftops, interiors.. so people get out of their cars sometimes. maybe create a different map for that? (done)
-- make waiting screens pretty, so players see it whenever they are not ready (kind of done, but doesn't always work)
--- add spectator mode? add click to spawn?? (no, forget it... well maybe as a separate option selectable from the team menu)
+-- add spectator mode? add click to spawn?? (no, forget it... well maybe as a separate option selectable from the team menu)
-- add time-limit? as it approaches, increase game speed? play sound from gta3?
-- play objective complete sound on delivery
-- IN TEAM MODE, CAN'T SEE OBJECTIVE MARKER AFTER FIRST DELIVERY (fixed)
diff --git a/[gamemodes]/[ctf]/ctf/ctf.lua b/[gamemodes]/[ctf]/ctf/ctf.lua
index 60e351f5e..555b50afc 100644
--- a/[gamemodes]/[ctf]/ctf/ctf.lua
+++ b/[gamemodes]/[ctf]/ctf/ctf.lua
@@ -344,7 +344,7 @@ function CTF_onPlayerWasted ( totalammo, killer, killerweapon, bodypart )
-- Handle respawn
if ( CTF_roundOn ) then
fadeCamera ( player, false, CTF_respawnTime/500, 000, 000, 000 )
-
+
setTimer( function ()
if isElement(player) then
fadeCamera(player, true )
diff --git a/[gamemodes]/[deathmatch]/deathmatch/client/spectate.lua b/[gamemodes]/[deathmatch]/deathmatch/client/spectate.lua
index 008d72b16..ae5c62a7f 100644
--- a/[gamemodes]/[deathmatch]/deathmatch/client/spectate.lua
+++ b/[gamemodes]/[deathmatch]/deathmatch/client/spectate.lua
@@ -10,7 +10,7 @@ function startSpectating(target)
fadeCamera(false, 0)
setPlayerHudComponentVisible("radar", false)
_hud.scoreDisplay:setVisible(false)
-
+
-- hide wasted screen and destroy wasted timer
_hud.wastedScreen:setVisible(false)
if isElement(_wastedTimer) then
@@ -27,7 +27,7 @@ function startSpectating(target)
-- TODO: handle this more gracefully
error("no valid spectate target", 2)
end
-
+
-- set camera target and disable controls
iprint(target)
setCameraTarget(target)
@@ -90,7 +90,7 @@ function setSpectateTarget(target)
if not _spectating then
error("local player is not spectating", 2)
end
-
+
if target == _currentTarget then
return
end
diff --git a/[gamemodes]/[fallout]/fallout/player_init_s.lua b/[gamemodes]/[fallout]/fallout/player_init_s.lua
index bb633f88d..ef9eb8186 100644
--- a/[gamemodes]/[fallout]/fallout/player_init_s.lua
+++ b/[gamemodes]/[fallout]/fallout/player_init_s.lua
@@ -3,7 +3,7 @@ local loadedPlayers = {}
addEventHandler("onPlayerResourceStart", root, function (startedResource)
if startedResource ~= resource then return end
if loadedPlayers[source] then return end
-
+
loadedPlayers[source] = true
if not getPlayerTeam(source) then --Check if its not playing
exports.freecam:setPlayerFreecamEnabled(source) -- Start spectating
diff --git a/[gamemodes]/[hay]/hay/hay_server.lua b/[gamemodes]/[hay]/hay/hay_server.lua
index 361255392..7c1843389 100644
--- a/[gamemodes]/[hay]/hay/hay_server.lua
+++ b/[gamemodes]/[hay]/hay/hay_server.lua
@@ -136,12 +136,12 @@ function startRound()
objects = {}
rocks = {}
moving = {}
-
+
for i, v in ipairs(getElementsByType("player")) do --Round start spawn
spawnFunct(v)
setElementData(v, "Max level", 0)
end
-
+
--Calculate speed velocity
xy_speed = 2000 / (options.z + 1)
z_speed = 1500 / (options.z + 1)
diff --git a/[gamemodes]/[play]/play/meta.xml b/[gamemodes]/[play]/play/meta.xml
index 2b8762132..53a62863c 100644
--- a/[gamemodes]/[play]/play/meta.xml
+++ b/[gamemodes]/[play]/play/meta.xml
@@ -1,6 +1,6 @@
-
+
diff --git a/[gamemodes]/[play]/play/play.lua b/[gamemodes]/[play]/play/play.lua
index d4b21c627..5f208e97f 100644
--- a/[gamemodes]/[play]/play/play.lua
+++ b/[gamemodes]/[play]/play/play.lua
@@ -7,7 +7,7 @@ local function onResourceStartPlay()
for playerID = 1, #playersTable do
local playerElement = playersTable[playerID]
-
+
playSpawnPlayer(playerElement)
end
diff --git a/[gamemodes]/[play]/play/play_players.lua b/[gamemodes]/[play]/play/play_players.lua
index 8c0b7a325..6ef0d3913 100644
--- a/[gamemodes]/[play]/play/play_players.lua
+++ b/[gamemodes]/[play]/play/play_players.lua
@@ -5,7 +5,7 @@ function playSpawnPlayer(playerElement)
if not isElement(playerElement) then
return false
end
-
+
local randomSpawn = math.random(spawnsCount)
local spawnData = playerSpawns[randomSpawn]
local posX, posY, posZ, rotX = unpack(spawnData)
diff --git a/[gamemodes]/[play]/play/play_vehicles.lua b/[gamemodes]/[play]/play/play_vehicles.lua
index e4738bbf9..5d75ca60a 100644
--- a/[gamemodes]/[play]/play/play_vehicles.lua
+++ b/[gamemodes]/[play]/play/play_vehicles.lua
@@ -118,7 +118,7 @@ function onVehicleElementDestroy()
if not vehicleType then
return false
end
-
+
destroyVehicleTimer(source)
vehiclesToSpawn[source] = nil
end
\ No newline at end of file
diff --git a/[gamemodes]/[race]/[maps]/race-10laphotring/10Lap Hotring.map b/[gamemodes]/[race]/[maps]/race-10laphotring/10Lap Hotring.map
index 99129631c..fddadf34b 100644
--- a/[gamemodes]/[race]/[maps]/race-10laphotring/10Lap Hotring.map
+++ b/[gamemodes]/[race]/[maps]/race-10laphotring/10Lap Hotring.map
@@ -1,4 +1,4 @@
-