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

9284 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Applevangelist
69fa6f4ee6 Merge remote-tracking branch 'origin/master' into develop 2023-12-19 17:38:51 +01:00
Applevangelist
702ec75935 Small fix 2023-12-19 17:38:31 +01:00
Applevangelist
6c204758e3 Merge remote-tracking branch 'origin/develop' into develop 2023-12-19 12:12:12 +01:00
Applevangelist
a437285c56 Merge remote-tracking branch 'origin/master' into develop 2023-12-19 12:12:08 +01:00
Applevangelist
1c4e3cb801 Merge remote-tracking branch 'origin/master' into develop 2023-12-19 12:11:37 +01:00
Applevangelist
465ec216ea #CONTROLLABLE - Option ECM 2023-12-19 12:11:09 +01:00
Applevangelist
549abc88c4 Merge remote-tracking branch 'origin/develop' into develop 2023-12-19 10:21:10 +01:00
Applevangelist
c26dde326c Merge remote-tracking branch 'origin/master' into develop 2023-12-19 10:21:06 +01:00
Applevangelist
ab516e0cd8 Merge remote-tracking branch 'origin/master' into develop 2023-12-19 10:20:12 +01:00
Applevangelist
d803b51e84 #ZONE 
* Fixed filling/drawing of more complex polygon zones
* Added function to (re-)fill polygon
* Added function to (re-)draw polygon outline
 2023-12-19 10:19:44 +01:00
Applevangelist
53f89fd42c #DATABASE 
* Read color, fill color from drawing data
 2023-12-19 10:18:20 +01:00
Applevangelist
af2517343d #ZONE_POLYGON 2023-12-19 10:15:30 +01:00
Frank
c72f109553 SRS 2023-12-19 00:02:17 +01:00
kaltokri
f2ba2022c2 Merge branch 'master' into develop 2023-12-18 16:22:38 +01:00
kaltokri
92e03522db Finished beginner section 2023-12-18 16:21:32 +01:00
Applevangelist
f967244834 Merge remote-tracking branch 'origin/develop' into develop 2023-12-18 10:59:03 +01:00
Applevangelist
33122a5bf9 Merge remote-tracking branch 'origin/master' into develop 2023-12-18 10:58:59 +01:00
Frank
9716162739 Update SRS.lua 2023-12-17 22:55:31 +01:00
Frank
4eea8fcadd Merge branch 'master' into FF/MasterDevel 2023-12-17 20:37:30 +01:00
Frank
5b37e7b249 Merge branch 'develop' into FF/Ops 2023-12-16 09:32:14 +01:00
Frank
5b7e0ce375 Merge branch 'master' into develop 2023-12-16 09:31:56 +01:00
Frank
0ae9be49da Update Range.lua 
- Fixed random good by phrase
 2023-12-16 09:31:44 +01:00
kaltokri
c250712e53 Merge branch 'master' into develop 2023-12-15 14:13:03 +01:00
kaltokri
bda4efc634 Added page "Create your own Hello world" 2023-12-15 14:11:58 +01:00
Applevangelist
52d1f0811d Merge remote-tracking branch 'origin/develop' into develop 2023-12-14 12:44:36 +01:00
Applevangelist
bc6c663f90 Merge remote-tracking branch 'origin/master' into develop 2023-12-14 12:44:32 +01:00
Applevangelist
566ebb67e3 Merge remote-tracking branch 'origin/master' into develop 2023-12-14 12:44:00 +01:00
Applevangelist
e84e16f58b xx 2023-12-14 12:43:36 +01:00
Applevangelist
55ffe37a79 #USERSOUND 
* Added USERSOUND:ToClient( Client, Delay )
 2023-12-14 12:42:13 +01:00
Applevangelist
e42fed18ea Merge remote-tracking branch 'origin/develop' into develop 2023-12-14 11:16:03 +01:00
Applevangelist
3fba1ec1d5 Merge remote-tracking branch 'origin/master' into develop 2023-12-14 11:15:58 +01:00
Applevangelist
6c21dfa48c Merge branch 'master' into develop 2023-12-14 11:13:06 +01:00
Applevangelist
b31fc3ed44 Limit Attacked() to have at least the capture threatlevel 2023-12-14 11:12:50 +01:00
Applevangelist
68548f4581 #COORDINATE 
* Fix for NewFromMGRS for less precise coordinates (below level 5)
 2023-12-14 11:12:14 +01:00
Applevangelist
f948a07d44 xxx 2023-12-14 11:10:12 +01:00
Applevangelist
38e1ef95a3 Merge remote-tracking branch 'origin/develop' into develop 2023-12-14 09:25:07 +01:00
Applevangelist
a9e88d234b Merge remote-tracking branch 'origin/master' into develop 2023-12-14 09:25:02 +01:00
Thomas
42fd2322d2
Update Range.lua (#2066) (#2067) 
MSRS config compatibility
 2023-12-13 19:33:07 +01:00
Thomas
8382eb9cd8
Update Range.lua (#2066) 
MSRS config compatibility
 2023-12-13 19:21:28 +01:00
Applevangelist
7e080f2fb0 Merge remote-tracking branch 'origin/develop' into develop 
# Conflicts:
#	Moose Development/Moose/Ops/Intelligence.lua
 2023-12-12 10:56:09 +01:00
Applevangelist
0bebb791a8 Merge remote-tracking branch 'origin/master' into develop 2023-12-12 10:55:29 +01:00
Applevangelist
585901dc7d Merge remote-tracking branch 'origin/master' into develop 2023-12-12 10:54:32 +01:00
Applevangelist
2a7213c1b7 xxx 2023-12-12 10:54:16 +01:00
Applevangelist
42468f3505 xxx 2023-12-12 10:54:01 +01:00
Applevangelist
f837e9dec7 #COORDINATE 
* Added functions to create a COORDINATE from MGRS
 2023-12-12 10:53:37 +01:00
Applevangelist
9eee7e8c9d Merge remote-tracking branch 'origin/develop' into develop 
# Conflicts:
#	Moose Setup/Moose.files
 2023-12-11 16:55:46 +01:00
Applevangelist
6c646dd331 Merge remote-tracking branch 'origin/master' into develop 2023-12-11 16:54:41 +01:00
Thomas
945a81b745
Update Intelligence.lua 2023-12-11 13:17:30 +01:00
ttrebuchon
cd4fb0c6c5
Add missing files to Moose.files: (#2062) 
Utilities/Socket.lua
Core/Astar.lua
Core/MarkerOps_Base.lua
Functional/ZoneGoalCargo.lua
Ops/OpsZone.lua
Ops/ArmyGroup.lua
Ops/OpsTransport.lua
Ops/Target.lua
 2023-12-11 11:50:09 +01:00
Thomas
b8d44643c1
Update Detection.lua (#2063) (#2064) 
# RadarBlur - make burn-through limit configureable
 2023-12-11 11:49:00 +01:00