weyne/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2026-07-21 06:04:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,659 Commits 15 Branches 93 Tags
52e83c78637cc94f1e212fdffd77e3eb2e7c1169
Commit Graph

7659 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Applevangelist 52e83c7863 Merge remote-tracking branch 'origin/develop' into develop 2023-10-20 12:39:44 +02:00
Applevangelist 26f3a8cf64 Merge remote-tracking branch 'origin/master' into develop 
# Conflicts:
#	Moose Development/Moose/Modules.lua
 2023-10-20 12:39:35 +02:00
kaltokri b808f2f568 Merge branch 'master' into develop 2023-10-20 09:59:06 +02:00
kaltokri 10dffb0689 Changed mail from MooseBotter 2023-10-20 09:58:35 +02:00
kaltokri 91aa2eb9f2 Merge branch 'master' into develop 2023-10-19 18:54:17 +02:00
kaltokri 722c33df62 Fixed wrong git config entries in build-docs.yml 2023-10-19 18:53:52 +02:00
kaltokri 3d697211bd Merge branch 'master' into develop 2023-10-19 18:25:07 +02:00
kaltokri dc54cc82af Fixed wrong repository owner 2023-10-19 18:24:46 +02:00
kaltokri 4fced3416a Merge branch 'master' into develop 2023-10-19 18:17:12 +02:00
kaltokri d4a46606fd Switched from env.FORCE_PUSH to vars.FORCE_PUSH 2023-10-19 18:16:45 +02:00
Thomas 015af9774c Update build-includes.yml 2023-10-19 16:17:48 +02:00
Thomas f0a37172b9 Update build-includes.yml (#2018) 2023-10-19 16:14:59 +02:00
Thomas 2dd2e593e8 Update README.md (#2017) 2023-10-19 15:48:50 +02:00
Applevangelist 49fd78abe7 #SRS 
* Typo
 2023-10-19 15:22:13 +02:00
Rolf Geuenich 1b5067088f Merge branch 'master' into develop 
Added new build system with GitHub Action Workflows
 2023-10-19 14:00:22 +02:00
Rolf Geuenich 7c8cca7f56 Added new build system with GitHub Action Workflows 2023-10-19 13:59:33 +02:00
Applevangelist 8920f7e25f Merge remote-tracking branch 'origin/develop' into develop 2023-10-19 13:12:10 +02:00
Applevangelist 8dc008e428 Merge remote-tracking branch 'origin/master' into develop 2023-10-19 13:12:06 +02:00
Rolf Geuenich 2986a33a56 Merge branch 'master' into develop 
Align Moose_Create.lua with the dev branch
 2023-10-19 11:39:33 +02:00
Rolf Geuenich 0658f6dc2b Align Moose_Create.lua with the develop branch 
Needed for later build system enhancements
 2023-10-19 11:39:07 +02:00
Rolf Geuenich ce6624fe0b Merge branch 'master' into develop 
Preperation for new build system
 2023-10-19 11:11:46 +02:00
Rolf Geuenich 75558078ee Cleanup and extension for GitHub Action Workflow build and act 2023-10-19 11:11:23 +02:00
Applevangelist 06b983870f Merge remote-tracking branch 'origin/develop' into develop 2023-10-17 16:59:15 +02:00
Applevangelist 5f1451f012 Merge remote-tracking branch 'origin/master' into develop 2023-10-17 16:59:10 +02:00
Applevangelist 3ba868b3b9 Merge remote-tracking branch 'origin/master' into develop 2023-10-17 16:58:40 +02:00
Applevangelist f6b5c69d4e #Triggers - docu changes 2023-10-17 16:58:14 +02:00
Applevangelist 73464a09f1 srs 2023-10-17 16:06:11 +02:00
Applevangelist cb048bb406 Merge remote-tracking branch 'origin/develop' into develop 
# Conflicts:
#	Moose Development/Moose/Sound/SRS.lua
 2023-10-17 16:06:03 +02:00
Applevangelist 07c86ec2dc Merge remote-tracking branch 'origin/master' into develop 
# Conflicts:
#	Moose Development/Moose/Core/Set.lua
#	Moose Development/Moose/Core/Zone.lua
 2023-10-17 16:05:24 +02:00
Applevangelist 443e853d2a #trigger 2023-10-17 16:03:47 +02:00
Applevangelist 85b10fb1c9 Merge remote-tracking branch 'origin/master' into develop 2023-10-17 16:03:24 +02:00
Applevangelist a7f01eb04a #ZONE and #SET_ZONE watch trigger 2023-10-17 16:02:01 +02:00
Applevangelist e578a673d9 Merge remote-tracking branch 'origin/master' into develop 
# Conflicts:
#	Moose Development/Moose/Sound/SRS.lua
 2023-10-17 11:08:13 +02:00
Applevangelist 65f9db8efa #MSRS 
* Added loading of a config file
 2023-10-17 11:05:09 +02:00
Applevangelist d8bb2fe1f1 #MSRS 2023-10-17 11:01:18 +02:00
Applevangelist 7558b7ee1d #MSRS 
* Added loading config file
 2023-10-17 09:28:20 +02:00
Applevangelist ab197699b6 ATIS 2023-10-14 17:23:26 +02:00
Applevangelist 12d23266c3 Merge remote-tracking branch 'origin/develop' into develop 
# Conflicts:
#	Moose Development/Moose/Sound/SRS.lua
 2023-10-14 17:21:51 +02:00
Applevangelist 9451956914 #MSRS 
* Added config file loading
 2023-10-14 16:49:55 +02:00
Applevangelist 3f04249d07 Merge remote-tracking branch 'origin/master' into develop 
# Conflicts:
#	Moose Development/Moose/Sound/SRS.lua
 2023-10-13 16:15:23 +02:00
Applevangelist 2ebad9ce96 #MSRS 
* Fixes for alternative backend
 2023-10-13 16:13:12 +02:00
Applevangelist c9cad84419 #SRS 2023-10-13 16:12:38 +02:00
Applevangelist 013a6f134e AUFTRAG 2023-10-12 18:05:23 +02:00
Applevangelist 8dc601bf48 Merge remote-tracking branch 'origin/develop' into develop 
# Conflicts:
#	Moose Development/Moose/Ops/Auftrag.lua
 2023-10-12 18:04:21 +02:00
Applevangelist 3f8c7eaa94 Merge remote-tracking branch 'origin/master' into develop 2023-10-12 18:03:08 +02:00
Applevangelist b8a2b28462 Merge remote-tracking branch 'origin/master' into develop 2023-10-12 18:02:33 +02:00
Applevangelist 9ccde838e7 #AUFTRAG 
* More Bryce fixes
 2023-10-12 18:01:56 +02:00
Applevangelist 6ba62e3e04 #AUFTRAG 
* bear trap for Bryce using RECON Auftrags
 2023-10-12 17:56:31 +02:00
Applevangelist 0c97bc5b59 #AUFTRAG 2023-10-12 17:55:54 +02:00
Applevangelist b9cc66004d #WAREHOUSE 
* Syntax
 2023-10-12 17:55:41 +02:00