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
..
galacticMap.c	Trophy-related prototyping fixes.	2016-03-10 18:02:19 +00:00
galacticMap.h	Check trophies at start of galactic map.	2016-03-09 15:53:56 +00:00
mission.c	Merge branch 'develop' into trophies	2016-04-04 11:30:27 +01:00
mission.h	Allow waypoints to be manually activated. Removed entId from Battle (redundant).	2016-04-04 11:23:32 +01:00
starSystems.c	Don't allow rogue files to crash game at startup.	2016-03-07 19:03:55 +00:00
starSystems.h	Centralizing getFileLocation() to make file loading more transparent.	2016-03-04 14:29:50 +00:00
stats.c	Added mines destroyed stat.	2016-04-03 08:37:09 +01:00
stats.h	Stats display bug fix.	2016-02-29 15:55:21 +00:00