Kp
616a3a6b70
Merge branch d1x-rebirth into unification/master
...
Conflicts:
SConstruct
common/main/cntrlcen.h
common/main/fuelcen.h
common/main/fvi.h
common/main/gameseq.h
common/main/gauges.h
common/main/multibot.h
common/main/net_udp.h
common/main/object.h
common/main/player.h
common/main/vers_id.h
d1x-rebirth/main/hostage.c
d1x-rebirth/main/multi.c
main/controls.c
main/hostage.h
main/laser.h
main/screens.h
similar/arch/ogl/gr.c
similar/editor/centers.c
similar/main/inferno.c
similar/main/lighting.c
similar/main/multibot.c
similar/main/paging.c
similar/main/physics.c
similar/main/player.c
similar/main/robot.c
similar/main/wall.c
2013-04-21 04:51:35 +00:00
Kp
0afdb86910
Construct self.sources sooner so that code can always append to it
2013-04-20 23:52:17 +00:00
Kp
ebc971be95
Support cross-configuring SDL
2013-04-20 20:35:58 +00:00
Kp
52a15a6e11
Add unused ai_restore_state parameter version to match D2X
2013-04-20 20:35:58 +00:00
Kp
63b1abc80a
Store fixed values at class scope
2013-04-20 20:35:58 +00:00
Kp
528ea51ce4
Refactor SConstruct register_program handling
2013-04-20 20:35:58 +00:00
Kp
17ca9f15bd
Move compiler flags/selection into a base class above DXXProgram
2013-04-20 20:35:58 +00:00
Kp
47aa7d000d
Make CPPDEFINES consistent with unification branch
2013-04-20 20:35:58 +00:00
Kp
e658660d21
Make name of GLES_CM library configurable
2013-04-20 20:35:58 +00:00
zico
cb280a8ef4
Adjusted SB_PRIMARY_W_BOX_RIGHT_L to fit perfectly
2013-04-18 15:46:09 +02:00
zico
8ae018aa0c
use const ubyte for multi_do_powcap_update()
2013-04-18 15:45:40 +02:00
zico
a060ec45db
Made UPID_GAME_INFO_SIZE, UPID_GAME_INFO_LITE_SIZE and UPID_SEQUENCE_SIZE change if NETGAME_NAME_LEN, MISSION_NAME_LEN or CALLSIGN_LEN changes, fixes bug where joining games was not possible anymore due to recent change of MISSION_NAME_LEN
2013-04-18 15:14:16 +02:00
zico
b769485d9a
Due to additive blending, transparent sprites will become invivible in font of white surfaces (lamps). Fix that with a little desaturation
2013-04-18 12:08:53 +02:00
zico
6d3dc4f1b1
Removed light_frame_count due to being unnecessary since lighting is now time-based and messed up deletion of dynamic light
2013-04-18 11:56:32 +02:00
zico
dab702aba9
Added option to ignore cycling weapons that are not on autoselect list
2013-04-08 15:04:19 +02:00
zico
bf52256c8d
Added 4th alternative HUD mode for no HUD rendering, aka Immersion mode
2013-04-08 14:28:41 +02:00
zico
c60b007398
Increased ship wiggle from 20FPS- to 30FPS-base as I think this more representy the 486 play style - feels way more natural to me, too
2013-04-08 12:55:27 +02:00
zico
758f2d64f8
Support for Raspberry Pi - patch by derhass
2013-04-08 12:54:02 +02:00
zico
3553ea3cf7
Added Rankings functionality like in D2X-Rebirth while still utilizing eff file from original D1X source; Decrease personal score when killing multi buddy and don't increment towards kill goal
2013-04-08 12:46:05 +02:00
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