1cb97aca38
Merge remote-tracking branch 'refs/remotes/origin/master' into MissileTrainer
...
# Conflicts:
# Embedded/Moose_Embedded.lua
# Moose/MissileTrainer.lua
# Test Missions/Moose_Test_MISSILETRAINER/Moose_Test_MISSILETRAINER.lua
# Test Missions/Moose_Test_MISSILETRAINER/Moose_Test_MISSILETRAINER.miz
2016-05-18 11:09:21 +02:00
df783226cb
Merge remote-tracking branch 'refs/remotes/origin/master' into MissileTrainer
2016-05-18 11:00:54 +02:00
62d04113d3
Revert "Embedded"
...
This reverts commit 6a06632a5e
2016-05-18 11:00:50 +02:00
6a06632a5e
Embedded
2016-05-18 10:44:26 +02:00
83d5338b16
Merge pull request #46 from FlightControl-Master/MissileTrainer
...
Missiletrainer
2016-05-17 10:58:53 +02:00
9b0879626f
Fix bug where missiles were deleted client to client
...
Bug solve of the early deletion of missiles fired from client to client
(air to air f.e.).
Updated documentation.
Added API to change the frequency of tracking.
2016-05-17 10:57:51 +02:00
fe36e0ee2a
Merge remote-tracking branch 'refs/remotes/origin/master' into MissileTrainer
2016-05-17 09:47:51 +02:00
d198da5ada
Merge remote-tracking branch 'refs/remotes/origin/master' into MissileTrainer
2016-05-17 07:14:08 +02:00
2eb784abad
Merge remote-tracking branch 'refs/remotes/origin/master' into MissileTrainer
...
# Conflicts:
# Moose/MissileTrainer.lua
2016-05-17 07:13:50 +02:00
cbcc9b411f
Documentation of MISSILETRAINER
2016-05-17 07:07:36 +02:00
1fef4793ca
Merge remote-tracking branch 'refs/remotes/origin/master' into MissileTrainer
...
# Conflicts:
# Moose/MissileTrainer.lua
2016-05-17 07:05:27 +02:00
ff689b05be
Merge pull request #45 from FlightControl-Master/Documentation
...
Documentation
2016-05-17 06:35:13 +02:00
219f44e008
Embedded
2016-05-17 06:33:19 +02:00
7a91bdff72
Updated documentation to MISSILELAUNCHER
2016-05-17 06:32:34 +02:00
f20ba8985b
Updates
2016-05-17 05:14:35 +02:00
75b2a668dd
Updated documentation for missile trainer
2016-05-16 09:06:02 +02:00
37c8bb5477
Merge pull request #44 from FlightControl-Master/Database-Rework
...
Database rework
2016-05-14 07:11:39 +02:00
0a66cb6a59
Documentation
2016-05-14 07:10:19 +02:00
bca06c1dbf
Updated documentation of Client
2016-05-14 06:47:22 +02:00
128bb0cc2c
Documentation
2016-05-14 06:41:46 +02:00
fe8438648c
Documentation + Added further APIs
2016-05-14 06:35:45 +02:00
d1b3de1940
Progress
2016-05-13 12:46:08 +02:00
6dd4bc638e
Updates
2016-05-12 14:54:52 +02:00
971f5e9ca4
Updates
2016-05-12 14:53:28 +02:00
e486c80350
Got something working now
2016-05-12 12:38:35 +02:00
01531f0c73
Progress
2016-05-11 17:18:50 +02:00
4d40f28cf8
Revised client and database logic. Still work in progress.
2016-05-11 14:19:46 +02:00
e71c02b885
Merge remote-tracking branch 'refs/remotes/origin/master' into Database-Rework
2016-05-11 06:07:24 +02:00
15b189d747
commit
2016-05-11 06:07:05 +02:00
5990650529
Merge remote-tracking branch 'refs/remotes/origin/master' into MissileTrainer
2016-05-11 05:57:25 +02:00
b836ca5fcd
Merge pull request #43 from FlightControl-Master/Clean-Web-Site
...
Removal of website from master
2016-05-11 05:51:22 +02:00
45cc120f76
Removal of website from master
...
(is still in the documentation branch)
2016-05-11 05:50:54 +02:00
db2cc49b85
Work in progress
2016-05-10 20:01:45 +02:00
37ec8c294f
Merge remote-tracking branch 'refs/remotes/origin/master' into Database-Rework
2016-05-10 17:30:53 +02:00
b7a2e8b278
Embedded
2016-05-10 17:28:37 +02:00
4667e7c41c
Solved bug in SCHEDULER
2016-05-10 17:28:14 +02:00
9f8bfa1603
Merge pull request #41 from FlightControl-Master/Rework-Scheduling-with-SCHEDULER-class
...
Rework scheduling with scheduler class
2016-05-10 15:49:37 +02:00
812c4216c5
Updated SPAWN with the SCHEDULER class
2016-05-10 15:48:53 +02:00
34d268b451
Optimized the scheduler
2016-05-10 12:05:07 +02:00
7e8090f772
Merge pull request #40 from FlightControl-Master/Anapa-Airbase-fixes
...
Anapa airbase fixes
2016-05-09 15:03:32 +02:00
bfb1bcc232
Anapa Airbase red Task Force 4 is working now :-)
...
You can pickup oil workers from the oil derrick with the helicopter in
mid sea...
2016-05-09 15:01:19 +02:00
8ef6ef14dd
Updates
2016-05-08 16:16:41 +02:00
3965c5e254
Merge pull request #39 from FlightControl-Master/Anapa-Airbase-fixes
...
Anapa airbase fixes
2016-05-07 15:27:01 +02:00
aaa3ab07e3
Updated Anapa Airbase
2016-05-07 15:25:51 +02:00
38244f10dd
Embedded
2016-05-07 07:18:54 +02:00
1949d69fa0
Updated Anapa
2016-05-07 06:59:15 +02:00
c68e4cd257
progress
2016-05-06 19:12:02 +02:00
4704afdc6c
Merge remote-tracking branch 'refs/remotes/origin/master' into Anapa-Airbase-fixes
2016-05-06 16:44:59 +02:00
979de8901c
Merge pull request #38 from FlightControl-Master/MissileTrainer
...
Missiletrainer
2016-05-06 16:43:48 +02:00
ad2c3ed83f
commit
2016-05-06 16:41:59 +02:00
Sven Van de Velde