Commit graph

1559 commits

Author SHA1 Message Date
zico ebfa2211ff merging? 2013-04-08 15:09:06 +02:00
zico 0ceaaaf237 Added option to ignore cycling weapons that are not on autoselect list 2013-04-08 15:04:28 +02:00
zico c361a6ef91 Added 4th alternative HUD mode for no HUD rendering, aka Immersion mode 2013-04-08 14:28:55 +02:00
Chris Taylor c47dcf2b51 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:21:00 +08:00
Chris Taylor 0b00caaeae Extend #ifdef guards to around StandardAlert for the messagebox, fixing a missing symbol error in SCons for Mac 2013-04-08 17:21:00 +08:00
Chris Taylor 4d6d655072 For SCons in Mac OS X, make sure the frameworks are linked properly 2013-04-08 17:21:00 +08:00
Chris Taylor f566bd1203 For Mac, in SCons link against physfs properly 2013-04-08 14:52:04 +08:00
Chris Taylor bf401f7c74 Allow SCons to find the HIServices framework for the Mac code in physfsx.c 2013-04-08 14:51:38 +08:00
Kp 1e3f1c658e Allow user to override Raspberry Pi defaults 2013-03-16 17:18:33 +00:00
Kp b4073678bd 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 2a85e25015 Move Darwin version handling into DarwinPlatformSettings 2013-04-07 17:03:58 +00:00
Kp 3062b23bd0 Add support for out-of-tree build 2013-03-16 18:24:52 +00:00
Chris Taylor 765742ca5c Updated Xcode project 2013-04-07 10:59:31 +08:00
Chris Taylor da4331a74a Added .gitignore 2013-04-06 11:55:00 +08:00
Chris Taylor c1280966f1 Updated Xcode project, changed references to error.h to dxxerror.h, since it was renamed 2013-04-06 11:21:32 +08:00
Chris Taylor a90a86ded6 For the assembler build, make sure platform_settings is accessed from self, likely preventing a compiling error 2013-04-06 10:08:09 +08:00
Kp 919c8fd86d Add proximity bomb ID test helper 2013-03-31 20:42:15 +00:00
Kp 706d2d7451 Remove unused include/ps*.inc 2013-03-31 20:42:15 +00:00
Kp 37f495a1a7 Fix debug=1 build break from 2a3524cd ("Move segment handling from editor.h")
When debug is enabled, gamecntl references symbols that moved to the new
header.
2013-03-31 20:42:14 +00:00
Kp 62ef6abefe Add helper to get pointer to reactor definition 2013-03-31 20:42:14 +00:00
Kp 8f95f0120d Use ubyte/const ubyte consistently in multiplayer messaging 2013-03-31 20:42:14 +00:00
Kp da757190cc Simplify processing of $ insertion of name in multiplayer messages 2013-03-31 20:42:14 +00:00
Kp c87886c814 Simplify logic for robot to drop proximity and smart bombs 2013-03-31 20:42:14 +00:00
Kp e7dcbeecae Adjust physics layout to match D1X 2013-03-31 20:42:14 +00:00
Kp 792d78e6e8 Support extra information, such as git describe, in version string 2013-03-31 20:42:14 +00:00
Kp ad6bb8999c Combine date,time into Descent version con_printf 2013-03-30 15:11:42 +00:00
Kp ea220cc5dd Avoid using #ifdef inside Error string on hog failure 2013-03-30 02:45:23 +00:00
Kp 74d241f9be Reorder differences to match D1X 2013-03-30 02:36:00 +00:00
Kp ab9c0681d2 Read robot_info arrays in pieces 2013-03-30 02:01:36 +00:00
Kp 977b48a8b1 Make stub g3_uninit_polygon_model inline 2013-03-30 18:51:51 +00:00
Kp 49b25a83eb Remove unused hostage dialog editor 2013-03-24 02:28:34 +00:00
Kp 613e0327f3 Remove unused gauge declarations 2013-03-24 02:11:09 +00:00
Kp 8704329767 Remove unused declarations in main/screens.h 2013-03-24 17:53:04 +00:00
Kp d9de256e21 Avoid crash on failure to open HAM file 2012-12-23 22:39:29 +00:00
Kp d86f0d25a1 Move declaration of last_palette_loaded to gamepal.h 2013-03-24 17:14:06 +00:00
Kp 8f682eb6b2 Delete definition of Segment2s
This should have been part of 644f7ce9 ("Move segment2 back to
segment").
2013-03-23 15:44:30 +00:00
Kp fd91be1ad2 Remove unused main/link.bat 2013-03-09 20:29:20 +00:00
Kp 765ae5173f Remove unused main/gamestat.h 2013-03-09 20:29:20 +00:00
Kp c31f5e8d1f Remove unused StartNewLevel parameter 'secret_flag' 2013-03-23 20:50:35 +00:00
Kp e8390669f5 Rename old_matcen_info to reflect that it is the D1 matcen_info 2013-03-23 21:31:49 +00:00
Kp bbd182b113 Fix bogus optimization in robot maker paging
The optimization meant to skip materialization centers which had no
robots enabled, but had two bugs.  It tested for a NULL address instead
of inspecting the bits in robot_flags[0], which caused the test to
always succeed.  It also ignored robot_flags[1], so a materialization
center with only high end robots would be wrongly skipped.

Remove the test, since the loop is cheap and handles all cases
correctly.
2013-03-23 21:20:41 +00:00
Kp 1eac5d4f37 Always use int[] for matcen robot flags 2013-03-23 21:15:14 +00:00
Kp 58892f5c27 Add stubs to hide editor reactor differences from D1X 2013-03-23 20:03:11 +00:00
Kp b2da5385e2 Remove N_controlcen_guns cache
Get the counter directly from the relevant reactor model
2013-03-23 19:15:12 +00:00
Kp 8768441da9 Move reactor Gun_dir,Gun_pos into struct object 2013-03-23 19:09:44 +00:00
Kp 9036214d0b Remove unused main/desc_id.h 2013-03-22 03:03:21 +00:00
Kp 5019ce9514 Remove unused header files 2013-03-17 22:54:53 +00:00
Kp 3c317cf3e1 Restructure struct segment to align better 2013-03-16 02:54:33 +00:00
Kp 644f7ce9c2 Move segment2 back to segment
The structure already exceeds 512 bytes, so combine the two to make the
code look more like D1X.
2013-03-17 18:55:32 +00:00
Kp 75dff94ac0 Support versions of gcc < 4.6
GCC 4.6 accepts the earlier form without comment, but GCC 4.5 chokes on it.
2013-03-17 18:24:11 +00:00