Commit graph

3648 commits

Author SHA1 Message Date
Kp 8d6698b4e6 Move */misc/args.c -> similar/misc/args.c 2013-03-03 01:03:33 +00:00
Kp e18fc92b68 Move */main/gamecntl.c -> similar/main/gamecntl.c 2013-03-03 01:03:33 +00:00
Kp c49fb2a68d Move */main/state.c -> similar/main/state.c 2013-03-03 01:03:33 +00:00
Kp 9fe359baae Move */main/game.c -> similar/main/game.c 2013-03-03 01:03:33 +00:00
Kp d607792030 Move */main/gameseg.c -> similar/main/gameseg.c 2013-03-03 01:03:33 +00:00
Kp fd710386b5 Move */main/gamerend.c -> similar/main/gamerend.c 2013-03-03 01:03:33 +00:00
Kp 1e0f0c8f1b Move */main/cntrlcen.c -> similar/main/cntrlcen.c 2013-03-03 01:03:33 +00:00
Kp 997c35c351 Move */include/loadgl.h -> common/include/loadgl.h 2013-03-03 01:03:33 +00:00
Kp b87e7c2325 Merge branch 'd2x-rebirth/master' into unification/master 2013-06-02 20:14:42 +00:00
Kp 306ab24486 Merge branch 'd1x-rebirth/master' into unification/master 2013-06-02 20:13:38 +00:00
Kp e30828a1f6 Fix mismerge that doubled up jointlist reading
Commit 616a3a6 improperly brought in both D1X and D2X copies of the same
loop, but it is a bug for the loop to be run twice.  This caused the
game to crash during initialization because the file position was not as
expected and the loader error handling is poor.
2013-05-09 23:46:58 +00:00
Kp e5ab7e85c4 Fix SCons parse errors for Darwin 2013-05-05 23:20:06 +00:00
Kp 1fb458fcf5 Support building multiple DXX configurations at once 2013-05-05 23:12:52 +00:00
Kp 3ea05cf282 Add support for linking under an alternate name 2013-05-05 22:59:09 +00:00
Kp 8a6356e208 Add support for DESTDIR installs 2013-05-05 22:55:16 +00:00
Kp d77f4ed6a1 Allow user to suppress install target 2013-05-05 22:50:19 +00:00
Kp 2d84785cb1 Automatically append "-editor" to editor binary names 2013-05-05 22:44:22 +00:00
Kp a89da5148f Report OpenGL ES path without a program 2013-05-05 18:52:00 +00:00
Kp fe6195fc99 Simplify reading $LDFLAGS 2013-05-05 23:33:38 +00:00
Kp c8a8f1847e Merge branch 'd2x-rebirth/master' into unification/master 2013-05-05 22:17:48 +00:00
Kp 410b07d5c4 Merge branch 'd1x-rebirth/master' into unification/master
Conflicts:
	SConstruct
2013-05-05 22:08:34 +00:00
Kp 1106583ae3 Move path defaults up so they can be shown without a program 2013-05-05 22:03:32 +00:00
Kp c3f06fac9e Move RPi defaults up so they can be shown without a program 2013-05-05 22:03:32 +00:00
Kp 9dfbe87b0d Run banner() sooner 2013-05-05 22:03:32 +00:00
Kp dbec5197f6 Move */main/vers_id.c -> similar/main/vers_id.c 2013-05-05 17:39:03 +00:00
Kp 2fc9fe867f Fix longstanding bug preventing build of both Windows binaries at once
SCons rejected building both Windows targets due to conflicting
instructions on how to compile messagebox.c.  Restructure the lookup so
that only one set of instructions is issued.
2013-05-05 17:39:03 +00:00
Kp 722f2efbf5 Move lazy object construction to a separate class 2013-05-05 17:39:03 +00:00
Kp 4a20b47dec Fix path to .rc file for Windows build 2013-05-05 17:39:03 +00:00
Kp 3cc87d57c6 Add support for cross-compilation 2013-05-05 17:39:03 +00:00
Kp 4aaaa53f60 Use program.srcdir, not self.srcdir for Win32PlatformSettings 2013-05-05 17:39:03 +00:00
Kp 9e5ef66204 Add Win32PlatformSettings.__init__ to fix SConstruct for Windows 2013-05-05 17:39:03 +00:00
Kp 1256332ebf Chain objects_editor property 2013-05-05 17:38:58 +00:00
Kp 813dcb8554 Chain objects_common lookup to simplify users 2013-05-05 17:35:44 +00:00
Kp 1efaa50f6a Allow source lists to carry extra attributes
Use it to move the transform_target parameter into the list itself.

