Commit Graph

9303 Commits

Author SHA1 Message Date
Applevangelist c138f76c8a Merge remote-tracking branch 'origin/develop' into branch 2024-08-08 13:04:49 +02:00
Applevangelist 5f4be987c6 Merge remote-tracking branch 'origin/master' into branch 2024-08-08 13:04:46 +02:00
Applevangelist 6e27877949 Merge remote-tracking branch 'origin/master' into develop 2024-08-08 09:21:27 +02:00
Applevangelist a3864d5f32 #EVENT small fixes 2024-08-08 09:20:59 +02:00
Applevangelist 63dc9b2e8e #CTLD - Dyn CArgo Spawns Handling 2024-08-06 18:19:35 +02:00
Thomas 9dc9b21b16 Update build-includes.yml (#2154) 2024-08-05 12:34:59 +02:00
Applevangelist f53bd8f11a #CTLD
* Added spawning crates behind the CH-47
* Added functionality to retain resource maps of cargo statics
* Added door check for cargo crate operations
2024-08-04 17:35:06 +02:00
Applevangelist 554809764f #AIRBASE - Added Kola airbases 2024-08-04 17:33:53 +02:00
Applevangelist 084c172e93 #SPAWN - Added StopRepeat() 2024-08-04 17:33:39 +02:00
Applevangelist d86f471361 #SPAWNSTATIC - added functions to manage cargo static resource maps 2024-08-04 17:33:22 +02:00
Applevangelist 7fa01b9e3c #STATIC - added access to STORAGE object if set (cargo static types) 2024-08-04 17:32:46 +02:00
Applevangelist 5ffeecc333 #STORAGE - added enumerators 2024-08-04 17:32:21 +02:00
Applevangelist 0d88fec4bf #UTILS - added rear door check for CH-47 2024-08-04 17:32:07 +02:00
Applevangelist 06d4e4ac1c Merge remote-tracking branch 'origin/develop' into branch 2024-08-03 14:34:20 +02:00
Applevangelist b3758ae0e7 Merge remote-tracking branch 'origin/master' into branch 2024-08-03 14:34:18 +02:00
Applevangelist ef27584d0b Merge remote-tracking branch 'origin/master' into develop 2024-08-03 14:33:52 +02:00
Applevangelist 4cb784cc18 OH-58D typename 2024-08-03 14:33:31 +02:00
Applevangelist ed82a4715d Merge remote-tracking branch 'origin/develop' into develop 2024-08-03 14:31:24 +02:00
Applevangelist 6a21db24c8 Merge remote-tracking branch 'origin/master' into develop 2024-08-03 14:30:48 +02:00
Applevangelist 16655cf070 CH47F types added plus doorcheck 2024-08-03 14:30:27 +02:00
Applevangelist 6a0b7896a4 Merge remote-tracking branch 'origin/Apple/Develop' into branch
# Conflicts:
#	Moose Development/Moose/Modules.lua
#	Moose Setup/Moose.files
2024-08-03 14:10:54 +02:00
Applevangelist cc0bbf3a17 Merge remote-tracking branch 'origin/develop' into branch
# Conflicts:
#	Moose Development/Moose/Modules.lua
#	Moose Development/Moose/Modules_local.lua
#	Moose Setup/Moose.files
2024-08-03 14:09:04 +02:00
Applevangelist 1802d0dc29 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	Moose Development/Moose/Modules.lua
#	Moose Development/Moose/Modules_local.lua
#	Moose Setup/Moose.files
2024-08-03 14:06:59 +02:00
Applevangelist fc2a820a34 Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Modules.lua
#	Moose Setup/Moose.files
2024-08-03 14:05:25 +02:00
Applevangelist cb4eccf57f Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Modules.lua
#	Moose Setup/Moose.files
2024-08-03 14:02:52 +02:00
Applevangelist 38e10331c9 #CLIENTWATCH Class 1.0 2024-08-03 13:57:16 +02:00
Applevangelist d1b4f63eb7 Merge remote-tracking branch 'origin/develop' into develop 2024-08-03 13:49:13 +02:00
Applevangelist 2e82793c3b Merge remote-tracking branch 'origin/master' into develop 2024-08-03 13:49:09 +02:00
Applevangelist d17d263fa3 Merge remote-tracking branch 'origin/master' into develop 2024-08-03 13:48:40 +02:00
Applevangelist 40053670ea Misc 2024-08-03 13:48:15 +02:00
Applevangelist e301efc690 xx 2024-08-03 13:47:38 +02:00
Applevangelist e77bf1f10e Merge remote-tracking branch 'origin/develop' into develop 2024-07-30 07:48:28 +02:00
Applevangelist ee37a325d4 Merge remote-tracking branch 'origin/master' into develop 2024-07-30 07:48:25 +02:00
Applevangelist 4a36eea5e6 xx 2024-07-30 07:48:01 +02:00
Applevangelist 27b9f32758 Merge remote-tracking branch 'origin/master' into develop 2024-07-30 07:47:50 +02:00
Applevangelist 37540bbbfb Docu 2024-07-30 07:47:06 +02:00
Applevangelist a63a15db1c docu corrections 2024-07-30 07:46:53 +02:00
Applevangelist f14457380f xxx 2024-07-30 07:44:55 +02:00
Applevangelist 0369aa8080 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	Moose Development/Moose/Ops/PlayerTask.lua
2024-07-29 13:03:10 +02:00
Applevangelist 4c8b367644 Merge remote-tracking branch 'origin/master' into develop 2024-07-29 13:02:14 +02:00
Applevangelist 4f64ae6057 Merge remote-tracking branch 'origin/master' into develop 2024-07-29 13:01:42 +02:00
Applevangelist 76294f11e4 Silence 2024-07-29 13:01:16 +02:00
Applevangelist da8ce95adf xx 2024-07-29 13:01:06 +02:00
Applevangelist 23697f4fe3 xx 2024-07-28 17:54:27 +02:00
Applevangelist b4ceafca50 Merge remote-tracking branch 'origin/master' into develop 2024-07-28 17:25:55 +02:00
Applevangelist cc247a0f03 docu 2024-07-28 17:25:33 +02:00
Applevangelist 1c24580d3f #PLAYERTASKCONTROLLER - variable type checks 2024-07-28 17:25:20 +02:00
Applevangelist 801e03551f Merge remote-tracking branch 'origin/develop' into develop 2024-07-28 15:21:45 +02:00
Applevangelist 5dd4435b7d #PLAYERTASKMANAGER - added listening to EVENTS.UnitLost 2024-07-28 15:20:54 +02:00
Applevangelist 01bfd8e141 Merge remote-tracking branch 'origin/develop' into develop 2024-07-28 13:42:13 +02:00