TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity
dxx-rebirth/d1x-rebirth/main
History
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
..
ai.c Merge branch d1x-rebirth into unification/master 2013-04-21 04:51:35 +00:00
ai.h Merge branch d1x-rebirth into unification/master 2013-04-21 04:51:35 +00:00
aipath.c
aistruct.h Move */main/object.h -> common/main/object.h 2013-03-03 01:03:33 +00:00
automap.c
bm.c
bm.h
bmread.c
cntrlcen.c Move */main/cntrlcen.h -> common/main/cntrlcen.h 2013-03-03 01:03:33 +00:00
collide.c
custom.c Merge branch d1x-rebirth into unification/master 2013-04-21 04:51:35 +00:00
custom.h
digicomp.c
digicomp.h
dumpmine.c
endlevel.c
fireball.c
fuelcen.c
fvi.c
game.c
gamecntl.c Merge branch d1x-rebirth into unification/master 2013-04-21 04:51:35 +00:00
gamemine.c
gamemine.h
gamerend.c Merge branch d1x-rebirth into unification/master 2013-04-21 04:51:35 +00:00
gamesave.c
gameseg.c
gameseq.c
gauges.c Merge branch d1x-rebirth into unification/master 2013-04-21 04:51:35 +00:00
hostage.c Move part of */main/hostage.c -> similar/main/hostage.c 2013-03-03 01:03:33 +00:00
kconfig.c
laser.c
menu.c Merge branch d1x-rebirth into unification/master 2013-04-21 04:51:35 +00:00
mission.c
multi.c Merge branch d1x-rebirth into unification/master 2013-04-21 04:51:35 +00:00
multi.h Merge branch d1x-rebirth into unification/master 2013-04-21 04:51:35 +00:00
net_udp.c Merge branch d1x-rebirth into unification/master 2013-04-21 04:51:35 +00:00
newdemo.c
object.c Move */main/cntrlcen.h -> common/main/cntrlcen.h 2013-03-03 01:03:33 +00:00
piggy.c
playsave.c Merge branch d1x-rebirth into unification/master 2013-04-21 04:51:35 +00:00
playsave.h Merge branch d1x-rebirth into unification/master 2013-04-21 04:51:35 +00:00
polyobj.c Move d2x-rebirth/include/interp.h -> common/include/interp.h 2013-03-03 01:03:33 +00:00
powerup.c
render.c Merge branch d1x-rebirth into unification/master 2013-04-21 04:51:35 +00:00
snddecom.c
snddecom.h
songs.c
state.c Merge branch d1x-rebirth into unification/master 2013-04-21 04:51:35 +00:00
state.h
switch.c
switch.h
text.h
titles.c
vers_id.c
weapon.c Merge branch d1x-rebirth into unification/master 2013-04-21 04:51:35 +00:00
weapon.h