Commit Graph

1980 Commits

Author SHA1 Message Date
Applevangelist 768a380b32 Merge remote-tracking branch 'origin/master' into branch 2025-06-08 18:44:36 +02:00
Applevangelist 62816f217b Merge remote-tracking branch 'origin/master' into develop 2025-06-08 18:43:35 +02:00
Applevangelist eeeeda4e5e #POINT - Offset options for smoke 2025-06-08 18:43:01 +02:00
Applevangelist 0233fef475 xx 2025-06-08 18:41:25 +02:00
Applevangelist ffc5cff275 Merge remote-tracking branch 'origin/master' into branch 2025-05-24 14:31:27 +02:00
Applevangelist d0449265c1 Merge remote-tracking branch 'origin/master' into develop 2025-05-21 10:22:16 +02:00
Applevangelist a4feafab8e #POINT - improved IsDay() for Kola 2025-05-21 10:21:48 +02:00
Applevangelist 1e0c27f599 Merge remote-tracking branch 'origin/master' into develop 2025-05-16 12:00:32 +02:00
Applevangelist 09b7922b84 Small fixes 2025-05-16 11:58:40 +02:00
Applevangelist 45bb0fff8a xx 2025-05-16 11:48:14 +02:00
Applevangelist 63899923fb Merge remote-tracking branch 'origin/master' into branch 2025-04-27 11:27:40 +02:00
Frank f177d0a257 Merge branch 'master' into develop 2025-04-26 23:39:34 +02:00
Frank ac4b620f16 COORDINATE
- Improved Smoke and Fire and Smoke functions by adding delay and duration parameters
2025-04-26 23:39:22 +02:00
Applevangelist f283e68a63 Merge remote-tracking branch 'origin/master' into branch 2025-04-24 14:49:33 +02:00
Thomas 3442725525 Merge pull request #2290 from FlightControl-Master/master
Merge from master
2025-04-23 06:29:32 +02:00
shaji 195aac4504 [ADDED] IsAlive condition for Unit and Group out message 2025-04-22 20:57:06 +02:00
Frank ab5a4c43c3 Merge branch 'develop' into FF/Ops 2025-04-17 21:40:58 +02:00
Applevangelist 66cb7dd9b7 Merge remote-tracking branch 'origin/master' into branch
# Conflicts:
#	Moose Development/Moose/Wrapper/Airbase.lua
2025-04-14 12:13:55 +02:00
Thomas ecce2eff9b Merge pull request #2281 from FlightControl-Master/master
Merge
2025-04-12 10:52:39 +02:00
Thomas 6c8858d2f5 Merge pull request #2280 from leka1986/patch-7
Update Set.lua
2025-04-12 10:51:00 +02:00
leka1986 53d7972858 Update Set.lua
Removed the Filter={},
2025-04-12 10:48:22 +02:00
leka1986 04a55e4104 Update Event.lua
Added nil checks which was causing nil. had this for a few weeks with no errors.
2025-04-12 10:44:29 +02:00
Frank 7d3bffcfef Naviation
- Added beacons class
- Added navpoints class
- Added vector class
2025-04-09 22:36:26 +02:00
Applevangelist abc86a7e9c Merge remote-tracking branch 'origin/master' into branch
# Conflicts:
#	Moose Development/Moose/Cargo/CargoGroup.lua
2025-04-09 08:17:06 +02:00
Applevangelist 6fe88a6319 Merge remote-tracking branch 'origin/master' into develop 2025-04-07 10:40:58 +02:00
Applevangelist c902a1f601 xxx 2025-04-07 10:40:39 +02:00
Applevangelist 1856754614 #Smaller Changes 2025-04-07 10:40:30 +02:00
Applevangelist b52176a0ff Merge remote-tracking branch 'origin/master' into develop 2025-04-06 16:19:43 +02:00
Applevangelist d707a4775c xx 2025-04-06 16:19:12 +02:00
Applevangelist d30b16a2fe Merge remote-tracking branch 'origin/master' into branch
# Conflicts:
#	Moose Development/Moose/Wrapper/DynamicCargo.lua
2025-04-03 09:16:32 +02:00
Thomas bad9d1ea92 Merge pull request #2274 from FlightControl-Master/master
Fix SpawnStatic
2025-04-02 09:45:44 +02:00
Thomas 4f3fd06cc9 Update SpawnStatic.lua
Restored previous version as overwritten
2025-04-02 09:42:02 +02:00
Applevangelist 4dc9e78812 Merge remote-tracking branch 'origin/master' into branch
# Conflicts:
#	Moose Development/Moose/AI/AI_Air.lua
#	Moose Development/Moose/AI/AI_Air_Engage.lua
#	Moose Development/Moose/AI/AI_Air_Patrol.lua
#	Moose Development/Moose/AI/AI_BAI.lua
#	Moose Development/Moose/AI/AI_Balancer.lua
#	Moose Development/Moose/AI/AI_CAP.lua
#	Moose Development/Moose/AI/AI_CAS.lua
#	Moose Development/Moose/AI/AI_Cargo_Airplane.lua
#	Moose Development/Moose/AI/AI_Cargo_Helicopter.lua
#	Moose Development/Moose/AI/AI_Formation.lua
#	Moose Development/Moose/AI/AI_Patrol.lua
#	Moose Development/Moose/Cargo/Cargo.lua
#	Moose Development/Moose/Cargo/CargoCrate.lua
#	Moose Development/Moose/Cargo/CargoGroup.lua
#	Moose Development/Moose/Cargo/CargoUnit.lua
#	Moose Development/Moose/Core/Point.lua
2025-04-01 14:15:06 +02:00
Applevangelist f729b1d358 Merge remote-tracking branch 'origin/master' into develop 2025-04-01 14:13:42 +02:00
Applevangelist 6c00b0c7eb #POINT - some catches for POINT_VEC2 behaviour 2025-04-01 14:13:14 +02:00
Applevangelist 5adefe6f7b Merge remote-tracking branch 'origin/master' into develop 2025-04-01 13:18:55 +02:00
Applevangelist 22b81318b9 xx 2025-04-01 13:18:02 +02:00
Applevangelist 76dc0d690a #POINT - Removal of References to legacy POINT_VEC2/3 classes 2025-04-01 13:17:48 +02:00
Applevangelist 4ec2923f46 Merge remote-tracking branch 'origin/master' into branch 2025-03-27 11:10:11 +01:00
Frank 92e680a276 Merge branch 'master' into develop 2025-03-23 14:11:37 +01:00
Frank 4955fe4d92 Update Spawn.lua
- Fix for problem that helos are not spawned on ships but at origin of the map
2025-03-23 14:11:21 +01:00
Applevangelist 0ec47795bf Merge remote-tracking branch 'origin/master' into branch 2025-03-21 09:23:24 +01:00
Applevangelist c634023717 xxx 2025-03-21 09:22:59 +01:00
Applevangelist e3670219ed Merge remote-tracking branch 'origin/master' into develop 2025-03-21 09:22:36 +01:00
Applevangelist a915452e6e #COORDINATE - use magnetic for BRAA 2025-03-21 09:22:08 +01:00
Applevangelist 9b24695377 Merge remote-tracking branch 'origin/master' into develop 2025-03-16 13:59:23 +01:00
Applevangelist 5ca3e3b2b8 #SHORAD tweak 2025-03-16 13:58:58 +01:00
Applevangelist 5d07cebdc4 Merge remote-tracking branch 'origin/master' into branch 2025-03-16 11:03:49 +01:00
Frank 784fcb7882 Merge branch 'master' into develop 2025-03-15 22:49:57 +01:00
Frank 23aeef7a20 Airbase
- Airbase changes for helipads that are also airdromes
- Improved SpawnAtAirbase function
2025-03-15 22:49:43 +01:00