Commit Graph

89 Commits

Author SHA1 Message Date
Steve e278374490 Merge from develop. 2016-03-27 11:21:23 +01: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 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
Steve 57d8c867e1 v0.6. Start of i18n. 2016-02-27 12:14:05 +00:00
Steve a2a1ec0613 Modal message box updates. 2016-02-23 22:20:07 +00:00
Steve 368e9dc592 Start of modal dialog display. 2016-02-23 07:19:31 +00:00
Steve 03712285c4 Campaign flow bug fixes. 2016-02-21 16:55:11 +00:00
Steve cedbed4dc8 Updated copyright dates. 2016-02-21 15:50:27 +00:00
Steve dcef433d4d Randomly scale planet. 2016-02-21 13:47:10 +00:00
Steve b004dd95ab Resize quadtree entity capacity as needed. 2016-02-21 08:13:17 +00:00
Steve 6b1e62dd38 Start of replacing grid with quadtree. 2016-02-21 07:48:22 +00:00
Steve 17c55ec080 Now scrolling the galactic map by clicking and dragging. 2016-02-14 11:07:15 +00:00
Steve e31f39d3a9 Replaced "Dummy" missions with manual complete flag. 2016-01-25 15:09:14 +00:00
Steve a251459413 Added "unwinnable" mission flag, to automatically continue the game when the player is defeated. 2016-01-25 14:58:07 +00:00
Steve 277092cdbc Using arrow to indicate more weapons available on HUD. 2015-12-28 13:44:57 +00:00
Steve 38e4564aae Display total available guns on HUD. 2015-12-27 21:16:57 +00:00
Steve e2ffe9ba84 Added ability to specify death type of fighters (e.g. supply ships shouldn't spin). 2015-12-24 12:12:23 +00:00
Steve 48f08a3fb0 Allowed locations to be activated by scripts. Added eliminate all objective type. 2015-12-22 17:58:18 +00:00
Steve 1884c8371e Added Locations for use with mission scripting. 2015-12-22 12:42:04 +00:00
Steve 3dbd8e72f7 Missions now unlock depending on number of other missions completed (and previous mission, where applicable). 2015-12-21 14:19:21 +00:00
Steve 9be0cdab6c Expire texts, based on age in cache. 2015-12-20 16:13:35 +00:00
Steve 1849a20831 AI fighers will now attempt to avoid combat if they take too much damage in a short space of time. 2015-12-20 15:13:41 +00:00
Steve d8eb896456 Enable debug mode by passing -debug. 2015-12-20 12:25:20 +00:00
Steve cfc0ed7cc8 AI can now follow leaders. 2015-12-18 12:02:01 +00:00
Steve b5dfab1bd5 Added debug keys. 2015-12-18 10:12:37 +00:00
Steve 743786efb8 Added debris. 2015-12-13 14:50:54 +00:00
Steve 6084251e9f Start of capital ships. 2015-12-07 19:19:14 +00:00
Steve 28a4cda6fd Set size of message box, based on amount of text. 2015-12-06 15:03:44 +00:00
Steve 9c532352f5 Allow for star systems to fall to Pandorans, once story missions are complete. 2015-11-30 09:33:43 +00:00
Steve 46337a1f16 Removed challenges from main campaign. 2015-11-29 08:44:34 +00:00
Steve 542209c24c Added ECM effect. 2015-11-29 08:34:25 +00:00
Steve 008e2aac8c Set message box time automatically. Added WAIT_MSG_BOX command. 2015-11-28 17:00:54 +00:00
Steve 9de6d6c737 Removed triggers, and replaced with script system. Added message box. 2015-11-28 10:11:20 +00:00