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

203 Commits

Author SHA1 Message Date
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 26ed8dc322 Allow side to be set for entities (mostly applies to mines). 2016-04-01 14:21:11 +01:00
Steve 3646a9326a Start of mines. 2016-03-30 07:22:58 +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 c00c134b70 Allow access to all missions when using -debug. 2016-03-27 11:08:44 +01:00
Steve 175b7e5ca0 Moved entity loading code out of mission.c, and into appropriate c files. 2016-03-17 08:11:52 +00:00
Steve 1b43e4908c Added ability to hide objective numbers. 2016-03-16 19:24:41 +00:00
Steve 4ef796bf92 Added id to objective, to allow script to function in non-English languages. 2016-03-16 06:54:34 +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 634d914bd9 Jumpgate initial state fix. 2016-03-14 11:28:19 +00:00
Steve edc18579ec Added support for spawners. 2016-03-14 11:12:22 +00:00
Steve 0a69dd0e5e Merge from develop. 2016-03-12 18:22:48 +00:00
Steve a5509b5bcd Logging updates. 2016-03-12 15:12:52 +00:00
Steve 71b0a00689 Use EF_DISABLED for jumpgates, rather than systemPower. 2016-03-12 12:35:05 +00:00
Steve ae6e2ede09 Control waypoints from script. 2016-03-12 12:09:42 +00:00
Steve 4f27b40d97 Added rescue challenges 2016-03-11 23:45:47 +00:00
Steve 7ba4dcf26c Memory leak fixes. 2016-03-10 22:47:33 +00:00
Steve da97818259 Trophy-related prototyping fixes. 2016-03-10 18:02:19 +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 8017719239 Allow fighters to be added to mission in disabled state. 2016-03-09 23:21:28 +00:00
Steve 25101c0f1d Now automatically checking trophies based on star system name. 2016-03-09 15:54:25 +00:00
Steve ba5260104a Check trophies at start of galactic map. 2016-03-09 15:53:56 +00:00
Steve 93dd00c785 Prototyping stats trophies. 2016-03-09 12:31:33 +00:00
Steve f867e793bd Trophy prototyping. 2016-03-09 11:51:26 +00:00
Steve 7118c10648 Draw jumpgate portal in jumpgate.c. Use systemPower instead of ALIVE_SLEEPING to determine status. 2016-03-08 14:28:11 +00:00
Steve 22b5267ffd Initially add all entities to quadtree, to avoid the popping effect. 2016-03-08 07:12:06 +00:00
Steve 99013a4e99 Allow jumpgate to be put into "sleep" state: effectively inactive. 2016-03-08 06:55:41 +00:00
Steve 798135eadf Don't allow rogue files to crash game at startup. 2016-03-07 19:03:55 +00:00
Steve bc1c5d09a8 Replaced extraction point with jumpgate. 2016-03-07 17:12:21 +00:00
Steve 4a52bb1fce Added item collection challenges. 2016-03-07 12:29:23 +00:00
Steve 244e5d6dd9 Merge from Master. 2016-03-06 19:07:43 +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 ac59559d90 Clear input when pressing Escape. 2016-03-05 15:35:09 +00:00
Steve f55a4e57c8 Pressing ESCAPE blocks when awaiting widget input. 2016-03-05 13:49:07 +00:00
Steve 7979b175a2 Waypoint challenge updates. 2016-03-04 22:59:16 +00:00
Steve 599c4fc338 Merge fixes. 2016-03-04 22:11:13 +00:00
Steve 159d36017b Centralizing getFileLocation() to make file loading more transparent. 2016-03-04 14:29:50 +00:00
Steve 95cb35d5a1 Added getJSONValue to aid with optional JSON data. 2016-03-04 14:14:04 +00:00
Steve b6012a2e21 Merged config branch. 2016-03-03 18:03:07 +00:00
Steve c8dd06dcdc Added AUTO option for music. Reorganised music for easier scanning. 2016-03-03 16:16:12 +00:00
Steve d5d5169078 Accuracy for rockets and missiles, not just shots. 2016-03-03 09:12:08 +00:00
Steve cb34b3b9b6 Maximum of 3 challenges per challenge mission. 2016-03-02 23:20:37 +00:00
Steve 2c71b16e17 Show and apply challenge restrictions. 2016-03-02 22:19:26 +00:00
Steve 0c31b2204c Refactored challenge data, for display on Challenge Home. 2016-03-02 06:46:13 +00:00
Steve 1c270888aa Removed mouse warping. Is too jarring. 2016-02-29 16:05:35 +00:00
Steve 9d846fd137 Randomize planet and background in Challenge Home. 2016-02-29 16:00:32 +00:00
Steve 25d68b27fb Stats display bug fix. 2016-02-29 15:55:21 +00:00
Steve 8242dbf037 Use getFileLocation for loading files (install is broken on Linux). 2016-02-29 14:43:24 +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 10cc12bd70 i18n updates. 2016-02-29 10:47:41 +00:00
Steve 9b6abf764a Percent complete stats updates. 2016-02-29 10:47:10 +00:00
Steve ad7a1eefda Challenge integration updates. 2016-02-28 13:02:57 +00:00
Steve 58e7b9b8ea i18n updates. Not optimised. That will come later. 2016-02-27 19:16:17 +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 d79325a0b3 Only select one mission. 2016-02-27 08:08:32 +00:00
Steve 6b25cc3c8b Clip camera using star systems. 2016-02-25 16:00:42 +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 a7f9585a9a Moved prepareScene / presentScene into main loop. 2016-02-22 17:27:36 +00:00
Steve 03712285c4 Campaign flow bug fixes. 2016-02-21 16:55:11 +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 a554c0ef00 Tidied headers. 2016-02-21 08:54:23 +00:00
Steve 6b1e62dd38 Start of replacing grid with quadtree. 2016-02-21 07:48:22 +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 17c55ec080 Now scrolling the galactic map by clicking and dragging. 2016-02-14 11:07:15 +00:00
Steve 855abe77cb Prevent replaying of previously complete campaign missions. 2016-02-13 16:59:18 +00:00
Steve 60a398408a Updated random planet placement. 2016-02-13 16:59:00 +00:00
Steve 8cd74e999d Increase filename length of music. 2016-01-28 17:03:23 +00:00
Steve e31f39d3a9 Replaced "Dummy" missions with manual complete flag. 2016-01-25 15:09:14 +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 fb8063b581 Get initial enemy count at start of mission. 2015-12-31 11:25:19 +00:00
Steve b095705dd0 When activating a captial ship, also activate its components. 2015-12-30 18:43:47 +00:00
Steve 01ec3ceb7b Stats bug fixes. 2015-12-23 19:22:31 +00:00
Steve c3785bcfce Allow the player to select and fire rockets, when using a bomber. 2015-12-23 16:25:25 +00:00
Steve 48f08a3fb0 Allowed locations to be activated by scripts. Added eliminate all objective type. 2015-12-22 17:58:18 +00:00
Steve 1884c8371e Added Locations for use with mission scripting. 2015-12-22 12:42:04 +00:00
Steve 3dbd8e72f7 Missions now unlock depending on number of other missions completed (and previous mission, where applicable). 2015-12-21 14:19:21 +00:00
Steve d8eb896456 Enable debug mode by passing -debug. 2015-12-20 12:25:20 +00:00
Steve bc8ef3b0bc Memory leak fix. 2015-12-20 11:58:35 +00:00
Steve af04c5a7ef Automatically load missions from star system misson dir (data/mission/xxx) 2015-12-20 11:58:21 +00:00
Steve 1c81be3168 Stats for capital ships. 2015-12-19 16:15:57 +00:00
Steve 2d37460944 Generate cap ship component names from parent name. 2015-12-18 12:02:45 +00:00
Steve 48d54af42e Use float for draw angle, instead of int. 2015-12-17 23:14:25 +00:00
Steve 310637b4eb Merged from v0.41. 2015-12-14 11:41:43 +00:00
Steve c4dfb823ef Code clean up. 2015-12-14 08:15:41 +00:00
Steve 4fbdcd0af6 Allow flags in missions to be added to existing entity flags, or replace them completely. 2015-12-12 18:24:23 +00:00
Steve 6b06b2a431 Increased corvette engine health. Allowed guns to fire missiles. Cap ships will also hunt down AI targets. 2015-12-12 17:12:25 +00:00
Steve 6084251e9f Start of capital ships. 2015-12-07 19:19:14 +00:00
Steve d6982e80ca Created common.h to aid with cross compiling. 2015-12-05 08:15:58 +00:00
Steve b3628c17b5 Decrease scroll zone. 2015-12-03 22:50:53 +00:00
Steve 2bca049973 Misc. clean up. 2015-12-03 16:53:29 +00:00
Steve 65b62091d1 Allow for file location to be determined automatically. 2015-12-02 23:20:19 +00:00
Steve 26c4bd4aea Allow AI Flags to be set in mission data. 2015-12-02 07:24:12 +00:00
Steve 9c532352f5 Allow for star systems to fall to Pandorans, once story missions are complete. 2015-11-30 09:33:43 +00:00
Steve f1f962aeae Complete conditions when CompleteMission() is called. 2015-11-29 16:50:06 +00:00
Steve d3b0755f8b Scatter bug fix for entities. 2015-11-29 16:30:59 +00:00