Commit Graph

45 Commits

Author SHA1 Message Date
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 16a1e1b20a Challenge completion bug fix. 2016-04-03 14:04:31 +01:00
Steve a64b41f851 Allow challenges to be completed even if the player is killed. 2016-04-02 09:37:39 +01:00
Steve e278374490 Merge from develop. 2016-03-27 11:21:23 +01:00
Steve b37a268169 Added capital ships to challenge killLimit check. 2016-03-13 10:51:48 +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 4f27b40d97 Added rescue challenges 2016-03-11 23:45:47 +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 ebfea2b5c4 Unlock next challenge mission is previous has been passed. 2016-03-09 23:25:54 +00:00
Steve 93dd00c785 Prototyping stats trophies. 2016-03-09 12:31:33 +00:00
Steve 798135eadf Don't allow rogue files to crash game at startup. 2016-03-07 19:03:55 +00:00
Steve 4a52bb1fce Added item collection challenges. 2016-03-07 12:29:23 +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 ac59559d90 Clear input when pressing Escape. 2016-03-05 15:35:09 +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 7979b175a2 Waypoint challenge updates. 2016-03-04 22:59:16 +00:00
Steve 159d36017b Centralizing getFileLocation() to make file loading more transparent. 2016-03-04 14:29:50 +00:00
Steve c8dd06dcdc Added AUTO option for music. Reorganised music for easier scanning. 2016-03-03 16:16:12 +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 d5d5169078 Accuracy for rockets and missiles, not just shots. 2016-03-03 09:12:08 +00:00
Steve 11d5ed635f Challenge processing fixes. 2016-03-03 07:44:04 +00:00
Steve cb34b3b9b6 Maximum of 3 challenges per challenge mission. 2016-03-02 23:20:37 +00:00
Steve 05185950e4 Auto select first challenge when coming from title. 2016-03-02 22:24:59 +00:00
Steve 2c71b16e17 Show and apply challenge restrictions. 2016-03-02 22:19:26 +00:00
Steve f9880354db i18n updates. 2016-03-02 07:14:38 +00:00
Steve 35a2277114 Display challenge information. 2016-03-02 06:58:03 +00:00
Steve 0c31b2204c Refactored challenge data, for display on Challenge Home. 2016-03-02 06:46:13 +00:00
Steve e5c5315e62 Print stats when in debug mode at end of challenge. 2016-03-01 07:21:31 +00:00
Steve 55bb0d1e36 Challenge home music. 2016-02-29 21:51:49 +00:00
Steve 1c270888aa Removed mouse warping. Is too jarring. 2016-02-29 16:05:35 +00:00
Steve 9d846fd137 Randomize planet and background in Challenge Home. 2016-02-29 16:00:32 +00:00
Steve 8242dbf037 Use getFileLocation for loading files (install is broken on Linux). 2016-02-29 14:43:24 +00:00
Steve adb86d9f14 Show planet in background. 2016-02-29 12:09:36 +00:00
Steve 10cc12bd70 i18n updates. 2016-02-29 10:47:41 +00:00
Steve 9b6abf764a Percent complete stats updates. 2016-02-29 10:47:10 +00:00
Steve bf7d6dc921 Added menu to challenges screen. 2016-02-29 09:54:03 +00:00
Steve 281dd4d7d2 Show number of challenges completed, lock challenges that can't be played yet. 2016-02-29 09:23:41 +00:00
Steve ad7a1eefda Challenge integration updates. 2016-02-28 13:02:57 +00:00
Steve 660bb57bb0 Further challenge updates. 2016-02-27 18:12:18 +00:00
Steve 2e5b45064a Challenges integration. 2016-02-27 16:16:21 +00:00