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

5045 commits

Author SHA1 Message Date
Kp ee564a45ff Fix sign mismatch in paging_touch_robot_maker 2013-07-19 02:51:32 +00:00
Kp 177e500893 Fix sign mismatch in control_center_triggers_swap 2013-07-19 02:50:49 +00:00
Kp a2b7e663df Move */main/weapon.c -> similar/main/weapon.c 2013-03-03 01:03:33 +00:00
Kp 5648874a37 Merge branch d2x-rebirth/master into unification/master 2013-06-14 03:31:59 +00:00
Kp 88208fc228 Merge branch d1x-rebirth/master into unification/master 
Conflicts:
	SConstruct
	d1x-rebirth/main/multi.c
	similar/main/cntrlcen.c
	similar/main/wall.c
 2013-06-14 03:18:32 +00:00
Kp 3c07a98d18 Move old_gametime into #ifdef D2 2013-06-04 03:30:50 +00:00
Kp cb4f543ad2 Move segment tmap restore logic out of #ifdef D2 2013-06-04 03:30:50 +00:00
Kp 738fdf41c4 Fix SDL-only D2X build failure 2013-06-03 01:20:26 +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 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 dbec5197f6 Move */main/vers_id.c -> similar/main/vers_id.c 2013-05-05 17:39:03 +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 ff96f3239d Move */main/controls.c -> similar/main/controls.c 2013-03-03 01:03:33 +00:00
Kp 86f373e4e0 Move */main/multibot.c -> similar/main/multibot.c 2013-03-03 01:03:33 +00:00
Kp 691b95a02c Move */main/physics.c -> similar/main/physics.c 2013-03-03 01:03:33 +00:00
Kp 0138d330b3 Move */main/inferno.c -> similar/main/inferno.c 2013-03-03 01:03:33 +00:00
Kp dab72f3127 Move */main/robot.c -> similar/main/robot.c 2013-03-03 01:03:33 +00:00
Kp 4b18dcbff9 Move */main/text.c -> similar/main/text.c 2013-03-03 01:03:33 +00:00
Kp d2e3ed0228 Move */main/wall.c -> similar/main/wall.c 2013-03-03 01:03:33 +00:00
Kp ccbb392fd4 Move */main/lighting.c -> similar/main/lighting.c 2013-03-03 01:03:33 +00:00
Kp e1c6fd9690 Move */main/config.c -> similar/main/config.c 2013-03-03 01:03:33 +00:00
Kp 0952484183 Move part of */main/hostage.c -> similar/main/hostage.c 2013-03-03 01:03:33 +00:00
Kp 40c71caf92 Move */main/credits.c -> similar/main/credits.c 2013-03-03 01:03:33 +00:00
Kp a622ccf07f Move */main/player.c -> similar/main/player.c 2013-03-03 01:03:33 +00:00
Kp a42e743694 Move */main/effects.c -> similar/main/effects.c 2013-03-03 01:03:33 +00:00
Kp 828452910a Move */main/digiobj.c -> similar/main/digiobj.c 2013-03-03 01:03:33 +00:00
Kp 29c9334261 Move */main/vclip.c -> similar/main/vclip.c 2013-03-03 01:03:33 +00:00
Kp 543f6002b8 Move */main/texmerge.c -> similar/main/texmerge.c 2013-03-03 01:03:33 +00:00
Kp 83ba5b6241 Move */main/terrain.c -> similar/main/terrain.c 2013-03-03 01:03:33 +00:00
Kp 2b613ee05a Move */main/slew.c -> similar/main/slew.c 2013-03-03 01:03:33 +00:00
Kp 996cb3ee99 Move */main/scores.h -> similar/main/scores.h 2013-03-03 01:03:33 +00:00
Kp 21c078df5b Move */main/paging.c -> similar/main/paging.c 2013-03-03 01:03:33 +00:00
Kp 5cf2b5873b Move */main/newmenu.c -> similar/main/newmenu.c 2013-03-03 01:03:33 +00:00
Kp cb64b8540b Move */main/morph.c -> similar/main/morph.c 2013-03-03 01:03:33 +00:00
Kp 85c4602199 Move */main/mglobal.c -> similar/main/mglobal.c 2013-03-03 01:03:33 +00:00
Kp 5fa1819e63 Move */main/kmatrix.c -> similar/main/kmatrix.c 2013-03-03 01:03:33 +00:00
Kp c48a9ea87d Move */main/hud.c -> similar/main/hud.c 2013-03-03 01:03:33 +00:00
Kp f418785edc Move */main/gamefont.c -> similar/main/gamefont.c 2013-03-03 01:03:33 +00:00
Kp db5239deee Move */main/console.c -> similar/main/console.c 2013-03-17 23:01:32 +00:00