FlightControl-Master/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-10-29 16:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,432 Commits 10 Branches 87 Tags
Commit Graph

9432 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Applevangelist
16655cf070 CH47F types added plus doorcheck 2024-08-03 14:30:27 +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
Applevangelist
9d84042ce8 Merge remote-tracking branch 'origin/master' into develop 2024-07-28 13:42:10 +02:00
Applevangelist
a63a8c78a8 Merge remote-tracking branch 'origin/master' into develop 2024-07-28 13:41:41 +02:00
Applevangelist
e4a8c36754 xx 2024-07-28 13:41:26 +02:00
Applevangelist
37cbf212f7 xx 2024-07-28 13:41:08 +02:00
Applevangelist
c59bf3f334 xx 2024-07-28 13:40:59 +02:00
Applevangelist
9f581ee660 Merge remote-tracking branch 'origin/develop' into develop 2024-07-28 12:44:50 +02:00
Applevangelist
ba2bfd5599 Merge remote-tracking branch 'origin/master' into develop 2024-07-28 12:44:17 +02:00
Applevangelist
fb31c25ab7 PLAYERTASK - nil check for client messaging 2024-07-28 12:43:57 +02:00
Applevangelist
8effa153b0 Merge remote-tracking branch 'origin/develop' into develop 2024-07-28 12:43:22 +02:00
Applevangelist
086f687e32 Merge remote-tracking branch 'origin/master' into develop 2024-07-28 12:43:18 +02:00
Applevangelist
8ae8c94b27 xx 2024-07-28 12:42:52 +02:00
Applevangelist
500fe37ac4 SET 2024-07-28 12:42:34 +02:00
Applevangelist
03cd390baf EASYGCICAP - added a bit of housekeeping 2024-07-28 12:07:34 +02:00
Applevangelist
72303ffbad xx 2024-07-28 12:05:31 +02:00
Applevangelist
1f721ff9b4 Merge remote-tracking branch 'origin/develop' into develop 2024-07-27 16:21:39 +02:00
Applevangelist
e3f780fda7 Merge remote-tracking branch 'origin/master' into develop 2024-07-27 16:21:36 +02:00
kaltokri
490bfe6a46 Merge branch 'master' into develop 2024-07-24 20:07:17 +02:00
kaltokri
50a38cf2a4 Fixed broken link in docs. 2024-07-24 20:06:56 +02:00
Thomas
c2aa57c603
Update Zone.lua 
Gg
 2024-07-21 07:41:36 +02:00
Frank
51e703326e
Merge pull request #2151 from w3z315/patch-1 
Fix ZoneCaptureCoalition on player ejects / gets killed in zone
 2024-07-21 00:35:02 +02:00
Frank
273170b4f4
Merge pull request #2152 from FlightControl-Master/FF/Ops 
AUFTRAG
 2024-07-21 00:29:52 +02:00