Commit Graph

37 Commits

Author SHA1 Message Date
Steve 1474ecf7ca Control trophy alerts from the main loop. 2016-05-31 09:37:46 +01:00
Steve 5d5c19a62d Allow campaign to be ended with script. 2016-05-31 09:12:14 +01:00
Steve 7e7b8c5454 Moved max suspicion reaction to scripts in missions. 2016-05-20 10:51:35 +01:00
Steve 50883125e1 Merge. 2016-05-15 08:19:26 +01:00
Steve e278374490 Merge from develop. 2016-03-27 11:21:23 +01:00
Steve 675d051011 Tidied headers. 2016-03-12 18:29:22 +00:00
Steve f5b3933a87 Merge branch 'develop' into trophies
Conflicts:
	src/battle/battle.c
2016-03-12 18:28:43 +00:00
Steve 0a69dd0e5e Merge from develop. 2016-03-12 18:22:48 +00:00
Steve 09a89e692b Added time up status for finishing a challenge already partly passed. 2016-03-05 15:34:37 +00:00
Steve d5d5169078 Accuracy for rockets and missiles, not just shots. 2016-03-03 09:12:08 +00:00
Steve ad7a1eefda Challenge integration updates. 2016-02-28 13:02:57 +00:00
Steve f153383f9e Challenge mission graphics. 2016-02-27 18:08:43 +00:00
Steve 2e5b45064a Challenges integration. 2016-02-27 16:16:21 +00:00
Steve 239845a279 Array resize bug fixes. 2016-02-24 23:12:13 +00:00
Steve a2a1ec0613 Modal message box updates. 2016-02-23 22:20:07 +00:00
Steve a7f9585a9a Moved prepareScene / presentScene into main loop. 2016-02-22 17:27:36 +00:00
Steve cedbed4dc8 Updated copyright dates. 2016-02-21 15:50:27 +00:00
Steve dcef433d4d Randomly scale planet. 2016-02-21 13:47:10 +00:00
Steve 6b1e62dd38 Start of replacing grid with quadtree. 2016-02-21 07:48:22 +00:00
Steve 1884c8371e Added Locations for use with mission scripting. 2015-12-22 12:42:04 +00:00
Steve d8eb896456 Enable debug mode by passing -debug. 2015-12-20 12:25:20 +00:00
Steve 743786efb8 Added debris. 2015-12-13 14:50:54 +00:00
Steve fb524386fa drawBullets() bug fix. 2015-12-11 19:06:16 +00:00
Steve 1b1a4ca792 Shift dead entities out of main list instead of freeing, to counter dangling pointers. 2015-12-10 10:15:27 +00:00
Steve d6982e80ca Created common.h to aid with cross compiling. 2015-12-05 08:15:58 +00:00
Steve 9de6d6c737 Removed triggers, and replaced with script system. Added message box. 2015-11-28 10:11:20 +00:00
Steve ede89eefd1 Shield damage effect updates. Laser will cause shield to disable for 10 seconds. 2015-11-18 16:04:12 +00:00
Steve 1cd8b42664 Centralize completeMission and failMission logic. 2015-11-02 19:18:26 +00:00
Steve a7c1906950 Replaced radar drawCircle call with graphic. Added radar range warning. 2015-11-02 10:11:47 +00:00
Steve 7a6a6b26c0 Start of Grid. 2015-11-01 22:19:39 +00:00
Steve 4f47cd0bc6 Allow player to switch fighters upon death, during an epic battle. 2015-10-31 10:00:46 +00:00
Steve 5c7b2a24bf Integrated waypoints into objective system. 2015-10-28 19:12:58 +00:00
Steve 705a2cebe9 Removed Fighter struct and replaced with Entity. 2015-10-26 19:16:12 +00:00
Steve 73eb5517bf Start of waypoints. 2015-10-26 17:27:43 +00:00
Steve d0a3d0d6c5 Start of triggers. 2015-10-26 08:10:13 +00:00
Steve f206f2052b Allow for switching of weapons. Show weapon info on hud. 2015-10-23 07:08:18 +01:00
Steve 24bf15ce09 Initial check in to GitHub. 2015-10-20 12:51:49 +01:00