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
461 Commits 11 Branches 87 Tags
Commit Graph

461 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
FlightControl
376b0d08a5 Merge remote-tracking branch 'refs/remotes/origin/master' into Detection 
# Conflicts:
#	Moose Mission Setup/Moose Mission Update/l10n/DEFAULT/Moose.lua
#	Moose Mission Setup/Moose.lua
#	Moose Test Missions/Moose_Test_AIBALANCER/Moose_Test_AIBALANCER.miz
#	Moose Test
Missions/Moose_Test_AIRBASEPOLICE/Moose_Test_AIRBASEPOLICE.miz
#	Moose Test
Missions/Moose_Test_BASE/Moose_Test_AIRBLANCER_with_Moose.miz
#	Moose Test
Missions/Moose_Test_BASE/Moose_Test_AIRBLANCER_without_Moose.miz
#	Moose Test Missions/Moose_Test_BASE/Moose_Test_BASE.miz
#	Moose Test Missions/Moose_Test_CLEANUP/Moose_Test_CLEANUP.miz
#	Moose Test Missions/Moose_Test_DESTROY/MOOSE_Test_DESTROY.miz
#	Moose Test Missions/Moose_Test_DETECTION/Moose_Test_DETECTION.miz
#	Moose Test
Missions/Moose_Test_DETECTION/Moose_Test_DETECTION_Laser.miz
#	Moose Test Missions/Moose_Test_ESCORT/MOOSE_Test_ESCORT.miz
#	Moose Test Missions/Moose_Test_FAC/Moose_Test_FAC.miz
#	Moose Test
Missions/Moose_Test_MISSILETRAINER/Moose_Test_MISSILETRAINER.miz
#	Moose Test Missions/Moose_Test_PATROLZONE/MOOSE_Test_PATROLZONE.miz
#	Moose Test Missions/Moose_Test_SEAD/MOOSE_Test_SEAD.miz
#	Moose Test Missions/Moose_Test_SET_AIRBASE/Moose_Test_SET_AIRBASE.miz
#	Moose Test Missions/Moose_Test_SET_CLIENT/Moose_Test_SET_CLIENT.miz
#	Moose Test Missions/Moose_Test_SET_GROUP/Moose_Test_SET_GROUP.miz
#	Moose Test Missions/Moose_Test_SPAWN/MOOSE_Test_SPAWN.miz
#	Moose Test
Missions/Moose_Test_SPAWN_Repeat/MOOSE_Test_SPAWN_Repeat.miz
#	Moose Test
Missions/Moose_Test_TASK_Pickup_and_Deploy/MOOSE_Test_TASK_Pickup_and_Deploy.miz
#	Moose Test Missions/Moose_Test_WRAPPER/Moose_Test_WRAPPER.miz
#	Moose Test Missions/Moose_Test_ZONE/Moose_Test_ZONE.miz
#	Moose Test
Missions/Moose_Test_ZONE_POLYGON/Moose_Test_ZONE_POLYGON.miz
#	Moose Test Missions/Moose_Test_ZONE_RADIUS/Moose_Test_ZONE_RADIUS.miz
#	Moose Test Missions/Moose_Test_ZONE_UNIT/Moose_Test_ZONE_UNIT.miz
 2016-07-04 19:43:53 +02:00
FlightControl
a9d54b7d02 Fixed bug with Restart Group after landing and engine shutdown... 
- Due to rename GetDCSGroup to GetDCSObject.
 2016-07-04 16:49:17 +02:00
FlightControl
093f12b57a Updated 2016-07-03 09:41:25 +02:00
FlightControl
d91ba031aa OK, SEADING is now working completely 
with a target zone, and with routing and seading task active in
parallel.
 2016-07-03 09:31:02 +02:00
Sven Van de Velde
eda2794373 Merge pull request #98 from FlightControl-Master/Bugfix 
Bugfix for ZONE_UNIT
 2016-07-03 07:55:17 +02:00
FlightControl
123dc13532 Fixed a bug in ZONE_UNIT 
GetRandomVec2() did not work for ZONE_UNIT
 2016-07-03 07:54:37 +02:00
FlightControl
23ea389b8f Progress on Route 2016-07-03 07:49:26 +02:00
FlightControl
4ac962a87a OK. got workiing prototype now, works! 2016-07-02 09:26:00 +02:00
FlightControl
ae1aeac6ce DONE! Prototype of hierarchical state machine is works!!! 2016-07-02 09:06:29 +02:00
FlightControl
d668b0a0f7 Progress hierarchical state machine 
- sub fsm call is working
- return from fsm to parent fsm is in progress
 2016-07-02 08:17:33 +02:00
