6470 Commits

Author SHA1 Message Date
Applevangelist
ec9119d1d0 xxx 2023-12-27 19:27:40 +01:00
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
kaltokri
6f5f89a0ee Merge branch 'master' into develop 2023-12-26 14:51:28 +01:00
kaltokri
46f70dd8a6 Fixed logic in SoundOutput.lua to play internal sound files with SRS 2023-12-26 14:50:54 +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
bf0ad93bf7 AICSAR Fix 2023-12-25 13:59:23 +01:00
Applevangelist
e46b148721 SRS 2023-12-25 13:28:00 +01:00
Applevangelist
b55b11be09 Merge remote-tracking branch 'origin/master' into develop 2023-12-25 13:22:16 +01:00
Applevangelist
d65042c640 SRS error from luacheck 2023-12-25 13:12:03 +01:00
Applevangelist
3ccfcdbd0f CSAR 2023-12-25 13:00:36 +01:00
Applevangelist
1ec5721198 Merge remote-tracking branch 'origin/master' into develop 2023-12-25 12:16:10 +01:00
Applevangelist
db7e94d879 New SRS Fixes 2023-12-25 12:14:57 +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
c9b0632a46 Merge remote-tracking branch 'origin/master' into develop 2023-12-25 11:44:55 +01:00
kaltokri
f482dac491 Merge branch 'master' into develop 2023-12-25 11:28:19 +01:00
kaltokri
f6f3189504 MSRS enhancements
- Added more tracing
- A check if executable exists
- Removed STTS references
2023-12-25 11:27:48 +01:00
Applevangelist
d855788e19 Merge remote-tracking branch 'origin/develop' into develop 2023-12-25 11:08:03 +01:00
Applevangelist
e9d9578eee Merge remote-tracking branch 'origin/master' into develop 2023-12-25 11:07:59 +01:00
Applevangelist
e913e83596 xxx 2023-12-25 11:07:39 +01:00
kaltokri
73fa021476 Merge branch 'master' into develop
# Conflicts:
#	Moose Development/Moose/Sound/SRS.lua
2023-12-25 09:41:57 +01:00
kaltokri
071554bfc5 Fixed some small typos and removed STTS in comments 2023-12-25 09:39:21 +01:00
kaltokri
cd8abd97c5 Merge branch 'master' into develop
# Conflicts:
#	Moose Development/Moose/Sound/SRS.lua
2023-12-25 06:13:40 +01:00
kaltokri
1527b53c76 Fixed ASW typo in SRS.lua 2023-12-25 06:09:31 +01:00
Frank
257530d421 Merge branch 'master' into develop 2023-12-24 03:26:53 +01:00
Frank
caaee4f551
Merge pull request #2068 from FlightControl-Master/FF/MasterDevel
MSRS
2023-12-24 03:21:50 +01:00
Frank
5f7115f4fe Update SRS.lua 2023-12-23 16:53:42 +01:00
Frank
9ec92a8fca SRS
- Refactoring
2023-12-23 15:57:27 +01:00
Applevangelist
9c624e6742 Merge remote-tracking branch 'origin/master' into develop 2023-12-23 14:54:07 +01:00
Applevangelist
e82e4f7dd7 Merge remote-tracking branch 'origin/master' into develop 2023-12-23 14:53:36 +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
7cc040c234 #RANGE
* Fixed Range trying to find a pilot on each and every birth event...
2023-12-23 14:51:59 +01:00
Applevangelist
668ba51ba2 xxx 2023-12-23 14:50:57 +01:00
Frank
9227ba9ecd Merge branch 'master' into FF/MasterDevel 2023-12-22 22:01:59 +01:00
Frank
e7fb073bab Update RAT.lua
- Removed restriction that zones need to be defined in the ME
2023-12-22 21:11:30 +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
e89b921f3e Update Zone.lua 2023-12-22 10:27:00 +01:00
Frank
0d18ce086c Update Zone.lua 2023-12-21 22:33:08 +01:00
Frank
8fb126682f Merge branch 'master' into FF/MasterDevel 2023-12-21 22:22:10 +01:00
Applevangelist
63acca90fd xxx 2023-12-21 11:06:31 +01:00
Applevangelist
fc0c54c7fd xx 2023-12-20 10:08:26 +01:00
Applevangelist
63a0224ea4 Merge remote-tracking branch 'origin/master' into develop 2023-12-20 10:08:14 +01:00