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

39 commits

Author SHA1 Message Date
Kp bca0dacc98 Merge branch d2x-rebirth/master into unification/master 
Conflicts:
	SConstruct
 2013-08-09 22:53:45 +00:00
Kp 33aa8937d9 Merge branch d1x-rebirth/master into unification/master 
Conflicts:
	SConstruct
	common/main/multi.h
	similar/main/gamerend.c
 2013-08-09 22:49:04 +00:00
Kp 50ce0c00c8 Remove SDL/ in #include statements 2013-07-21 22:02:13 +00:00
Kp 4577dd3977 Merge branch 'd2x-rebirth/master' into unification/master 2013-07-21 21:34:46 +00:00
Kp a49aff4897 Restore use of Windows icon file 2013-06-02 21:46:32 +00:00
Kp 05a8aaccaf Move */arch/sdl/digi_audio.c -> similar/arch/sdl/digi_audio.c 2013-03-03 01:03:33 +00:00
Kp b09f96b31f Move */arch/sdl/digi.c -> similar/arch/sdl/digi.c 2013-03-03 01:03:33 +00:00
Kp a842e15d94 Merge branch d2x-rebirth into unification/master 
Conflicts:
	SConstruct
	common/include/editor/ehostage.h
	common/main/cntrlcen.h
	common/main/laser.h
	common/main/mission.h
	common/main/net_udp.h
	common/main/object.h
	main/vers_id.h
	similar/editor/kfuncs.c
	similar/main/inferno.c
	similar/main/lighting.c
	similar/main/multibot.c
	similar/main/newmenu.c
	similar/main/physics.c
 2013-04-21 04:52:22 +00:00
Kp acbe1209e8 Move */arch/sdl/digi_mixer.c -> similar/arch/sdl/digi_mixer.c 2013-03-03 01:03:33 +00:00
Kp e66b36de14 Move */arch/sdl/gr.c -> similar/arch/sdl/gr.c 2013-03-17 23:01:32 +00:00
Kp 6ef38884e1 Move */arch/sdl/key.c -> similar/arch/sdl/key.c 2013-03-17 23:01:31 +00:00
Kp ddb26fa198 Move */arch/sdl/event.c -> similar/arch/sdl/event.c 2013-03-17 23:01:31 +00:00
Kp b5c3902697 Move */arch/sdl/init.c -> similar/arch/sdl/init.c 2013-03-17 23:01:31 +00:00
Kp d64f605f54 Move */arch/sdl/joy.c -> common/arch/sdl/joy.c 2013-03-17 23:01:31 +00:00
Kp 4bd3f0dbec Move */arch/sdl/mouse.c -> similar/arch/sdl/mouse.c 2013-03-17 23:01:31 +00:00
Kp b14f7c2f5f Move */arch/ogl/gr.c -> similar/arch/ogl/gr.c 2013-03-17 23:01:31 +00:00
Kp 0db5890d62 Remove unused */arch/linux 2013-03-17 23:01:31 +00:00
Kp 519780f401 Remove unused arch/include/gui.h 2013-03-17 23:01:31 +00:00
Kp 78fde624f6 Move */arch/sdl/timer.c -> similar/arch/sdl/timer.c 2013-03-17 23:01:31 +00:00
Kp ea29654c53 Move */arch/sdl/jukebox.c -> similar/arch/sdl/jukebox.c 2013-03-17 23:01:31 +00:00
Kp 3fe3da9a25 Move */arch/ogl/ogl.c -> similar/arch/ogl/ogl.c 2013-03-17 23:01:31 +00:00
Kp c34a25e1ed Move */arch/sdl/digi_mixer_music.c -> common/arch/sdl/digi_mixer_music.c 2013-03-17 23:01:31 +00:00
Kp 68af7a81ba Move */arch/sdl/rbaudio.c -> common/arch/sdl/rbaudio.c 2013-03-17 23:01:30 +00:00
Kp 7a85d4af05 Fix memory leak on realloc failure in digi_mixer_music 2012-11-24 16:26:53 +00:00
Kp eb8ebe40b9 Move */arch/sdl/window.c -> common/arch/sdl/window.c 2013-03-03 01:03:33 +00:00
Kp 504cf23746 Move */arch/win32/messagebox.c -> common/arch/win32/messagebox.c 2013-03-03 01:03:33 +00:00
Kp 972da8a7c7 Move */arch/include/window.h -> common/include/window.h 2013-03-03 01:03:33 +00:00
Kp 2ab85c0413 Move */arch/include/messagebox.h -> common/include/messagebox.h 2013-03-03 01:03:33 +00:00
Kp 0b38376ebd Move */arch/include/key.h -> common/include/key.h 2013-03-03 01:03:33 +00:00
Kp 536203188c Move */arch/include/jukebox.h -> common/include/jukebox.h 2013-03-03 01:03:33 +00:00
Kp 2fc1cba2b5 Move */3d -> common/3d 
Move all the common 3d/ code into a common directory.  Substantial
differences exist in 3d/interp.c, so it is not yet common.
 2013-03-03 01:03:33 +00:00
Kp d7f46c9623 Merge branch 'd2x-rebirth' into unification/master 2013-03-10 03:37:28 +00:00
Kp 8298b3c7e6 Move */arch/include/mouse.h -> common/include/mouse.h 2013-03-03 01:03:33 +00:00
Kp 10260197f6 Move */arch/include/joy.h -> common/include/joy.h 2013-03-03 01:03:33 +00:00
Kp 896865c4c4 Move */arch/include/digi_mixer_music.h -> common/include/digi_mixer_music.h 2013-03-03 01:03:33 +00:00
Kp 94e1ee629a Move */arch/include/digi_mixer.h -> common/include/digi_mixer.h 2013-03-03 01:03:33 +00:00
Kp c6e0882f51 Move */arch/include/digi_audio.h -> common/include/digi_audio.h 2013-03-03 01:03:33 +00:00
Kp 27953049cf Move */arch/include/event.h -> common/include/event.h 2013-03-03 01:03:33 +00:00
Kp 7cda97cc74 Move d2x-rebirth source into subdirectory d2x-rebirth 2013-02-19 00:34:46 +00:00