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

28 commits

Author SHA1 Message Date
Kp f39cd4dbf6 Centralize RDL/RL2 file extension text 2013-03-17 22:18:42 +00:00
Kp 04a6716b90 Move */main/gameseg.h -> common/main/gameseg.h 2013-03-03 01:03:33 +00:00
Kp 7002c4be66 Move */main/gamesave.h -> common/main/gamesave.h 2013-03-03 01:03:33 +00:00
Kp f938bd3845 Move */main/segment.h -> common/main/segment.h 2013-03-03 01:03:33 +00:00
Kp a4277df58f Merge branch 'unify-d2x-rebirth' into unify 
Conflicts:
	SConstruct
	common/include/editor/editor.h
	d2x-rebirth/editor/ehostage.c
	d2x-rebirth/include/d_glob.h
	d2x-rebirth/include/d_io.h
	d2x-rebirth/main/desc_id.h
	d2x-rebirth/main/gamestat.h
	d2x-rebirth/main/link.bat
 2013-03-31 17:24:44 +00:00
Kp db5239deee Move */main/console.c -> similar/main/console.c 2013-03-17 23:01:32 +00:00
Kp 9058a5c791 Move segment handling from editor.h 2013-03-17 23:01:32 +00:00
Kp 4e3f3f3103 Move prototype of which_bomb to weapon.h 2013-03-17 23:01:31 +00:00
Kp 5aeec83d49 Move */main/vclip.h -> common/main/vclip.h 2013-03-17 23:01:31 +00:00
Kp 92a2bfe1fc Move */main/textures.h -> common/main/textures.h 2013-03-17 23:01:31 +00:00
Kp 643293169c Move */main/sounds.h -> common/main/sounds.h 2013-03-17 23:01:31 +00:00
Kp bb96e0ba5e Move */main/digi.h -> common/main/digi.h 2013-03-17 23:01:31 +00:00
Kp a0e2f7f12f Move */main/piggy.h -> common/main/piggy.h 2013-03-17 23:01:31 +00:00
Kp 11306c249e Move */main/songs.h -> common/main/songs.h 2013-03-17 23:01:30 +00:00
Kp caaf44e358 Fix array underrun when searching for highest used object 2012-12-02 23:47:41 +00:00
Kp a8f8bb3682 Fix array boundary over-read in obj_get_signature 2012-12-02 23:28:56 +00:00
Kp b00d8130fa Move */main/render.h -> common/main/render.h 2013-03-03 01:03:33 +00:00
Kp 57dbf885ec Move */main/config.h -> common/main/config.h 2013-03-03 01:03:33 +00:00
Kp bb13bf5618 Move */main/vers_id.h -> common/main/vers_id.h 2013-03-03 01:03:33 +00:00
Kp fa26a436aa Move */main/gamefont.h -> common/main/gamefont.h 2013-03-03 01:03:33 +00:00
Kp 7f023bc8b0 Move */main/lighting.h -> common/main/lighting.h 2013-03-03 01:03:33 +00:00
Kp a0de8a594c Move */main/hudmsg.h -> common/main/hudmsg.h 2013-03-03 01:03:33 +00:00
Kp 2b8d1fa5e7 Remove unused update_rendered_data parameter 
This value is stored, but never read.  Remove it.
 2013-03-09 18:28:15 +00:00
Kp d7f46c9623 Merge branch 'd2x-rebirth' into unification/master 2013-03-10 03:37:28 +00:00
Kp e6c78ed004 Move */main/slew.h -> common/main/slew.h 2013-03-03 01:03:33 +00:00
Kp 53e4ff58e0 Move */main/morph.h -> common/main/morph.h 2013-03-03 01:03:33 +00:00
Kp 4033f2020b Move */main/inferno.h -> common/main/inferno.h 
Add preprocessor symbols to detect which version of Descent is built,
since some headers are not identical between the two versions, but are
close enough to be worth sharing.
 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