tbftss/data
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
..
app Allow keys and mouse buttons to be selected in options. 2016-03-05 12:35:19 +00:00
battle Renamed "textureName" to simply "texture". 2016-02-13 14:31:45 +00:00
capitalShips Load data from files found in directory, rather than using a text file. 2016-02-27 16:14:14 +00:00
challenges Replaced extraction point with jumpgate. 2016-03-07 17:12:21 +00:00
craft Added initial INF tug graphics. 2016-03-10 11:56:14 +00:00
fighters Load data from files found in directory, rather than using a text file. 2016-02-27 16:14:14 +00:00
fonts Initial check in to GitHub. 2015-10-20 12:51:49 +01:00
galaxy Removed INF. They don't exist after 2616. 2016-02-24 07:16:23 +00:00
missions Various mission tweaks. 2016-03-10 11:57:46 +00:00
trophies Merge remote-tracking branch 'origin/develop' into trophies 2016-03-10 12:04:04 +00:00
turrets Load data from files found in directory, rather than using a text file. 2016-02-27 16:14:14 +00:00
widgets Allow keys and mouse buttons to be selected in options. 2016-03-05 12:35:19 +00:00