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
4,773 Commits 10 Branches 87 Tags
Commit Graph

614 Commits

Author SHA1 Message Date
Frank
1e6899c40b OPS 2021-08-25 17:20:17 +02:00
Frank
218d9f48b0 Merge branch 'FF/Ops' into FF/OpsDev 2021-08-05 00:24:23 +02:00
Frank
f67cf99477 OPS and SCHEDULER 2021-08-05 00:23:25 +02:00
Frank
a5ad58e516 FC 2021-08-02 21:57:53 +02:00
Frank
835041e5f6 OPS 2021-07-14 21:00:34 +02:00
Frank
9e7c360912 Merge branch 'develop' into FF/Ops 2021-07-06 21:57:31 +02:00
Frank
51acd33d19 Merge branch 'master' into develop 2021-07-06 21:57:08 +02:00
Frank
af3dbe2f86 Merge branch 'develop' into FF/Ops 2021-07-06 21:56:53 +02:00
Frank
89308f7d06 Update Airbase.lua 
- Fixed Andersen
 2021-07-06 21:49:51 +02:00
Applevangelist
00b3e9b371
Merge pull request #1564 from justin-lovell/justin-lovell-mark-changed-event 
Synchronize Text with Wrapper State
 2021-07-04 18:10:35 +02:00
Applevangelist
0d02f56855
Merge pull request #1565 from justin-lovell/updated-debug-msg 
Correcting typo for debug message
 2021-07-04 18:10:21 +02:00
Justin Lovell
a14bca1059
Synchronize Text with Wrapper State 
Bug - text is not synchronized with the wrapper state, hence the `GetText()` will be incorrect.

Method `TextChanged` does not exist, resulting `nil` reference errors when the players update markers. Current implementation of `MARKER:OnEventMarkChange(EventData)` is not implemented the same as its siblings of `OnEventMarkRemoved` and `OnEventMarkAdded`. The siblings would move the FSM accordingly -- aligned implementation
 2021-07-03 23:30:45 +10:00
Justin Lovell
a7e07af24f
Correcting typo for debug message 
Small PR
 2021-07-03 23:24:04 +10:00
Frank
1cc012c7d1 Merge branch 'develop' into FF/Ops 2021-07-02 08:53:44 +02:00
Frank
28c6810878 Merge branch 'master' into develop 2021-07-02 08:52:07 +02:00
Frank
353d6dfec0 Update Airbase.lua 
- Corrected Mariana Islands airbase names
- Fixed bug in Syria airbase name `["Thalah"]="Tha'lah"`
 2021-07-02 08:51:51 +02:00
Frank
36669c80da OPSTRANSPORT 2021-06-25 13:23:56 +02:00
Frank
978be4e383 OPS Transport 2021-06-23 17:20:51 +02:00
Frank
83db7b32e8 Merge branch 'master' into FF/Ops 2021-06-12 22:59:20 +02:00
Frank
d496d3d16e Merge branch 'master' into develop 2021-06-12 22:23:10 +02:00
Frank
72df687ce7
Merge pull request #1549 from FlightControl-Master/FF/MasterDevel 
Sound Update
 2021-06-12 22:22:02 +02:00
Frank
6b801247ab Merge branch 'FF/MasterDevel' into FF/Ops 2021-06-11 23:41:52 +02:00
Frank
078573629d SRS 
- added coordinate
- added google
 2021-06-11 23:41:37 +02:00
Applevangelist
c8d2a7e833
Added commands for immortal and invisible to Wrapper.Group#GROUP (#1547) 
* Added function for message duration (#1542)

... and correct flash status setting

* Update Spawn.lua (#1544)

* Update Spawn.lua

* Update Group.lua (#1546)

Added invisible and immortal commands on GROUP level.
 2021-06-10 11:59:50 +02:00
Applevangelist
832d6b1c08
Update Group.lua (#1546) 
Added invisible and immortal commands on GROUP level.
 2021-06-10 11:20:01 +02:00
Frank
7c37d8b204 Merge branch 'FF/MasterDevel' into FF/Ops 2021-06-09 13:19:14 +02:00
Frank
4fa525a4ae Update Airbase.lua 2021-06-08 22:06:33 +02:00
Frank
88d44fa654 Merge branch 'develop' into FF/Ops 2021-05-28 23:01:47 +02:00
Frank
8b6f9f9de7 Merge branch 'master' into develop 2021-05-28 23:01:15 +02:00
Frank
fcd75a34eb Merge branch 'master' into FF/MasterDevel 2021-05-28 23:00:50 +02:00
Applevangelist
dab486ec99
Update Controllable.lua 
Typo in `OptionDisperseOnAttack()`
 2021-05-26 09:16:26 +02:00
Applevangelist
6e37300d9b
Update Controllable.lua 
Added function `IsSubmarine()`removed type from `OptionDisperseOnAttack()`
 2021-05-26 08:44:30 +02:00
Shadowze
75849fbfb5 Update Positionable.lua 
function added to work out if a unit is a submarine
 2021-05-25 22:30:16 +01:00
Frank
f984ff044b Merge branch 'master' into develop 2021-05-25 21:13:36 +02:00
Applevangelist
47d814e409
CONTROLLABLE:PatrolRouteRandom fix for Subs (#1536) 
* CONTROLLABLE:PatrolRouteRandom fix for Subs

fixes issue #1535

* Update Controllable.lua

* Update Controllable.lua
 2021-05-21 12:35:32 +02:00
Frank
1b3cac9424 Merge branch 'FF/MasterDevel' into FF/Ops 2021-05-13 23:38:17 +02:00
Frank
0410ae6877 Mariana Islands 2021-05-13 23:30:34 +02:00
Frank
d68dcaf69a Merge branch 'develop' into FF/Ops 2021-05-11 14:52:31 +02:00
Frank
856c3578f6 Merge branch 'master' into develop 2021-05-11 11:59:48 +02:00
Frank
057e231a9d Emission 2021-05-11 11:41:26 +02:00
Frank
296944c23c Merge branch 'develop' into FF/Ops 2021-05-07 22:57:34 +02:00
Frank
4f772fecdc Merge branch 'master' into develop 2021-05-07 21:56:17 +02:00
Frank
8b4ba430fb Update Airbase.lua 
- Fixed #1524
 2021-05-07 21:55:56 +02:00
Applevangelist
9eba6d607c Updated doc images 2021-05-06 09:30:06 +02:00
Frank
cfa851beea Merge branch 'master' into FF/Ops 2021-05-02 00:25:07 +02:00
Applevangelist
a466365949
Update Controllable.lua (#1519) 
Error line 1463
 2021-04-25 20:31:02 +02:00
Applevangelist
57f6096aa1
Update Controllable.lua (#1518) 
Error line 1466
 2021-04-25 20:24:41 +02:00
Frank
b12f71c430 Merge branch 'develop' into FF/Ops 2021-04-23 13:38:28 +02:00
Frank
236a69e5dc Merge branch 'master' into develop 2021-04-23 13:29:37 +02:00
Applevangelist
bbb2174957
Update Controllable.lua 
added `OptionDisperseOnAttack` for GROUND units
 2021-04-23 12:00:49 +02:00