tbftss/data
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
..
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 Don't show mission target boxes around capital ship components. 2016-03-28 11:45:48 +01:00
challenges Slightly increased time limit. 2016-04-02 16:38:01 +01:00
craft Merge from develop. 2016-03-27 11:21:23 +01:00
fighters Reduced Shale fire rate. 2016-04-01 14:19:15 +01:00
fonts Initial check in to GitHub. 2015-10-20 12:51:49 +01:00
galaxy Merge from develop. 2016-03-27 11:21:23 +01:00
missions Crystabelle -> Christabel 2016-04-04 11:24:49 +01:00
trophies Merge branch 'develop' into trophies 2016-03-12 18:28:43 +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