Commit Graph

1055 Commits

Author SHA1 Message Date
FlightControl 22fdf034ee Progress on SEAD 2017-03-03 10:49:38 +01:00
FlightControl a99924d9ed Progress on SEAD model 2017-03-03 10:27:09 +01:00
FlightControl 846edca815 Merge remote-tracking branch 'refs/remotes/origin/master' into FlightControl
# Conflicts:
#	Moose Mission Setup/Moose Mission Update/l10n/DEFAULT/Moose.lua
#	Moose Mission Setup/Moose.lua
#	Moose Test Missions/SPA - Spawning/SPA-010 - Spawn Demo/SPA-010 -
Spawn Demo.miz
#	Moose Test Missions/SPA - Spawning/SPA-011 - Ground Ops - Simple
Spawning/SPA-011 - Ground Ops - Simple Spawning.miz
#	Moose Test Missions/SPA - Spawning/SPA-012 - Ground Ops - Multiple
Spawns/SPA-012 - Ground Ops - Multiple Spawns.miz
#	Moose Test Missions/SPA - Spawning/SPA-013 - Ground Ops - Scheduled
Spawns/SPA-013 - Ground Ops - Scheduled Spawns.miz
#	Moose Test Missions/SPA - Spawning/SPA-014 - Ground Ops - Scheduled
Spawns Limited/SPA-014 - Ground Ops - Scheduled Spawns Limited.miz
#	Moose Test Missions/SPA - Spawning/SPA-015 - Ground Ops - Randomize
Route/SPA-015 - Ground Ops - Randomize Route.miz
#	Moose Test Missions/SPA - Spawning/SPA-016 - Ground Ops - Randomize
Zones/SPA-016 - Ground Ops - Randomize Zones.miz
#	Moose Test Missions/SPA - Spawning/SPA-017 - Ground Ops - Set AI
inactive while spawning/SPA-017 - Ground Ops - Set AI inactive while
spawning.miz
#	Moose Test Missions/SPA - Spawning/SPA-018 - Ground Ops - Randomize
Templates/SPA-018 - Ground Ops - Randomize Templates.miz
#	Moose Test Missions/SPA - Spawning/SPA-100 - CleanUp Inactive
Units/SPA-100 - CleanUp Inactive Units.miz
#	Moose Test Missions/SPA - Spawning/SPA-110 - Limit Spawning/SPA-110 -
Limit Spawning.miz
#	Moose Test Missions/SPA - Spawning/SPA-121 - Air Ops - Scheduled
Spawns with Repeat on Landing with Limit/SPA-121 - Air Ops - Scheduled
Spawns with Repeat on Landing with Limit.miz
#	Moose Test Missions/SPA - Spawning/SPA-130 - Uncontrolled
Spawning/SPA-130 - Uncontrolled Spawning.miz
#	Moose Test Missions/SPA - Spawning/SPA-200 - Randomize Unit
Types/SPA-200 - Randomize Unit Types.miz
#	Moose Test Missions/SPA - Spawning/SPA-220 - Randomize Zones/SPA-220 -
Randomize Zones.miz
#	Moose Test Missions/SPA - Spawning/SPA-310 - Spawn at Static
position/SPA-310 - Spawn at Static position.miz
#	Moose Test Missions/SPA - Spawning/SPA-320 - Spawn at Unit
position/SPA-320 - Spawn at Unit position.miz
#	Moose Test Missions/SPA - Spawning/SPA-330 - Spawn at Vec2
position/SPA-330 - Spawn at Vec2 position.miz
#	Moose Test Missions/SPA - Spawning/SPA-340 - Spawn at Vec3
position/SPA-340 - Spawn at Vec3 position.miz
#	Moose Test Missions/ZON - Zones/ZON-100 - Normal Zone/ZON-100 - Normal
Zone.miz
#	docs/Documentation/Zone.html
2017-03-03 09:51:17 +01:00
Sven Van de Velde d6afb5e6e7 Merge pull request #264 from FlightControl-Master/master-adding
Added methods to POINT_VEC3 and documentation
2017-03-03 08:33:30 +01:00
FlightControl 5d17cde83a Added methods to POINT_VEC3 and documented 2017-03-03 08:31:45 +01:00
FlightControl 83447468f8 Merge remote-tracking branch 'refs/remotes/origin/master' into master-adding 2017-03-03 08:14:34 +01:00
Sven Van de Velde 1af9ad46b9 Merge pull request #263 from FlightControl-Master/master-scoring
Added API to set Score GOALs
2017-03-03 08:09:19 +01:00
FlightControl ef5f83034b Added API to set Goal Scores upon a condition 2017-03-03 08:08:29 +01:00
FlightControl 1b6d241acc Merge remote-tracking branch 'refs/remotes/origin/master' into master-scoring 2017-03-02 23:56:29 +01:00
Sven Van de Velde 9bc84264ef Merge pull request #262 from FlightControl-Master/master-scoring
Master scoring
2017-03-02 23:34:33 +01:00
FlightControl c476c7df27 Fix of scheduler.
When trace is off, the scheduler removed the link to placed schedules.
This was wrong due to a wrong weak table. Corrected.
2017-03-02 23:33:54 +01:00
FlightControl 082e1d5e2e Merge remote-tracking branch 'refs/remotes/origin/master' into master-scoring 2017-03-02 17:53:34 +01:00
Sven Van de Velde fbec9519ee Merge pull request #261 from FlightControl-Master/master-scoring
Master scoring
2017-03-02 17:45:14 +01:00
FlightControl 336f1781a7 Scoring scale change
-- Presentation update
-- Documentation updated
-- SetScale functions instead of multiplier
-- Updated proper scoring scaling formula!
2017-03-02 17:43:46 +01:00
FlightControl 4861c46e0d Merge remote-tracking branch 'refs/remotes/origin/master' into master-scoring 2017-03-02 17:43:18 +01:00
Sven Van de Velde 9ea2221c33 Merge pull request #260 from Kalbuth/master
Added TimeOut functionality for TASK, coded by whisper.
2017-03-02 13:39:45 +01:00
Kalbuth f945018dfe Added TimeOut functionality for TASK
SetTimeOut( Timer ) method added, to have TASK go into Cancelled state is staying in Planned state for more than Timer seconds.
2017-03-02 13:21:30 +01:00
FlightControl 45c7f72732 Merge remote-tracking branch 'refs/remotes/origin/master' into master-scoring 2017-03-02 12:50:00 +01:00
Sven Van de Velde f3d5b17548 Merge pull request #259 from FlightControl-Master/master-scoring
BIGFIX: Scoring Coalition change Fratricide
2017-03-02 12:30:21 +01:00
FlightControl 3789bf79c2 BIGFIX: Scoring Coalition change Fratricide
Fixed some bugs in the logging of fratricide.
2017-03-02 12:29:41 +01:00
Sven Van de Velde 7f3a2fa8e1 Merge pull request #257 from FlightControl-Master/master-bugfix-scoring-client-to-client
BUGFIX: Fixed a problem in AI_BALANCER. When the SPAWN object uses the InitLimit method to limit the amount of airplanes spawned, the OnAfterSpawned event would always be called, even when Spawn() would return an empty group, because the limit of spawned groups was reached. This resulted in the OnAfterSpawned event handler receiving an empty AIGroup object, with all the consequences you can imagine.
Now, the AI_BALANCER code has been adapted, that, if the SPAWN object returns en empty AIGroup, then the OnAfterSpawned event will **not** be triggered!
2017-03-02 10:00:46 +01:00
FlightControl 7c7aa76fdd Update to AI_Balancer 2017-03-02 09:56:47 +01:00
FlightControl 0a3db0034f Scoring maths 2017-03-01 10:16:44 +01:00
FlightControl 72d6b2b769 Presentation 2017-03-01 10:15:10 +01:00
FlightControl 36aac4162d Merge remote-tracking branch 'refs/remotes/origin/master' into master-bugfix-scoring-client-to-client 2017-03-01 09:39:28 +01:00
FlightControl 8d65e6f05a New video from Gunterlund 2017-02-28 21:59:29 +01:00
Sven Van de Velde d496b594ae Merge pull request #256 from FlightControl-Master/master-bugfix-scoring-client-to-client
New SCORING class
2017-02-28 18:54:00 +01:00
FlightControl 5dec4b137b Static moose.lua 2017-02-28 18:52:34 +01:00
FlightControl a0029fd0bd Merge remote-tracking branch 'refs/remotes/origin/master' into master-bugfix-scoring-client-to-client 2017-02-28 18:51:34 +01:00
FlightControl ad3baa1f0d Static moose.lua 2017-02-28 18:50:35 +01:00
Sven Van de Velde 9d23c4943c Merge pull request #255 from FlightControl-Master/master-bugfix-scoring-client-to-client
New SCORING class release.
New SCORING class ...

