Commit Graph

1358 Commits

Author SHA1 Message Date
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
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 5267b7b559 Place wingmates around player at start of mission. 2016-03-08 07:21:23 +00:00
Steve 22b5267ffd Initially add all entities to quadtree, to avoid the popping effect. 2016-03-08 07:12:06 +00:00
Steve 99013a4e99 Allow jumpgate to be put into "sleep" state: effectively inactive. 2016-03-08 06:55:41 +00:00
Steve a74ff87a46 Added portal effect to jumpgate. 2016-03-07 22:50:41 +00:00
Steve ecdf9998d0 Don't select options widget. 2016-03-07 19:04:12 +00:00
Steve 798135eadf Don't allow rogue files to crash game at startup. 2016-03-07 19:03:55 +00:00
Steve d042d2d02c i18n updates. 2016-03-07 17:13:02 +00:00
Steve bc1c5d09a8 Replaced extraction point with jumpgate. 2016-03-07 17:12:21 +00:00
Steve bd715286a1 Allows show killed message during a challenge battle. 2016-03-07 12:31:43 +00:00
Steve 6ef07a65e2 Craft marked as EF_AI_TARGET will be attacked even if they are dodging and avoiding combat. 2016-03-07 12:31:22 +00:00
Steve 16591691b5 Allow challenges to be ended via the script. 2016-03-07 12:30:20 +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 4a52bb1fce Added item collection challenges. 2016-03-07 12:29:23 +00:00
Steve f6239903f7 Merge branch 'master' into develop
Conflicts:
	CHANGELOG
	common.mk
	src/galaxy/starSystems.c
2016-03-06 21:53:07 +00:00
Steve 244e5d6dd9 Merge from Master. 2016-03-06 19:07:43 +00:00
Steve 33f2359812 Added Clarke mission #4 2016-03-06 17:54:03 +00:00
Steve e04ad44a1a Eliminate all objective bug fix. 2016-03-06 17:27:23 +00:00