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

755 Commits

Author SHA1 Message Date
Steve a5ed044fff Remove addedTo if no ents added and children have none. 2016-04-20 15:44:57 +01:00
Steve 7e752ccae4 Don't recurse into quads that haven't had anything added to them. 2016-04-20 13:53:25 +01:00
Steve 6d8856deae Don't exceed your own speed when following a leader. 2016-04-20 13:53:06 +01:00
Steve d4b791ed17 Tell fighters not to separate from EF_NON_SOLID objects. 2016-04-20 09:38:54 +01:00
Steve a3be44a000 Mine deployment fix. 2016-04-20 09:38:29 +01:00
Steve d871e48144 AIF_ASSASSIN check fix. 2016-04-19 12:50:27 +01:00
Steve c395ee25e5 Allow AIF_ASSASSIN flag to be set, to always attack a target. 2016-04-19 11:13:43 +01:00
Steve add135d62e Jumpgate state fix. 2016-04-19 11:13:20 +01:00
Steve 9f4be9a780 If a mission has hidden objectives, don't complete when all current ones are finished. 2016-04-18 10:54:59 +01:00
Steve 2723e084da Run script function when an enemy is disabled. 2016-04-18 10:54:28 +01:00
Steve c215dc75d3 Jumpgate state fix. 2016-04-17 11:52:48 +01:00
Steve 7c100f0c37 Added button to restore default controls. 2016-04-17 11:26:04 +01:00
Steve 474ede91af Drawing health bars over fighters. 2016-04-17 11:00:08 +01:00
Steve dde34beedb Tell retreating enemies to head for the jumpgate. 2016-04-17 09:11:49 +01:00
Steve c729d59c3a Script call to complete the mission now also completes all objectives. 2016-04-17 09:11:36 +01:00
Steve 9e6d34b914 Made size of mine explosion a little larger. 2016-04-16 16:48:48 +01:00
Steve ccd4160f0e Don't allow boost if you have 0 speed (when playing as a cannon, for example). 2016-04-16 16:48:30 +01:00
Steve 97a067cb34 Load default config first, and then overwrite with user config. 2016-04-16 15:50:23 +01:00
Steve 22ff6aeeb7 Only attach tow ropes to ET_FIGHTER types. 2016-04-16 14:04:32 +01:00
Steve 82acb9f96a Highlight OK button by default when pausing. 2016-04-16 11:07:26 +01:00
Steve 38eca9480d Allow for important messages to be created (such as maydays from capital ships). 2016-04-16 11:00:19 +01:00
Steve 344b2d27b8 Give AIF_TARGET_FOCUS fighters a low chance of targetting something else. 2016-04-16 10:59:42 +01:00
Steve f7c1aa6f1b Update conditions when capital ships are destroyed. 2016-04-16 08:59:14 +01:00
Steve b40936fd79 Always add ents to quadtree, to allow AI to see components. Shuffle around later. 2016-04-15 13:08:30 +01:00
Steve 5e58f09fcf Don't trash original string when working with flags. #funwithflags 2016-04-15 13:07:58 +01:00
Steve 87048e4c85 Apply all flags to capitals ship, except for EF_AI_LEADER. 2016-04-15 13:07:28 +01:00
Steve c3136ea3af Allow flags of spawned entities to be set. 2016-04-15 11:31:39 +01:00
Steve a49817ba2e Leader following AI bug fix. 2016-04-15 11:31:11 +01:00
Steve 915eec5cf0 Allow shadow mines to hunt player, or wander around if not near them. 2016-04-14 16:10:21 +01:00
Steve 7dea0c440e Aster doesn't have a planet, as it's a star system. 2016-04-14 16:09:41 +01:00
Steve 7eee4d3d8e Spawner updates. 2016-04-14 11:56:58 +01:00
Steve 9c8b7af0d6 Added Shadow Mine. 2016-04-14 11:56:42 +01:00
Steve d976c7d3c8 Don't fire missiles at things flagged with EF_NO_KILL. 2016-04-13 11:46:42 +01:00
Steve d2412c2dcb Restore speed of disabled entity when being towed. 2016-04-13 11:46:23 +01:00
Steve 561f427c13 Engine effect bug fix. 2016-04-13 11:04:47 +01:00
Steve 2af802231a Load challenges in Challenge.c 2016-04-13 11:04:28 +01:00
Steve 5fa24f55f2 Added Survive challenge type. 2016-04-13 11:02:08 +01:00
Steve 9ad7f87ca9 Misc. tidy up. 2016-04-12 08:41:13 +01:00
Steve 8e6fcf81fa Using constants for save and config filenames. 2016-04-11 08:44:36 +01:00
Steve 78f125a4ec Added challenge icons. 2016-04-10 12:00:29 +01:00
Steve bcb634befb Player kill count bug fix. 2016-04-10 09:35:30 +01:00
Steve 61b3ede526 Wander takes priority over moving to leaders. Don't suddenly stop when close to leader during flocking. 2016-04-10 08:36:27 +01:00
Steve 4652d6c7e4 Lowered component health. 2016-04-10 08:23:59 +01:00
Steve 6c8349781c Use quadtree for drawing, now that quadtree bug is squashed (hopefully). 2016-04-09 18:13:59 +01:00
Steve bea850f755 Wander fixes. 2016-04-09 17:40:34 +01:00
Steve 90d157411a Quadtree fetch fix. 2016-04-09 17:39:24 +01:00
Steve cb6ad171a7 Jumpgates are neutral by default. 2016-04-09 15:48:00 +01:00
Steve c716f84884 Allow bullets to still hit immortal entities, but not inflict any real damage. 2016-04-09 13:23:54 +01:00
Steve a5676b9b49 Added EF_AI_IGNORE, to tell AI to ignore entities. 2016-04-09 13:23:10 +01:00
Steve 57e9d6d036 EF_NO_TARGET -> EF_NO_PLAYER_TARGET 2016-04-09 13:22:45 +01:00
Steve 554c3678df Made COMPONENTS more generic, not just for capital ships. 2016-04-09 13:22:20 +01:00
Steve e0adc2baee Show jumpgate and components as white on radar. 2016-04-09 13:21:40 +01:00
Steve 64b85f122e Added components to jumpgate, to allow it to be targetted. 2016-04-09 13:21:19 +01:00
Steve 648ea2e0a7 Further flocking tweaks. 2016-04-08 18:41:51 +01:00
Steve 4792c6d971 Added TEAM_PLAYER trophy. 2016-04-08 11:03:50 +01:00
Steve f983b7e2f2 Player / Leader following tweaks. 2016-04-08 10:58:22 +01:00
Steve 0abfb672d7 Don't attach rope if disabled. Speed is 0 if created disabled. 2016-04-07 12:40:14 +01:00
Steve 5e8b983f3e Update to showing objective numbers. 2016-04-07 12:39:53 +01:00
Steve 505fbb2547 Don't update target location, unless there are enemies nearby. 2016-04-06 16:49:47 +01:00
Steve f97e0bc299 Report number of civilians killed. 2016-04-06 12:56:48 +01:00
Steve 1afc9e65f0 Updated capital ship destruction. 2016-04-05 12:21:17 +01:00
Steve b26a5cecd5 Code tidy up. 2016-04-05 10:00:17 +01:00
Steve b02850d0fc Logging update. 2016-04-05 09:58:59 +01:00
Steve 0eaeaba386 Disabling trophies for now. Will activate in v0.7 or later. 2016-04-04 11:40:13 +01:00
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 c4d9fae84c Removed \n from logging. 2016-04-04 11:25:09 +01:00
Steve 29d873d28a Allow waypoints to be manually activated. Removed entId from Battle (redundant). 2016-04-04 11:23:32 +01:00
Steve 77da136e75 Time limit warning for challenges. 2016-04-03 14:04:56 +01:00
Steve 16a1e1b20a Challenge completion bug fix. 2016-04-03 14:04:31 +01:00
Steve 8537e5207f Entity drawing bug fix. 2016-04-03 08:37:45 +01:00
Steve e7190150bf Added killedBy, for easier stat counting. 2016-04-03 08:37:31 +01:00
Steve f9d02696fd Added mines destroyed stat. 2016-04-03 08:37:09 +01:00
Steve 86ed4678e2 Misc clean up. 2016-04-02 16:38:26 +01:00
Steve 4a1958319c Don't use quadtree for drawing. 2016-04-02 16:37:49 +01:00
Steve c555aeccbe Capital ship bug fixes. 2016-04-02 10:47:44 +01:00
Steve 67c7bc7d55 Misc. HUD updates. 2016-04-02 09:37:49 +01:00
Steve a64b41f851 Allow challenges to be completed even if the player is killed. 2016-04-02 09:37:39 +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 d329fbaf2f Only deploy mines if you're moving. 2016-04-01 17:02:56 +01:00
Steve cfc41a624b Exploded mines will push others aside. 2016-04-01 17:02:36 +01:00
Steve 26ed8dc322 Allow side to be set for entities (mostly applies to mines). 2016-04-01 14:21:11 +01:00
Steve a913dc613b Set width and height of entities in spawn functions. 2016-04-01 14:20:47 +01:00
Steve e2172a1789 Show mines on radar as white. 2016-04-01 14:20:03 +01:00
Steve 994c0b55dd Don't explode mine on owner. 2016-04-01 14:19:55 +01:00
Steve d178134a00 Allow AI to drop mines. 2016-04-01 14:19:03 +01:00
Steve 58fb3e911b Tell AI to avoid mines. 2016-04-01 11:40:09 +01:00
Steve e8f70072d5 Don't cause damage to immortal fighters. 2016-04-01 11:39:52 +01:00
Steve 3bf73b5d70 Updates to mines. 2016-04-01 10:49:41 +01:00
Steve daa8eff104 Mines have a short radar range. 2016-03-30 22:41:34 +01:00
Steve 3646a9326a Start of mines. 2016-03-30 07:22:58 +01:00
Steve 52691f7be5 Enable AI flags to focus on targets. 2016-03-29 22:45:46 +01:00
Steve 8705337e2a Show number of conditions on HUD, as well as objectives. 2016-03-29 07:19:39 +01:00
Steve e6ea4bff06 Reworked canAttack logic. 2016-03-29 07:09:26 +01:00
Steve c288fce12f Windows build fixes. 2016-03-28 18:26:02 +01:00
Steve f114ad7e7e Merge branch 'develop' into trophies 2016-03-28 16:09:24 +01:00
Steve 2168b72401 Allow -info to enable INFO level logging. 2016-03-28 16:07:47 +01:00
Steve ab8be196b5 Khepri now green and associated with rogue nation. 2016-03-28 11:47:11 +01:00
Steve 81f2dd1947 Stray revert compile fix. 2016-03-28 11:46:20 +01:00
Steve 45d9d2a00d Don't show mission target boxes around capital ship components. 2016-03-28 11:45:48 +01:00
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