Commit Graph

67 Commits

Author SHA1 Message Date
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 1c0359d14f Made mine more visible. 2016-04-01 14:19:24 +01:00
Steve 3bf73b5d70 Updates to mines. 2016-04-01 10:49:41 +01:00
Steve 3646a9326a Start of mines. 2016-03-30 07:22:58 +01:00
Steve 11ce19e677 Added Blizzard. 2016-03-28 22:33:15 +01:00
Steve f114ad7e7e Merge branch 'develop' into trophies 2016-03-28 16:09:24 +01:00
Steve c0a547addb Added Razor and Shale. 2016-03-28 13:54:06 +01:00
Steve ab8be196b5 Khepri now green and associated with rogue nation. 2016-03-28 11:47:11 +01:00
Steve 47f7f5671a Added trophy graphics. 2016-03-27 11:32:38 +01:00
Steve e278374490 Merge from develop. 2016-03-27 11:21:23 +01:00
Steve 612e76fe04 Added INF Swarmer. 2016-03-14 17:54:56 +00:00
Steve 0a69dd0e5e Merge from develop. 2016-03-12 18:22:48 +00:00
Steve b235a11f3d Updated waypoint graphics. 2016-03-12 12:10:50 +00:00
Steve 80658d6537 Added initial INF tug graphics. 2016-03-10 11:56:14 +00:00
Steve bb892c1efe Added new HUD icons. 2016-03-09 23:18:40 +00:00
Steve a74ff87a46 Added portal effect to jumpgate. 2016-03-07 22:50:41 +00:00
Steve bc1c5d09a8 Replaced extraction point with jumpgate. 2016-03-07 17:12:21 +00:00
Steve 09a89e692b Added time up status for finishing a challenge already partly passed. 2016-03-05 15:34:37 +00:00
Steve 7f98080a18 Added new backgrounds. 2016-02-29 12:09:14 +00:00
Steve f153383f9e Challenge mission graphics. 2016-02-27 18:08:43 +00:00
Steve bbd42a0456 Removed black outline. 2016-02-22 16:12:49 +00:00
Steve 480192efe1 Created second UNF Corvette. 2016-02-20 07:23:24 +00:00
Steve 757b942174 Added hud icons for armour, shield, ecm, and boost. 2016-02-15 16:59:47 +00:00
Steve b8ba509d27 Updated CSN Corvette #2. 2016-02-12 22:31:12 +00:00
Steve 6256e97414 Start of second CSN corvette. 2016-02-11 15:40:44 +00:00
Steve 354b4cd9d2 Added Plasma Turret cannon. 2016-01-23 14:15:05 +00:00
Steve bd6ef78687 Iniital version of second INF corvette. 2016-01-21 17:08:40 +00:00
Steve 9093a53a19 Start of second INF corvette. 2016-01-21 12:49:30 +00:00
Steve 277092cdbc Using arrow to indicate more weapons available on HUD. 2015-12-28 13:44:57 +00:00
Steve 6cebdd6a89 Various spacecraft tweaks. 2015-12-27 18:02:41 +00:00
Steve c0804b8732 Swapped Lynx and Leopard graphics. 2015-12-26 22:03:27 +00:00
Steve 9d312fd1a7 Added Lynx UNF bomber. 2015-12-26 21:09:08 +00:00
Steve 7f055102bf Split space craft into separate lists. 2015-12-26 21:08:53 +00:00
Steve 4345a01e3f Added munitions ship. 2015-12-24 20:18:40 +00:00
Steve ff953cf0e7 Supply ship updates. 2015-12-24 11:53:49 +00:00
Steve f2cd43c95e Added supply ship. 2015-12-24 08:57:00 +00:00
Steve 7855cd59ea CSN corvette graphics tweaks. 2015-12-19 16:16:08 +00:00
Steve 4bf78f0138 Further CSN corvette updates. 2015-12-19 12:49:02 +00:00
Steve df04ff1439 Start of CSN corvette. 2015-12-19 12:30:02 +00:00
Steve 7325bbe506 INF Corvette updates. 2015-12-18 08:26:21 +00:00
Steve 929e942bba INF corvette graphic updates. 2015-12-17 23:15:10 +00:00
Steve 81a536177c Added INF corvette. 2015-12-16 22:39:59 +00:00
Steve 743786efb8 Added debris. 2015-12-13 14:50:54 +00:00
Steve 5416debc21 Corvette graphics updates. 2015-12-12 14:56:33 +00:00
Steve fb41a28c0c Corvette graphics updates. 2015-12-12 12:17:29 +00:00
Steve 1fa033bc7e Relocated corvette graphics. 2015-12-10 17:50:03 +00:00
Steve ede17199c3 Created corvette. 2015-12-10 10:04:00 +00:00
Steve 6084251e9f Start of capital ships. 2015-12-07 19:19:14 +00:00
Steve 109e1c1788 Converted ODPs to turrets. Added rocket turret. 2015-11-30 11:29:33 +00:00
Steve 542209c24c Added ECM effect. 2015-11-29 08:34:25 +00:00