Steve
|
5e1220b9a4
|
Merge branch 'develop' into trophies
Conflicts:
src/battle/bullets.c
src/battle/bullets.h
src/battle/fighters.c
|
2016-04-04 11:30:27 +01:00 |
|
Steve
|
c06c236200
|
Crystabelle -> Christabel
|
2016-04-04 11:24:49 +01:00 |
|
Steve
|
0041ee49b4
|
4th Alba mission.
|
2016-04-04 11:24:35 +01:00 |
|
Steve
|
29d873d28a
|
Allow waypoints to be manually activated. Removed entId from Battle (redundant).
|
2016-04-04 11:23:32 +01:00 |
|
Steve
|
9bbeed7ea4
|
Updated mission descriptions.
|
2016-04-03 09:19:11 +01:00 |
|
Steve
|
c44d605b13
|
Slightly increased time limit.
|
2016-04-02 16:38:01 +01:00 |
|
Steve
|
422901632f
|
Added challenge #12.
|
2016-04-02 09:34:21 +01:00 |
|
Steve
|
28eec0b8e0
|
Merge branch 'develop' into trophies
Conflicts:
README.md
src/defs.h
src/galaxy/mission.c
src/system/sound.c
|
2016-04-01 17:14:06 +01:00 |
|
Steve
|
86b1f27f00
|
Misc misson tweaks.
|
2016-04-01 17:03:11 +01:00 |
|
Steve
|
0985bcd0e9
|
Start of 2nd Aster mission.
|
2016-04-01 14:21:26 +01:00 |
|
Steve
|
fc384452a2
|
Reduced Shale fire rate.
|
2016-04-01 14:19:15 +01:00 |
|
Steve
|
510bd3da00
|
AI target focus for bombers.
|
2016-03-29 22:46:07 +01:00 |
|
Steve
|
6016e46c37
|
Mission tweaks.
|
2016-03-29 21:57:02 +01:00 |
|
Steve
|
ce8f1fed93
|
Replaced Rebel Firefly and Nymph with Razor and Shale.
|
2016-03-29 07:09:10 +01:00 |
|
Steve
|
11ce19e677
|
Added Blizzard.
|
2016-03-28 22:33:15 +01:00 |
|
Steve
|
f114ad7e7e
|
Merge branch 'develop' into trophies
|
2016-03-28 16:09:24 +01:00 |
|
Steve
|
c0a547addb
|
Added Razor and Shale.
|
2016-03-28 13:54:06 +01:00 |
|
Steve
|
0e4129069a
|
Start of first Aster mission.
|
2016-03-28 11:47:24 +01:00 |
|
Steve
|
ab8be196b5
|
Khepri now green and associated with rogue nation.
|
2016-03-28 11:47:11 +01:00 |
|
Steve
|
45d9d2a00d
|
Don't show mission target boxes around capital ship components.
|
2016-03-28 11:45:48 +01:00 |
|
Steve
|
e278374490
|
Merge from develop.
|
2016-03-27 11:21:23 +01:00 |
|
Steve
|
b07beab755
|
Added missing mission descriptions.
|
2016-03-27 11:09:01 +01:00 |
|
Steve
|
fe9c49244f
|
Final Clarke mission tweaks.
|
2016-03-27 08:56:18 +01:00 |
|
Steve
|
6ca888d775
|
Misc. mission clean up.
|
2016-03-26 18:16:28 +00:00 |
|
Steve
|
743a2d73d4
|
Start of final Clarke mission.
|
2016-03-26 18:16:17 +00:00 |
|
Steve
|
8c639a9cb5
|
Clarke now falls to the Pandorans.
|
2016-03-26 18:16:05 +00:00 |
|
Steve
|
1b43e4908c
|
Added ability to hide objective numbers.
|
2016-03-16 19:24:41 +00:00 |
|
Steve
|
50cde212f4
|
Clark mission #5 tweaks.
|
2016-03-16 06:55:07 +00:00 |
|
Steve
|
09e676d713
|
Added simple die, to prevent swarmers spreading debris everywhere.
|
2016-03-16 06:53:07 +00:00 |
|
Steve
|
13344ddc06
|
Made many attributes optional.
|
2016-03-14 17:55:34 +00:00 |
|
Steve
|
612e76fe04
|
Added INF Swarmer.
|
2016-03-14 17:54:56 +00:00 |
|
Steve
|
4e8b85b6a1
|
Removed script-based spawner. Redundant.
|
2016-03-14 11:28:01 +00:00 |
|
Steve
|
380ca3e26a
|
Tweaked accuracy threshold.
|
2016-03-14 08:30:34 +00:00 |
|
Steve
|
35b5e4a1c6
|
Misc cleanup.
|
2016-03-13 10:52:12 +00:00 |
|
Steve
|
34e4880535
|
Added challenge #11.
|
2016-03-13 10:50:41 +00:00 |
|
Steve
|
160f65a15b
|
Added EF_NO_KILL_INC to prevent kill count increment.
|
2016-03-13 10:50:32 +00:00 |
|
Steve
|
f5b3933a87
|
Merge branch 'develop' into trophies
Conflicts:
src/battle/battle.c
|
2016-03-12 18:28:43 +00:00 |
|
Steve
|
0a69dd0e5e
|
Merge from develop.
|
2016-03-12 18:22:48 +00:00 |
|
Steve
|
0d074eaa22
|
JSON bug fix.
|
2016-03-12 15:13:04 +00:00 |
|
Steve
|
71b0a00689
|
Use EF_DISABLED for jumpgates, rather than systemPower.
|
2016-03-12 12:35:05 +00:00 |
|
Steve
|
5d38abcbeb
|
Use EF_DISABLED, instead of system power.
|
2016-03-12 12:12:12 +00:00 |
|
Steve
|
a4fbb85cb6
|
Rothan mission #2
|
2016-03-12 12:11:06 +00:00 |
|
Steve
|
96556bc0df
|
Increased Rook firepower.
|
2016-03-12 12:09:50 +00:00 |
|
Steve
|
ae6e2ede09
|
Control waypoints from script.
|
2016-03-12 12:09:42 +00:00 |
|
Steve
|
4f19dcb9a5
|
Added challenge #10.
|
2016-03-11 23:46:00 +00:00 |
|
Steve
|
91e0073cfa
|
Merge branch 'develop' into trophies
|
2016-03-10 17:52:07 +00:00 |
|
Steve
|
ed438db279
|
Grammar.
|
2016-03-10 17:51:55 +00:00 |
|
Steve
|
e8d63df494
|
Merge remote-tracking branch 'origin/develop' into trophies
# Conflicts:
# src/battle/battle.c
# src/challenges/challengeHome.c
|
2016-03-10 12:04:04 +00:00 |
|
Steve
|
d2803bf961
|
Various mission tweaks.
|
2016-03-10 11:57:46 +00:00 |
|
Steve
|
80658d6537
|
Added initial INF tug graphics.
|
2016-03-10 11:56:14 +00:00 |