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
7,306 Commits 10 Branches 87 Tags
Commit Graph

7306 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Applevangelist
0b692d045f #CTLD logic correction for loading 2023-02-21 11:38:24 +01:00
Applevangelist
7b58ca9134 Merge remote-tracking branch 'origin/develop' into develop 2023-02-19 17:17:45 +01:00
Applevangelist
8e6eb17ef5 Merge remote-tracking branch 'origin/master' into develop 
# Conflicts:
#	Moose Development/Moose/Wrapper/Net.lua
 2023-02-19 17:17:35 +01:00
Applevangelist
ce7b30b54e Merge remote-tracking branch 'origin/master' into develop 2023-02-19 17:16:34 +01:00
Applevangelist
6c1abddb1e #NET added a couple of functions 2023-02-19 17:16:00 +01:00
Applevangelist
93c92d49f7 NET 2023-02-19 17:15:35 +01:00
Applevangelist
feeb0c01f2 Merge remote-tracking branch 'origin/master' into develop 2023-02-19 12:32:29 +01:00
Applevangelist
70386811e6 AICSAR 2023-02-19 12:31:57 +01:00
Applevangelist
7dc239f506 Added CLIENT:FindByPlayerName(Name) 
NET - slot blocker comments in log removed
 2023-02-19 12:31:32 +01:00
Applevangelist
bef8e53347 #AICSAR - added option to use eject event 2023-02-19 12:30:00 +01:00
Applevangelist
46c3ed72c3 Merge remote-tracking branch 'origin/master' into develop 2023-02-18 15:04:36 +01:00
Applevangelist
3e8413c6b7 #NET - further ado 2023-02-18 15:03:53 +01:00
Applevangelist
55a055a047 #NET - further ado 2023-02-18 15:03:07 +01:00
Applevangelist
1fd8f4d837 #AICSAR 
* Named functions for the events
 2023-02-18 11:04:49 +01:00
Applevangelist
9b62710d64 #AICSAR 
* Named functions for the events
 2023-02-18 11:04:37 +01:00
Applevangelist
a1f028aa5e Merge remote-tracking branch 'origin/develop' into develop 2023-02-17 16:43:01 +01:00
Applevangelist
5187bc04c1 Merge remote-tracking branch 'origin/master' into develop 2023-02-17 16:42:56 +01:00
Applevangelist
7959f650d5 NET 2023-02-17 16:42:25 +01:00
Applevangelist
6f3fbb25cf Merge remote-tracking branch 'origin/master' into develop 2023-02-17 16:42:10 +01:00
Applevangelist
ff86bfb91d #NET Event blocker fix 2023-02-17 16:41:38 +01:00
Applevangelist
05b8df0d88 Merge remote-tracking branch 'origin/master' into develop 2023-02-17 16:24:21 +01:00
Applevangelist
6a9e868035 Merge remote-tracking branch 'origin/develop' into develop 2023-02-17 16:23:52 +01:00
Applevangelist
5da82a6b01 Merge remote-tracking branch 'origin/master' into develop 2023-02-17 16:23:46 +01:00
Applevangelist
ffb6cbfb17 NET 2023-02-17 16:23:16 +01:00
Applevangelist
66494b7b5a NET 2023-02-17 16:23:02 +01:00
Applevangelist
973127aa8c #NET Fixes 2023-02-17 15:42:06 +01:00
Applevangelist
a4dcb643bd #NET Fixes 2023-02-17 15:41:33 +01:00
Applevangelist
2b02f6659a #Net 2023-02-17 15:41:10 +01:00
Applevangelist
83866c3dd3 #NET Fixes 2023-02-17 15:02:11 +01:00
Applevangelist
6acf051539 #Net Fixes 2023-02-17 15:02:03 +01:00
Applevangelist
9e23cda02a #NET Fixes 2023-02-17 15:01:49 +01:00
Applevangelist
c29b67df55 #NET small fix 2023-02-17 14:33:32 +01:00
Applevangelist
4797abc287 #NET Bugfix 2023-02-17 14:32:48 +01:00
Applevangelist
8c083cccc8 #NET - bug fix 2023-02-17 14:32:17 +01:00
Applevangelist
bd312b86d2 Merge remote-tracking branch 'origin/master' into develop 2023-02-17 13:23:10 +01:00
Applevangelist
d132447af8 #Net 2023-02-17 13:22:39 +01:00
Applevangelist
50f73f1be2 #NET extended block to UCID 2023-02-17 13:22:10 +01:00
Applevangelist
822b95e8aa Merge remote-tracking branch 'origin/master' into develop 2023-02-17 08:55:27 +01:00
Applevangelist
a7e45338e3 #AICSAR - Added alt/speed options 2023-02-17 08:54:54 +01:00
Applevangelist
985adc0267 Fixes 2023-02-17 08:54:33 +01:00
Applevangelist
2ebbc8f466 #NET - added docu 2023-02-17 08:54:15 +01:00
Applevangelist
39b94a2ac1 Merge remote-tracking branch 'origin/develop' into develop 
# Conflicts:
#	Moose Development/Moose/Modules.lua
#	Moose Setup/Moose.files
 2023-02-16 18:24:35 +01:00
Applevangelist
5f007be781 Merge remote-tracking branch 'origin/master' into develop 2023-02-16 18:23:18 +01:00
Applevangelist
578b68f635 #AICSAR 2023-02-16 18:22:26 +01:00
Applevangelist
7637f0c6ce Merge remote-tracking branch 'origin/develop' into develop 2023-02-16 18:22:10 +01:00
Applevangelist
6ec43b72ce #AICSAR 
* Added PlayerName to `OnAfterPilotRescued(From,Event,To,PilotName)` if available
 2023-02-16 18:22:06 +01:00
Frank
91e80bf1a6 Merge branch 'FF/Ops' into FF/OpsDev 2023-02-16 17:30:47 +01:00
Frank
e6464dc5cb Merge branch 'develop' into FF/Ops 2023-02-16 17:30:15 +01:00
Frank
34c799b668 Merge branch 'master' into develop 2023-02-16 17:29:54 +01:00
Frank
1a96b30a45
Merge pull request #1922 from FlightControl-Master/FF/MasterDevel 
Airspeed
 2023-02-16 17:28:13 +01:00