-- Client to Client scoring working
-- CSV file working
-- Conditional display of messages
-- Set audience of messages (all or coalition)
-- Set additional scoring per unit, static
-- Set zones with additional scoring
-- Set fraticide levels
-- Set scoring multipliers
-- Set penalty scores when a player changes coalition.

New methods in MESSAGE class
-- ToAllIf() - Only send when a condition is true.
-- ToCoalitionIf() - Only send when a condition is true.

Important! Some ZONE methods have changed name!
-- 2017-02-28: ZONE_BASE:IsVec2InZone() replaces ZONE_BASE:IsPointVec2InZone().
-- 2017-02-28: ZONE_BASE:IsVec3InZone() replaces ZONE_BASE:IsPointVec3InZone().
-- 2017-02-28: ZONE_RADIUS:IsVec2InZone() replaces ZONE_RADIUS:IsPointVec2InZone().
-- 2017-02-28: ZONE_RADIUS:IsVec3InZone() replaces ZONE_RADIUS:IsPointVec3InZone().
-- 2017-02-28: ZONE_POLYGON:IsVec2InZone() replaces ZONE_POLYGON:IsPointVec2InZone().
-- 2017-02-28: ZONE_POLYGON:IsVec3InZone() replaces ZONE_POLYGON:IsPointVec3InZone().

