FlightControl-Master/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-10-29 16:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/master' into Detection

Browse Source 
# Conflicts:
#	Moose Mission Setup/Moose Mission Update/l10n/DEFAULT/Moose.lua
#	Moose Mission Setup/Moose.lua
This commit is contained in:
FlightControl 2016-07-23 17:23:29 +02:00
commit 906045a027
3 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Moose Development/Moose/Menu.lua
View File

@ -495,7 +495,6 @@ do -- MENU_CLIENT
-- --
-- --- @param Client#CLIENT MenuClient -- --- @param Client#CLIENT MenuClient
-- local function AddStatusMenu( MenuClient ) -- local function AddStatusMenu( MenuClient )
-- env.info(MenuClient.ClientName)
-- local MenuClientName = MenuClient:GetName() -- local MenuClientName = MenuClient:GetName()
-- -- This would create a menu for the red coalition under the MenuCoalitionRed menu object. -- -- This would create a menu for the red coalition under the MenuCoalitionRed menu object.
-- MenuStatus[MenuClientName] = MENU_CLIENT:New( MenuClient, "Status for Planes" ) -- MenuStatus[MenuClientName] = MENU_CLIENT:New( MenuClient, "Status for Planes" )
@ -722,7 +721,6 @@ do
-- --
-- --- @param Group#GROUP MenuGroup -- --- @param Group#GROUP MenuGroup
-- local function AddStatusMenu( MenuGroup ) -- local function AddStatusMenu( MenuGroup )
-- env.info(MenuGroup.GroupName)
-- local MenuGroupName = MenuGroup:GetName() -- local MenuGroupName = MenuGroup:GetName()
-- -- This would create a menu for the red coalition under the MenuCoalitionRed menu object. -- -- This would create a menu for the red coalition under the MenuCoalitionRed menu object.
-- MenuStatus[MenuGroupName] = MENU_GROUP:New( MenuGroup, "Status for Planes" ) -- MenuStatus[MenuGroupName] = MENU_GROUP:New( MenuGroup, "Status for Planes" )

1
Moose Test Missions/Moose_Test_MENU_CLIENT/Moose_Test_MENU_CLIENT.lua
View File

@ -23,7 +23,6 @@ do
--- @param Client#CLIENT MenuClient --- @param Client#CLIENT MenuClient
local function AddStatusMenu( MenuClient ) local function AddStatusMenu( MenuClient )
env.info(MenuClient.ClientName)
local MenuClientName = MenuClient:GetName() local MenuClientName = MenuClient:GetName()
-- This would create a menu for the red coalition under the MenuCoalitionRed menu object. -- This would create a menu for the red coalition under the MenuCoalitionRed menu object.
MenuStatus[MenuClientName] = MENU_CLIENT:New( MenuClient, "Status for Planes" ) MenuStatus[MenuClientName] = MENU_CLIENT:New( MenuClient, "Status for Planes" )

1
Moose Test Missions/Moose_Test_MENU_GROUP/Moose_Test_MENU_GROUP.lua
View File

@ -23,7 +23,6 @@ do
--- @param Group#GROUP MenuGroup --- @param Group#GROUP MenuGroup
local function AddStatusMenu( MenuGroup ) local function AddStatusMenu( MenuGroup )
env.info(MenuGroup.GroupName)
local MenuGroupName = MenuGroup:GetName() local MenuGroupName = MenuGroup:GetName()
-- This would create a menu for the red coalition under the MenuCoalitionRed menu object. -- This would create a menu for the red coalition under the MenuCoalitionRed menu object.
MenuStatus[MenuGroupName] = MENU_GROUP:New( MenuGroup, "Status for Planes" ) MenuStatus[MenuGroupName] = MENU_GROUP:New( MenuGroup, "Status for Planes" )