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

7629 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Applevangelist
07c86ec2dc Merge remote-tracking branch 'origin/master' into develop 
# Conflicts:
#	Moose Development/Moose/Core/Set.lua
#	Moose Development/Moose/Core/Zone.lua
 2023-10-17 16:05:24 +02:00
Applevangelist
443e853d2a #trigger 2023-10-17 16:03:47 +02:00
Applevangelist
a7f01eb04a #ZONE and #SET_ZONE watch trigger 2023-10-17 16:02:01 +02:00
Applevangelist
65f9db8efa #MSRS 
* Added loading of a config file
 2023-10-17 11:05:09 +02:00
Applevangelist
d8bb2fe1f1 #MSRS 2023-10-17 11:01:18 +02:00
Applevangelist
7558b7ee1d #MSRS 
* Added loading config file
 2023-10-17 09:28:20 +02:00
Applevangelist
ab197699b6 ATIS 2023-10-14 17:23:26 +02:00
Applevangelist
12d23266c3 Merge remote-tracking branch 'origin/develop' into develop 
# Conflicts:
#	Moose Development/Moose/Sound/SRS.lua
 2023-10-14 17:21:51 +02:00
Applevangelist
9451956914 #MSRS 
* Added config file loading
 2023-10-14 16:49:55 +02:00
Applevangelist
3f04249d07 Merge remote-tracking branch 'origin/master' into develop 
# Conflicts:
#	Moose Development/Moose/Sound/SRS.lua
 2023-10-13 16:15:23 +02:00
Applevangelist
2ebad9ce96 #MSRS 
* Fixes for alternative backend
 2023-10-13 16:13:12 +02:00
Applevangelist
c9cad84419 #SRS 2023-10-13 16:12:38 +02:00
Applevangelist
013a6f134e AUFTRAG 2023-10-12 18:05:23 +02:00
Applevangelist
8dc601bf48 Merge remote-tracking branch 'origin/develop' into develop 
# Conflicts:
#	Moose Development/Moose/Ops/Auftrag.lua
 2023-10-12 18:04:21 +02:00
Applevangelist
3f8c7eaa94 Merge remote-tracking branch 'origin/master' into develop 2023-10-12 18:03:08 +02:00
Applevangelist
b8a2b28462 Merge remote-tracking branch 'origin/master' into develop 2023-10-12 18:02:33 +02:00
Applevangelist
9ccde838e7 #AUFTRAG 
* More Bryce fixes
 2023-10-12 18:01:56 +02:00
Applevangelist
6ba62e3e04 #AUFTRAG 
* bear trap for Bryce using RECON Auftrags
 2023-10-12 17:56:31 +02:00
Applevangelist
0c97bc5b59 #AUFTRAG 2023-10-12 17:55:54 +02:00
Applevangelist
b9cc66004d #WAREHOUSE 
* Syntax
 2023-10-12 17:55:41 +02:00
Applevangelist
dca57c97de Syntax 2023-10-12 10:54:00 +02:00
Applevangelist
400ae46e03 #RAT 
* DOcu
 2023-10-12 08:52:23 +02:00
Applevangelist
80817a1af3 Merge remote-tracking branch 'origin/develop' into develop 2023-10-06 15:50:55 +02:00
Applevangelist
3d44af3042 Merge remote-tracking branch 'origin/master' into develop 2023-10-06 15:50:51 +02:00
Applevangelist
fb1b5b209e Merge remote-tracking branch 'origin/master' into develop 2023-10-06 15:50:10 +02:00
Applevangelist
17838e7fe7 #MESSAGE 
* Docu adds and corrections
 2023-10-06 15:49:42 +02:00
Applevangelist
fd0f55099f Merge remote-tracking branch 'origin/develop' into develop 2023-10-06 13:24:11 +02:00
Applevangelist
c8a20afb87 Merge remote-tracking branch 'origin/master' into develop 2023-10-06 13:24:06 +02:00
Applevangelist
9493570e6b Merge remote-tracking branch 'origin/master' into develop 2023-10-06 13:18:50 +02:00
Applevangelist
b0d0dbfe72 #MESSAGE 
* Added `ToSRS()`
 2023-10-06 13:18:28 +02:00
Applevangelist
8d37414eac #MESSAGE 
* Added `ToSRS()`
 2023-10-06 13:17:54 +02:00
Applevangelist
439c11c376 Merge remote-tracking branch 'origin/master' into develop 2023-10-06 11:43:50 +02:00
Applevangelist
aed6438648 Merge remote-tracking branch 'origin/develop' into develop 2023-10-06 11:43:27 +02:00
Applevangelist
00b466c6a5 Merge remote-tracking branch 'origin/master' into develop 2023-10-06 11:43:23 +02:00
Applevangelist
2d081dfc03 CTLD/CSAR - Added sound file location 2023-10-06 11:42:51 +02:00
Applevangelist
a6c244f670 Merge remote-tracking branch 'origin/master' into develop 2023-10-06 11:31:59 +02:00
Applevangelist
8c44cf8fca #EasyGCICAP 
* Added Recon Patrol points
 2023-10-06 11:31:35 +02:00
Applevangelist
4a594f41b0 #SET_ZONE 
* Added GetAverageCoordinate()
 2023-10-06 11:30:59 +02:00
Applevangelist
ed7821ad1c #EasyGCICAP 2023-10-06 11:30:31 +02:00
Applevangelist
8f71e6c5c4 #EasyGCICAP 
* Recon Points option added
 2023-10-06 11:16:30 +02:00
Applevangelist
7adf99f82e #INTEL 
* Added Conflict zones
 2023-10-05 17:39:55 +02:00
Frank
ffea9708d1 Merge branch 'master' into develop 2023-09-29 15:39:28 +02:00
Frank
04b4af58f7 Update ATIS.lua 
#2010
 2023-09-29 14:26:22 +02:00
Applevangelist
034c1aa481 Merge remote-tracking branch 'origin/develop' into develop 2023-09-29 10:21:08 +02:00
Applevangelist
40fa3afbde Merge remote-tracking branch 'origin/master' into develop 2023-09-29 10:21:03 +02:00
Applevangelist
b108bd9ac6 Merge branch 'master' into develop 2023-09-29 10:20:27 +02:00
Applevangelist
f44ba39ec5 Fox/Missiletrainers 2023-09-29 10:20:01 +02:00
Applevangelist
00c837c361 Merge remote-tracking branch 'origin/develop' into develop 2023-09-28 13:29:20 +02:00
Applevangelist
d6e3caaa9b #EasyGCICAP 
* Docu additions
 2023-09-28 13:28:49 +02:00
Applevangelist
a54b785ca3 #EasyGCICAP 
* Docu additions
 2023-09-28 13:28:35 +02:00