Commit Graph

184 Commits

Author SHA1 Message Date
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 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 f867e793bd Trophy prototyping. 2016-03-09 11:51:26 +00:00
Steve a74ff87a46 Added portal effect to jumpgate. 2016-03-07 22:50: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 fff301e3e2 Allow shrinking of array. 2016-03-06 09:48:29 +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 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 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 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 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 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 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 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 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 2e5b45064a Challenges integration. 2016-02-27 16:16:21 +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 239845a279 Array resize bug fixes. 2016-02-24 23:12:13 +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 66fa5ede35 Display loading progress for initial load. 2016-02-22 17:28:23 +00:00
Steve d529a83bfa Set window title with full game name. 2016-02-22 12:47:41 +00:00
Steve 4128868692 Dynamically allocate number of files in list. 2016-02-21 17:24:21 +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 5bf486ede6 Display all available weapons on HUD. 2016-02-20 15:04:15 +00:00
Steve da71c1d647 Added ECM, mag bolt hit, and power down sounds. 2016-02-20 14:19:59 +00:00
Steve de3dde7211 Allow widgets to be selected by pressing Return, as well as Space. 2016-02-15 14:08:13 +00:00
Steve b99dd3a4e4 Added jump effects (sound and graphics). 2016-02-14 18:13:15 +00:00
Steve 17c55ec080 Now scrolling the galactic map by clicking and dragging. 2016-02-14 11:07:15 +00:00
Steve cc4ac782a9 Allow selected widget to be activated by pressing space. 2016-01-03 13:53:41 +00:00
Steve e2b7576f89 Allow AI to wander. 2015-12-24 21:42:26 +00:00
Steve e2ffe9ba84 Added ability to specify death type of fighters (e.g. supply ships shouldn't spin). 2015-12-24 12:12:23 +00:00
Steve 01ec3ceb7b Stats bug fixes. 2015-12-23 19:22:31 +00:00
Steve 9be0cdab6c Expire texts, based on age in cache. 2015-12-20 16:13:35 +00:00
Steve d8eb896456 Enable debug mode by passing -debug. 2015-12-20 12:25:20 +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 cfc0ed7cc8 AI can now follow leaders. 2015-12-18 12:02:01 +00:00
Steve b5dfab1bd5 Added debug keys. 2015-12-18 10:12:37 +00:00
Steve 310637b4eb Merged from v0.41. 2015-12-14 11:41:43 +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 05f58e0971 Added SECONDARY_TARGET flag. 2015-12-10 12:40:23 +00:00
Steve a541cf1976 Allow mod to handle floats. 2015-12-10 10:05:00 +00:00
Steve 91822f1ca3 Further capital ship code updates. Added long range fire flag for cannons. 2015-12-08 22:42:31 +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 9825e39f4f Install path bug fixes. 2015-12-03 08:43:26 +00:00
Steve 65b62091d1 Allow for file location to be determined automatically. 2015-12-02 23:20:19 +00:00
Steve e5906d5f5f Added new AI flags. 2015-11-30 11:29:56 +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 a4dc4f3e05 Display rebels as red on radar. 2015-11-29 12:56:00 +00:00
Steve 76eb50d92c Added radio sound. 2015-11-29 12:55:36 +00:00
Steve dec3538956 Added AIF_MOVES_TO_PLAYER flag. 2015-11-28 14:33:05 +00:00
Steve 9de6d6c737 Removed triggers, and replaced with script system. Added message box. 2015-11-28 10:11:20 +00:00
Steve a278f3554b Only play GUI sound when mouse hovers over a button. 2015-11-26 17:41:43 +00:00
Steve 416b50d7eb Added setMouse function. 2015-11-26 08:17:16 +00:00
Steve cd0463c92f Updates to widget-mouse interactions. 2015-11-26 08:16:29 +00:00
Steve 5aa3daf342 Moved platform specific code to src/plat 2015-11-24 22:46:52 +00:00
Niels Nesse d4b1cda08d Build system improvements for windows
- Add EXE extension correctly
- Detect windows with _WIN32 macro and retire UNIX macro
2015-11-24 01:12:23 -08:00
Steve d62d8e74ba Further code changes for mouse support. 2015-11-24 07:16:48 +00:00
Steve 374ca825ce Code clean up. 2015-11-24 07:16:12 +00:00
Steve 95e26f3e7b Start of mouse control integration. 2015-11-23 14:52:11 +00:00
Steve b8409765d3 Debug statement fix. 2015-11-23 10:14:42 +00:00
Niels Nesse b98c2e6b49 Adding win32 makefile 2015-11-23 00:46:50 -08:00
Steve 84e0b88d00 Texture cache fix. 2015-11-22 16:52:27 +00:00
Steve 597f6f5cb7 Removed missiles types. Now only homing missiles, and rockets for bombers. 2015-11-21 23:45:22 +00:00
Steve 94e0259953 Added defensive AI flags - only attack sometimes. 2015-11-21 23:27:43 +00:00
Steve a82f8b6f2c Renamed FLEE flags to RETREAT. 2015-11-21 17:32:39 +00:00
Steve 4db432f845 Allow player to retreat from missions. 2015-11-20 22:51:44 +00:00
Steve a43a6b1706 Reduced sound distance. 2015-11-18 18:37:37 +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 0bd067e552 Added laser. 2015-11-18 16:02:10 +00:00