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

..

backgrounds

Added new backgrounds.

2016-02-29 12:09:14 +00:00

battle

Added time up status for finishing a challenge already partly passed.

2016-03-05 15:34:37 +00:00

bullets

Made mag bolt circular, for variation.

2015-11-18 18:38:49 +00:00

cannons

Added Plasma Turret cannon.

2016-01-23 14:15:05 +00:00

capitalShips

Created second UNF Corvette.

2016-02-20 07:23:24 +00:00

craft

Added initial INF tug graphics.

2016-03-10 11:56:14 +00:00

debris

Added debris.

2015-12-13 14:50:54 +00:00

effects

Added ECM effect.

2015-11-29 08:34:25 +00:00

entities

Made mine more visible.

2016-04-01 14:19:24 +01:00

fighters

Added Blizzard.

2016-03-28 22:33:15 +01:00

galaxy

Show indicator arrow for star systems with available missions.

2015-10-20 17:20:55 +01:00

hud

Added new HUD icons.

2016-03-09 23:18:40 +00:00

input

Start of mouse control integration.

2015-11-23 14:52:11 +00:00

items

Added crate graphics.

2015-11-16 14:31:16 +00:00

planets

Initial check in to GitHub.

2015-10-20 12:51:49 +01:00

title

Initial check in to GitHub.

2015-10-20 12:51:49 +01:00

trophies

Added trophy graphics.

2016-03-27 11:32:38 +01:00

widgets

Initial check in to GitHub.

2015-10-20 12:51:49 +01:00