Merge branch 'master' into fix-map-LOD-table

Author: Fernando-A-Rocha

[admin]/admin2/client/admin_wrapper.lua

@@ -18,6 +18,7 @@ function getVehicleNameFromModel(id)
         [609] = "Black Boxville",
         [604] = "Damaged Glendale",
         [544] = "Fire Truck (Ladder)",
+        [494] = "Hotring Racer",
         [502] = "Hotring Racer 2",
         [503] = "Hotring Racer 3",
         [505] = 'Rancher (From "Lure")',
@@ -40,6 +41,7 @@ function getVehicleModelFromName(name)
         ["Black Boxville"] = 609,
         ["Damaged Glendale"] = 604,
         ["Fire Truck (Ladder)"] = 544,
+        ["Hotring Racer"] = 494,
         ["Hotring Racer 2"] = 502,
         ["Hotring Racer 3"] = 503,
         ['Rancher (From "Lure")'] = 505,

[gamemodes]/[play]/play/play_config.lua

@@ -99,6 +99,5 @@ vehicleSpawns = {
 	{475, 2024.2908935547, 1506.1636962891, 10.72031211853, 270.00003051758},
 	{541, 2024.7091064453, 1499.3103027344, 10.520312309265, 270.00003051758},
 	{429, 2025.9349365234, 1490.2434082031, 10.5703125, 270.00003051758},
-	{429, 2025.6474609375, 1494.671875, 10.5703125, 270.00003051758},
-	{469, 2024.5600585938, 1623.0500488281, 12.002040863037, 270.00003051758}
+	{429, 2025.6474609375, 1494.671875, 10.5703125, 270.00003051758}
 }

[gamemodes]/[race]/race/racevoting_server.lua

@@ -47,7 +47,7 @@ end
 ----------------------------------------------------------------------------
 function displayKillerPunchLine( player )
 	if lastVoteStarterName ~= '' then
-		outputRace( 'Offical news: Everybody hates ' .. lastVoteStarterName )
+		outputRace( 'Official news: Everybody hates ' .. lastVoteStarterName )
 	end
 end
 

[gamemodes]/[race]/race/util_client.lua

@@ -153,7 +153,7 @@ end
 function checkVehicleIsHelicopter()
 	local vehID = getElementModel(g_Vehicle)
 	if vehID == 417 or vehID == 425 or vehID == 447 or vehID == 465 or vehID == 469 or vehID == 487 or vehID == 488 or vehID == 497 or vehID == 501 or vehID == 548 or vehID == 563 then
-		setHelicopterRotorSpeed (g_Vehicle, 0.2)
+		setVehicleRotorSpeed(g_Vehicle, 0.2)
 	end
 end
 

[gameplay]/hedit/client/gui/languages/german.lua

@@ -120,7 +120,7 @@
                 textlabel = "Добро пожаловать в официальный MTA редактор хэндлинга!\n"..
 				            "Этот скрипт позволяет вам редактировать хэндлинг любого транспорта прямо в игре!\n"..
                             "Вы можете сохранять и загружать свой хэндлинг черех меню 'Хэндлинг' или же имортировать хэндлинг из других игр через меню 'Функции' в верхнем левом углу.\n"..
-                            "За большей информацией о хэндлинг редакторе - такой, как список изменений - посетите сайт в окошке снизу:\n\n\n\nP.S. Редактор хэндлинга был переведен FornetGear'ом. Страница в ВКонтакте скриптера - переводчика: 'http://vk.com/id41070112'",
+                            "За большей информацией о хэндлинг редакторе - такой, как список изменений - посетите сайт в окошке снизу:\n\n\n\nP.S.",
                 websitebox = "https://github.com/multitheftauto/mtasa-resources/tree/master/%5Bgameplay%5D/hedit",
                 morelabel = "Благодарим вас за пользование редактором хэндлинга!"
             }

[gameplay]/hedit/client/gui/languages/russian.lua

@@ -1,5 +1,5 @@
 <meta>
-    <info type="script" name="Ingame Handling Editor" author="Remi-X" version="2.1.4" description="The first ingame handling editor for MTA!" />
+    <info type="script" name="Ingame Handling Editor" author="Remi-X" version="2.1.5" description="The first ingame handling editor for MTA!" />
     <oop>true</oop>
     <min_mta_version server="1.4.0" client="1.4.0" />
 
@@ -26,6 +26,7 @@
     <script src="client/gui/languages/english.lua"  type="client" />
     <script src="client/gui/languages/russian.lua"  type="client" />
     <script src="client/gui/languages/turkish.lua"  type="client" />
+    <script src="client/gui/languages/german.lua"  type="client" />
     <script src="client/gui/languages/spanish.lua"  type="client" />
     <script src="client/gui/languages/polish.lua"   type="client" />
     <script src="client/gui/languages/arabic.lua"   type="client" />
@@ -47,7 +48,7 @@
 
     <!-- SERVER -->
     <script src="server/logmanager.lua"             type="server" />
-    <script src="server/cfgloader.lua"              type="server" />>
+    <script src="server/cfgloader.lua"              type="server" />
     <script src="server/core.lua"                   type="server" />
     <script src="server/utils.lua"                  type="server" />
 

[gameplay]/hedit/meta.xml

@@ -1,4 +1,4 @@
 DEBUGMODE = false
 
-MTAVER = 1.4
-HVER = "2.1.2"
+MTAVER = 1.6
+HVER = "2.1.5"

[gameplay]/hedit/shared/settings.lua

@@ -91,7 +91,7 @@ function toggleSpeakerSounds(playerElement, toggleOn)
 		local speakerDimension = getElementDimension(speakerBox)
 		local speakerSoundMaxDistance = speakerData.speakerSoundMaxDistance
 		local speakerStreamURL = speakerData.speakerStreamURL
-		local speakerNewSound = playSound3D(speakerStreamURL, speakerBoxPosX, speakerBoxPosY, speakerBoxPosZ, false, false)
+		local speakerNewSound = playSound3D(speakerStreamURL, speakerBoxPosX, speakerBoxPosY, speakerBoxPosZ, true, false)
 
 		if (not speakerNewSound) then
 			return false
@@ -339,4 +339,4 @@ function clearSpeakersOnDestroyQuit()
 	clearPlayerSpeaker(source)
 end
 addEventHandler("onClientPlayerQuit", root, clearSpeakersOnDestroyQuit)
-addEventHandler("onClientElementDestroy", resourceRoot, clearSpeakersOnDestroyQuit)
+addEventHandler("onClientElementDestroy", resourceRoot, clearSpeakersOnDestroyQuit)