FlightControl
7b66589cca Got a first test mission working 2016-07-01 09:16:16 +02:00
FlightControl
6b942590bd Cleaned 2016-07-01 06:15:43 +02:00
FlightControl
65391223d5 SEAD task is working! 2016-07-01 06:13:26 +02:00
FlightControl
e2250dc92f Statemachine 2016-06-30 10:52:37 +02:00
FlightControl
7ab52025fd Merge remote-tracking branch 'refs/remotes/origin/master' into Detection 2016-06-28 12:35:41 +02:00
FlightControl
626b95fb46 Merge remote-tracking branch 'refs/remotes/origin/master' into Bugfix 2016-06-28 12:17:27 +02:00
Sven Van de Velde
eb863416ee Merge pull request #96 from FlightControl-Master/Bugfix 
Fixed GetID bug
- Due to rework, the function GetID got "lost". Added it back.
- Also fixed the OBJECT class now owning the GetID() method.
- Derived methods IDENTIFIABLE and POSITIONABLE fixed.
- Fixed AIRBASE class
 2016-06-28 12:02:13 +02:00
FlightControl
27bb51e69c Fixed GetID bug detected in missiletrainer class. 
- Was part of a larger issue related to the class hierarchy between
Object -> Identifiable -> Positionable ...
- Also fixed AIRBASE class fitting now the class hierarchy.
 2016-06-28 11:59:30 +02:00
FlightControl
dc644df47e Merge remote-tracking branch 'refs/remotes/origin/master' into Bugfix 2016-06-28 11:19:11 +02:00
FlightControl
3a01fb76bf progress 2016-06-28 11:19:01 +02:00
FlightControl
4056e5d66d Merge remote-tracking branch 'refs/remotes/origin/master' into Detection 2016-06-26 07:45:34 +02:00
Sven Van de Velde
1187e46e89 Merge pull request #95 from FlightControl-Master/Remove-routines.scheduleFunction 
Removed completely routines.scheduleFunction
 2016-06-26 07:41:37 +02:00
FlightControl
fefe5382af Removed completely routines.scheduleFunction 2016-06-26 07:41:01 +02:00
Sven Van de Velde
e842c7a042 Merge pull request #94 from FlightControl-Master/Bugfix-Polygon-zone-test 
Fixed the raycasting of ZONE_POLYGON_BASE
 2016-06-26 07:22:25 +02:00
FlightControl
9d7f196075 Fixed the raycasting of ZONE_POLYGON_BASE 
- The raycasting was wrong when the vertices of the polygon were not
closed.
Now after this fix, the raycasting of the polygon is correctly
performed. The begin and end vertices of the polygon don't need to be
closed anymore within the mission editor. Check the test mission
Moose_Test_ZONE_POLYGON.miz
 2016-06-26 07:21:56 +02:00
FlightControl
4a378129f1 Started with DETECTION and FAC presentation 2016-06-25 13:48:36 +02:00
Sven Van de Velde
d211bc084b Merge pull request #93 from FlightControl-Master/SLMOD-fix 
Done fixed for SLMOD. Need to retest.
 2016-06-25 13:30:32 +02:00
FlightControl
c3da8ac008 Done fixed for SLMOD. Need to retest. 2016-06-25 13:29:58 +02:00
FlightControl
8b57ab494b Documentation 2016-06-25 12:54:09 +02:00
Sven Van de Velde
7985cafdc0 Merge pull request #92 from FlightControl-Master/Detection 
Large rework publish



    reworked the core moose class hierarchy
    DETECTION_UNITGROUPS
    FAC_REPORT
    fixes
 2016-06-25 08:54:57 +02:00
FlightControl
c581fe1551 Implemented DETECTION and FAC first classes 2016-06-25 08:53:19 +02:00
FlightControl
a34c04e0f2 Updates in test 2016-06-24 21:22:18 +02:00
FlightControl
5e6043aeb3 Progress reworking object model. 2016-06-24 12:52:52 +02:00
FlightControl
b56210a03a Merge remote-tracking branch 'refs/remotes/origin/master' into Bugfix 2016-06-24 05:48:58 +02:00
FlightControl
e99458520a Merge remote-tracking branch 'refs/remotes/origin/master' into Detection 2016-06-24 05:48:30 +02:00
Sven Van de Velde
2b5140cec1 Merge pull request #87 from FlightControl-Master/Bugfix 
Bugfix
 2016-06-24 05:47:44 +02:00
FlightControl
e014cfce51 Bugfix 
Fixed
 2016-06-24 05:46:21 +02:00
