Steve
|
47f7f5671a
|
Added trophy graphics.
|
2016-03-27 11:32:38 +01:00 |
|
Steve
|
147f2afae4
|
Merge branch 'trophies' of ssh://github.com/stephenjsweeney/tbftss into trophies
Conflicts:
locale/tbftss.pot
src/battle/battle.c
src/battle/battle.h
src/galaxy/mission.c
|
2016-03-27 11:25:50 +01:00 |
|
Steve
|
e278374490
|
Merge from develop.
|
2016-03-27 11:21:23 +01:00 |
Sweeney
|
1938c6714c
|
Merge remote-tracking branch 'origin/develop' into trophies
# Conflicts:
# data/challenges/10.json
# locale/tbftss.pot
# src/battle/battle.c
# src/battle/battle.h
# src/battle/script.h
# src/galaxy/mission.c
|
2016-03-15 12:19:32 +00:00 |
|
Steve
|
13344ddc06
|
Made many attributes optional.
|
2016-03-14 17:55:34 +00:00 |
|
Steve
|
1fbf31e56c
|
Don't check spawners if player is dead.
|
2016-03-14 17:55:09 +00:00 |
|
Steve
|
634d914bd9
|
Jumpgate initial state fix.
|
2016-03-14 11:28:19 +00:00 |
|
Steve
|
4e8b85b6a1
|
Removed script-based spawner. Redundant.
|
2016-03-14 11:28:01 +00:00 |
|
Steve
|
edc18579ec
|
Added support for spawners.
|
2016-03-14 11:12:22 +00:00 |
|
Steve
|
35e23e8450
|
Added large explosions, for capital ships.
|
2016-03-14 08:30:19 +00:00 |
|
Steve
|
35b5e4a1c6
|
Misc cleanup.
|
2016-03-13 10:52:12 +00:00 |
|
Steve
|
7b0c70005f
|
Lookup updates.
|
2016-03-13 10:52:02 +00:00 |
|
Steve
|
b37a268169
|
Added capital ships to challenge killLimit check.
|
2016-03-13 10:51:48 +00:00 |
|
Steve
|
160f65a15b
|
Added EF_NO_KILL_INC to prevent kill count increment.
|
2016-03-13 10:50:32 +00:00 |
|
Steve
|
675d051011
|
Tidied headers.
|
2016-03-12 18:29:22 +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
|
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
|
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
|
ed6b0ae376
|
Don't point to jumpgate on HUD if it's inactive.
|
2016-03-12 12:10:14 +00:00 |
|
Steve
|
ae6e2ede09
|
Control waypoints from script.
|
2016-03-12 12:09:42 +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
|
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
|
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
|
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
|
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
|
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 |
|
Steve
|
93dd00c785
|
Prototyping stats trophies.
|
2016-03-09 12:31:33 +00:00 |
|
Steve
|
f867e793bd
|
Trophy prototyping.
|
2016-03-09 11:51:26 +00:00 |
|
Steve
|
fb584735c6
|
Jumpgate updates.
|
2016-03-08 19:00:56 +00:00 |
|
Steve
|
7118c10648
|
Draw jumpgate portal in jumpgate.c. Use systemPower instead of ALIVE_SLEEPING to determine status.
|
2016-03-08 14:28:11 +00:00 |
|
Steve
|
22b5267ffd
|
Initially add all entities to quadtree, to avoid the popping effect.
|
2016-03-08 07:12:06 +00:00 |