9207 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Applevangelist	0aff4bf98c	Merge remote-tracking branch 'origin/master' into develop	2024-07-16 13:39:32 +02:00
Applevangelist	c73d8a6339	Further fixes	2024-07-16 13:38:42 +02:00
Applevangelist	b6b99a2e99	xx	2024-07-16 13:38:14 +02:00
Applevangelist	d35c941748	Merge remote-tracking branch 'origin/develop' into develop	2024-07-16 11:55:21 +02:00
Applevangelist	cfc8312b21	Merge remote-tracking branch 'origin/master' into develop	2024-07-16 11:54:58 +02:00
Applevangelist	c040d2fa3f	Merge remote-tracking branch 'origin/master' into develop	2024-07-16 11:54:46 +02:00
Thomas	04f2f7d34f	Update Database.lua (#2148) ... Small fix	2024-07-16 08:45:56 +02:00
Thomas	5d6951ae11	Update Spawn.lua (#2149) ... Small fix	2024-07-16 08:45:37 +02:00
Applevangelist	f6b4e81111	Merge remote-tracking branch 'origin/develop' into develop	2024-07-15 17:24:42 +02:00
Applevangelist	c8da1277de	Merge remote-tracking branch 'origin/master' into develop	2024-07-15 17:24:39 +02:00
Applevangelist	91a0e992cd	Merge remote-tracking branch 'origin/master' into develop	2024-07-15 17:24:13 +02:00
Applevangelist	b890dc22a3	xx	2024-07-15 17:23:45 +02:00
Applevangelist	214cd3748c	#SET - dynamic slot fixes for SET_CLIENT and SET_PLAYER	2024-07-15 17:23:30 +02:00
Applevangelist	703589d8e4	xx	2024-07-15 14:32:38 +02:00
Applevangelist	379c31b28a	Merge remote-tracking branch 'origin/master' into develop	2024-07-15 14:32:17 +02:00
Applevangelist	6fb931a055	#SPAWN - couple of fixes for SPAWN, planes scheduler	2024-07-15 14:31:54 +02:00
Applevangelist	8a89ed5857	Merge remote-tracking branch 'origin/master' into develop	2024-07-14 19:16:00 +02:00
Applevangelist	87b866eca1	xx	2024-07-14 19:15:33 +02:00
Applevangelist	b5d1cee96b	#documentation	2024-07-14 19:15:19 +02:00
Applevangelist	6557a6cf0b	Merge remote-tracking branch 'origin/develop' into develop	2024-07-14 18:49:23 +02:00
Applevangelist	0128381f4f	Merge remote-tracking branch 'origin/master' into develop	2024-07-14 18:49:17 +02:00
Applevangelist	4511a68a2b	Merge remote-tracking branch 'origin/master' into develop	2024-07-14 18:48:44 +02:00
Applevangelist	9ecaca365f	xx	2024-07-14 18:48:23 +02:00
Applevangelist	e6aa341863	Dynamic Slots - fixes for #GROUP, #UNIT, #CSAR and #CTLD	2024-07-14 18:48:07 +02:00
Applevangelist	504e56e827	Merge remote-tracking branch 'origin/master' into develop	2024-07-14 17:49:53 +02:00
Applevangelist	3595afe0cc	#DATABASE- stage 1 fix for dynamic client slots	2024-07-14 17:49:25 +02:00
Applevangelist	cfc0cc66b2	xxx	2024-07-14 17:48:48 +02:00
Applevangelist	2442adfd2f	Merge remote-tracking branch 'origin/master' into develop	2024-07-13 15:22:18 +02:00
Applevangelist	a833703731	xx	2024-07-13 15:21:51 +02:00
Applevangelist	0b21cb687e	Various fixes	2024-07-13 15:21:35 +02:00
Applevangelist	af85745433	CONTROLLABLE:TaskLandAtVec2( Vec2, Duration , CombatLanding, DirectionAfterLand)	2024-07-12 19:33:35 +02:00
Applevangelist	ef58cae59f	Merge remote-tracking branch 'origin/master' into develop	2024-07-12 19:33:17 +02:00
Applevangelist	8a21fe80de	#CONTROLLABLE - Added combat and direction options in CONTROLLABLE:TaskLandAtVec2( Vec2, Duration , CombatLanding, DirectionAfterLand)	2024-07-12 19:32:55 +02:00
Applevangelist	86fc8db9e6	#AUFTRAG LANDATCOORDINATE - added combat land options	2024-07-12 19:32:24 +02:00
Applevangelist	7bc7fee6d7	Merge remote-tracking branch 'origin/develop' into develop	2024-07-12 13:38:35 +02:00
Applevangelist	46c5b50077	Merge remote-tracking branch 'origin/master' into develop	2024-07-12 13:38:30 +02:00
Applevangelist	5c54f47527	Merge remote-tracking branch 'origin/master' into develop	2024-07-12 13:37:46 +02:00
Applevangelist	51eb3a2e82	#AIRBASE - corrections for South Atlantic/Falklands	2024-07-12 13:37:04 +02:00
Applevangelist	d9aad161b0	Merge remote-tracking branch 'origin/develop' into develop	2024-07-12 13:31:21 +02:00
Applevangelist	fea2098c40	Merge remote-tracking branch 'origin/master' into develop	2024-07-12 13:31:17 +02:00
Applevangelist	03f8b1e301	Merge remote-tracking branch 'origin/master' into develop	2024-07-12 13:30:51 +02:00
Applevangelist	ec8bfb32b4	events	2024-07-12 13:30:29 +02:00
Applevangelist	d298ed2a83	Merge remote-tracking branch 'origin/develop' into develop	2024-07-12 12:20:53 +02:00
Applevangelist	515ac2c060	Merge remote-tracking branch 'origin/master' into develop	2024-07-12 12:20:50 +02:00
Applevangelist	6a31e47705	Merge remote-tracking branch 'origin/master' into develop	2024-07-12 12:20:16 +02:00
Applevangelist	e6dda35f3d	Typos	2024-07-12 12:19:58 +02:00
Applevangelist	70e4454fa9	Merge remote-tracking branch 'origin/develop' into develop	2024-07-12 11:46:38 +02:00
Applevangelist	82b4f4ee58	Merge remote-tracking branch 'origin/master' into develop	2024-07-12 11:46:35 +02:00
Applevangelist	925233709b	xx	2024-07-12 11:46:12 +02:00
Applevangelist	0af15699f3	Merge remote-tracking branch 'origin/master' into develop	2024-07-12 11:45:53 +02:00