616a3a6b70
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 |
||
---|---|---|
.. | ||
config.c | ||
console.c | ||
controls.c | ||
credits.c | ||
digiobj.c | ||
effects.c | ||
gamefont.c | ||
hostage.c | ||
hud.c | ||
inferno.c | ||
kmatrix.c | ||
lighting.c | ||
mglobal.c | ||
morph.c | ||
multibot.c | ||
newmenu.c | ||
paging.c | ||
physics.c | ||
player.c | ||
robot.c | ||
scores.c | ||
slew.c | ||
terrain.c | ||
texmerge.c | ||
text.c | ||
vclip.c | ||
wall.c |