TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity
3416 commits 2 branches 28 tags 122 MiB
C++ 89.7%
C 5.5%
Python 4.1%
Shell 0.4%
Roff 0.2%
Go to file
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
common Merge branch d1x-rebirth into unification/master 2013-04-21 04:51:35 +00:00
d1x-rebirth Merge branch d1x-rebirth into unification/master 2013-04-21 04:51:35 +00:00
d2x-rebirth Move */main/controls.c -> similar/main/controls.c 2013-03-03 01:03:33 +00:00
similar Merge branch d1x-rebirth into unification/master 2013-04-21 04:51:35 +00:00
.gitignore Added .gitignore 2013-04-06 11:48:26 +08:00
SConstruct Merge branch d1x-rebirth into unification/master 2013-04-21 04:51:35 +00:00