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

606 Commits

Author SHA1 Message Date
Steve bd8e88b3ac Don't allow tugs to take ownership of something that is already owned. 2016-03-28 10:39:52 +01:00
Steve c7bdeb195c Allow capital ship to be disabled. 2016-03-28 10:39:25 +01:00
Steve 47f7f5671a Added trophy graphics. 2016-03-27 11:32:38 +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 aadb4f6949 Make shield splinter effects more visible. 2016-03-27 08:56:09 +01:00
Steve 06f7867013 Use CONTROL_NEXT_FIGHTER / CONTROL_PREV_FIGHTER to select fighters during epic missions. 2016-03-27 08:55:58 +01:00
Steve d33bcf9414 In epic battles, spawned in entities (such as swarmers) don't count towards the epicLimit. 2016-03-27 08:55:25 +01:00
Steve ca043f171c Only initially add active entities to quadtree. 2016-03-26 18:15:52 +00: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 73a3c0c78a Fixed shield splinter effect. 2016-03-16 21:54:08 +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
Steve 30fa446006 Allow script to activate spawners. 2016-03-16 06:53:49 +00:00
Steve 0332e2fe20 Fixed time script bug. 2016-03-16 06:53:30 +00:00
Steve 604526611a Increased flock leading distance. 2016-03-16 06:53:20 +00:00
Steve 09e676d713 Added simple die, to prevent swarmers spreading debris everywhere. 2016-03-16 06:53:07 +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 13344ddc06 Made many attributes optional. 2016-03-14 17:55:34 +00:00
Steve 1fbf31e56c Don't check spawners if player is dead. 2016-03-14 17:55:09 +00:00
Steve 634d914bd9 Jumpgate initial state fix. 2016-03-14 11:28:19 +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 35e23e8450 Added large explosions, for capital ships. 2016-03-14 08:30:19 +00:00
Steve 35b5e4a1c6 Misc cleanup. 2016-03-13 10:52:12 +00:00
Steve 7b0c70005f Lookup updates. 2016-03-13 10:52:02 +00:00
Steve b37a268169 Added capital ships to challenge killLimit check. 2016-03-13 10:51:48 +00:00
Steve 160f65a15b Added EF_NO_KILL_INC to prevent kill count increment. 2016-03-13 10:50:32 +00: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 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 bdced9c00f Use aiActionTime, instead of thinkTime, to allow waypoint to continue to spin. 2016-03-12 12:11:56 +00:00
Steve e9c43f3d60 Flocking tweak. 2016-03-12 12:11:30 +00:00
Steve ed6b0ae376 Don't point to jumpgate on HUD if it's inactive. 2016-03-12 12:10:14 +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 3bd78dbd20 Spawn fighters offscreen or off map. 2016-03-11 23:45:12 +00:00
Steve c66b734e7e Added interval-based script events. 2016-03-11 23:43:50 +00:00
Steve 553178128f InitStars during start up (lost during memory leak fixes). 2016-03-11 07:22:23 +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 25b641c8d4 MIsc. clean up. 2016-03-10 11:58:10 +00:00
Steve 108dfa44d7 Allow tugs with AIF_UNLIMITED_RANGE to find targets anywhere. 2016-03-10 11:57:05 +00:00
Steve 3a0618b150 Rope cutting bug fix. 2016-03-10 11:56:38 +00:00
Steve 812f69b02e Drawn effects bug fix. 2016-03-10 11:56:27 +00:00
Steve ebfea2b5c4 Unlock next challenge mission is previous has been passed. 2016-03-09 23:25:54 +00:00
Steve 0bcc69ee69 Move planet a little faster. 2016-03-09 23:25:27 +00:00
Steve 1a4b5c679c Don't attach rope to vessel with rope already attached. 2016-03-09 23:25:12 +00:00
Steve 7789d3ab64 Remove rope flags when rope is detached. 2016-03-09 23:22:32 +00:00
Steve c9bde77bca Spin jumpgate portal a little faster. 2016-03-09 23:21:51 +00:00
Steve 8017719239 Allow fighters to be added to mission in disabled state. 2016-03-09 23:21:28 +00:00
Steve 46503f4fe7 Mark craft as stolen if they are moved to jumpgate by a vessel not on your side. 2016-03-09 23:20:50 +00:00
Steve 16c8f81389 Play sound effects for control config widgets. 2016-03-09 23:19:10 +00:00
Steve bb892c1efe Added new HUD icons. 2016-03-09 23:18:40 +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 fb584735c6 Jumpgate updates. 2016-03-08 19:00:56 +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 a74ff87a46 Added portal effect to jumpgate. 2016-03-07 22:50:41 +00:00
Steve ecdf9998d0 Don't select options widget. 2016-03-07 19:04:12 +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 bd715286a1 Allows show killed message during a challenge battle. 2016-03-07 12:31:43 +00:00
Steve 6ef07a65e2 Craft marked as EF_AI_TARGET will be attacked even if they are dodging and avoiding combat. 2016-03-07 12:31:22 +00:00
Steve 16591691b5 Allow challenges to be ended via the script. 2016-03-07 12:30:20 +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 e04ad44a1a Eliminate all objective bug fix. 2016-03-06 17:27:23 +00:00
Steve 5764e0a4b2 Capital ships destroyed / lost triggers. 2016-03-06 17:14:13 +00:00
Steve 497977c665 Don't add capital ship components to quadtree until they've been positioned. 2016-03-06 17:13:57 +00:00
Steve 721ca3e110 Trophy updates. 2016-03-06 17:13:34 +00:00
Steve fff301e3e2 Allow shrinking of array. 2016-03-06 09:48:29 +00:00
Steve c14b687209 Screenshot save path update. 2016-03-06 09:48:09 +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 e28390a496 Added array resize function (not using realloc because it doesn't zero the new array). 2016-03-05 23:56:21 +00:00
Steve ac59559d90 Clear input when pressing Escape. 2016-03-05 15:35:09 +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 d2a234839b Integrated mouse control mappings. 2016-03-05 13:21:17 +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 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 d2acbefc6d Prevent modal dialog from being dismissed immediately. 2016-03-04 14:14:45 +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 122bb53a66 Challenge time bugfix. 2016-03-03 14:19:29 +00:00
Steve 4f6721cba4 Added 5th challenge mission. 2016-03-03 11:31:32 +00:00
Steve ed9b02a917 Disabled entities now become secondary targets. 2016-03-03 11:31:18 +00:00
Steve d5d5169078 Accuracy for rockets and missiles, not just shots. 2016-03-03 09:12:08 +00:00
Steve 2ca26b1ea0 Divide by zero check. 2016-03-03 07:47:33 +00:00
Steve 263a6cc5b5 Removed unneeded abs on hashcode. 2016-03-03 07:47:18 +00:00
Steve d980e412f2 Draw circle performance update. Removed drawFilledCircle (unused). 2016-03-03 07:47:03 +00:00
Steve 11d5ed635f Challenge processing fixes. 2016-03-03 07:44:04 +00:00
Steve cb34b3b9b6 Maximum of 3 challenges per challenge mission. 2016-03-02 23:20:37 +00:00
Steve 05185950e4 Auto select first challenge when coming from title. 2016-03-02 22:24:59 +00:00
Steve 2c71b16e17 Show and apply challenge restrictions. 2016-03-02 22:19:26 +00:00
Steve f9880354db i18n updates. 2016-03-02 07:14:38 +00:00
Steve 35a2277114 Display challenge information. 2016-03-02 06:58:03 +00:00
Steve 0c31b2204c Refactored challenge data, for display on Challenge Home. 2016-03-02 06:46:13 +00:00
Steve e5c5315e62 Print stats when in debug mode at end of challenge. 2016-03-01 07:21:31 +00:00
Steve c95b56728f Using getFileLocation. 2016-02-29 21:52:30 +00:00
Steve 55bb0d1e36 Challenge home music. 2016-02-29 21:51:49 +00:00
Steve e5e96f8e81 GPL notices. 2016-02-29 16:05:49 +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 adb86d9f14 Show planet in background. 2016-02-29 12:09:36 +00:00
Steve 1808ec8fbc Use function pointer array for init steps. 2016-02-29 11:38:31 +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 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 281dd4d7d2 Show number of challenges completed, lock challenges that can't be played yet. 2016-02-29 09:23:41 +00:00
Steve 83523f868a Use battle sound (distance) instead of normal sound. 2016-02-29 09:23:14 +00:00
Steve 211df6d8ec i18n updates. 2016-02-28 13:45:17 +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 44c7e78606 Further i18n integration updates. 2016-02-28 09:59:33 +00:00
Steve 58e7b9b8ea i18n updates. Not optimised. That will come later. 2016-02-27 19:16:17 +00:00
Steve 821e7ac872 Start of i18n support. 2016-02-27 18:13:05 +00:00
Steve 660bb57bb0 Further challenge updates. 2016-02-27 18:12:18 +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 ef6e65a51c Slow player down when mission is complete. 2016-02-27 16:15:41 +00:00
Steve 4df206d6b2 Show time on HUD when in challenge mission. 2016-02-27 16:15:30 +00:00
Steve 69e45f4e3f Clear input when transitioning. 2016-02-27 16:14:48 +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 57d8c867e1 v0.6. Start of i18n. 2016-02-27 12:14:05 +00:00
Steve d79325a0b3 Only select one mission. 2016-02-27 08:08:32 +00:00
Steve 1f5af02441 Fixed for point effects not showing. 2016-02-25 16:43:26 +00:00
Steve 6b25cc3c8b Clip camera using star systems. 2016-02-25 16:00:42 +00:00
Steve b5bafa1b1e Windows save path bug fix. 2016-02-25 12:27:08 +00:00
Steve 3f100a0848 Init effects on title screen, to prevent crash. 2016-02-25 12:26:54 +00:00
Steve 84889d8391 Windows build fixes. 2016-02-25 11:46:39 +00:00
Steve 19630696c5 Prevented AI craft for jittering when close to leader. 2016-02-25 10:55:15 +00:00
Steve e79d331599 Added ALL_OBJECTIVES_COMPLETE script command. 2016-02-25 10:52:01 +00:00