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

7244 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas
096d145cf9
Update Airbase.lua (#1957) 
Deleted raj al … airbases #1955
 2023-06-12 06:22:51 +02:00
Frank
d31db1351a
Merge pull request #1956 from FlightControl-Master/FF/Ops 
AUFTRAG
 2023-06-11 22:52:28 +02:00
Frank
0f33603ecc AUFTRAG 
- Changed ingress waypoint of CASENHANCED
 2023-06-11 22:45:59 +02:00
Thomas
b3883301a2
Update Airbase.lua 
Corrected enumerator for Ben-Gurion (Ben_Gurion)
 2023-06-11 12:33:01 +02:00
Frank
3bbd55cfc2
Merge pull request #1953 from ttrebuchon/tt/fix-opsgroup-getlifepoints-typo 
Set life0 based on itself, rather than off of life
 2023-06-11 00:52:13 +02:00
ttrebuchon
163273096c Set life0 based on itself, rather than off of life 2023-06-10 18:08:29 -04:00
Applevangelist
3d4eb1545e Merge remote-tracking branch 'origin/develop' into develop 2023-06-10 19:12:04 +02:00
Applevangelist
5006d01932 Merge remote-tracking branch 'origin/master' into develop 
# Conflicts:
#	Moose Development/Moose/Utilities/Utils.lua
 2023-06-10 19:11:59 +02:00
Applevangelist
3a7521c492 #UTILS 
* Sinai TIme
 2023-06-10 19:08:46 +02:00
Applevangelist
caa5a96235 fix 2023-06-10 19:06:22 +02:00
Applevangelist
cee1c592ba #UTILS 
* Sinai TIme
 2023-06-10 19:04:40 +02:00
Applevangelist
ccc11623c3 #UTILS 
* Sinai Time
 2023-06-10 19:04:18 +02:00
Frank
6d1030925c Merge branch 'master' into develop 2023-06-10 10:08:35 +02:00
Frank
f1fc9f0b27 Update Utils.lua 
- Added parameters time zone and magvar for Sinai map
 2023-06-10 10:08:22 +02:00
Applevangelist
dd5399a41d Merge remote-tracking branch 'origin/develop' into develop 2023-06-09 15:17:20 +02:00
Applevangelist
9da6b2a4f5 Merge remote-tracking branch 'origin/master' into develop 2023-06-09 15:17:12 +02:00
Applevangelist
dabe8a58d1 Merge remote-tracking branch 'origin/develop' into develop 2023-06-09 15:16:41 +02:00
Applevangelist
16cf6693ab Merge remote-tracking branch 'origin/master' into develop 2023-06-09 15:16:38 +02:00
Applevangelist
e9adcb0dd5 #AIRBASE 
* Sinai airfield enumerator
 2023-06-09 15:13:45 +02:00
Applevangelist
23e71e991f #AIRBASE 
* Sinai airfield enumerator
 2023-06-09 15:13:20 +02:00
Applevangelist
8658804c82 Merge remote-tracking branch 'origin/develop' into develop 2023-06-09 13:25:54 +02:00
Applevangelist
fd51ec6932 #FIX 2023-06-09 13:25:29 +02:00
Frank
7a16a5dda8
Merge pull request #1952 from FlightControl-Master/FF/Ops 
OPS
 2023-06-08 19:55:30 +02:00
Frank
1b6648996c OPSGROUP 
- Improved CAPTUREZONE for FLIGHTGROUP
 2023-06-08 19:51:09 +02:00
Frank
f45a22fe78 Merge branch 'develop' into FF/Ops 2023-06-08 15:52:25 +02:00
Applevangelist
afe2b675e5 #RAT 
* Fixes from dev
 2023-06-08 13:59:59 +02:00
Applevangelist
77c4eb0d54 Merge remote-tracking branch 'origin/develop' into develop 2023-06-08 13:59:05 +02:00
Applevangelist
238640ec91 Merge remote-tracking branch 'origin/master' into develop 2023-06-08 13:58:58 +02:00
Applevangelist
2c14ee74b0 #SCORING 
* Can leave text empty on some instances
 2023-06-08 13:58:26 +02:00
Applevangelist
4314959cbb Merge remote-tracking branch 'origin/develop' into develop 2023-06-08 13:57:03 +02:00
Applevangelist
fad85ef7ed #PLAYERTASK 
* Added basic scoring
 2023-06-08 13:56:59 +02:00
Applevangelist
0a0a4684f8 #PLAYERTASKCONTROLLER 
* Added basic scoring
 2023-06-08 13:55:52 +02:00
Frank
569b3df6af Merge branch 'master' into develop 2023-06-08 09:46:24 +02:00
Frank
f351d2a37e
Merge pull request #1951 from FlightControl-Master/FF/MasterDevel 
Update RAT.lua
 2023-06-08 09:45:49 +02:00
Frank
4cb0e70184 Update RAT.lua 
- Fixed RATMANAGER spamming due to not accounting for planned/scheduled groups
 2023-06-08 09:43:11 +02:00
Applevangelist
910da86caf Merge remote-tracking branch 'origin/develop' into develop 2023-06-07 17:25:49 +02:00
ttrebuchon
73ff2c576d
Fix typo from TRANSPORT. to OPSTRANSPORT. (#1950) 2023-06-07 17:26:20 +02:00
Applevangelist
d5ffb48548 #PLAYERTASK 
* Fix for one tts output
 2023-06-07 17:25:45 +02:00
Frank
8ce371f898 WAREHOUSE 
- Runway destroyed event only triggered if it was operational
 2023-06-07 09:03:01 +02:00
Applevangelist
a12f874e34 Merge remote-tracking branch 'origin/develop' into develop 2023-06-06 16:29:22 +02:00
Thomas
6f02f23240
PlayerTask.lua (#1948) 
Small fix for one tts text
 2023-06-06 16:20:16 +02:00
Applevangelist
00f89f0855 PLAYERTASK 
* Small fix in TTS text
 2023-06-06 16:13:23 +02:00
ttrebuchon
0a1d469c68
Fix Offset values being saved to the ZONE_UNIT class itself (#1947) 2023-06-03 20:15:33 +02:00
Applevangelist
4cc14b93b6 Merge remote-tracking branch 'origin/develop' into develop 2023-06-03 12:35:59 +02:00
Applevangelist
f5aa294c70 Merge remote-tracking branch 'origin/master' into develop 2023-06-03 12:35:54 +02:00
Applevangelist
823f8fb4fb Merge remote-tracking branch 'origin/master' into develop 2023-06-03 12:35:05 +02:00
Applevangelist
41bb2551d3 #CTLD 
* Ensure new menus can be build if player changes helos
 2023-06-03 12:34:18 +02:00
Applevangelist
bb17e8cc1f #CTLD 
* Ensure new menus can be build if player changes helos
 2023-06-03 12:34:09 +02:00
Applevangelist
69f2acae72 Merge remote-tracking branch 'origin/develop' into develop 2023-06-02 08:46:56 +02:00
Applevangelist
00ecbc98ba Merge remote-tracking branch 'origin/master' into develop 
# Conflicts:
#	Moose Development/Moose/Wrapper/Airbase.lua
 2023-06-02 08:46:48 +02:00