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
|
cca080e88f
|
Updated i18n.
|
2016-03-12 15:13:12 +00:00 |
|
Steve
|
0d074eaa22
|
JSON bug fix.
|
2016-03-12 15:13:04 +00:00 |
|
Steve
|
a5509b5bcd
|
Logging updates.
|
2016-03-12 15:12:52 +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
|
bdced9c00f
|
Use aiActionTime, instead of thinkTime, to allow waypoint to continue to spin.
|
2016-03-12 12:11:56 +00:00 |
|
Steve
|
e9c43f3d60
|
Flocking tweak.
|
2016-03-12 12:11:30 +00:00 |
|
Steve
|
a4fbb85cb6
|
Rothan mission #2
|
2016-03-12 12:11:06 +00:00 |
|
Steve
|
b235a11f3d
|
Updated waypoint graphics.
|
2016-03-12 12:10:50 +00:00 |
|
Steve
|
ed6b0ae376
|
Don't point to jumpgate on HUD if it's inactive.
|
2016-03-12 12:10:14 +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
|
4f27b40d97
|
Added rescue challenges
|
2016-03-11 23:45:47 +00:00 |
|
Steve
|
3bd78dbd20
|
Spawn fighters offscreen or off map.
|
2016-03-11 23:45:12 +00:00 |
|
Steve
|
c66b734e7e
|
Added interval-based script events.
|
2016-03-11 23:43:50 +00:00 |
|
Steve
|
0952920325
|
Various trophy integration tweaks.
|
2016-03-11 13:51:27 +00:00 |
|
Steve
|
0671000366
|
Merge remote-tracking branch 'origin/develop' into trophies
|
2016-03-11 11:31:38 +00:00 |
|
Steve
|
553178128f
|
InitStars during start up (lost during memory leak fixes).
|
2016-03-11 07:22:23 +00:00 |
|
Steve
|
7ba4dcf26c
|
Memory leak fixes.
|
2016-03-10 22:47:33 +00:00 |
|
Steve
|
da97818259
|
Trophy-related prototyping fixes.
|
2016-03-10 18:02:19 +00:00 |
|
Steve
|
5706e1d29c
|
Added trophy alert sound effect.
|
2016-03-10 18:01:43 +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
|
4bb3ae1efb
|
Menu entry and icons for Linux.
|
2016-03-10 16:07:02 +00:00 |
|
Steve
|
26b6b3eb7e
|
i18n updates.
|
2016-03-10 15:44:48 +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
|
25b641c8d4
|
MIsc. clean up.
|
2016-03-10 11:58:10 +00:00 |
|
Steve
|
d2803bf961
|
Various mission tweaks.
|
2016-03-10 11:57:46 +00:00 |
|
Steve
|
772dc44ea4
|
Added -Wempty-body.
|
2016-03-10 11:57:18 +00:00 |
|
Steve
|
108dfa44d7
|
Allow tugs with AIF_UNLIMITED_RANGE to find targets anywhere.
|
2016-03-10 11:57:05 +00:00 |
|
Steve
|
3a0618b150
|
Rope cutting bug fix.
|
2016-03-10 11:56:38 +00:00 |
|
Steve
|
812f69b02e
|
Drawn effects bug fix.
|
2016-03-10 11:56:27 +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
|
ebfea2b5c4
|
Unlock next challenge mission is previous has been passed.
|
2016-03-09 23:25:54 +00:00 |
|
Steve
|
0bcc69ee69
|
Move planet a little faster.
|
2016-03-09 23:25:27 +00:00 |
|
Steve
|
1a4b5c679c
|
Don't attach rope to vessel with rope already attached.
|
2016-03-09 23:25:12 +00:00 |
|
Steve
|
7789d3ab64
|
Remove rope flags when rope is detached.
|
2016-03-09 23:22:32 +00:00 |
|
Steve
|
c9bde77bca
|
Spin jumpgate portal a little faster.
|
2016-03-09 23:21:51 +00:00 |
|
Steve
|
8017719239
|
Allow fighters to be added to mission in disabled state.
|
2016-03-09 23:21:28 +00:00 |
|
Steve
|
46503f4fe7
|
Mark craft as stolen if they are moved to jumpgate by a vessel not on your side.
|
2016-03-09 23:20:50 +00:00 |
|
Steve
|
16c8f81389
|
Play sound effects for control config widgets.
|
2016-03-09 23:19:10 +00:00 |
|
Steve
|
bb892c1efe
|
Added new HUD icons.
|
2016-03-09 23:18:40 +00:00 |
|
Steve
|
831dbf2fdc
|
Create POT with trophy info.
|
2016-03-09 15:55:01 +00:00 |
|
Steve
|
f8344f4047
|
Added new trophies.
|
2016-03-09 15:54:45 +00:00 |
|
Steve
|
25101c0f1d
|
Now automatically checking trophies based on star system name.
|
2016-03-09 15:54:25 +00:00 |
|
Steve
|
ba5260104a
|
Check trophies at start of galactic map.
|
2016-03-09 15:53:56 +00:00 |