weyne/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2026-07-20 22:03:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,282 Commits 15 Branches 93 Tags
e8432db26eb591810c2e7ff41baba3dbf6d6e7e2
Commit Graph

7282 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Applevangelist e8432db26e #ClientMenu 2023-07-17 16:26:06 +02:00
Applevangelist e8ad649770 #PT 2023-07-16 11:26:47 +02:00
Applevangelist 63770fdf79 Merge remote-tracking branch 'origin/develop' into develop 2023-07-15 18:02:45 +02:00
Applevangelist b48d713fda Merge remote-tracking branch 'origin/master' into develop 2023-07-15 18:02:39 +02:00
Applevangelist 77955bc03c #changes 2023-07-15 18:02:12 +02:00
Thomas 1ad538ea9f Commits from master (#1972) 
* #SPAWN

* Update Spot.lua

Fix
 2023-07-15 09:46:55 +02:00
Thomas 5954b8692f Update Spot.lua 
Fix
 2023-07-15 09:36:24 +02:00
Applevangelist 99b41c6715 Merge remote-tracking branch 'origin/develop' into develop 2023-07-13 16:15:33 +02:00
Applevangelist 62e6eb91fc Merge remote-tracking branch 'origin/master' into develop 2023-07-13 16:15:28 +02:00
Applevangelist f6fdecf892 Merge remote-tracking branch 'origin/master' 2023-07-13 16:15:11 +02:00
Applevangelist 53fb77b50d #SPAWN 2023-07-13 16:15:06 +02:00
Applevangelist 191f7a7377 Merge remote-tracking branch 'origin/master' into develop 2023-07-13 16:13:26 +02:00
Applevangelist 04a9dc3a8c #SPAWN 
* Added method to init spawn position
 2023-07-13 16:13:00 +02:00
Applevangelist eba9c697e3 #SPAWN 2023-07-13 16:06:23 +02:00
Applevangelist 643ba17d80 Merge remote-tracking branch 'origin/develop' into develop 
# Conflicts:
#	Moose Development/Moose/Core/ClientMenu.lua
#	Moose Setup/Moose.files
 2023-07-13 16:06:14 +02:00
Applevangelist 301f49078e Merge remote-tracking branch 'origin/master' into develop 2023-07-12 17:55:50 +02:00
Applevangelist 77d2804fce Merge remote-tracking branch 'origin/master' into develop 2023-07-12 17:55:07 +02:00
Applevangelist 6c5cf814b4 #Spot 2023-07-12 17:54:35 +02:00
Applevangelist 10b9a32f29 #SPOT 
* Fix for switching laser off and on again not follwing unit any more
 2023-07-12 17:54:17 +02:00
Applevangelist 63ba50a83a #CLIENTMENUMANAGER Docu 2023-07-11 16:10:40 +02:00
Applevangelist 45adc6160d #CLIENTMENUMANAGER Docu 2023-07-11 16:10:08 +02:00
Applevangelist 0326bee7a3 # 2023-07-11 15:42:14 +02:00
Applevangelist fb8f804af2 # CLIENTMENU 
* Initial release
 2023-07-11 15:41:06 +02:00
Applevangelist ee7fca09b6 Merge remote-tracking branch 'origin/master' into develop 2023-07-07 15:16:10 +02:00
Applevangelist fd1257052b # 2023-07-07 15:15:28 +02:00
Applevangelist ffbab7453c Merge remote-tracking branch 'origin/master' into develop 2023-07-07 15:15:09 +02:00
Applevangelist 40fa929eb0 * Added omissed DetectedItem.Name found by @Nocke 2023-07-07 15:14:33 +02:00
Applevangelist 102a48bf97 Merge remote-tracking branch 'origin/develop' into develop 
# Conflicts:
#	Moose Development/Moose/Functional/AmmoTruck.lua
 2023-07-03 17:30:50 +02:00
Applevangelist 2537fc44bb Merge remote-tracking branch 'origin/master' into develop 2023-07-03 17:29:36 +02:00
Applevangelist 10872918bb #AUFTRAG 
* Added GROUNDESCORT from the DCS Task with same name
 2023-07-03 17:29:06 +02:00
Applevangelist 7dd270dc8b #GROUND ESCORT 2023-07-03 17:26:47 +02:00
Applevangelist 8979097fd7 Merge remote-tracking branch 'origin/master' into develop 2023-07-03 17:06:47 +02:00
Applevangelist 71b2cc1ee5 #AMMOTRUCK 
* Added TTL
 2023-07-03 17:06:31 +02:00
Applevangelist be3fc2c964 #GROUNDESCORT 2023-07-03 17:05:54 +02:00
Applevangelist 0d6fe49a41 changes 2023-07-03 16:45:02 +02:00
Applevangelist 8c8ef19f01 #CONTROLLABLE 
* Added TaskGroundEscort
 2023-07-03 16:44:46 +02:00
Thomas ffcfc448be Update Controllable.lua 2023-07-03 13:53:59 +02:00
Thomas 303a15eb50 Ammotruck 
* Added feature for # of re-munitions a truck can do
 2023-07-03 12:21:05 +02:00
Applevangelist ebf3d8d55e Merge remote-tracking branch 'origin/develop' into develop 2023-07-01 13:17:58 +02:00
Applevangelist 3909a4b2dc Merge remote-tracking branch 'origin/master' into develop 2023-07-01 13:17:51 +02:00
Applevangelist 389d5c7e5b Merge remote-tracking branch 'origin/master' into develop 2023-07-01 13:17:19 +02:00
Applevangelist 1eaa3d309d #SCORING 
* typo
 2023-07-01 13:15:59 +02:00
Applevangelist 30f8a57556 Merge remote-tracking branch 'origin/develop' into develop 2023-07-01 13:15:31 +02:00
Applevangelist 03a18d5237 Merge remote-tracking branch 'origin/master' into develop 
# Conflicts:
#	Moose Development/Moose/Functional/Scoring.lua
#	Moose Development/Moose/Utilities/Utils.lua
 2023-07-01 13:15:24 +02:00
Applevangelist 178005346d Merge remote-tracking branch 'origin/master' into develop 2023-07-01 13:12:54 +02:00
Applevangelist a52cd5612a Merge remote-tracking branch 'origin/master' 2023-07-01 13:12:29 +02:00
Applevangelist 041c21a883 Merge remote-tracking branch 'origin/master' into develop 2023-07-01 13:12:03 +02:00
Applevangelist e82ed762be Merge remote-tracking branch 'origin/master' 2023-07-01 13:11:46 +02:00
Applevangelist 0bb16ec827 #AIRBASE 
* Fix for nil error in finding parking for a group

#MANTIS
* Added SAM type "SHORAD" as designator

#SCORING
* fix for non local problem

#UTILS
* fix for OneLineSerialize
 2023-07-01 13:11:21 +02:00
Applevangelist fd946e971a #AWACS 
* Bugfixes
 2023-07-01 13:08:27 +02:00