4 commits

Author	SHA1	Message	Date
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	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	dab72f3127	Move */main/robot.c -> similar/main/robot.c	2013-03-03 01:03:33 +00:00

Renamed from d2x-rebirth/main/robot.c (Browse further)