Commit Graph

1142 Commits

Author SHA1 Message Date
Steve 0c9efaaa41 Merge branch 'develop'
Conflicts:
	makefile
2016-05-15 08:20:24 +01:00
Steve 50883125e1 Merge. 2016-05-15 08:19:26 +01:00
Steve 6e0cbba3d8 Determine width of trophy alert based on title and description length. 2016-05-14 17:35:57 +01:00
Steve 8a363137a5 v0.7 updates 2016-05-14 17:03:14 +01:00
Steve c8c2752d15 Training mission updates. 2016-05-14 17:03:03 +01:00
Steve 95876d3437 Don't face left when player isn't moving. 2016-05-14 17:02:51 +01:00
Steve eb343ce61d Manual updates. 2016-05-14 14:50:02 +01:00
Steve 4cf6530686 Evading a missile is not the same as destroying it with the ECM. 2016-05-14 14:16:05 +01:00
Steve da644bfb6c Stats and i18n updates. 2016-05-14 12:43:41 +01:00
Steve fe4c076ac3 Screenshot update. 2016-05-14 12:43:00 +01:00
Steve 78a0be8b1b Pass capital ship group name to condition and objective check. 2016-05-14 12:42:47 +01:00
Steve a00072e78b Use HMS Corvette 02 for some Tzac capital ships. 2016-05-14 12:33:04 +01:00
Steve f63f3fb9ad HMS Corvette 02 tweaks. 2016-05-14 12:25:35 +01:00
Steve 2ffd3bee38 Start of HMS Corvette 02. 2016-05-14 11:53:03 +01:00
Steve 3317336695 New item graphics (not powerups). 2016-05-13 10:00:52 +01:00
Steve 0841aedfa6 Challenge 22. 2016-05-13 09:05:52 +01:00
Steve 1306268847 Retreat allies and enemies at end of challenge, so they don't keep fighting. 2016-05-13 09:05:42 +01:00
Steve 2920b00e96 Don't head for the jumpgate if retreating during a challenge. 2016-05-13 09:05:27 +01:00
Steve b9b8f524b3 Also save game when unlocking a stats trophy. 2016-05-13 08:37:06 +01:00
Steve ecd5c8df4a Removed teamDeathMatch, won't work. 2016-05-13 08:36:43 +01:00
Steve 3496ff251a Don't create a bullet that is BT_NONE when using combined guns. 2016-05-13 08:36:26 +01:00
Steve 622a3e0d5d Added ITEMS, Mace, Clarke, and Rothan trophies. 2016-05-12 19:11:19 +01:00
Steve f3956d370d Tidy headers update. 2016-05-12 12:20:16 +01:00
Steve c0ef632ed8 Tidied headers. 2016-05-12 11:41:12 +01:00
Steve 64d88faec8 Use app.saveGame rather than forcing a save (trophy unlocks can cause saving to happen twice in a row). 2016-05-12 11:41:03 +01:00
Steve 2aa917ac59 Challenge 21. 2016-05-12 10:28:59 +01:00
Steve 7fd17e8ebe Added powercore item. 2016-05-12 09:34:58 +01:00
Steve a04c3321e7 Always set next to null after memcpy. 2016-05-12 09:34:48 +01:00
Steve bd1dac445a Fighter damage indication fix. 2016-05-12 09:34:33 +01:00
Steve 2e17d68b47 Added death match challenges. 2016-05-12 09:34:09 +01:00
Steve 65ef43754e Various updates. 2016-05-11 09:54:05 +01:00
Steve 27dae461e6 Logo updated to be consistent with website. 2016-05-11 09:53:50 +01:00
Steve ceac73c348 Challenge 20. 2016-05-11 09:53:29 +01:00
Steve 9b6144de5b Disable limit of 5. 2016-05-10 14:56:57 +01:00
Steve a3590f3580 Use player->side instead of SIDE_ALLIES. 2016-05-10 14:56:33 +01:00
Steve 025e72822b Use battle.hasThreats to determine if all enemies have been defeated. 2016-05-10 14:56:10 +01:00
Steve 6dcbd265d9 Restrict controls when player is dead or disabled. 2016-05-10 10:03:17 +01:00
Steve 09ecd97f29 Set logging type after memset of app and dev, to allow -debug to work correctly. 2016-05-10 10:00:42 +01:00
Steve afd88ba8ed Added challenge 19. 2016-05-10 10:00:19 +01:00
Steve 894997fdf3 Angel tweaks. 2016-05-10 10:00:12 +01:00
Steve f9922e3bf1 Allow mines to be destroyed by any shot. 2016-05-10 09:59:53 +01:00
Steve 2198db980b Health bars should be green for player-align craft. 2016-05-10 09:59:39 +01:00
Steve e631133983 Show disable and kill limit on hud. 2016-05-10 09:59:21 +01:00
Steve 3537265e6a Added disable limit to challenges. 2016-05-10 09:59:06 +01:00
Steve a335b738a7 Added Angel, a rarely seen INF fighter equipped with mag cannons. 2016-05-09 11:23:57 +01:00
Steve 7d9e852659 Tidied headers. 2016-05-09 09:45:02 +01:00
Steve 136bfbda8b Don't save game here, it can result in wiped saves due to start up errors. 2016-05-09 09:43:19 +01:00
Steve 1d253038b6 Added challenge 18. 2016-05-09 09:34:31 +01:00
Steve a38f21bd95 Set logging level before anything else. 2016-05-09 09:34:22 +01:00
Steve 410400633b Hashcode should use unsigned long. 2016-05-09 09:34:04 +01:00