Commit Graph

673 Commits

Author SHA1 Message Date
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
Steve 5764e0a4b2 Capital ships destroyed / lost triggers. 2016-03-06 17:14:13 +00:00
Steve 497977c665 Don't add capital ship components to quadtree until they've been positioned. 2016-03-06 17:13:57 +00:00
Steve 721ca3e110 Trophy updates. 2016-03-06 17:13:34 +00:00
Steve 28ef43b632 Background updates. 2016-03-06 17:13:18 +00:00
Steve 5f4fe28d22 i18n updates. 2016-03-06 09:48:55 +00:00
Steve fff301e3e2 Allow shrinking of array. 2016-03-06 09:48:29 +00:00
Steve c14b687209 Screenshot save path update. 2016-03-06 09:48:09 +00:00
Steve 922b39c0ea Challenge #8, defend extraction point. Added flag to allow AI to sometimes ignore extraction point. 2016-03-06 09:47:44 +00:00
Steve e28390a496 Added array resize function (not using realloc because it doesn't zero the new array). 2016-03-05 23:56:21 +00:00
Steve ac59559d90 Clear input when pressing Escape. 2016-03-05 15:35:09 +00:00
Steve fe55f2e8ba Challenge updates. 2016-03-05 15:34:49 +00:00
Steve 09a89e692b Added time up status for finishing a challenge already partly passed. 2016-03-05 15:34:37 +00:00
Steve f55a4e57c8 Pressing ESCAPE blocks when awaiting widget input. 2016-03-05 13:49:07 +00:00
Steve d2a234839b Integrated mouse control mappings. 2016-03-05 13:21:17 +00:00
Steve 6dfb51e8b0 Allow keys and mouse buttons to be selected in options. 2016-03-05 12:35:19 +00:00
Steve acd53f6b97 Further custom control integration. 2016-03-05 08:42:35 +00:00
Steve 7979b175a2 Waypoint challenge updates. 2016-03-04 22:59:16 +00:00
Steve 599c4fc338 Merge fixes. 2016-03-04 22:11:13 +00:00
Steve 159d36017b Centralizing getFileLocation() to make file loading more transparent. 2016-03-04 14:29:50 +00:00
Steve 2b3fecce88 Added Challenge #7. 2016-03-04 14:14:57 +00:00
Steve d2acbefc6d Prevent modal dialog from being dismissed immediately. 2016-03-04 14:14:45 +00:00
Steve 95cb35d5a1 Added getJSONValue to aid with optional JSON data. 2016-03-04 14:14:04 +00:00
Steve b6012a2e21 Merged config branch. 2016-03-03 18:03:07 +00:00
Steve b136a6bb6c Time limit should be 30. 2016-03-03 17:20:51 +00:00
Steve cafa9b411d Removed dist target. 2016-03-03 16:39:43 +00:00
Steve c8dd06dcdc Added AUTO option for music. Reorganised music for easier scanning. 2016-03-03 16:16:12 +00:00
Steve 92a9cd7ce6 Challenge #6 2016-03-03 14:19:34 +00:00
Steve 122bb53a66 Challenge time bugfix. 2016-03-03 14:19:29 +00:00
Steve 4f6721cba4 Added 5th challenge mission. 2016-03-03 11:31:32 +00:00
Steve ed9b02a917 Disabled entities now become secondary targets. 2016-03-03 11:31:18 +00:00
Steve d5d5169078 Accuracy for rockets and missiles, not just shots. 2016-03-03 09:12:08 +00:00
Steve 2f168c2559 Added Pandora makefile. 2016-03-03 07:54:49 +00:00
Steve 3278adccf6 i18n updates. 2016-03-03 07:54:32 +00:00
Steve 2ca26b1ea0 Divide by zero check. 2016-03-03 07:47:33 +00:00
Steve 263a6cc5b5 Removed unneeded abs on hashcode. 2016-03-03 07:47:18 +00:00