Commit Graph

176 Commits

Author SHA1 Message Date
Steve ef63ea73c4 Check that mission exists, before marking complete status. 2016-04-27 09:56:03 +01:00
Steve 0bb7ce2591 Added EF_FRIENDLY_HEALTH_BAR. 2016-04-26 10:43:43 +01:00
Steve d3e2da1821 Use 12-hour clock 2016-04-26 08:17:05 +01:00
Steve f0868c7a29 Reset delta time when ending a transition. 2016-04-26 08:16:15 +01:00
Steve 134acf7a3d Trophy integration updates. 2016-04-24 18:11:02 +01:00
Steve 3ce51feb9c Various trophy tweaks. 2016-04-24 13:00:27 +01:00
Steve 5d59f1f353 Allow screenshot key to be configured. 2016-04-23 17:46:47 +01:00
Steve c395ee25e5 Allow AIF_ASSASSIN flag to be set, to always attack a target. 2016-04-19 11:13:43 +01:00
Steve 7c100f0c37 Added button to restore default controls. 2016-04-17 11:26:04 +01:00
Steve 97a067cb34 Load default config first, and then overwrite with user config. 2016-04-16 15:50:23 +01:00
Steve 5e58f09fcf Don't trash original string when working with flags. #funwithflags 2016-04-15 13:07:58 +01:00
Steve 9c8b7af0d6 Added Shadow Mine. 2016-04-14 11:56:42 +01:00
Steve 5fa24f55f2 Added Survive challenge type. 2016-04-13 11:02:08 +01:00
Steve 8e6fcf81fa Using constants for save and config filenames. 2016-04-11 08:44:36 +01:00
Steve cb6ad171a7 Jumpgates are neutral by default. 2016-04-09 15:48:00 +01:00
Steve 1afc9e65f0 Updated capital ship destruction. 2016-04-05 12:21:17 +01:00
Steve 5e1220b9a4 Merge branch 'develop' into trophies
Conflicts:
	src/battle/bullets.c
	src/battle/bullets.h
	src/battle/fighters.c
2016-04-04 11:30:27 +01:00
Steve c4d9fae84c Removed \n from logging. 2016-04-04 11:25:09 +01:00
Steve 77da136e75 Time limit warning for challenges. 2016-04-03 14:04:56 +01:00
Steve f9d02696fd Added mines destroyed stat. 2016-04-03 08:37:09 +01:00
Steve 28eec0b8e0 Merge branch 'develop' into trophies
Conflicts:
	README.md
	src/defs.h
	src/galaxy/mission.c
	src/system/sound.c
2016-04-01 17:14:06 +01:00
Steve d178134a00 Allow AI to drop mines. 2016-04-01 14:19:03 +01:00
Steve 3bf73b5d70 Updates to mines. 2016-04-01 10:49:41 +01:00
Steve 3646a9326a Start of mines. 2016-03-30 07:22:58 +01:00
Steve 52691f7be5 Enable AI flags to focus on targets. 2016-03-29 22:45:46 +01:00
Steve c288fce12f Windows build fixes. 2016-03-28 18:26:02 +01:00
Steve f114ad7e7e Merge branch 'develop' into trophies 2016-03-28 16:09:24 +01:00
Steve 45d9d2a00d Don't show mission target boxes around capital ship components. 2016-03-28 11:45:48 +01:00
Steve 47f7f5671a Added trophy graphics. 2016-03-27 11:32:38 +01:00
Steve e278374490 Merge from develop. 2016-03-27 11:21:23 +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 09e676d713 Added simple die, to prevent swarmers spreading debris everywhere. 2016-03-16 06:53:07 +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 675d051011 Tidied headers. 2016-03-12 18:29:22 +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 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 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 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 f867e793bd Trophy prototyping. 2016-03-09 11:51:26 +00:00
Steve a74ff87a46 Added portal effect to jumpgate. 2016-03-07 22:50:41 +00:00
Steve 798135eadf Don't allow rogue files to crash game at startup. 2016-03-07 19:03:55 +00:00
Steve bc1c5d09a8 Replaced extraction point with jumpgate. 2016-03-07 17:12:21 +00:00
Steve 4a52bb1fce Added item collection challenges. 2016-03-07 12:29:23 +00:00