FlightControl
7b8ef52ae0 Merge remote-tracking branch 'refs/remotes/origin/master' into Bugfix 2016-06-24 05:44:15 +02:00
FlightControl
9dcfe83ed8 Updates 2016-06-23 14:46:51 +02:00
FlightControl
8d12cc2a4d Merge remote-tracking branch 'refs/remotes/origin/master' into Detection 2016-06-22 15:13:59 +02:00
FlightControl
12186bf2b0 Fixed AIBALANCER issue #86 2016-06-22 10:21:02 +02:00
Sven Van de Velde
d43a15a977 Merge pull request #85 from FlightControl-Master/Detection 
Detection
 2016-06-22 09:32:25 +02:00
FlightControl
062f34bd26 Fixed bug during detection, when i unit got destroyed, the detection stopped. Fixed now 
Added a test :IsAlive
 2016-06-22 09:31:44 +02:00
FlightControl
08116dab2c Merge remote-tracking branch 'refs/remotes/origin/master' into Detection 
# Conflicts:
#	Moose Mission Setup/Moose Mission Update/l10n/DEFAULT/Moose.lua
#	Moose Mission Setup/Moose.lua
#	Moose Mission Setup/Moose_Create.bat
#	Moose Test Missions/Moose_Test_AIBALANCER/Moose_Test_AIBALANCER.miz
#	Moose Test
Missions/Moose_Test_AIRBASEPOLICE/Moose_Test_AIRBASEPOLICE.miz
#	Moose Test
Missions/Moose_Test_BASE/Moose_Test_AIRBLANCER_with_Moose.miz
#	Moose Test
Missions/Moose_Test_BASE/Moose_Test_AIRBLANCER_without_Moose.miz
#	Moose Test Missions/Moose_Test_BASE/Moose_Test_BASE.miz
#	Moose Test Missions/Moose_Test_CLEANUP/Moose_Test_CLEANUP.miz
#	Moose Test Missions/Moose_Test_DESTROY/MOOSE_Test_DESTROY.miz
#	Moose Test Missions/Moose_Test_ESCORT/MOOSE_Test_ESCORT.miz
#	Moose Test
Missions/Moose_Test_MISSILETRAINER/Moose_Test_MISSILETRAINER.miz
#	Moose Test Missions/Moose_Test_SEAD/MOOSE_Test_SEAD.miz
#	Moose Test Missions/Moose_Test_SET_CLIENT/Moose_Test_SET_CLIENT.miz
#	Moose Test Missions/Moose_Test_SET_GROUP/Moose_Test_SET_GROUP.miz
#	Moose Test Missions/Moose_Test_SPAWN/MOOSE_Test_SPAWN.miz
#	Moose Test
Missions/Moose_Test_SPAWN_Repeat/MOOSE_Test_SPAWN_Repeat.miz
#	Moose Test
Missions/Moose_Test_TASK_Pickup_and_Deploy/MOOSE_Test_TASK_Pickup_and_Deploy.miz
#	Moose Test Missions/Moose_Test_WRAPPER/Moose_Test_WRAPPER.miz
#	Moose Test Missions/Moose_Test_ZONE/Moose_Test_ZONE.miz
#	Moose Test
Missions/Moose_Test_ZONE_POLYGON/Moose_Test_ZONE_POLYGON.miz
#	Moose Test Missions/Moose_Test_ZONE_RADIUS/Moose_Test_ZONE_RADIUS.miz
#	Moose Test Missions/Moose_Test_ZONE_UNIT/Moose_Test_ZONE_UNIT.miz
 2016-06-22 08:54:40 +02:00
HellRayzr
4bd4c6aa79 test 2016-06-20 21:49:24 +02:00
HellRayzr
fdefd87e88 AI BALANCE CHANGE DB 2016-06-20 21:44:01 +02:00
Sven Van de Velde
ca950e1599 Merge pull request #81 from FlightControl-Master/AI-Balancer 
- Replaced range test for unit to range test for players.
- Ensure that players database is properly populated.
- Fixed some documentation.
- Removed smoke from trigger.
- Fixed name of RandomPointVec2 to RandomVec2 and fixed in all usages.
 2016-06-20 13:14:00 +02:00
FlightControl
c8443f8798 Updates and fixes 
- Replaced range test for unit to range test for players.
- Ensure that players database is properly populated.
- Fixed some documentation.
- Removed smoke from trigger.
- Fixed name of RandomPointVec2 to RandomVec2 and fixed in all usages.
 2016-06-20 13:12:51 +02:00
FlightControl
8a3cdc6b85 Merge remote-tracking branch 'refs/remotes/origin/master' into AI-Balancer 2016-06-20 12:33:28 +02:00
FlightControl
ad56973b01 Presentation update 2016-06-20 12:29:11 +02:00