Commit Graph

119 Commits

Author SHA1 Message Date
Steve ecd5c8df4a Removed teamDeathMatch, won't work. 2016-05-13 08:36:43 +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 2e17d68b47 Added death match challenges. 2016-05-12 09:34:09 +01:00
Steve 025e72822b Use battle.hasThreats to determine if all enemies have been defeated. 2016-05-10 14:56:10 +01:00
Steve 3537265e6a Added disable limit to challenges. 2016-05-10 09:59:06 +01:00
Steve 6287e10746 Allow challenges to specify that all enemies must be defeated before activating waypoint. 2016-05-09 09:33:35 +01:00
Steve b64e9e70fc Added EF_DROPS_ITEM, to allow ships to drop items when destroyed in challenge mode. 2016-05-06 10:56:58 +01:00
Steve c87c95fbde Added healthBars option to gameplay features. 2016-05-01 16:35:11 +01:00
Steve 6b768b4554 Experimental new gameplay features. 2016-04-30 21:52:01 +01:00
Steve e196752efa Draw and blink a white rectangle around the message box speaker. 2016-04-26 13:22:31 +01:00
Steve f0868c7a29 Reset delta time when ending a transition. 2016-04-26 08:16:15 +01:00
Steve bdfbe345c7 Short description length reduced to 32 characters. 2016-04-25 17:22:12 +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 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
Steve 0c31b2204c Refactored challenge data, for display on Challenge Home. 2016-03-02 06:46:13 +00:00
Steve ad7a1eefda Challenge integration updates. 2016-02-28 13:02:57 +00:00
Steve a1703d5066 vSync is now always on. 2016-02-28 10:00:17 +00:00
Steve 2e5b45064a Challenges integration. 2016-02-27 16:16:21 +00:00