Commit graph

3842 commits

Author SHA1 Message Date
Chris Taylor 7d5833007d Update SDLmain.m from SDL 1.2.14 source, fixing a missing symbol 'NSAppleMenuController' when building using SCons for Mac. For Mac, using SCons, it finally builds and works again\! 2013-04-08 17:08:54 +08:00
Chris Taylor 8e6d903ad2 Extend #ifdef guards to around StandardAlert for the messagebox, fixing a missing symbol error in SCons for Mac 2013-04-08 16:34:24 +08:00
Chris Taylor 77d4cccf56 Letting the Xcode project figure out its geography regions 2013-04-08 16:32:25 +08:00
Chris Taylor 175cad804c For SCons in Mac OS X, make sure the frameworks are linked properly 2013-04-08 16:21:53 +08:00
Chris Taylor 5ee91b1a8e Merged in remote changes 2013-04-08 14:40:07 +08:00
Chris Taylor 7683d7998d For Mac in SCons, find the HIServices framework for physfsx.c 2013-04-08 14:35:48 +08:00
Chris Taylor f3b1294bf0 For Mac, in SCons link against physfs properly 2013-04-08 14:27:36 +08:00
Chris Taylor e3eabde3ca Allow SCons to find the HIServices framework for the Mac code in physfsx.c 2013-04-08 13:00:05 +08:00
Kp 5f34dab041 Set Environment tools= from platform settings
This allows Linux and Darwin to pass None instead of ['mingw32'].
2013-04-07 17:04:16 +00:00
Kp 54e7d17c58 Move Darwin version handling into DarwinPlatformSettings 2013-04-07 17:03:58 +00:00
Chris Taylor ab30f9ff4a Merge branch 'd1x-rebirth/master' of github.com:dxx-rebirth/dxx-rebirth into d1x
Merged in recent changes
2013-04-07 11:02:44 +08:00
Kp ea3cea4ce2 Make master drop powerups from uncontrolled robot at death
This code is in D2X, and per zico should be enabled in D1X as well.  It
appears to predate the release of Descent 2 source, so this was likely a
fix from Parallax that was never backported.
2013-04-06 21:13:34 +00:00
Kp f333e34368 Remove unused inclusion of dxxerror.h 2013-04-06 16:35:13 +00:00
Chris Taylor 2bfb13c9e0 Added .gitignore 2013-04-06 11:48:26 +08:00
Chris Taylor bb18ba4fbb Updated Xcode project, changed references to error.h to dxxerror.h, since it was renamed 2013-04-06 09:51:35 +08:00
Chris Taylor 3cffacb9b2 Changes towards building using SCons on Mac OS X 2013-04-05 09:25:10 +08:00
Chris Taylor b750415db6 For the assembler build, make sure platform_settings is accessed from self, likely preventing a compiling error 2013-04-05 09:12:33 +08:00
Kp 264f2aa8db Add multi_send_robot_explode unused parameter isthief to match D2X 2013-03-31 20:41:21 +00:00
Kp 5dab4b56cd Add proximity bomb ID test helper to match D2X 2013-03-31 20:41:21 +00:00
Kp 00e2f806bc Fix debug=1 build break from fe7cf3bc ("Move segment handling from editor.h")
When debug is enabled, gamecntl references symbols that moved to the new
header.
2013-03-31 20:41:21 +00:00
Kp 255211e28b Add helper to get pointer to reactor definition 2013-03-31 20:41:21 +00:00
Kp cb537edd82 Use ubyte/const ubyte consistently in multiplayer messaging 2013-03-31 20:41:21 +00:00
Kp 84fb22aafe Simplify logic for robot to drop proximity bomb 2013-03-31 20:41:20 +00:00
Kp ff1247fe72 Add stubs to make physics code more like D2X 2013-03-31 20:41:20 +00:00
Kp 929f29dca9 Support extra information, such as git describe, in version string 2013-03-31 20:41:19 +00:00
Kp 50d8a27541 Combine date,time into Descent version con_printf 2013-03-30 15:11:42 +00:00
Kp cfb50a40de Avoid using #ifdef inside Error string on hog failure 2013-03-30 02:45:23 +00:00
Kp 44fa05fdbd Reorder differences to match D2X 2013-03-30 02:36:00 +00:00
Kp 359120025e Use helper jointlist_read_n to match D2X 2013-03-30 23:08:45 +00:00
Kp 6eb53cfea2 Add unused multi_send_door_open parameter 'flag' to match D2X 2013-03-24 22:53:12 +00:00
Kp 5cc09c974a Make blast_blastable_wall match D2X 2013-03-24 22:27:04 +00:00
Kp 7b8fa4db3d Remove unused gauge declarations 2013-03-24 02:11:09 +00:00
Kp c0ae3d9264 Move player_ship_read bm.c -> player.c 2013-03-24 01:54:39 +00:00
Kp 19c95a684a Remove unused hostage vclip_num 2013-03-24 23:51:53 +00:00
Kp e6961be059 Remove write-only hostage text 2013-03-24 23:48:24 +00:00
Kp d1a095f916 Remove unused hostage code 2013-03-24 23:38:52 +00:00
Kp ea264c8d42 Add support for out-of-tree build 2013-03-16 18:24:52 +00:00
Kp 9cf2df4400 Remove unused main/script.h 2013-03-09 20:29:20 +00:00
Kp ccbd566860 Remove unused declarations in main/screens.h 2013-03-24 17:53:04 +00:00
Kp 4fd6a17e9b Remove write-only robot fields fire_power[] and shield[] in main/robot.h 2013-03-24 17:53:04 +00:00
Kp 986f0ae4f8 Remove afterburner support stubs 2013-03-24 17:53:04 +00:00
Kp cede0b90b2 Remove unused flags in main/player.h 2013-03-24 17:53:04 +00:00
Kp 7143a6927a Remove unused newdemo_record_trigger 2013-03-23 19:15:12 +00:00
Kp d5657d7cf8 Remove unused include/tracker/tracker.h 2013-03-09 20:29:20 +00:00
Kp 438611ca9d Add create_smart_children parameter num_smart_children to match D2X 2013-03-23 22:57:04 +00:00
Kp 951ac5027c Add LoadLevel parameter page_in_textures to match D2X 2013-03-23 22:57:04 +00:00
Kp b197f80beb Add unused StartNewLevelSub parameter 'secret_flag' to match D2X 2013-03-23 21:01:48 +00:00
Kp d79e68910c Add unused init_player_stats_level parameter 'secret_flag' to match D2X 2013-03-23 21:01:48 +00:00
Kp ac68a04296 Add unused fix *l to find_hitpoint_uv to match D2X 2013-03-23 02:32:02 +00:00
Kp 02cd293c28 Always use int[] for matcen robot flags 2013-03-23 21:15:14 +00:00