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

1277 Commits

Author SHA1 Message Date
Applevangelist
a33ca69368 fixes 2023-05-17 10:26:58 +02:00
Applevangelist
2470632e84 Fixes for getPlayerName errors 2023-04-18 10:26:43 +02:00
Applevangelist
7db7919207 Merge remote-tracking branch 'origin/develop' into develop 2023-02-26 10:25:21 +01:00
Frank
84dbda6f2b OPS 
- Rm laser marker
 2023-02-24 23:29:03 +01:00
Applevangelist
4bc4e631d8 Merge remote-tracking branch 'origin/master' into develop 2023-02-24 14:05:57 +01:00
Applevangelist
e95c1ad3aa #Fixes from dev 2023-02-23 10:30:59 +01:00
Applevangelist
d0e6a29486 Merge remote-tracking branch 'origin/develop' into develop 2023-02-23 10:20:22 +01:00
Frank
ffef3183c7 OpsGroup 
- Fixed bug in checklos
 2023-02-22 23:01:47 +01:00
Frank
20a9857fcf Merge branch 'FF/OpsDev' into FF/Ops 2023-02-22 22:17:49 +01:00
Frank
828395c398 Merge branch 'develop' into FF/Ops 2023-02-22 22:17:35 +01:00
Frank
462e29da6e RANGE and OPS 
** RANGE**
- Added scenery as target

**OPSGROUP**
- Added option that group does not return to its legion

**AUFTRAG**
- Added option that assets do not return to its legion
 2023-02-22 22:16:42 +01:00
Applevangelist
70386811e6 AICSAR 2023-02-19 12:31:57 +01:00
Applevangelist
bef8e53347 #AICSAR - added option to use eject event 2023-02-19 12:30:00 +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
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
578b68f635 #AICSAR 2023-02-16 18:22:26 +01:00
Applevangelist
6ec43b72ce #AICSAR 
* Added PlayerName to `OnAfterPilotRescued(From,Event,To,PilotName)` if available
 2023-02-16 18:22:06 +01:00
Applevangelist
6d9e2fbfe1 Merge remote-tracking branch 'origin/master' into develop 
# Conflicts:
#	Moose Development/Moose/Core/Database.lua
#	Moose Development/Moose/Modules.lua
#	Moose Setup/Moose.files
 2023-02-13 16:41:32 +01:00
Frank
ac1b458eb4 Merge branch 'FF/Ops' into FF/OpsDev 2023-02-12 13:53:47 +01:00
Frank
f5938bc235 Merge branch 'develop' into FF/Ops 2023-02-12 13:53:25 +01:00
Frank
7280c17506 Merge branch 'master' into develop 2023-02-12 13:04:32 +01:00
Frank
92c5c32e8c
Merge pull request #1921 from FlightControl-Master/FF/MasterDevel 
Update Range.lua
 2023-02-12 13:03:08 +01:00
Frank
c8780b2d5f Update Range.lua 
- Coordinate of bomb target is now always updated (not only for moving targets)
- If the target is not alive any more, the last known position is used for its coordinate
 2023-02-12 13:00:19 +01:00
Frank
4e280f02b6 Merge branch 'FF/Ops' into FF/OpsDev 2023-02-12 11:53:42 +01:00
Frank
854f6ae6ae Merge branch 'develop' into FF/Ops 2023-02-12 11:52:13 +01:00
Applevangelist
c2b8261133 Merge remote-tracking branch 'origin/master' into develop 2023-02-09 16:13:06 +01:00
Applevangelist
2da2ddb5bb #DETECTION 
* Docu fixes
 2023-02-09 16:12:39 +01:00
Applevangelist
cb00a3fa38 #DETECTION 
* Docu fixes
 2023-02-09 16:11:59 +01:00
Applevangelist
2a3d69d0d5 #DETECTION 
* Docu fixes
 2023-02-09 16:11:45 +01:00
Applevangelist
608033f38f #AICSAR 
* Docu additions
 2023-02-09 13:17:49 +01:00
Applevangelist
292bc790ee #AICSAR 
* Docu additions
 2023-02-09 13:17:34 +01:00
Applevangelist
e44f61181a #AICSAR 
* Fixed issue with underlying OpsTransport
* Added FSM Transition OnAfterPilotUnloaded()
* Added options for SRS TTS output - no sound files
* Added voice options for downed pilot and operator - these can have different voices
 2023-02-09 11:57:41 +01:00
Applevangelist
28c25816a6 #AICSAR 
* Fixed issue with underlying OpsTransport
* Added FSM Transition OnAfterPilotUnloaded()
* Added options for SRS TTS output - no sound files
* Added voice options for downed pilot and operator - these can have different voices
 2023-02-09 11:57:28 +01:00
Frank
bbd8ceb8c0 Merge branch 'develop' into FF/Ops 2023-02-08 16:15:06 +01:00
Frank
34c26c44bc Merge branch 'develop' into FF/OpsDev 2023-02-07 22:53:19 +01:00
Applevangelist
b4d5650cb0 Merge remote-tracking branch 'origin/master' into develop 2023-02-06 08:18:08 +01:00
Applevangelist
63b16e5bd4 Merge remote-tracking branch 'origin/master' into develop 2023-02-06 08:17:05 +01:00
Mr.Alien
03ba7524b2
Comment out code for scoring hits (#1911) 2023-02-06 08:15:45 +01:00
Applevangelist
10dd7eff78 Merge remote-tracking branch 'origin/master' into develop 
# Conflicts:
#	Moose Development/Moose/Modules.lua
 2023-02-05 13:50:25 +01:00
Frank
0400f1a23e Merge branch 'FF/Ops' into FF/OpsDev 2023-02-05 00:23:42 +01:00
Frank
d3d60757c1 Merge branch 'develop' into FF/Ops 2023-02-05 00:23:25 +01:00
Frank
57079e5104 Merge branch 'master' into develop 2023-02-04 23:34:14 +01:00
Frank
6d967358da WEAPON v0.1.0 
**WEAPON**
- Improments of class
- ARTY works
- FOX works
- RANGE should work, not tested.
 2023-02-04 23:28:45 +01:00
Mr.Alien
d4d305d53b
Fix confusing hit and kill messages with incorrect math (#1913) 2023-02-04 23:02:36 +01:00
Mr.Alien
c58918e002
Add missing part of code in previous commit (#1910) 2023-02-04 22:36:16 +01:00
Mr.Alien
dec7854476
Fix issue with getting thread level after a kill (#1908) 2023-02-04 22:01:55 +01:00
Applevangelist
a415b131c4 Merge remote-tracking branch 'origin/master' into develop 2023-02-04 21:51:35 +01:00
Thomas
b250111d57
Scoring credits a kill to player who hit the same unit before it spawned (#1905) (#1906) 
Co-authored-by: Mr.Alien <124381209+MrAlien753@users.noreply.github.com>
 2023-02-04 21:48:23 +01:00