 Applevangelist
|
13ac4c386a
|
Merge remote-tracking branch 'origin/master' into develop
|
2023-07-25 12:03:02 +02:00 |
|
|
Applevangelist
|
6fa90c7f39
|
#AWACS
|
2023-07-25 12:02:42 +02:00 |
|
|
Applevangelist
|
6fcaccdfb1
|
* fixes
|
2023-07-25 12:02:09 +02:00 |
|
|
Applevangelist
|
f31741f934
|
#AI_ESCORT
* Improve documentation
|
2023-07-25 12:01:18 +02:00 |
|
|
Applevangelist
|
070cd6e7c6
|
Merge remote-tracking branch 'origin/develop' into develop
|
2023-07-23 12:43:35 +02:00 |
|
|
Applevangelist
|
64e87a906f
|
Merge remote-tracking branch 'origin/master' into develop
|
2023-07-23 12:43:31 +02:00 |
|
|
Applevangelist
|
f84d02d8a1
|
Merge remote-tracking branch 'origin/master' into develop
|
2023-07-23 12:42:59 +02:00 |
|
|
Applevangelist
|
7d3a08cde2
|
#CLIENTMENU, #PLAYERTASK
* Fixes for "No current task" not being deleted later on
|
2023-07-23 12:42:36 +02:00 |
|
|
Applevangelist
|
1fbadd02f9
|
#Updates
|
2023-07-23 12:41:46 +02:00 |
|
|
Applevangelist
|
02fadaf17e
|
#AIRBASE, #ATIS
|
2023-07-23 12:38:21 +02:00 |
|
|
Applevangelist
|
46258492bd
|
#AIRBASE, #ATIS
* Additions
|
2023-07-23 12:37:57 +02:00 |
|
|
Applevangelist
|
c4a13f985e
|
Merge remote-tracking branch 'origin/develop' into develop
|
2023-07-19 16:08:21 +02:00 |
|
|
Applevangelist
|
e2929a78c4
|
#AICSAR - correct code version
|
2023-07-19 16:06:44 +02:00 |
|
|
Applevangelist
|
15bf379cdc
|
#AICSAR
* Added FSM Event "HeloOnDuty"
|
2023-07-19 09:56:27 +02:00 |
|
|
Applevangelist
|
7367e15121
|
#AICSAR
* Added FSM Event "HeloOnDuty"
|
2023-07-19 09:56:09 +02:00 |
|
|
Applevangelist
|
07cdc36181
|
Merge remote-tracking branch 'origin/develop' into develop
|
2023-07-17 16:28:35 +02:00 |
|
|
Applevangelist
|
69fc2dca42
|
Merge remote-tracking branch 'origin/master' into develop
|
2023-07-17 16:28:29 +02:00 |
|
|
Applevangelist
|
8a8e40e810
|
#PLAYERTASK
* Refactored menubuilds to use new CLIENTMENU/CLIENTMENUCONTROLLER classes
|
2023-07-17 16:27:54 +02:00 |
|
|
Applevangelist
|
2c8adf58cb
|
#CLIENTMENU
* Rewrite with a different data approach
|
2023-07-17 16:26:53 +02:00 |
|
|
Applevangelist
|
e8432db26e
|
#ClientMenu
|
2023-07-17 16:26:06 +02:00 |
|
|
Applevangelist
|
bb579fff5b
|
Merge remote-tracking branch 'origin/master' into develop
|
2023-07-16 11:28:24 +02:00 |
|
|
Applevangelist
|
6481f66e27
|
#MANTIS
* Added IDs for Current Hill Assets, keyword "CHM" for group names
|
2023-07-16 11:27:34 +02:00 |
|
|
Applevangelist
|
e8ad649770
|
#PT
|
2023-07-16 11:26:47 +02:00 |
|
|
Applevangelist
|
63770fdf79
|
Merge remote-tracking branch 'origin/develop' into develop
|
2023-07-15 18:02:45 +02:00 |
|
|
Applevangelist
|
b48d713fda
|
Merge remote-tracking branch 'origin/master' into develop
|
2023-07-15 18:02:39 +02:00 |
|
|
Applevangelist
|
77955bc03c
|
#changes
|
2023-07-15 18:02:12 +02:00 |
|
|
Thomas
|
1ad538ea9f
|
Commits from master (#1972)
* #SPAWN
* Update Spot.lua
Fix
|
2023-07-15 09:46:55 +02:00 |
|
|
Thomas
|
5954b8692f
|
Update Spot.lua
Fix
|
2023-07-15 09:36:24 +02:00 |
|
|
Applevangelist
|
99b41c6715
|
Merge remote-tracking branch 'origin/develop' into develop
|
2023-07-13 16:15:33 +02:00 |
|
|
Applevangelist
|
62e6eb91fc
|
Merge remote-tracking branch 'origin/master' into develop
|
2023-07-13 16:15:28 +02:00 |
|
|
Applevangelist
|
f6fdecf892
|
Merge remote-tracking branch 'origin/master'
|
2023-07-13 16:15:11 +02:00 |
|
|
Applevangelist
|
53fb77b50d
|
#SPAWN
|
2023-07-13 16:15:06 +02:00 |
|
|
Applevangelist
|
191f7a7377
|
Merge remote-tracking branch 'origin/master' into develop
|
2023-07-13 16:13:26 +02:00 |
|
|
Applevangelist
|
04a9dc3a8c
|
#SPAWN
* Added method to init spawn position
|
2023-07-13 16:13:00 +02:00 |
|
|
Applevangelist
|
eba9c697e3
|
#SPAWN
|
2023-07-13 16:06:23 +02:00 |
|
|
Applevangelist
|
643ba17d80
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# Moose Development/Moose/Core/ClientMenu.lua
# Moose Setup/Moose.files
|
2023-07-13 16:06:14 +02:00 |
|
|
Applevangelist
|
301f49078e
|
Merge remote-tracking branch 'origin/master' into develop
|
2023-07-12 17:55:50 +02:00 |
|
|
Applevangelist
|
77d2804fce
|
Merge remote-tracking branch 'origin/master' into develop
|
2023-07-12 17:55:07 +02:00 |
|
|
Applevangelist
|
6c5cf814b4
|
#Spot
|
2023-07-12 17:54:35 +02:00 |
|
|
Applevangelist
|
10b9a32f29
|
#SPOT
* Fix for switching laser off and on again not follwing unit any more
|
2023-07-12 17:54:17 +02:00 |
|
|
Applevangelist
|
63ba50a83a
|
#CLIENTMENUMANAGER Docu
|
2023-07-11 16:10:40 +02:00 |
|
|
Applevangelist
|
45adc6160d
|
#CLIENTMENUMANAGER Docu
|
2023-07-11 16:10:08 +02:00 |
|
|
Applevangelist
|
0326bee7a3
|
#
|
2023-07-11 15:42:14 +02:00 |
|
|
Applevangelist
|
fb8f804af2
|
# CLIENTMENU
* Initial release
|
2023-07-11 15:41:06 +02:00 |
|
|
Applevangelist
|
ee7fca09b6
|
Merge remote-tracking branch 'origin/master' into develop
|
2023-07-07 15:16:10 +02:00 |
|
|
Applevangelist
|
fd1257052b
|
#
|
2023-07-07 15:15:28 +02:00 |
|
|
Applevangelist
|
ffbab7453c
|
Merge remote-tracking branch 'origin/master' into develop
|
2023-07-07 15:15:09 +02:00 |
|
|
Applevangelist
|
40fa929eb0
|
* Added omissed DetectedItem.Name found by @Nocke
|
2023-07-07 15:14:33 +02:00 |
|
|
Applevangelist
|
102a48bf97
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# Moose Development/Moose/Functional/AmmoTruck.lua
|
2023-07-03 17:30:50 +02:00 |
|
|
Applevangelist
|
2537fc44bb
|
Merge remote-tracking branch 'origin/master' into develop
|
2023-07-03 17:29:36 +02:00 |
|