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
|
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 |
|
Steve
|
e363cca064
|
Start of first Rothan mission.
|
2016-03-09 23:26:08 +00:00 |
|
Steve
|
f8344f4047
|
Added new trophies.
|
2016-03-09 15:54:45 +00:00 |
|
Steve
|
93dd00c785
|
Prototyping stats trophies.
|
2016-03-09 12:31:33 +00:00 |
|
Steve
|
fb584735c6
|
Jumpgate updates.
|
2016-03-08 19:00:56 +00:00 |
|
Steve
|
5267b7b559
|
Place wingmates around player at start of mission.
|
2016-03-08 07:21:23 +00:00 |
|
Steve
|
99013a4e99
|
Allow jumpgate to be put into "sleep" state: effectively inactive.
|
2016-03-08 06:55:41 +00:00 |
|
Steve
|
bc1c5d09a8
|
Replaced extraction point with jumpgate.
|
2016-03-07 17:12:21 +00:00 |
|
Steve
|
885d566e6b
|
Don't allow shuttles to be selected during epic battles (for challenges).
|
2016-03-07 12:29:54 +00:00 |
|
Steve
|
d597fa731a
|
Added Challenge #9.
|
2016-03-07 12:29:34 +00:00 |
|
Steve
|
33f2359812
|
Added Clarke mission #4
|
2016-03-06 17:54:03 +00:00 |
|
Steve
|
721ca3e110
|
Trophy updates.
|
2016-03-06 17:13:34 +00:00 |
|
Steve
|
28ef43b632
|
Background updates.
|
2016-03-06 17:13:18 +00:00 |
|
Steve
|
922b39c0ea
|
Challenge #8, defend extraction point. Added flag to allow AI to sometimes ignore extraction point.
|
2016-03-06 09:47:44 +00:00 |
|
Steve
|
fe55f2e8ba
|
Challenge updates.
|
2016-03-05 15:34:49 +00:00 |
|
Steve
|
6dfb51e8b0
|
Allow keys and mouse buttons to be selected in options.
|
2016-03-05 12:35:19 +00:00 |
|
Steve
|
acd53f6b97
|
Further custom control integration.
|
2016-03-05 08:42:35 +00:00 |
|
Steve
|
7979b175a2
|
Waypoint challenge updates.
|
2016-03-04 22:59:16 +00:00 |
|
Steve
|
2b3fecce88
|
Added Challenge #7.
|
2016-03-04 14:14:57 +00:00 |
|
Steve
|
b6012a2e21
|
Merged config branch.
|
2016-03-03 18:03:07 +00:00 |
|
Steve
|
b136a6bb6c
|
Time limit should be 30.
|
2016-03-03 17:20:51 +00:00 |
|
Steve
|
c8dd06dcdc
|
Added AUTO option for music. Reorganised music for easier scanning.
|
2016-03-03 16:16:12 +00:00 |
|
Steve
|
92a9cd7ce6
|
Challenge #6
|
2016-03-03 14:19:34 +00:00 |
|
Steve
|
4f6721cba4
|
Added 5th challenge mission.
|
2016-03-03 11:31:32 +00:00 |
|
Steve
|
d5d5169078
|
Accuracy for rockets and missiles, not just shots.
|
2016-03-03 09:12:08 +00:00 |
|
Steve
|
2c71b16e17
|
Show and apply challenge restrictions.
|
2016-03-02 22:19:26 +00:00 |
|
Steve
|
9dac6aa0ba
|
Challenge #4 tweaks.
|
2016-03-01 07:21:56 +00:00 |
|
Steve
|
9caca3ab82
|
Challenge 04.
|
2016-02-29 21:52:06 +00:00 |
|
Steve
|
d869c22f36
|
Allow random planet and backgrounds for missions, using "AUTO" in mission definition.
|
2016-02-29 14:42:46 +00:00 |
|
Steve
|
bf7d6dc921
|
Added menu to challenges screen.
|
2016-02-29 09:54:03 +00:00 |
|
Steve
|
0e159402e9
|
Show stats button on title screen.
|
2016-02-29 09:35:39 +00:00 |
|
Steve
|
1291c0cf22
|
Tidy up.
|
2016-02-29 09:23:59 +00:00 |
|
Steve
|
ad7a1eefda
|
Challenge integration updates.
|
2016-02-28 13:02:57 +00:00 |
|
Steve
|
a1703d5066
|
vSync is now always on.
|
2016-02-28 10:00:17 +00:00 |
|
Steve
|
2e5b45064a
|
Challenges integration.
|
2016-02-27 16:16:21 +00:00 |
|
Steve
|
2c33041344
|
Load data from files found in directory, rather than using a text file.
|
2016-02-27 16:14:14 +00:00 |
|
Steve
|
266088f764
|
Start of restoring challenges.
|
2016-02-27 12:14:29 +00:00 |
|
Steve
|
1476c69944
|
Various script updates.
|
2016-02-25 10:54:48 +00:00 |
|
Steve
|
12999f3dd9
|
Updated "Pilot" to "Wingmate".
|
2016-02-25 10:53:37 +00:00 |
|
Steve
|
e79d331599
|
Added ALL_OBJECTIVES_COMPLETE script command.
|
2016-02-25 10:52:01 +00:00 |
|
Steve
|
913184d877
|
Removed INF. They don't exist after 2616.
|
2016-02-24 07:16:23 +00:00 |
|
Steve
|
a2a1ec0613
|
Modal message box updates.
|
2016-02-23 22:20:07 +00:00 |
|
Steve
|
368e9dc592
|
Start of modal dialog display.
|
2016-02-23 07:19:31 +00:00 |
|
Steve
|
7ffd3b0406
|
Added Mag cannon training at Sol.
|
2016-02-21 22:49:43 +00:00 |