TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity
dxx-rebirth/common
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
..
2d Move */2d/2dsline.c -> common/2d/2dsline.c 2013-03-03 01:03:33 +00:00
3d Move */3d -> common/3d 2013-03-03 01:03:33 +00:00
arch Move */arch/sdl/joy.c -> common/arch/sdl/joy.c 2013-03-17 23:01:31 +00:00
editor Move */editor/data -> common/editor/data 2013-03-17 23:01:32 +00:00
include Move d2x-rebirth/include/interp.h -> common/include/interp.h 2013-03-03 01:03:33 +00:00
main Merge branch d1x-rebirth into unification/master 2013-04-21 04:51:35 +00:00
maths Move */maths/vecmat.c -> common/maths/vecmat.c 2013-03-03 01:03:33 +00:00
misc Move */misc/dl_list.c -> common/misc/dl_list.c 2013-03-03 01:03:33 +00:00
texmap Move */texmap/*.c -> common/texmap 2013-03-17 23:01:32 +00:00
ui Move */ui/button.c -> common/ui/button.c 2013-03-03 01:03:33 +00:00