Commit Graph

2017 Commits

Author SHA1 Message Date
Applevangelist d23f029953 Merge remote-tracking branch 'origin/master' into develop 2025-01-02 11:19:39 +01:00
Applevangelist 203f0c8abc #docu 2025-01-02 11:18:44 +01:00
Applevangelist c7fe42d919 Merge remote-tracking branch 'origin/master' into develop 2024-12-27 12:26:31 +01:00
Applevangelist 9916afaa49 #COORDINATE Adding names to smoke to be able to switch them off earlier 2024-12-27 12:25:25 +01:00
Applevangelist ecdca9919e xx 2024-12-27 12:24:02 +01:00
Applevangelist b3ed0681a8 xx 2024-12-26 17:19:14 +01:00
Applevangelist 9300050573 Merge remote-tracking branch 'origin/master' into develop 2024-12-26 17:18:28 +01:00
Applevangelist 6bee1cc88e Small additions 2024-12-26 17:16:43 +01:00
Applevangelist 3efe02fe37 xx 2024-12-18 11:36:36 +01:00
Applevangelist 3f632b92e2 Merge remote-tracking branch 'origin/master' into develop 2024-12-18 11:35:39 +01:00
Applevangelist 014750ea7f #SET - Documentation fixes 2024-12-18 11:35:13 +01:00
Applevangelist 58f5152fe5 Merge remote-tracking branch 'origin/master' into branch 2024-12-15 11:42:35 +01:00
Applevangelist f151271cb1 Merge remote-tracking branch 'origin/master' into develop 2024-12-15 11:42:04 +01:00
Applevangelist 6001f6abda #EVENT - another fix for scenery without getName function 2024-12-15 11:41:24 +01:00
Applevangelist 3c878be568 Merge remote-tracking branch 'origin/master' into branch 2024-12-15 11:29:51 +01:00
Frank 903c065b74 Merge branch 'master' into develop 2024-12-14 16:55:36 +01:00
Frank 6204cecbbd SPAWNSTATIC
- moved AddStatic to after static spawn fixing registration of spawned static
2024-12-14 16:54:39 +01:00
Frank d8dcf37886 DATABASE
- Fixed error that static was not returned in `DATABASE:AddStatic()` (leads to issues if a static object with the same name is spawned)
- Other minor changes
2024-12-14 13:48:04 +01:00
Applevangelist 0a6bdd6e04 #SET_OPSGROUP - fix for teleport/respawn 2024-12-06 14:07:09 +01:00
Applevangelist 855ea764b1 #SET_OPSGROUP - fix for teleport/respawn 2024-12-06 14:06:56 +01:00
Applevangelist 116527abfe xx 2024-11-30 13:09:58 +01:00
Applevangelist 76a8bc7a33 Merge remote-tracking branch 'origin/master' into branch 2024-11-26 08:06:48 +01:00
Frank 1a74f112ef Merge branch 'master' into develop 2024-11-21 23:13:18 +01:00
Frank abb4de46d7 Controllable Detection Improvements/Fixes
- Fixed bug in detection functions for optical detection (enum incorrect)
- Fixed bug in order of return values of `CONTROLLABLE:IsTargetDetected` (both hoggit and DCS are WRONG and MOOSE adopted it).
2024-11-21 23:13:05 +01:00
Applevangelist ddcc20cc47 Merge remote-tracking branch 'origin/master' into branch 2024-11-17 16:24:07 +01:00
Frank 09e1883488 Merge branch 'master' into develop 2024-11-15 23:22:00 +01:00
Frank dce9631399 Update Event.lua
- Set `Event.IniGroupName` from db in case group does not exist any more
2024-11-15 23:21:50 +01:00
Applevangelist 954190f6df xx 2024-11-07 09:05:53 +01:00
Applevangelist f82490f0d5 Merge remote-tracking branch 'origin/master' into develop 2024-10-29 13:57:56 +01:00
Applevangelist dfe2ed2a98 #EVENT - Fix for TgtUnit Name being unobtainable 2024-10-29 13:57:21 +01:00
Applevangelist 20b0902768 xxx 2024-10-29 13:56:28 +01:00
Applevangelist 1b3c94cc57 Merge remote-tracking branch 'origin/master' into develop 2024-10-27 13:25:41 +01:00
Applevangelist 216ea230a8 #BASE - Roll back to "old" serialize method for Trace 2024-10-27 13:25:13 +01:00
Applevangelist 98a82c5959 xx 2024-10-27 13:24:45 +01:00
Applevangelist ebc7902775 Merge remote-tracking branch 'origin/develop' into branch 2024-10-26 18:46:39 +02:00
Applevangelist 13ec9bcdd4 Merge remote-tracking branch 'origin/master' into develop 2024-10-26 18:45:40 +02:00
Thomas 2aa0b5ddfb Update MarkerOps_Base.lua
Added data to FSM events
2024-10-21 11:32:47 +02:00
Applevangelist d89ed535b7 Merge remote-tracking branch 'origin/master' into develop 2024-10-03 14:06:42 +02:00
Applevangelist 3524cba4ef xx 2024-10-01 12:08:51 +02:00
Applevangelist 8ede1fb351 #DCS 2.9.8.1107 airbase updates 2024-10-01 12:03:00 +02:00
Applevangelist a1d06a6fc8 Merge remote-tracking branch 'origin/master' into branch
# Conflicts:
#	Moose Development/Moose/Core/Spawn.lua
2024-09-30 11:37:07 +02:00
Applevangelist 3d5dfc422d xx 2024-09-30 11:36:19 +02:00
Applevangelist 37998fbf1d Merge remote-tracking branch 'origin/master' into develop 2024-09-30 11:36:06 +02:00
Applevangelist 846aa823d4 fixes for #SEAD and #SPAWN 2024-09-30 11:35:25 +02:00
Applevangelist a8a1a0e37c Merge remote-tracking branch 'origin/master' into branch 2024-09-27 11:58:45 +02:00
Applevangelist 0d877853eb Merge remote-tracking branch 'origin/master' into develop 2024-09-27 11:58:08 +02:00
Applevangelist 68298fc585 #EVENT Fix for scenery sometimes nit having a getName() function 2024-09-27 11:57:40 +02:00
Applevangelist 48d30250a0 Merge remote-tracking branch 'origin/master' into develop 2024-09-23 12:44:14 +02:00
Applevangelist 1f3df107bf xxx 2024-09-23 12:43:51 +02:00
Applevangelist a798f2d61c Small fixes 2024-09-23 12:43:39 +02:00