weyne/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-08-15 10:47:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,035 Commits 11 Branches 87 Tags
Commit Graph

1819 Commits

Author SHA1 Message Date
Applevangelist
cfc8312b21 Merge remote-tracking branch 'origin/master' into develop 2024-07-16 11:54:58 +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
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
6fb931a055 #SPAWN - couple of fixes for SPAWN, planes scheduler 2024-07-15 14:31:54 +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
0128381f4f Merge remote-tracking branch 'origin/master' into develop 2024-07-14 18:49:17 +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
a833703731 xx 2024-07-13 15:21:51 +02:00
Applevangelist
0b21cb687e Various fixes 2024-07-13 15:21:35 +02:00
Applevangelist
fea2098c40 Merge remote-tracking branch 'origin/master' into develop 2024-07-12 13:31:17 +02:00
Applevangelist
ec8bfb32b4 events 2024-07-12 13:30:29 +02:00
Applevangelist
82b4f4ee58 Merge remote-tracking branch 'origin/master' into develop 2024-07-12 11:46:35 +02:00
Applevangelist
9d2896d088 EVENTS - additional events from last release 2024-07-12 11:44:24 +02:00
Applevangelist
26adb7934e Merge remote-tracking branch 'origin/master' into develop 
# Conflicts:
#	Moose Development/Moose/Core/Message.lua
 2024-07-09 11:32:23 +02:00
Applevangelist
65c7b0d12f Docu fixes 2024-07-09 11:30:41 +02:00
Frank
bdec6eb82d Merge branch 'FF/Ops' into FF/OpsDev 2024-07-07 11:33:44 +02:00
Frank
ead7844e5f Merge branch 'master' into develop 2024-07-05 21:36:12 +02:00
Frank
29a4f7c160 Update Event.lua 
#2143 Try with isExist
 2024-07-05 21:35:55 +02:00
Frank
d25d89afbb Merge branch 'master' into develop 2024-07-05 17:54:06 +02:00
Frank
55a9c7e020 Update Event.lua 
#2143
 2024-07-05 17:53:50 +02:00
Frank
9bdacfbcf7 Merge branch 'develop' into FF/OpsDev 2024-07-01 16:46:22 +02:00
Applevangelist
0058383e64 Merge remote-tracking branch 'origin/master' into develop 
# Conflicts:
#	Moose Development/Moose/Core/Message.lua
 2024-06-30 16:02:11 +02:00
Applevangelist
1549ca1cc4 Merge remote-tracking branch 'origin/master' into develop 2024-06-30 16:01:22 +02:00
Applevangelist
9ca30fc00c Fixes 2024-06-30 16:00:49 +02:00
Applevangelist
9479b338c5 xxx 2024-06-30 15:57:09 +02:00
Applevangelist
335bd897d5 Merge remote-tracking branch 'origin/master' into develop 2024-06-30 11:31:51 +02:00
Mike Young
c571d32d0e
Update UserFlag.lua for incorrect documentation 
Update UserFlag.lua for incorrect documentation
 2024-06-27 19:48:17 -04:00
Frank
be2eda25df Merge branch 'develop' into FF/OpsDev 2024-06-27 21:31:24 +02:00
Applevangelist
1be62b9c4e Merge remote-tracking branch 'origin/master' into develop 2024-06-25 13:09:48 +02:00
Applevangelist
30fd2230b0 Merge remote-tracking branch 'origin/master' into develop 2024-06-25 13:09:16 +02:00
Applevangelist
b350243e50 Docu fix 2024-06-25 13:08:46 +02:00
Applevangelist
e94a918bbe Merge remote-tracking branch 'origin/master' into develop 2024-06-25 10:46:51 +02:00
Frank
faadbdecfb Merge branch 'master' into develop 2024-06-24 23:55:13 +02:00
Frank
62ef56684b Update Templates 
- Added nil check if client template does not exist in `WAREHOUSE` class
- Added nil checks in `DATABASE` if client template does not exist
- Fixed `SET_CLIENT:IsIncludeObject()` function if client template does not exist
 2024-06-24 23:55:01 +02:00
Applevangelist
07dc55b284 Merge remote-tracking branch 'origin/master' into develop 2024-06-20 08:53:08 +02:00
Applevangelist
7d6f9fc4b5 Merge remote-tracking branch 'origin/master' into develop 2024-06-20 08:52:25 +02:00
Applevangelist
f9f0a8e866 #COORDINATE - Fix is day/night for Kola locations when the sun either never rises or never sets. 2024-06-20 08:51:59 +02:00
Frank
fa8e1d2a56 Merge branch 'FF/Ops' into FF/OpsDev 2024-06-19 07:53:54 +02:00
Frank
d83cabbab6 Merge branch 'master' into develop 2024-06-18 09:21:12 +02:00
Frank
5f9d4405b1 AIRBOSS 
- Added case that group template cannot be found in MOOSE db
 2024-06-18 09:20:59 +02:00
Applevangelist
a2580122de Merge remote-tracking branch 'origin/master' into develop 2024-06-11 10:20:52 +02:00
Applevangelist
a6de09a0ca Fixes 2024-06-11 09:03:57 +02:00
Applevangelist
5e62791837 fixes 2024-06-11 09:02:31 +02:00
Applevangelist
1d5f9cc4cc Merge remote-tracking branch 'origin/master' into develop 2024-06-09 18:32:57 +02:00
Applevangelist
2262f27d18 Merge remote-tracking branch 'origin/master' into develop 2024-06-09 18:32:28 +02:00