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

5174 Commits

Author SHA1 Message Date
Applevangelist
28a44d9e05 Merge remote-tracking branch 'origin/master' into develop 2023-02-28 07:39:36 +01:00
Thomas
cb9ab26522
Update Enums.lua (#1925) 2023-02-26 19:06:45 +01:00
Thomas
5341e5faee
Update Enums.lua 2023-02-26 19:03:33 +01:00
Applevangelist
7db7919207 Merge remote-tracking branch 'origin/develop' into develop 2023-02-26 10:25:21 +01:00
Frank
7aa4aaf371 Update Auftrag.lua 
- Fixed wrong IAS to TAS convertion for orbit missions
 2023-02-26 01:02:39 +01:00
Frank
901480d99c Merge branch 'FF/Ops' into develop 2023-02-24 23:29:32 +01:00
Frank
84dbda6f2b OPS 
- Rm laser marker
 2023-02-24 23:29:03 +01:00
Applevangelist
4bc4e631d8 Merge remote-tracking branch 'origin/master' into develop 2023-02-24 14:05:57 +01:00
Applevangelist
0d08d732a5 #AWACS - do not convert speed to IAS, as already done in AUFTRAG 2023-02-23 11:12:05 +01:00
Applevangelist
3c2a4dcc70 #AWACS - do not convert speed to IAS, as already done in AUFTRAG 2023-02-23 11:11:48 +01:00
Applevangelist
a6224b484e dcs 2023-02-23 10:33:11 +01:00
Applevangelist
8c0f960e39 Merge remote-tracking branch 'origin/master' into develop 2023-02-23 10:32:38 +01:00
Applevangelist
5670764f3b Merge remote-tracking branch 'origin/master' into develop 2023-02-23 10:31:59 +01:00
Applevangelist
e95c1ad3aa #Fixes from dev 2023-02-23 10:30:59 +01:00
Applevangelist
d0e6a29486 Merge remote-tracking branch 'origin/develop' into develop 2023-02-23 10:20:22 +01:00
Frank
ffef3183c7 OpsGroup 
- Fixed bug in checklos
 2023-02-22 23:01:47 +01:00
Frank
20a9857fcf Merge branch 'FF/OpsDev' into FF/Ops 2023-02-22 22:17:49 +01:00
Frank
828395c398 Merge branch 'develop' into FF/Ops 2023-02-22 22:17:35 +01:00
Frank
462e29da6e RANGE and OPS 
** RANGE**
- Added scenery as target

**OPSGROUP**
- Added option that group does not return to its legion

**AUFTRAG**
- Added option that assets do not return to its legion
 2023-02-22 22:16:42 +01:00
Applevangelist
29ebe94015 #CTLD logic correction for loading 2023-02-21 11:39:23 +01:00
Applevangelist
9cfed56847 #CTLD logic correction for loading 2023-02-21 11:38:40 +01:00
Applevangelist
0b692d045f #CTLD logic correction for loading 2023-02-21 11:38:24 +01:00
Applevangelist
8e6eb17ef5 Merge remote-tracking branch 'origin/master' into develop 
# Conflicts:
#	Moose Development/Moose/Wrapper/Net.lua
 2023-02-19 17:17:35 +01:00
Applevangelist
ce7b30b54e Merge remote-tracking branch 'origin/master' into develop 2023-02-19 17:16:34 +01:00
Applevangelist
6c1abddb1e #NET added a couple of functions 2023-02-19 17:16:00 +01:00
Applevangelist
93c92d49f7 NET 2023-02-19 17:15:35 +01:00
Applevangelist
feeb0c01f2 Merge remote-tracking branch 'origin/master' into develop 2023-02-19 12:32:29 +01:00
Applevangelist
70386811e6 AICSAR 2023-02-19 12:31:57 +01:00
Applevangelist
7dc239f506 Added CLIENT:FindByPlayerName(Name) 
NET - slot blocker comments in log removed
 2023-02-19 12:31:32 +01:00
Applevangelist
bef8e53347 #AICSAR - added option to use eject event 2023-02-19 12:30:00 +01:00
Applevangelist
46c3ed72c3 Merge remote-tracking branch 'origin/master' into develop 2023-02-18 15:04:36 +01:00
Applevangelist
3e8413c6b7 #NET - further ado 2023-02-18 15:03:53 +01:00
Applevangelist
55a055a047 #NET - further ado 2023-02-18 15:03:07 +01:00
Applevangelist
1fd8f4d837 #AICSAR 
* Named functions for the events
 2023-02-18 11:04:49 +01:00
Applevangelist
9b62710d64 #AICSAR 
* Named functions for the events
 2023-02-18 11:04:37 +01:00
Applevangelist
7959f650d5 NET 2023-02-17 16:42:25 +01:00
Applevangelist
6f3fbb25cf Merge remote-tracking branch 'origin/master' into develop 2023-02-17 16:42:10 +01:00
Applevangelist
ff86bfb91d #NET Event blocker fix 2023-02-17 16:41:38 +01:00
Applevangelist
05b8df0d88 Merge remote-tracking branch 'origin/master' into develop 2023-02-17 16:24:21 +01:00
Applevangelist
ffb6cbfb17 NET 2023-02-17 16:23:16 +01:00
Applevangelist
66494b7b5a NET 2023-02-17 16:23:02 +01:00
Applevangelist
973127aa8c #NET Fixes 2023-02-17 15:42:06 +01:00
Applevangelist
a4dcb643bd #NET Fixes 2023-02-17 15:41:33 +01:00
Applevangelist
2b02f6659a #Net 2023-02-17 15:41:10 +01:00
Applevangelist
83866c3dd3 #NET Fixes 2023-02-17 15:02:11 +01:00
Applevangelist
6acf051539 #Net Fixes 2023-02-17 15:02:03 +01:00
Applevangelist
9e23cda02a #NET Fixes 2023-02-17 15:01:49 +01:00
Applevangelist
c29b67df55 #NET small fix 2023-02-17 14:33:32 +01:00
Applevangelist
4797abc287 #NET Bugfix 2023-02-17 14:32:48 +01:00
Applevangelist
8c083cccc8 #NET - bug fix 2023-02-17 14:32:17 +01:00