Commit Graph

123 Commits

Author SHA1 Message Date
Steve a500f137b6 Galactic map display updates. 2016-06-07 09:24:09 +01:00
Steve ccff127394 Allow optional missions to expire. 2016-06-03 14:10:22 +01:00
Steve 713f30ed5e Hide mouse pointer during credits. 2016-06-01 09:55:44 +01:00
Steve 4ef44ed636 Use campaignFinished variable in battle, to prevent script crashes. 2016-06-01 09:55:28 +01:00
Steve 1474ecf7ca Control trophy alerts from the main loop. 2016-05-31 09:37:46 +01:00
Steve 35b36754e6 Added Torelli destruction. 2016-05-30 11:58:16 +01:00
Steve 9d5d90e62f Start of credits. 2016-05-29 09:38:05 +01:00
Steve 6d8f9f575e Allow some missions have to unlimited enemies (unwinnable epics). 2016-05-29 09:36:10 +01:00
Steve 4cd0c36b73 Revenge trophy requires player to kill the enemy that killed them last. 2016-05-26 18:17:46 +01:00
Steve 197e630fee Add Surrender challenge type. 2016-05-25 12:25:13 +01:00
Steve c17f1af851 Added AIF_ZAK_SUSPICIOUS. 2016-05-20 09:51:34 +01:00
Steve b55574a9e6 Start of Frequent Flyer trophy. 2016-05-17 19:02:58 +01:00
Steve 60d477b754 Don't become suspicious of the player immediately after combat ends. 2016-05-17 11:34:32 +01:00
Steve ee4e88668e Added suspicion level, for optional missions. 2016-05-16 10:54:46 +01:00
Steve 038a119965 Added isOptional and optional stats, to allow for optional mission tracking. 2016-05-15 13:53:19 +01:00
Steve 0116202471 Use type in Star System instead of isSol, to allow for special Pandoran missions. 2016-05-15 10:50:09 +01:00
Steve b6513dc1f7 Added type to message box, to allow for Pandoran messages, using different font. 2016-05-15 10:00:06 +01:00
Steve 50883125e1 Merge. 2016-05-15 08:19:26 +01:00
Steve 7e752ccae4 Don't recurse into quads that haven't had anything added to them. 2016-04-20 13:53:25 +01:00
Steve 38eca9480d Allow for important messages to be created (such as maydays from capital ships). 2016-04-16 11:00:19 +01:00
Steve c3136ea3af Allow flags of spawned entities to be set. 2016-04-15 11:31:39 +01:00
Steve 7eee4d3d8e Spawner updates. 2016-04-14 11:56:58 +01:00
Steve 9ad7f87ca9 Misc. tidy up. 2016-04-12 08:41:13 +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 29d873d28a Allow waypoints to be manually activated. Removed entId from Battle (redundant). 2016-04-04 11:23:32 +01:00
Steve e7190150bf Added killedBy, for easier stat counting. 2016-04-03 08:37: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 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 8705337e2a Show number of conditions on HUD, as well as objectives. 2016-03-29 07:19:39 +01:00
Steve e278374490 Merge from develop. 2016-03-27 11:21:23 +01:00
Steve d33bcf9414 In epic battles, spawned in entities (such as swarmers) don't count towards the epicLimit. 2016-03-27 08:55:25 +01:00
Steve 1b43e4908c Added ability to hide objective numbers. 2016-03-16 19:24:41 +00:00
Steve 4ef796bf92 Added id to objective, to allow script to function in non-English languages. 2016-03-16 06:54:34 +00:00
Steve edc18579ec Added support for spawners. 2016-03-14 11:12:22 +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 25101c0f1d Now automatically checking trophies based on star system name. 2016-03-09 15:54:25 +00:00
Steve 93dd00c785 Prototyping stats trophies. 2016-03-09 12:31:33 +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 bc1c5d09a8 Replaced extraction point with jumpgate. 2016-03-07 17:12:21 +00:00
Steve 16591691b5 Allow challenges to be ended via the script. 2016-03-07 12:30:20 +00:00
Steve 721ca3e110 Trophy updates. 2016-03-06 17:13:34 +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 f55a4e57c8 Pressing ESCAPE blocks when awaiting widget input. 2016-03-05 13:49:07 +00:00
Steve 6dfb51e8b0 Allow keys and mouse buttons to be selected in options. 2016-03-05 12:35:19 +00:00
Steve 7979b175a2 Waypoint challenge updates. 2016-03-04 22:59:16 +00:00
Steve b6012a2e21 Merged config branch. 2016-03-03 18:03:07 +00:00
Steve cb34b3b9b6 Maximum of 3 challenges per challenge mission. 2016-03-02 23:20:37 +00:00
Steve 2c71b16e17 Show and apply challenge restrictions. 2016-03-02 22:19:26 +00:00