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

2386 Commits

Author SHA1 Message Date
Applevangelist
7aa150f287 Merge remote-tracking branch 'origin/develop' into develop 2023-12-26 19:19:45 +01:00
Applevangelist
853ecf9add Merge remote-tracking branch 'origin/master' into develop 2023-12-26 19:19:39 +01:00
Applevangelist
2be85fb187 CTLD 2023-12-26 19:19:10 +01:00
Applevangelist
33259be4d9 Merge remote-tracking branch 'origin/develop' into develop 2023-12-26 19:18:54 +01:00
Applevangelist
e4cea7b3c4 Merge remote-tracking branch 'origin/master' into develop 2023-12-26 19:18:36 +01:00
Applevangelist
3bdf4b4c76 #CTLD 
* Fix multi-crate requests deducting too much Stock
 2023-12-26 19:18:13 +01:00
Thomas
e2e9bd7de0
Update EasyGCICAP.lua 2023-12-26 08:53:11 +01:00
Frank
1b01b89343 TARGET 
- Fixed IsAlive
 2023-12-25 23:12:55 +01:00
Applevangelist
b55b11be09 Merge remote-tracking branch 'origin/master' into develop 2023-12-25 13:22:16 +01:00
Applevangelist
3ccfcdbd0f CSAR 2023-12-25 13:00:36 +01:00
Applevangelist
16f3dcbbb4 New SRS fixes 2023-12-25 12:14:41 +01:00
Applevangelist
d010c3a9fa New SRS fixes 2023-12-25 12:14:18 +01:00
Applevangelist
e9d9578eee Merge remote-tracking branch 'origin/master' into develop 2023-12-25 11:07:59 +01:00
Frank
257530d421 Merge branch 'master' into develop 2023-12-24 03:26:53 +01:00
Frank
9ec92a8fca SRS 
- Refactoring
 2023-12-23 15:57:27 +01:00
Applevangelist
c7ef270d4d #FLIGHTCONTROL 
* Added a delay in spawning the parking guard so in MP we have time to get the heading of the Player's plane
 2023-12-23 14:53:11 +01:00
Applevangelist
668ba51ba2 xxx 2023-12-23 14:50:57 +01:00
Applevangelist
c8ab26ab93 Merge remote-tracking branch 'origin/master' into develop 2023-12-22 10:53:46 +01:00
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
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