TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity
3560 commits 2 branches 28 tags 122 MiB
Commit graph

3560 commits

This branch
This branch
All branches
Author SHA1 Message Date
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 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
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 04ba4ecf9e Add new mission type with support for HAM-by-reference 
If a mission starts with !name instead of name/yname/zname, then enable
two new behaviors.  Any other lines which start with an exclamation
point are considered critical and must be recognized or the mission is
rejected.  This allows the addition of mandatory lines without revising
the name= line every time.  Also, add support for one such critical
directive, which reads a HAM by reference, allowing well known HAMs to
be used without being shipped every time.

Syntax:

	!name = My extra-extended mission
	!ham = d2x.ham
	... regular mn2 directives ...
 2013-04-06 21:24:40 +00: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 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
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 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 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 ad6bb8999c Combine date,time into Descent version con_printf 2013-03-30 15:11:42 +00:00
Kp 50d8a27541 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 cfb50a40de 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 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 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 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 49b25a83eb Remove unused hostage dialog editor 2013-03-24 02:28:34 +00:00