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

2710 Commits

Author SHA1 Message Date
Frank
0d1fc2fbf2 Merge branch 'master' into develop 2023-12-22 10:36:34 +01:00
Frank
f86b3505b2 Update Airboss.lua 
- Fixed Attitude Monitor
 2023-12-22 10:36:25 +01:00
Frank
5b37e7b249 Merge branch 'develop' into FF/Ops 2023-12-16 09:32:14 +01:00
Applevangelist
b31fc3ed44 Limit Attacked() to have at least the capture threatlevel 2023-12-14 11:12:50 +01:00
Applevangelist
f948a07d44 xxx 2023-12-14 11:10:12 +01:00
Applevangelist
7e080f2fb0 Merge remote-tracking branch 'origin/develop' into develop 
# Conflicts:
#	Moose Development/Moose/Ops/Intelligence.lua
 2023-12-12 10:56:09 +01:00
Applevangelist
2a7213c1b7 xxx 2023-12-12 10:54:16 +01:00
Applevangelist
42468f3505 xxx 2023-12-12 10:54:01 +01:00
Thomas
945a81b745
Update Intelligence.lua 2023-12-11 13:17:30 +01:00
Applevangelist
9fbbb4ae02 Merge remote-tracking branch 'origin/master' into develop 2023-12-07 13:32:33 +01:00
Applevangelist
7e5a97e7c7 Merge remote-tracking branch 'origin/master' into develop 2023-12-07 13:32:03 +01:00
Applevangelist
9ce1d360d6 #CTLD 
* Spawn dropped troops in a nice circle 5m (hover: 1.5m) left of the he
 2023-12-07 13:31:40 +01:00
Applevangelist
99e7d6ae92 #CTLD 
* Spawn dropped troops in a nice circle 5m (hover: 1.5m) left of the helo
 2023-12-07 13:31:32 +01:00
Applevangelist
91fb98e32a Merge remote-tracking branch 'origin/master' into develop 2023-12-07 12:16:26 +01:00
Applevangelist
f342ba758e Merge remote-tracking branch 'origin/master' into develop 2023-12-07 12:15:56 +01:00
Thomas
dd37a42470
Update CTLD.lua (#2060) 
Changes from @Rey
 2023-12-07 12:12:19 +01:00
Applevangelist
fe9d841af5 #PLAYERRECCE 
* Fixed visual targets not being smoked
* Added option to smoke an average coordinate of targets instead of all
* Defaulted self-smoking of player to false
 2023-12-07 11:21:52 +01:00
Applevangelist
e8c7e62900 xx 2023-12-07 11:20:20 +01:00
Applevangelist
69c20e78fb Merge remote-tracking branch 'origin/develop' into develop 2023-12-06 08:44:15 +01:00
Applevangelist
22175456a5 Merge remote-tracking branch 'origin/master' into develop 2023-12-06 08:44:10 +01:00
Applevangelist
58fa533f79 xxx 2023-12-06 08:43:43 +01:00
Frank
bc3a5271dc Update OpsGroup.lua 
- Fixed group returning to legion when told not to
 2023-12-04 22:19:31 +01:00
Applevangelist
4d4b8862c2 Merge remote-tracking branch 'origin/develop' into develop 2023-12-04 10:42:26 +01:00
Applevangelist
31b75b7d17 Merge remote-tracking branch 'origin/master' into develop 2023-12-04 10:42:23 +01:00
Thomas
fac7a5fdc6
Update CTLD.lua (#2058) 
Add Remove Crates option
 2023-12-04 10:40:38 +01:00
Frank
a20b6e8a62 Merge branch 'FF/Ops' into FF/OpsDev 2023-12-03 21:10:24 +01:00
Frank
cfca4fdc46 Merge branch 'develop' into FF/Ops 2023-12-03 21:09:17 +01:00
Frank
cca5a5d55d Fixes 
- Fixed A/C starting on ALERT5
- Fixed nil check for DrawID in UndrawZone
 2023-12-03 20:51:19 +01:00
Applevangelist
f8e3e7ff99 Merge remote-tracking branch 'origin/master' into develop 2023-12-03 12:12:34 +01:00
Applevangelist
1c10bfea92 Merge remote-tracking branch 'origin/master' into develop 2023-12-03 12:11:55 +01:00
Applevangelist
c97d2ecaba #ATIS - multi freq example added 2023-12-03 12:11:22 +01:00
Applevangelist
77dd4f86b9 Merge remote-tracking branch 'origin/master' into develop 2023-12-02 15:12:05 +01:00
Applevangelist
e79c2481da Merge remote-tracking branch 'origin/master' into develop 2023-12-02 15:11:35 +01:00
Applevangelist
89a902fd57 #ATIS 
* make info multi-frequency safe
 2023-12-02 15:11:14 +01:00
Applevangelist
c3bba7d1fc #PLAYERRECCE 
* Make the laser corridor a bit wider

#FLIGHtCONTROL
* Also create non-info when ATIS isn't set
 2023-12-01 16:29:49 +01:00
Applevangelist
d7c7a1a1dd xxx 2023-12-01 16:28:04 +01:00
Applevangelist
37dab7b8bd color 2023-11-29 16:42:55 +01:00
Applevangelist
68b97773fe #OPSZONE 
* Added option to set own pikey-ish zone colors
 2023-11-29 16:42:30 +01:00
Applevangelist
3c0e977584 #PLAYERRECCE 
* Bug fix for clock view calculation
* Ensure lasing is switched off when using the menu
* Create SPOT more often
 2023-11-28 10:37:45 +01:00
Applevangelist
b33df5374f #PLAYERRECCE 
* Bug fix for clock view calculation
* Ensure lasing is switched off when using the menu
* Create SPOT more often
 2023-11-28 10:36:28 +01:00
Frank
a4704d0e2f Update ArmyGroup.lua 2023-11-26 23:57:21 +01:00
Frank
bfaf88f017 Merge branch 'develop' into FF/Ops 2023-11-23 22:23:50 +01:00
Applevangelist
2dfde7d1fd xxx 2023-11-21 13:22:51 +01:00
Applevangelist
9014e27edc xxx 2023-11-21 13:21:02 +01:00
Frank
b5965bbf81 Merge branch 'develop' into FF/Ops 2023-11-20 13:52:16 +01:00
Applevangelist
76a7a7f6da Merge remote-tracking branch 'origin/master' into develop 2023-11-19 15:37:32 +01:00
Applevangelist
0dd4da1db4 Merge remote-tracking branch 'origin/master' into develop 2023-11-19 15:36:46 +01:00
Applevangelist
1f1d1e4f2f #CTLD 
* Added info event for repairs and builds starting
 2023-11-19 15:36:16 +01:00
Applevangelist
fbbdac9b7e Merge remote-tracking branch 'origin/master' into develop 2023-11-18 16:44:46 +01:00
Applevangelist
6dd69eb6db CTLD - avoid old mission go haywire with UnitCapabilities() 2023-11-18 16:44:23 +01:00