Commit Graph

1964 Commits

Author SHA1 Message Date
Applevangelist 49097649de xx 2025-12-17 11:31:07 +01:00
Applevangelist 7605c2f4f5 xx 2025-12-15 12:12:20 +01:00
Applevangelist 7fec25ddcd xx 2025-12-14 14:34:22 +01:00
Applevangelist 280d2f6517 Merge remote-tracking branch 'origin/master' into branch 2025-12-06 11:55:13 +01:00
leka1986 83464090d6 Update Set.lua
removed duplicate Filter = {},
2025-12-06 10:20:03 +01:00
Applevangelist d6a9e4726e Merge remote-tracking branch 'origin/master' into branch 2025-11-28 08:48:08 +01:00
Applevangelist 6ed031762b #BUGFIXING 2025-11-27 09:21:17 +01:00
Applevangelist 5955c2d61f #VARIOUS Small fixes 2025-11-22 15:17:26 +01:00
Applevangelist c869d23778 #ZONE - Small fix 2025-11-22 15:15:24 +01:00
Applevangelist 5edffbbca4 #SET - Small fix 2025-11-22 15:14:57 +01:00
Applevangelist 01f2b6b783 #EVENT - Small fix 2025-11-22 15:13:43 +01:00
Applevangelist f4a2ae8ccc xx 2025-11-16 16:52:41 +01:00
Applevangelist 6f05249214 XX 2025-11-13 15:54:47 +01:00
Applevangelist c9c6d5dbc2 Merge remote-tracking branch 'origin/develop' into branch
# Conflicts:
#	Moose Development/Moose/Core/Fsm.lua
#	Moose Development/Moose/Modules.lua
#	Moose Development/Moose/Modules_local.lua
2025-11-13 14:09:12 +01:00
Frank 505c86399c Merge branch 'develop' into FF/Ops 2025-11-09 21:46:36 +01:00
Applevangelist 2e263561d3 Merge remote-tracking branch 'origin/master' into branch
# Conflicts:
#	Moose Development/Moose/Core/Set.lua
2025-11-09 17:22:36 +01:00
Applevangelist c10e57ec3b Merge remote-tracking branch 'origin/master' into develop 2025-11-09 17:19:57 +01:00
Applevangelist 046bd37fd5 xx 2025-11-09 17:19:29 +01:00
Applevangelist 55c3e7aba6 Merge remote-tracking branch 'origin/master' into develop 2025-11-09 16:53:39 +01:00
Applevangelist fbf83b3aed #SET - Rationalize FilterCoalitions() and allow values like coalition.side.BLUE 2025-11-09 16:53:10 +01:00
Applevangelist 255a652d4d xx 2025-11-09 16:52:30 +01:00
Frank ea60795e84 Assets
- remove assets from warehouse if they are removed from cohort
2025-11-09 16:21:38 +01:00
Applevangelist 50827b3b60 Merge remote-tracking branch 'origin/master' into branch 2025-11-02 09:53:58 +01:00
Frank 7cc18b8082 Nav updates 2025-10-31 19:13:36 +01:00
Frank bef805d694 Update Pathline.lua 2025-10-31 14:18:38 +01:00
Frank 3479d08193 VECTOR + PATHLINE 2025-10-31 14:16:20 +01:00
Thomas 8ca9474c1c Merge pull request #2429 from FlightControl-Master/master
Merge from master
2025-10-31 06:28:57 +01:00
Shafik 801b4f01b6 [FIXED] SET_CLIENT:HandleCASlots() 2025-10-30 23:10:17 +02:00
Frank e3cee8dafe VECTOR 2025-10-28 23:07:59 +01:00
Frank 3686e0de63 Vector 2025-10-26 23:00:32 +01:00
Frank 2931b32ce6 Vector 0.0.3 2025-10-26 20:54:52 +01:00
Applevangelist 1ecc3c8ff2 Merge remote-tracking branch 'origin/master' into branch 2025-10-26 16:20:13 +01:00
Applevangelist b28e66fe6d Merge remote-tracking branch 'origin/master' into develop 2025-10-26 16:19:44 +01:00
Applevangelist 8392788cdb Minor fixes 2025-10-26 16:19:10 +01:00
Frank 654f752ca0 Merge branch 'develop' into FF/Ops 2025-10-25 21:17:01 +02:00
Applevangelist 02022685f4 Merge remote-tracking branch 'origin/master' into branch 2025-10-13 18:52:58 +02:00
Applevangelist 3a95e75c2d Merge remote-tracking branch 'origin/master' into develop 2025-10-13 18:52:26 +02:00
Applevangelist dbae37f151 xx 2025-10-13 18:51:55 +02:00
Applevangelist 488996fadb Merge remote-tracking branch 'origin/master' into branch 2025-10-07 11:39:27 +02:00
Thomas 025bd3237c Merge pull request #2405 from FlightControl-Master/master
Merge from master
2025-10-05 18:04:43 +02:00
smiki 6e45ee558e [FIXED] SPAWNSTATIC not registering script spawned static templates therefore ReSpawn is not working. 2025-10-05 16:57:33 +02:00
Applevangelist 45e62a5b2f Merge remote-tracking branch 'origin/master' into branch 2025-10-02 18:01:52 +02:00
Thomas d8281b0103 Merge pull request #2403 from FlightControl-Master/master
Merge from master
2025-10-01 15:26:49 +02:00
smiki 935b52c489 [FIXED] ZONE_POLYGON from RECT ME drawing rotation not taken into account. 2025-10-01 15:11:44 +02:00
smiki aace98545a [FIXED] ZONE_POLYGON from RECT ME drawing rotation not taken into account. 2025-10-01 15:07:18 +02:00
smiki f39236c8fd [FIXED] ZONE_POLYGON from RECT ME drawing rotation not taken into account. 2025-10-01 14:59:59 +02:00
smiki 43b4a6834b [FIXED] ZONE_POLYGON from RECT ME drawing rotation not taken into account. 2025-10-01 14:50:04 +02:00
smiki b51e758516 [ADDED] SET_OPSGROUP:CountAlive 2025-09-30 21:17:29 +02:00
Frank 5a92fb1f65 Merge branch 'develop' into FF/Ops 2025-09-28 20:48:52 +02:00
Applevangelist fa10c7d0d4 Merge remote-tracking branch 'origin/master' into branch 2025-09-25 07:25:39 +02:00