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

7789 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Applevangelist
d5a9f776f7 Various 2023-11-08 11:09:49 +01:00
Applevangelist
7f650913d9 #EVENT 
* Add player UCID to event data structure (for multi-player)
 2023-11-07 11:07:28 +01:00
Applevangelist
c765070401 #FLIGHTGROUP 
* Resolve a stalemate when all jobs are done but _CheckGroupDone isn't called any longer
 2023-11-06 18:35:17 +01:00
Applevangelist
1e974c7d3a Merge remote-tracking branch 'origin/develop' into develop 2023-11-05 13:02:28 +01:00
Applevangelist
20f74c95bf Merge remote-tracking branch 'origin/master' into develop 2023-11-05 13:02:24 +01:00
Applevangelist
6db2e333ad Merge remote-tracking branch 'origin/master' into develop 2023-11-05 13:01:59 +01:00
Applevangelist
b7159f7334 # 2023-11-05 13:01:38 +01:00
Applevangelist
9d3cb4cc1b #MESSAGE 
* SRS label correction
 2023-11-05 13:01:27 +01:00
Applevangelist
7a97fed8a1 #SRS 2023-11-04 17:26:28 +01:00
kaltokri
0eb9dfc7de Merge branch 'master' into develop 2023-11-03 16:34:36 +01:00
kaltokri
9d500186d1 Enhancement of build-docs to remove old files 2023-11-03 16:33:45 +01:00
kaltokri
f80265786d Fix broken links SetEngageRange 2023-11-03 15:52:53 +01:00
Applevangelist
1064f2123b Merge remote-tracking branch 'origin/develop' into develop 2023-11-03 13:39:36 +01:00
Applevangelist
6e72c4c40a Merge remote-tracking branch 'origin/master' into develop 2023-11-03 13:39:32 +01:00
Applevangelist
4eb0f8e9ca Merge remote-tracking branch 'origin/master' into develop 2023-11-03 13:39:02 +01:00
Applevangelist
5a583671a7 #SRS - Improvements, set also a coordinate 2023-11-03 13:38:37 +01:00
Applevangelist
7b9d8d375d #SRS Improvements 2023-11-03 13:37:59 +01:00
Applevangelist
b1823824c2 #SRS Improvements 2023-11-03 13:37:37 +01:00
Applevangelist
f0de6ca9e1 #ATIS 2023-11-02 19:26:51 +01:00
Applevangelist
e560c3ffdd Merge remote-tracking branch 'origin/master' into develop 2023-11-02 19:25:50 +01:00
Applevangelist
7393cb2cbe #ATIS 
* Some fixes
 2023-11-02 19:25:28 +01:00
Applevangelist
1e015fd988 Merge remote-tracking branch 'origin/master' into develop 
# Conflicts:
#	Moose Development/Moose/AI/AI_Escort_Request.lua
#	Moose Development/Moose/AI/AI_Formation.lua
 2023-11-02 18:22:30 +01:00
Applevangelist
74bd41743b Merge remote-tracking branch 'origin/develop' into develop 2023-11-02 18:20:49 +01:00
Applevangelist
56d4143a05 Merge remote-tracking branch 'origin/master' into develop 2023-11-02 18:20:45 +01:00
Applevangelist
1093e55ea8 #OPSGROUP #FLIGHTCONTROL 
* Added setting coordinate for SRS
 2023-11-02 18:19:55 +01:00
Applevangelist
bcbe872c7d #ATIS 
* Added coordinate for SRS
* Added SRS calling out take off AND landing runway (if set)
 2023-11-02 18:18:55 +01:00
Applevangelist
408f9d9c0c #ATIS and #SRS 2023-11-02 18:16:30 +01:00
kaltokri
cc95c45fb0 Merge branch 'master' into develop 2023-11-02 15:16:41 +01:00
kaltokri
bf60c535bc Merge branch 'master' of github.com:FlightControl-Master/MOOSE 
# Conflicts:
#	Moose Development/Moose/Tasking/Task_Cargo_CSAR.lua
 2023-11-02 15:16:12 +01:00
kaltokri
feb99e9405 Fix for SetEngageRange documentation in AI_A2A and A2G classes 2023-11-02 15:14:57 +01:00
Frank
6c36910ac7 Update FlightGroup.lua 
#2033
 2023-11-02 01:41:39 +01:00
Frank
d60f20a162 Merge branch 'master' into develop 2023-11-02 01:40:01 +01:00
Frank
9fde88d61a Merge branch 'master' of https://github.com/FlightControl-Master/MOOSE 2023-11-02 01:39:42 +01:00
Frank
430b4a274c Update Warehouse.lua 
#2033
 2023-11-02 01:39:40 +01:00
Thomas
dc26134845
Merge from master (#2036) 
* Update Storage.lua

* Update Storage.lua (#2035)
 2023-11-01 06:21:56 +01:00
Thomas
5996426119
Update Storage.lua (#2035) 2023-11-01 06:20:36 +01:00
Thomas
36d9460cdf
Update Storage.lua 2023-11-01 06:19:53 +01:00
Frank
adad7ef901 Merge branch 'master' into develop 2023-10-31 19:53:35 +01:00
Frank
1561f49c9c Lings 
- Fixed link in Core.Condition (will add demo miz)
- Fixed lings in Task_Cargo_CSAR und Task_Cargo_Transport
 2023-10-31 19:53:20 +01:00
kaltokri
bb6bb20179 Merge branch 'master' into develop 2023-10-31 16:37:19 +01:00
kaltokri
e032781a92 Changed Core.Group to Wrapper.Group 2023-10-31 16:36:51 +01:00
kaltokri
07cac604cf Merge branch 'master' into develop 2023-10-31 16:31:01 +01:00
kaltokri
aa7d0b1e25 Fixed broken links 2023-10-31 16:30:48 +01:00
kaltokri
28cb44874f Merge branch 'master' into develop 2023-10-31 16:06:06 +01:00
kaltokri
13a8babe75 Fixed broken links 2023-10-31 16:05:48 +01:00
kaltokri
616f204f5b Merge branch 'master' into develop 2023-10-31 15:44:22 +01:00
kaltokri
87dda49113 Fixed broken links 2023-10-31 15:44:07 +01:00
kaltokri
211e1b41b0 Merge branch 'master' into develop 2023-10-31 15:23:53 +01:00
kaltokri
018830b539 Merge branch 'master' of github.com:FlightControl-Master/MOOSE 
# Conflicts:
#	Moose Development/Moose/AI/AI_Air_Engage.lua
 2023-10-31 15:23:26 +01:00
kaltokri
d92d2d07c5 Fixed broken links 2023-10-31 15:21:15 +01:00