Commit Graph

101 Commits

Author SHA1 Message Date
Steve 0abfb672d7 Don't attach rope if disabled. Speed is 0 if created disabled. 2016-04-07 12:40:14 +01:00
Steve f97e0bc299 Report number of civilians killed. 2016-04-06 12:56:48 +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 e278374490 Merge from develop. 2016-03-27 11:21:23 +01:00
Steve 175b7e5ca0 Moved entity loading code out of mission.c, and into appropriate c files. 2016-03-17 08:11:52 +00:00
Steve 09e676d713 Added simple die, to prevent swarmers spreading debris everywhere. 2016-03-16 06:53:07 +00:00
Steve 13344ddc06 Made many attributes optional. 2016-03-14 17:55:34 +00:00
Steve 4e8b85b6a1 Removed script-based spawner. Redundant. 2016-03-14 11:28:01 +00:00
Steve 160f65a15b Added EF_NO_KILL_INC to prevent kill count increment. 2016-03-13 10:50:32 +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 a5509b5bcd Logging updates. 2016-03-12 15:12:52 +00:00
Steve 3bd78dbd20 Spawn fighters offscreen or off map. 2016-03-11 23:45:12 +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 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 798135eadf Don't allow rogue files to crash game at startup. 2016-03-07 19:03:55 +00:00
Steve bc1c5d09a8 Replaced extraction point with jumpgate. 2016-03-07 17:12:21 +00:00
Steve bd715286a1 Allows show killed message during a challenge battle. 2016-03-07 12:31:43 +00:00
Steve 159d36017b Centralizing getFileLocation() to make file loading more transparent. 2016-03-04 14:29:50 +00:00
Steve 95cb35d5a1 Added getJSONValue to aid with optional JSON data. 2016-03-04 14:14:04 +00:00
Steve ed9b02a917 Disabled entities now become secondary targets. 2016-03-03 11:31:18 +00:00
Steve 8242dbf037 Use getFileLocation for loading files (install is broken on Linux). 2016-02-29 14:43:24 +00:00
Steve 211df6d8ec i18n updates. 2016-02-28 13:45:17 +00:00
Steve ad7a1eefda Challenge integration updates. 2016-02-28 13:02:57 +00:00
Steve 2c33041344 Load data from files found in directory, rather than using a text file. 2016-02-27 16:14:14 +00:00
Steve 0c88500690 Start of avoidance code for capital ships. 2016-02-22 12:47:30 +00:00
Steve cedbed4dc8 Updated copyright dates. 2016-02-21 15:50:27 +00:00
Steve da71c1d647 Added ECM, mag bolt hit, and power down sounds. 2016-02-20 14:19:59 +00:00
Steve a5f73cc3fc Renamed "textureName" to simply "texture". 2016-02-13 14:31:45 +00:00
Steve 58e91e83c0 Don't instantly kill the player during an epic mission. 2016-01-28 17:03:13 +00:00
Steve 672fd01282 Eliminate all tweaks. 2016-01-24 09:50:31 +00:00
Steve 7f055102bf Split space craft into separate lists. 2015-12-26 21:08:53 +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 1f03b81cca Misc. updates. 2015-12-22 17:58:53 +00:00
Steve 05b42f21ce AI evasion updates. 2015-12-20 16:13:49 +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 2e2bd9d882 Debris updates. 2015-12-16 22:40:26 +00:00
Steve 691068a634 Shield smash bug fix. 2015-12-14 14:04:48 +00:00
Steve c4dfb823ef Code clean up. 2015-12-14 08:15:41 +00:00
Steve 2012f87b39 Randomize debris for fighters. Added Rebel AI thresholds. 2015-12-13 17:56:16 +00:00
Steve 743786efb8 Added debris. 2015-12-13 14:50:54 +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 91822f1ca3 Further capital ship code updates. Added long range fire flag for cannons. 2015-12-08 22:42:31 +00:00
Steve 6441f926e2 Various tweaks and refactoring to accomodate capital ships. 2015-12-07 19:19:41 +00:00
Steve 65b62091d1 Allow for file location to be determined automatically. 2015-12-02 23:20:19 +00:00
Steve a15efc4ea9 Enable running of scripts when enemies are killed. 2015-12-02 07:24:26 +00:00
Steve 999c0eedb3 Add MOVE_TO_PLAYER flag if fighter is an ally not hasn't got FOLLOWS flag set. 2015-11-30 12:41:11 +00:00