Fix the non-OpenGL build, which should have had a transform_target
parameter and did not.
2013-05-05 04:03:45 +00:00
Kp 1cb4ee361f Make GET_INTEL_* const-correct
Based on a report by derhass, but with additional changes.  Original
report at

<http://www.dxx-rebirth.com/frm/index.php/topic,1048.msg17421.html#msg17421>.
2013-05-04 17:13:47 +00:00
Kp ace1902ef7 Add Raspberry Pi automatic environment setup
Patch by derhass.

Requested at
<http://www.dxx-rebirth.com/frm/index.php/topic,1048.msg17426/topicseen.html#msg17426>.
2013-05-04 17:13:31 +00:00
Kp 5901c3c677 Make GET_INTEL_* const-correct
Based on a report by derhass, but with additional changes.  Original
report at

<http://www.dxx-rebirth.com/frm/index.php/topic,1048.msg17421.html#msg17421>.
2013-05-03 23:02:11 +00:00
Kp 969c976b82 Restore Raspberry Pi support lost in ed33108
Patch by derhass.
2013-05-03 22:52:57 +00:00
Kp d268169eb0 Use D2XR pick_connected_segment for increased randomness 2013-05-02 03:35:57 +00:00
Kp ee9fbc387b Fix edge cases in new cycle skip logic
Commit dab702a introduced two undesirable behaviors which can be
mitigated by a heuristic from commit cab78bb and commit 7bed83b.  This
heuristic prevents a buffer overread if no weapons are auto-selectable
and prevents the player from being stuck on a single weapon if only one
weapon is auto-selectable and that weapon is the current weapon.
Players would not use cycle in such a case, so skipping the
non-auto-select weapons does not help.
2013-04-27 20:52:09 +00:00
Kp ef8fb7fe44 Fix edge cases in new cycle skip logic
Commit 0ceaaaf introduced two undesirable behaviors which can be
mitigated by a heuristic from commit cab78bb and commit 7bed83b.  This
heuristic prevents a buffer overread if no weapons are auto-selectable
and prevents the player from being stuck on a single weapon if only one
weapon is auto-selectable and that weapon is the current weapon.
Players would not use cycle in such a case, so skipping the
non-auto-select weapons does not help.
2013-04-27 20:49:24 +00:00
Kp ed5d6cc1e1 Use primary order list for primary cycling
Fix copy-paste bug from commit 0ceaaaf.
2013-04-27 01:48:30 +00:00
Kp e054a205a2 Make do_exploding_wall_frame set WALL_BLASTED
Hostage doors misbehave after commit 5cc09c9:

5cc09c974a (commitcomment-3037382)

Descent 1 set WALL_BLASTED in blast_blastable_wall, but Descent 2 set
WALL_BLASTED in do_exploding_wall_frame.  Commit 5cc09c9 broke exploding
walls because it removed the WALL_BLASTED logic from
blast_blastable_wall, but did not add it to do_exploding_wall_frame.

Reported-by: zico <zico@dxx-rebirth.com>
2013-04-24 01:40:37 +00:00
zico 3405bf6562 Added a lot of status messages for RBA code shown with -verbose, hopefully making it easier for users to track down problems and made all RBA messages start with RBAudio prefix 2013-04-22 12:37:59 +02:00
zico d5016e349f Added a lot of status messages for RBA code shown with -verbose, hopefully making it easier for users to track down problems and made all RBA messages start with RBAudio prefix 2013-04-22 12:37:51 +02:00
zico 40efb50a37 Clear Netgame struct each time player enters a new IP in manual join menu 2013-04-22 11:42:41 +02:00
zico 664139efcf Clear Netgame struct each time player enters a new IP in manual join menu 2013-04-22 11:42:38 +02:00
zico ea8020267a In restricted game mode check for player callsign and sockaddr at the same time 2013-04-22 11:26:55 +02:00
zico 07a73afee7 In restricted game mode check for player callsign and sockaddr at the same time 2013-04-22 11:26:49 +02:00
Kp a842e15d94 Merge branch d2x-rebirth into unification/master
Conflicts:
	SConstruct
	common/include/editor/ehostage.h
	common/main/cntrlcen.h
	common/main/laser.h
	common/main/mission.h
	common/main/net_udp.h
	common/main/object.h
	main/vers_id.h
	similar/editor/kfuncs.c
	similar/main/inferno.c
	similar/main/lighting.c
	similar/main/multibot.c
	similar/main/newmenu.c
	similar/main/physics.c
2013-04-21 04:52:22 +00:00