walkero
/
tbftss
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity
877 Commits 3 Branches 28 Tags 100 MiB
Commit Graph

305 Commits

Author SHA1 Message Date
Steve 422901632f Added challenge #12. 2016-04-02 09:34:21 +01:00
Steve 28eec0b8e0 Merge branch 'develop' into trophies 
Conflicts:
	README.md
	src/defs.h
	src/galaxy/mission.c
	src/system/sound.c
 2016-04-01 17:14:06 +01:00
Steve 86b1f27f00 Misc misson tweaks. 2016-04-01 17:03:11 +01:00
Steve 0985bcd0e9 Start of 2nd Aster mission. 2016-04-01 14:21:26 +01:00
Steve fc384452a2 Reduced Shale fire rate. 2016-04-01 14:19:15 +01:00
Steve 510bd3da00 AI target focus for bombers. 2016-03-29 22:46:07 +01:00
Steve 6016e46c37 Mission tweaks. 2016-03-29 21:57:02 +01:00
Steve ce8f1fed93 Replaced Rebel Firefly and Nymph with Razor and Shale. 2016-03-29 07:09:10 +01:00
Steve 11ce19e677 Added Blizzard. 2016-03-28 22:33:15 +01:00
Steve f114ad7e7e Merge branch 'develop' into trophies 2016-03-28 16:09:24 +01:00
Steve c0a547addb Added Razor and Shale. 2016-03-28 13:54:06 +01:00
Steve 0e4129069a Start of first Aster mission. 2016-03-28 11:47:24 +01:00
Steve ab8be196b5 Khepri now green and associated with rogue nation. 2016-03-28 11:47:11 +01:00
Steve 45d9d2a00d Don't show mission target boxes around capital ship components. 2016-03-28 11:45:48 +01:00
Steve e278374490 Merge from develop. 2016-03-27 11:21:23 +01:00
Steve b07beab755 Added missing mission descriptions. 2016-03-27 11:09:01 +01:00
Steve fe9c49244f Final Clarke mission tweaks. 2016-03-27 08:56:18 +01:00
Steve 6ca888d775 Misc. mission clean up. 2016-03-26 18:16:28 +00:00
Steve 743a2d73d4 Start of final Clarke mission. 2016-03-26 18:16:17 +00:00
Steve 8c639a9cb5 Clarke now falls to the Pandorans. 2016-03-26 18:16:05 +00:00
Steve 1b43e4908c Added ability to hide objective numbers. 2016-03-16 19:24:41 +00:00
Steve 50cde212f4 Clark mission #5 tweaks. 2016-03-16 06:55:07 +00:00
Steve 09e676d713 Added simple die, to prevent swarmers spreading debris everywhere. 2016-03-16 06:53:07 +00:00
Steve 13344ddc06 Made many attributes optional. 2016-03-14 17:55:34 +00:00
Steve 612e76fe04 Added INF Swarmer. 2016-03-14 17:54:56 +00:00
Steve 4e8b85b6a1 Removed script-based spawner. Redundant. 2016-03-14 11:28:01 +00:00
Steve 380ca3e26a Tweaked accuracy threshold. 2016-03-14 08:30:34 +00:00
Steve 35b5e4a1c6 Misc cleanup. 2016-03-13 10:52:12 +00:00
Steve 34e4880535 Added challenge #11. 2016-03-13 10:50:41 +00:00
Steve 160f65a15b Added EF_NO_KILL_INC to prevent kill count increment. 2016-03-13 10:50:32 +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 0d074eaa22 JSON bug fix. 2016-03-12 15:13:04 +00:00
Steve 71b0a00689 Use EF_DISABLED for jumpgates, rather than systemPower. 2016-03-12 12:35:05 +00:00
Steve 5d38abcbeb Use EF_DISABLED, instead of system power. 2016-03-12 12:12:12 +00:00
Steve a4fbb85cb6 Rothan mission #2 2016-03-12 12:11:06 +00:00
Steve 96556bc0df Increased Rook firepower. 2016-03-12 12:09:50 +00:00
Steve ae6e2ede09 Control waypoints from script. 2016-03-12 12:09:42 +00:00
Steve 4f19dcb9a5 Added challenge #10. 2016-03-11 23:46:00 +00:00
Steve 91e0073cfa Merge branch 'develop' into trophies 2016-03-10 17:52:07 +00:00
Steve ed438db279 Grammar. 2016-03-10 17:51:55 +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 d2803bf961 Various mission tweaks. 2016-03-10 11:57:46 +00:00
Steve 80658d6537 Added initial INF tug graphics. 2016-03-10 11:56:14 +00:00
Steve e363cca064 Start of first Rothan mission. 2016-03-09 23:26:08 +00:00
Steve f8344f4047 Added new trophies. 2016-03-09 15:54:45 +00:00
Steve 93dd00c785 Prototyping stats trophies. 2016-03-09 12:31:33 +00:00
Steve fb584735c6 Jumpgate updates. 2016-03-08 19:00:56 +00:00
Steve 5267b7b559 Place wingmates around player at start of mission. 2016-03-08 07:21:23 +00:00
Steve 99013a4e99 Allow jumpgate to be put into "sleep" state: effectively inactive. 2016-03-08 06:55:41 +00:00
Steve bc1c5d09a8 Replaced extraction point with jumpgate. 2016-03-07 17:12:21 +00:00
Steve 885d566e6b Don't allow shuttles to be selected during epic battles (for challenges). 2016-03-07 12:29:54 +00:00
Steve d597fa731a Added Challenge #9. 2016-03-07 12:29:34 +00:00
Steve 33f2359812 Added Clarke mission #4 2016-03-06 17:54:03 +00:00
Steve 721ca3e110 Trophy updates. 2016-03-06 17:13:34 +00:00
Steve 28ef43b632 Background updates. 2016-03-06 17:13:18 +00:00
Steve 922b39c0ea Challenge #8, defend extraction point. Added flag to allow AI to sometimes ignore extraction point. 2016-03-06 09:47:44 +00:00
Steve fe55f2e8ba Challenge updates. 2016-03-05 15:34:49 +00:00
Steve 6dfb51e8b0 Allow keys and mouse buttons to be selected in options. 2016-03-05 12:35:19 +00:00
Steve acd53f6b97 Further custom control integration. 2016-03-05 08:42:35 +00:00
Steve 7979b175a2 Waypoint challenge updates. 2016-03-04 22:59:16 +00:00
Steve 2b3fecce88 Added Challenge #7. 2016-03-04 14:14:57 +00:00
Steve b6012a2e21 Merged config branch. 2016-03-03 18:03:07 +00:00
Steve b136a6bb6c Time limit should be 30. 2016-03-03 17:20:51 +00:00
Steve c8dd06dcdc Added AUTO option for music. Reorganised music for easier scanning. 2016-03-03 16:16:12 +00:00
Steve 92a9cd7ce6 Challenge #6 2016-03-03 14:19:34 +00:00
Steve 4f6721cba4 Added 5th challenge mission. 2016-03-03 11:31:32 +00:00
Steve d5d5169078 Accuracy for rockets and missiles, not just shots. 2016-03-03 09:12:08 +00:00
Steve 2c71b16e17 Show and apply challenge restrictions. 2016-03-02 22:19:26 +00:00
Steve 9dac6aa0ba Challenge #4 tweaks. 2016-03-01 07:21:56 +00:00
Steve 9caca3ab82 Challenge 04. 2016-02-29 21:52:06 +00:00
Steve d869c22f36 Allow random planet and backgrounds for missions, using "AUTO" in mission definition. 2016-02-29 14:42:46 +00:00
Steve bf7d6dc921 Added menu to challenges screen. 2016-02-29 09:54:03 +00:00
Steve 0e159402e9 Show stats button on title screen. 2016-02-29 09:35:39 +00:00
Steve 1291c0cf22 Tidy up. 2016-02-29 09:23:59 +00:00
Steve ad7a1eefda Challenge integration updates. 2016-02-28 13:02:57 +00:00
Steve a1703d5066 vSync is now always on. 2016-02-28 10:00:17 +00:00
Steve 2e5b45064a Challenges integration. 2016-02-27 16:16:21 +00:00
Steve 2c33041344 Load data from files found in directory, rather than using a text file. 2016-02-27 16:14:14 +00:00
Steve 266088f764 Start of restoring challenges. 2016-02-27 12:14:29 +00:00
Steve 1476c69944 Various script updates. 2016-02-25 10:54:48 +00:00
Steve 12999f3dd9 Updated "Pilot" to "Wingmate". 2016-02-25 10:53:37 +00:00
Steve e79d331599 Added ALL_OBJECTIVES_COMPLETE script command. 2016-02-25 10:52:01 +00:00
Steve 913184d877 Removed INF. They don't exist after 2616. 2016-02-24 07:16:23 +00:00
Steve a2a1ec0613 Modal message box updates. 2016-02-23 22:20:07 +00:00
Steve 368e9dc592 Start of modal dialog display. 2016-02-23 07:19:31 +00:00
Steve 7ffd3b0406 Added Mag cannon training at Sol. 2016-02-21 22:49:43 +00:00
Steve 03712285c4 Campaign flow bug fixes. 2016-02-21 16:55:11 +00:00
Steve 480192efe1 Created second UNF Corvette. 2016-02-20 07:23:24 +00:00
Steve e8748966a6 Fixed flags for pirate lieutenant (collision detection was removed). 2016-02-15 14:07:54 +00:00
Steve 54b92ad137 Added message for when a star system falls to the Pandorans (campaign-related, unavoidable). 2016-02-14 11:53:03 +00:00
Steve a5f73cc3fc Renamed "textureName" to simply "texture". 2016-02-13 14:31:45 +00:00
Steve dbf872c9c0 Updated corvette firing rates. 2016-02-13 11:02:04 +00:00
Steve b8ba509d27 Updated CSN Corvette #2. 2016-02-12 22:31:12 +00:00
Steve 6256e97414 Start of second CSN corvette. 2016-02-11 15:40:44 +00:00
Steve 8e0550b705 Added final Iliad mission. 2016-01-28 17:02:57 +00:00
Steve 044e860894 Third Alba mission. 2016-01-28 16:22:17 +00:00
Steve f403df5c99 Mission description updates. 2016-01-28 15:54:17 +00:00
Steve e31f39d3a9 Replaced "Dummy" missions with manual complete flag. 2016-01-25 15:09:14 +00:00
Steve bf3de041c6 Misc. mission updates. 2016-01-24 09:50:39 +00:00