Commit Graph

61 Commits

Author SHA1 Message Date
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
Steve 77da136e75 Time limit warning for challenges. 2016-04-03 14:04:56 +01:00
Steve 147f2afae4 Merge branch 'trophies' of ssh://github.com/stephenjsweeney/tbftss into trophies
Conflicts:
	locale/tbftss.pot
	src/battle/battle.c
	src/battle/battle.h
	src/galaxy/mission.c
2016-03-27 11:25:50 +01:00
Steve e278374490 Merge from develop. 2016-03-27 11:21:23 +01:00
Steve 0332e2fe20 Fixed time script bug. 2016-03-16 06:53:30 +00:00
Sweeney 1938c6714c Merge remote-tracking branch 'origin/develop' into trophies
# Conflicts:
#	data/challenges/10.json
#	locale/tbftss.pot
#	src/battle/battle.c
#	src/battle/battle.h
#	src/battle/script.h
#	src/galaxy/mission.c
2016-03-15 12:19:32 +00:00
Steve 1fbf31e56c Don't check spawners if player is dead. 2016-03-14 17:55:09 +00:00
Steve 4e8b85b6a1 Removed script-based spawner. Redundant. 2016-03-14 11:28:01 +00:00
Steve edc18579ec Added support for spawners. 2016-03-14 11:12: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 c66b734e7e Added interval-based script events. 2016-03-11 23:43:50 +00:00
Steve 7ba4dcf26c Memory leak fixes. 2016-03-10 22:47:33 +00:00
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
Steve 0bcc69ee69 Move planet a little faster. 2016-03-09 23:25:27 +00:00
Steve ba5260104a Check trophies at start of galactic map. 2016-03-09 15:53:56 +00:00
Steve f867e793bd Trophy prototyping. 2016-03-09 11:51:26 +00:00
Steve 09a89e692b Added time up status for finishing a challenge already partly passed. 2016-03-05 15:34:37 +00:00
Steve f55a4e57c8 Pressing ESCAPE blocks when awaiting widget input. 2016-03-05 13:49:07 +00:00
Steve d5d5169078 Accuracy for rockets and missiles, not just shots. 2016-03-03 09:12:08 +00:00
Steve 0c31b2204c Refactored challenge data, for display on Challenge Home. 2016-03-02 06:46:13 +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 266088f764 Start of restoring challenges. 2016-02-27 12:14:29 +00:00
Steve e79d331599 Added ALL_OBJECTIVES_COMPLETE script command. 2016-02-25 10:52:01 +00:00
Sweeney 56540a56ac Start of bullet, debris, and effect performance updates. Dynamic array sizing. 2016-02-24 15:02:51 +00:00
Steve a7f9585a9a Moved prepareScene / presentScene into main loop. 2016-02-22 17:27:36 +00:00
Steve fd56b75a6a Press 6 to complete mission in debug mode. 2016-02-21 16:55:29 +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 b004dd95ab Resize quadtree entity capacity as needed. 2016-02-21 08:13:17 +00:00
Steve 6b1e62dd38 Start of replacing grid with quadtree. 2016-02-21 07:48:22 +00:00
Steve 909cdd76f3 Now drawing stars after planet. Increased size of brightest stars by one pixel. 2016-02-14 11:08:03 +00:00
Steve b6e128231d Scroll planet in background more slowly. 2016-02-13 16:53:56 +00:00
Steve a251459413 Added "unwinnable" mission flag, to automatically continue the game when the player is defeated. 2016-01-25 14:58:07 +00:00
Steve 1f03b81cca Misc. updates. 2015-12-22 17:58:53 +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 bd5f1c3b49 Don't execute scripts or message boxes if the player is dead. 2015-12-19 08:56:52 +00:00
Steve 310637b4eb Merged from v0.41. 2015-12-14 11:41:43 +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 6441f926e2 Various tweaks and refactoring to accomodate capital ships. 2015-12-07 19:19:41 +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 a9dc374d40 Added new stats. 2015-11-17 07:23:50 +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