weyne/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2026-08-25 13:02:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into develop

Browse Source 
# Conflicts:
#	Moose Development/Moose/Core/Set.lua
#	Moose Development/Moose/Functional/Artillery.lua
This commit is contained in:
Applevangelist
2024-01-12 18:47:28 +01:00
parent 36a6d5fede bb07e1935e
commit 0bf1204499
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Moose Development/Moose/Core/Set.lua
-1
View File
@@ -7855,7 +7855,6 @@ do -- SET_OPSGROUP
self:Add( groupname, group ) self:Add( groupname, group )
end end
end end
end end
end end
end end
Moose Development/Moose/Functional/Artillery.lua
+3 -2
View File
@@ -1,4 +1,5 @@
--- --- **Functional** - Control artillery units.
--
-- === -- ===
-- --
-- The ARTY class can be used to easily assign and manage targets for artillery units using an advanced queueing system. -- The ARTY class can be used to easily assign and manage targets for artillery units using an advanced queueing system.
@@ -3545,7 +3546,7 @@ end
-- @param #string To To state. -- @param #string To To state.
function ARTY:onafterRespawn(Controllable, From, Event, To) function ARTY:onafterRespawn(Controllable, From, Event, To)
self:_EventFromTo("onafterRespawn", Event, From, To) self:_EventFromTo("onafterRespawn", Event, From, To)
self:I("Respawning arty group")
local group=self.Controllable --Wrapper.Group#GROUP local group=self.Controllable --Wrapper.Group#GROUP
-- Respawn group. -- Respawn group.