Commit Graph

63 Commits

Author SHA1 Message Date
Steve 0a69dd0e5e Merge from develop. 2016-03-12 18:22:48 +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 46503f4fe7 Mark craft as stolen if they are moved to jumpgate by a vessel not on your side. 2016-03-09 23:20:50 +00:00
Steve f867e793bd Trophy prototyping. 2016-03-09 11:51:26 +00:00
Steve bc1c5d09a8 Replaced extraction point with jumpgate. 2016-03-07 17:12:21 +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 acd53f6b97 Further custom control integration. 2016-03-05 08:42:35 +00:00
Steve 7979b175a2 Waypoint challenge updates. 2016-03-04 22:59:16 +00:00
Steve 599c4fc338 Merge fixes. 2016-03-04 22:11:13 +00:00
Steve b6012a2e21 Merged config branch. 2016-03-03 18:03:07 +00:00
Steve d5d5169078 Accuracy for rockets and missiles, not just shots. 2016-03-03 09:12:08 +00:00
Steve 9b6abf764a Percent complete stats updates. 2016-02-29 10:47:10 +00:00
Steve ad7a1eefda Challenge integration updates. 2016-02-28 13:02:57 +00:00
Steve 913184d877 Removed INF. They don't exist after 2616. 2016-02-24 07:16:23 +00:00
Steve cedbed4dc8 Updated copyright dates. 2016-02-21 15:50:27 +00:00
Steve e2b7576f89 Allow AI to wander. 2015-12-24 21:42:26 +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 01ec3ceb7b Stats bug fixes. 2015-12-23 19:22:31 +00:00
Steve 1c81be3168 Stats for capital ships. 2015-12-19 16:15:57 +00:00
Steve cfc0ed7cc8 AI can now follow leaders. 2015-12-18 12:02:01 +00:00
Steve 4fbdcd0af6 Allow flags in missions to be added to existing entity flags, or replace them completely. 2015-12-12 18:24:23 +00:00
Steve 6b06b2a431 Increased corvette engine health. Allowed guns to fire missiles. Cap ships will also hunt down AI targets. 2015-12-12 17:12:25 +00:00
Steve 05f58e0971 Added SECONDARY_TARGET flag. 2015-12-10 12:40:23 +00:00
Steve 91822f1ca3 Further capital ship code updates. Added long range fire flag for cannons. 2015-12-08 22:42:31 +00:00
Steve 6084251e9f Start of capital ships. 2015-12-07 19:19:14 +00:00
Steve e5906d5f5f Added new AI flags. 2015-11-30 11:29:56 +00:00
Steve a4dc4f3e05 Display rebels as red on radar. 2015-11-29 12:56:00 +00:00
Steve dec3538956 Added AIF_MOVES_TO_PLAYER flag. 2015-11-28 14:33:05 +00:00
Steve 9de6d6c737 Removed triggers, and replaced with script system. Added message box. 2015-11-28 10:11:20 +00:00
Steve cd0463c92f Updates to widget-mouse interactions. 2015-11-26 08:16:29 +00:00
Steve b8409765d3 Debug statement fix. 2015-11-23 10:14:42 +00:00
Steve 597f6f5cb7 Removed missiles types. Now only homing missiles, and rockets for bombers. 2015-11-21 23:45:22 +00:00
Steve 94e0259953 Added defensive AI flags - only attack sometimes. 2015-11-21 23:27:43 +00:00
Steve a82f8b6f2c Renamed FLEE flags to RETREAT. 2015-11-21 17:32:39 +00:00
Steve 4db432f845 Allow player to retreat from missions. 2015-11-20 22:51:44 +00:00
Steve 0bd067e552 Added laser. 2015-11-18 16:02:10 +00:00
Steve a776005a65 Reworked AI system, to make it more generic and flexible. 2015-11-18 11:27:05 +00:00
Steve a9dc374d40 Added new stats. 2015-11-17 07:23:50 +00:00
Steve 5aa8e0280e Added EF_MUST_DISABLE, to replace EF_DISABLE. 2015-11-16 16:24:57 +00:00
Steve 8c0b7fdb2f Further item code updates: allow items to be created and collected. 2015-11-16 12:31:50 +00:00
Steve 627b18d0b7 Added shuttle. 2015-11-16 11:26:23 +00:00
Steve 235d471a3b Added Tug. 2015-11-14 23:18:09 +00:00
Steve c9632613ce Updated EF_DISABLE to EF_DISABLED. Fixed objective logic for disabled craft (fire only once). 2015-11-14 16:14:48 +00:00
Steve 1f62eb2564 Added entity groups, to help with triggers and events. 2015-11-14 08:41:07 +00:00
Steve dc2f2c4635 Added ALIVE_ESCAPED and TT_ESCAPED. 2015-11-11 22:33:33 +00:00
Steve ad405c57ae Start of civilian ships: will follow player when close and flee in to extraction points. 2015-11-11 06:46:58 +00:00
Steve faf6c9890c Start of extraction points. 2015-11-09 22:46:57 +00:00
Steve 5dc4042b55 Added lookups for DISABLED. 2015-10-29 16:46:08 +00:00
Steve a87395cc23 Allow enemies to flee. 2015-10-29 16:18:41 +00:00