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

154 Commits

Author SHA1 Message Date
Applevangelist
642824818c Merge branch 'master' into develop 
# Conflicts:
#	Moose Development/Moose/Sound/SRS.lua
 2024-01-05 15:44:24 +01:00
Applevangelist
f2f7c88299 SRS changes 2024-01-05 15:42:11 +01:00
Applevangelist
1a1c3a6c9f xx 2024-01-05 15:41:01 +01:00
Applevangelist
f5d6d31b10 xxx 2024-01-04 14:01:12 +01:00
Applevangelist
170f97d013 xxx 2024-01-04 14:01:02 +01:00
Applevangelist
8910311c5c Merge remote-tracking branch 'origin/master' into develop 
# Conflicts:
#	Moose Development/Moose/AI/AI_A2A_Dispatcher.lua
#	Moose Development/Moose/AI/AI_Balancer.lua
#	Moose Development/Moose/AI/AI_Cargo_Dispatcher.lua
 2024-01-03 18:15:58 +01:00
Frank
d9748ef147 Update SRS.lua 
- Fixed bugs for self
 2024-01-02 17:06:32 +01:00
kaltokri
5fe77956cb Fixed broken links of restructure 2024-01-01 15:51:02 +01:00
kaltokri
2d086a62f0 Added link to example missions to MSRS 2024-01-01 00:38:48 +01:00
Applevangelist
8fc6f511c8 Merge remote-tracking branch 'origin/master' into develop 
# Conflicts:
#	Moose Development/Moose/Sound/SRS.lua
 2023-12-31 17:26:28 +01:00
kaltokri
ea2175bba8 Added debug output to SRS.lua 2023-12-31 17:14:54 +01:00
Applevangelist
0ef70d0b6a Merge remote-tracking branch 'origin/master' into develop 2023-12-29 14:51:44 +01:00
kaltokri
4fe1318e7c Fixed a logic failure with external sound files in SoundOutput.lua 2023-12-28 16:38:26 +01:00
Applevangelist
7aa150f287 Merge remote-tracking branch 'origin/develop' into develop 2023-12-26 19:19:45 +01:00
Applevangelist
853ecf9add Merge remote-tracking branch 'origin/master' into develop 2023-12-26 19:19:39 +01:00
Applevangelist
e4cea7b3c4 Merge remote-tracking branch 'origin/master' into develop 2023-12-26 19:18:36 +01:00
kaltokri
46f70dd8a6 Fixed logic in SoundOutput.lua to play internal sound files with SRS 2023-12-26 14:50:54 +01:00
Applevangelist
e46b148721 SRS 2023-12-25 13:28:00 +01:00
Applevangelist
b55b11be09 Merge remote-tracking branch 'origin/master' into develop 2023-12-25 13:22:16 +01:00
Applevangelist
d65042c640 SRS error from luacheck 2023-12-25 13:12:03 +01:00
Applevangelist
c9b0632a46 Merge remote-tracking branch 'origin/master' into develop 2023-12-25 11:44:55 +01:00
kaltokri
f482dac491 Merge branch 'master' into develop 2023-12-25 11:28:19 +01:00
kaltokri
f6f3189504 MSRS enhancements 
- Added more tracing
- A check if executable exists
- Removed STTS references
 2023-12-25 11:27:48 +01:00
Applevangelist
d855788e19 Merge remote-tracking branch 'origin/develop' into develop 2023-12-25 11:08:03 +01:00
Applevangelist
e9d9578eee Merge remote-tracking branch 'origin/master' into develop 2023-12-25 11:07:59 +01:00
kaltokri
73fa021476 Merge branch 'master' into develop 
# Conflicts:
#	Moose Development/Moose/Sound/SRS.lua
 2023-12-25 09:41:57 +01:00
kaltokri
071554bfc5 Fixed some small typos and removed STTS in comments 2023-12-25 09:39:21 +01:00
kaltokri
cd8abd97c5 Merge branch 'master' into develop 
# Conflicts:
#	Moose Development/Moose/Sound/SRS.lua
 2023-12-25 06:13:40 +01:00
kaltokri
1527b53c76 Fixed ASW typo in SRS.lua 2023-12-25 06:09:31 +01:00
Frank
257530d421 Merge branch 'master' into develop 2023-12-24 03:26:53 +01:00
Frank
5f7115f4fe Update SRS.lua 2023-12-23 16:53:42 +01:00
Frank
9ec92a8fca SRS 
- Refactoring
 2023-12-23 15:57:27 +01:00
Frank
c72f109553 SRS 2023-12-19 00:02:17 +01:00
Frank
9716162739 Update SRS.lua 2023-12-17 22:55:31 +01:00
Frank
4eea8fcadd Merge branch 'master' into FF/MasterDevel 2023-12-17 20:37:30 +01:00
Applevangelist
bc6c663f90 Merge remote-tracking branch 'origin/master' into develop 2023-12-14 12:44:32 +01:00
Applevangelist
566ebb67e3 Merge remote-tracking branch 'origin/master' into develop 2023-12-14 12:44:00 +01:00
Applevangelist
e84e16f58b xx 2023-12-14 12:43:36 +01:00
Applevangelist
55ffe37a79 #USERSOUND 
* Added USERSOUND:ToClient( Client, Delay )
 2023-12-14 12:42:13 +01:00
Frank
67924c894d Update SRS.lua 
- Removed altbackend functions
 2023-11-26 16:45:19 +01:00
Frank
1b1f8e0d2c Update SRS.lua 2023-11-24 23:59:31 +01:00
Frank
f87126f22c Merge branch 'master' into FF/MasterDevel 2023-11-24 15:44:54 +01:00
Applevangelist
7978bbc612 Merge remote-tracking branch 'origin/master' into develop 
# Conflicts:
#	Moose Development/Moose/Sound/SRS.lua
 2023-11-24 08:58:23 +01:00
Thomas
62e8302753
Update SRS.lua (#2047) 
Fix for config load when not desanitized
 2023-11-24 06:35:32 +01:00
Thomas
cac7b39823
Update SRS.lua 
Fix for config load when not desanitized
 2023-11-24 06:32:44 +01:00
Frank
af3c579a03 Update SRS.lua 2023-11-23 22:22:59 +01:00
Applevangelist
a89c96e3c4 fixes 2023-11-23 17:00:38 +01:00
Frank
52c2401d93 Update SRS.lua 2023-11-22 22:53:54 +01:00
Applevangelist
f071c674d0 fix 2023-11-22 18:35:23 +01:00
Applevangelist
02a87d9fe0 fix 2023-11-22 18:35:12 +01:00