Commit Graph

1649 Commits

Author SHA1 Message Date
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
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