The EVENTDISPATCHER:
-- now also processes SCENERY and STATICS.
-- Fields of EVENTDATA are now properly documented.
-- Fields are conditionallly filled, based on SCENERY, STATICS, UNIT.
-- Additional fields are added to EVENTDATA.

A new SCENERY class has been added.

Updated documentation.

SCO-100 has been updated. More test missions to be created.
2017-02-28 18:49:16 +01:00
FlightControl 438a587927 Wrap up updates. 2017-02-28 18:35:29 +01:00
FlightControl b9bd76f387 Progress 2017-02-28 18:16:13 +01:00
FlightControl 316d7325bc Progress 2017-02-28 18:16:05 +01:00
FlightControl d779fb4167 Event too 2017-02-28 14:01:57 +01:00
FlightControl 8edbb5ca23 Progress, a lot is working already. 2017-02-28 14:01:38 +01:00
FlightControl e0254308d3 Progress 2017-02-27 16:27:21 +01:00
FlightControl 405c297cdf Documentation 2017-02-27 11:17:24 +01:00
FlightControl 1f109c3935 Merge remote-tracking branch 'refs/remotes/origin/master' into master-bugfix-scoring-client-to-client 2017-02-27 10:33:10 +01:00
FlightControl 1e143778bd Scoring updates 2017-02-26 22:55:36 +01:00
Sven Van de Velde 389659df0c Merge pull request #253 from FlightControl-Master/master-bugfix-scoring-client-to-client
Master bugfix scoring client to client
2017-02-26 15:31:55 +01:00
FlightControl c9c3b11b14 Updated static scores 2017-02-26 15:31:23 +01:00
FlightControl 0f7bc2b663 First draft version new scoring 2017-02-26 15:25:32 +01:00
FlightControl 41eb39c2a5 Task Templates 2017-02-26 13:30:29 +01:00
Sven Van de Velde 490f1b47c7 SCORING new functions addons. 2017-02-26 11:58:26 +01:00
Sven Van de Velde b8df0c433b bugfixes and cleanup of scoring code for player to player scoring 2017-02-26 07:58:02 +01:00
Sven Van de Velde e29d486dfb Trace 2017-02-24 13:47:26 +01:00
Sven Van de Velde 5f6deff3fa BUGFIX of Scoring CLIENT to CLIENT.
Creation of test mission to test hits and kills client to client.
2017-02-24 13:45:56 +01:00
Sven Van de Velde 34cdfbad40 Merge remote-tracking branch 'refs/remotes/origin/master' into master-bugfix 2017-02-24 13:35:22 +01:00
Sven Van de Velde 20215d105f Merge pull request #251 from FlightControl-Master/master-bugfix-spawn-randomizetemplate
Master bugfix spawn randomizetemplate
2017-02-24 13:15:04 +01:00