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
|
5d1edf89b3
|
Merge branch 'develop' into trophies
Conflicts:
data/challenges/10.json
data/missions/rothan/02 - rothan defence #2.json
locale/tbftss.pot
src/battle/ai.c
src/battle/battle.c
src/battle/battle.h
src/battle/fighters.h
src/battle/script.c
src/battle/script.h
src/galaxy/mission.c
src/galaxy/mission.h
src/main.c
|
2016-03-27 11:22:05 +01:00 |
|
Steve
|
e278374490
|
Merge from develop.
|
2016-03-27 11:21:23 +01:00 |
|
Steve
|
005ecce9e4
|
Updated i18n.
|
2016-03-27 11:09:47 +01:00 |
|
Steve
|
b07beab755
|
Added missing mission descriptions.
|
2016-03-27 11:09:01 +01:00 |
|
Steve
|
c00c134b70
|
Allow access to all missions when using -debug.
|
2016-03-27 11:08:44 +01:00 |
|
Steve
|
fe9c49244f
|
Final Clarke mission tweaks.
|
2016-03-27 08:56:18 +01:00 |
|
Steve
|
aadb4f6949
|
Make shield splinter effects more visible.
|
2016-03-27 08:56:09 +01:00 |
|
Steve
|
06f7867013
|
Use CONTROL_NEXT_FIGHTER / CONTROL_PREV_FIGHTER to select fighters during epic missions.
|
2016-03-27 08:55:58 +01:00 |
|
Steve
|
d33bcf9414
|
In epic battles, spawned in entities (such as swarmers) don't count towards the epicLimit.
|
2016-03-27 08:55:25 +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
|
ca043f171c
|
Only initially add active entities to quadtree.
|
2016-03-26 18:15:52 +00:00 |
|
Steve
|
f82f5c6d04
|
i18n updates.
|
2016-03-17 08:11:58 +00:00 |
|
Steve
|
175b7e5ca0
|
Moved entity loading code out of mission.c, and into appropriate c files.
|
2016-03-17 08:11:52 +00:00 |
|
Steve
|
73a3c0c78a
|
Fixed shield splinter effect.
|
2016-03-16 21:54:08 +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
|
4ef796bf92
|
Added id to objective, to allow script to function in non-English languages.
|
2016-03-16 06:54:34 +00:00 |
|
Steve
|
30fa446006
|
Allow script to activate spawners.
|
2016-03-16 06:53:49 +00:00 |
|
Steve
|
0332e2fe20
|
Fixed time script bug.
|
2016-03-16 06:53:30 +00:00 |
|
Steve
|
604526611a
|
Increased flock leading distance.
|
2016-03-16 06:53:20 +00:00 |
|
Steve
|
09e676d713
|
Added simple die, to prevent swarmers spreading debris everywhere.
|
2016-03-16 06:53:07 +00: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
|
612e76fe04
|
Added INF Swarmer.
|
2016-03-14 17:54:56 +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
|
380ca3e26a
|
Tweaked accuracy threshold.
|
2016-03-14 08:30:34 +00:00 |
|
Steve
|
35e23e8450
|
Added large explosions, for capital ships.
|
2016-03-14 08:30:19 +00:00 |
|
Steve
|
ad96a70b0a
|
i18n updates.
|
2016-03-13 10:54:50 +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
|
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
|
675d051011
|
Tidied headers.
|
2016-03-12 18:29:22 +00:00 |
|
Steve
|
ff353136c7
|
Merge branch 'trophies' of ssh://github.com/stephenjsweeney/tbftss into trophies
Conflicts:
src/battle/battle.h
|
2016-03-12 18:28:47 +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
|
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 |