1119 Commits

Author SHA1 Message Date
FlightControl
2cf27b3b0f SCO-500 Demo Mission for SCORING system demonstration on a MP server 2017-03-05 14:37:18 +01:00
FlightControl
a6c596f724 Check scoring test mission in master. 2017-03-05 14:23:13 +01:00
FlightControl
fc3b66c06c Removed trace from Zone.lua 2017-03-05 10:27:54 +01:00
FlightControl
b004f0f968 Removed trace 2017-03-05 10:27:29 +01:00
FlightControl
56c9401ce3 Merge remote-tracking branch 'refs/remotes/origin/master' into master-bugfix 2017-03-05 10:15:27 +01:00
FlightControl
3244f46e88 Moose.lua with the changes 2017-03-05 10:14:53 +01:00
FlightControl
538e040fdf Updated Database 2017-03-05 10:05:12 +01:00
Sven Van de Velde
158e41e04e Merge pull request #279 from FlightControl-Master/master-bugfix
Master bugfix
2017-03-05 10:01:58 +01:00
FlightControl
0d474b2286 Updated Database 2017-03-05 10:01:28 +01:00
FlightControl
79657efaf8 Merge remote-tracking branch 'refs/remotes/origin/master' into master-bugfix 2017-03-05 09:54:43 +01:00
Sven Van de Velde
48841f2412 Merge pull request #278 from FlightControl-Master/master-bugfix
Master bugfix
2017-03-05 09:51:01 +01:00
FlightControl
0ebff60e8d Updated Set 2017-03-05 09:50:31 +01:00
FlightControl
5c5bedd794 Merge remote-tracking branch 'refs/remotes/origin/master' into master-bugfix 2017-03-05 09:46:00 +01:00
Sven Van de Velde
91bc509984 Merge pull request #277 from FlightControl-Master/master-adding
Zone boundaries by tires with a white flag.
2017-03-05 09:33:21 +01:00
FlightControl
f7bf997511 Implemented a new method on ZONE:BoundZone
Creates a visual boundary around a ZONE_* of tires with a white flag.
These tires will also move when the ZONE is "rebound".
2017-03-05 09:32:17 +01:00
FlightControl
5793e04aeb Merge remote-tracking branch 'refs/remotes/origin/master' into master-adding 2017-03-05 07:46:09 +01:00
Sven Van de Velde
b81bc550ec Merge pull request #267 from FlightControl-Master/master-bugfix
Master bugfix
v1.1
2017-03-04 16:03:19 +01:00
FlightControl
f725866ef4 Docs 2017-03-04 16:02:37 +01:00
FlightControl
842aa878ad EVENTDATA structure was hidden in documentation. 2017-03-04 16:02:21 +01:00
FlightControl
bbc9ddf9a3 Merge remote-tracking branch 'refs/remotes/origin/master' into master-bugfix 2017-03-04 16:01:41 +01:00
FlightControl
bf5dce5b5f Merge remote-tracking branch 'refs/remotes/origin/master' into master-bugfix 2017-03-04 15:48:12 +01:00
Sven Van de Velde
c9a3740ac7 Merge pull request #266 from FlightControl-Master/master-scoring
Master scoring - Bugfixes
2017-03-04 15:01:01 +01:00
FlightControl
942ae18290 BUGFIXES: Fixed problems
-- With menu
-- On destroy, sometimes the wrong target was scored. Is fixed, was
silly leftover statement that did that. Corrected.
-- Goals added.
2017-03-04 14:59:56 +01:00
FlightControl
a8d4e5e5e6 Merge remote-tracking branch 'refs/remotes/origin/master' into master-scoring 2017-03-04 09:10:35 +01:00
Sven Van de Velde
1ec21942af Merge pull request #265 from FlightControl-Master/master-adding
Added methods Set and Add to the POINT_VEC3 and POINT_VEC2 classes + documentation
2017-03-03 13:35:53 +01:00
FlightControl
b75c1a92ad Added POINT_VEC3 and POINT_VEC2 Set and Add methods + documentation 2017-03-03 13:34:10 +01:00
FlightControl
ba1a08920f Merge remote-tracking branch 'refs/remotes/origin/master' into master-scoring 2017-03-03 08:34:38 +01:00
FlightControl
edaa5112a1 Merge remote-tracking branch 'refs/remotes/origin/master' into master-adding 2017-03-03 08:34:21 +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