Kp
1ed0a170a9
Remove unused PHYSFSRWOPS_openWrite
2013-12-01 23:56:17 +00:00
Kp
3c61dc4dec
Remove unused PHYSFSRWOPS_openAppend
2013-12-01 23:56:17 +00:00
Kp
8413412426
Remove unused PHYSFSRWOPS_makeRWops
2013-12-01 23:56:17 +00:00
Kp
ea327d8394
Move d2x-rebirth/main/movie.c -> d2x-rebirth/main/movie.cpp
2013-11-09 17:45:21 +00:00
Kp
4577dd3977
Merge branch 'd2x-rebirth/master' into unification/master
2013-07-21 21:34:46 +00:00
Kp
997c35c351
Move */include/loadgl.h -> common/include/loadgl.h
2013-03-03 01:03:33 +00:00
Kp
30c7274c17
Move d2x-rebirth/include/interp.h -> common/include/interp.h
...
Prior to the Bazaar import, an unidentified committer moved some
function declarations from 3d.h to interp.h, but only for Descent II.
Replicate those changes in Descent I, and move the Descent II header
interp.h to become common.
2013-03-03 01:03:33 +00:00
Kp
49046095f5
Move */*/hash.h -> common/include/hash.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
8979873ee8
Move */include/pcx.h -> similar/include/pcx.h
2013-03-17 23:01:31 +00:00
Kp
ccd65b83ae
Move */include/editor/eswitch.h -> common/include/editor/eswitch.h
2013-03-03 01:03:33 +00:00
Kp
b732616404
Move */include/editor/kdefs.h -> common/include/editor/kdefs.h
2013-03-03 01:03:33 +00:00
Kp
923633b2ac
Move */include/editor/texpage.h -> common/include/editor/texpage.h
2013-03-03 01:03:33 +00:00
Kp
501f1d6a25
Move */include/ui.h -> common/include/ui.h
2013-03-03 01:03:33 +00:00
Kp
0d2a2910e5
Move */include/editor/editor.h -> common/include/editor/editor.h
2013-03-03 01:03:33 +00:00
Kp
5b2b6b1975
Move */include/editor/centers.h -> common/include/editor/centers.h
2013-03-03 01:03:33 +00:00
Kp
4b4ff91172
Move */include/editor/ehostage.h -> common/include/editor/ehostage.h
2013-03-03 01:03:33 +00:00
Kp
69679eed12
Move */include/editor/eobject.h -> common/include/editor/eobject.h
2013-03-03 01:03:33 +00:00
Kp
5fbeb7c27b
Move */include/editor/info.h -> common/include/editor/info.h
2013-03-03 01:03:33 +00:00
Kp
70c4a8ea0f
Move */include/editor/kfuncs.h -> common/include/editor/kfuncs.h
2013-03-03 01:03:33 +00:00
Kp
1f6fdba458
Move */include/editor/macro.h -> common/include/editor/macro.h
2013-03-03 01:03:33 +00:00
Kp
ce742086b5
Move */include/editor/meddraw.h -> common/include/editor/meddraw.h
2013-03-03 01:03:33 +00:00
Kp
ca7947a7ce
Move */include/editor/medlist.h -> common/include/editor/medlist.h
2013-03-03 01:03:33 +00:00
Kp
f9cd5142dc
Move */include/editor/medmisc.h -> common/include/editor/medmisc.h
2013-03-03 01:03:33 +00:00
Kp
dff777bca7
Move */include/editor/medrobot.h -> common/include/editor/medrobot.h
2013-03-03 01:03:33 +00:00
Kp
ba84aecf73
Move */include/editor/medsel.h -> common/include/editor/medsel.h
2013-03-03 01:03:33 +00:00
Kp
5499dd374b
Move */include/editor/medwall.h -> common/include/editor/medwall.h
2013-03-03 01:03:33 +00:00
Kp
e3885cb709
Move */include/editor/objpage.h -> common/include/editor/objpage.h
2013-03-03 01:03:33 +00:00
Kp
a259ecf691
Move */include/editor/seguvs.h -> common/include/editor/seguvs.h
2013-03-03 01:03:33 +00:00
Kp
6d10818c40
Move */include/func.h -> common/include/func.h
2013-03-03 01:03:33 +00:00
Kp
b2382d7772
Move */include/makesig.h -> common/include/makesig.h
2013-03-03 01:03:33 +00:00
Kp
70d4274106
Move */include/rbaudio.h -> common/include/rbaudio.h
2013-03-03 01:03:33 +00:00
Kp
1abda3c5a6
Move */include/strio.h -> common/include/strio.h
2013-03-03 01:03:33 +00:00
Kp
c90750e802
Move */include/dl_list.h -> common/include/dl_list.h
2013-03-03 01:03:33 +00:00
Kp
3becab2461
Move */include/texmap.h -> common/include/texmap.h
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
291e32b1e9
Move */include/3d.h -> common/include/3d.h
2013-03-03 01:03:33 +00:00
Kp
daeada6d98
Move */include/palette.h -> common/include/palette.h
2013-03-03 01:03:33 +00:00
Kp
88b0cd1cf4
Move */include/ogl_init.h -> common/include/ogl_init.h
2013-03-03 01:03:33 +00:00
Kp
1633f29eab
Move */include/grdef.h -> common/include/grdef.h
...
Drop the special case for Metrowerks in Descent I.
2013-03-03 01:03:33 +00:00
Kp
139ed37bc8
Move */include/gr.h -> common/include/gr.h
2013-03-03 01:03:33 +00:00
Kp
9a236566b8
Move */include/args.h -> common/include/args.h
2013-03-03 01:03:33 +00:00
Kp
0c2a08ec01
Move */include/physfsx.h -> common/include/physfsx.h
2013-03-03 01:03:33 +00:00
Kp
2afbfda4ee
Move */include/ignorecase.h -> common/include/ignorecase.h
2013-03-03 01:03:33 +00:00
Kp
a05d292255
Move */include/u_mem.h -> common/include/u_mem.h
...
The Descent I reference to virtual_memory_on is unused, so drop it.
2013-03-03 01:03:33 +00:00
Kp
d9ee4c7dce
Move */include/strutil.h -> common/include/strutil.h
2013-03-03 01:03:33 +00:00
Kp
d99d197f8d
Move */include/iff.h -> common/include/iff.h
2013-03-03 01:03:33 +00:00
Kp
781d4abdf2
Move */include/rle.h -> common/include/mouse.h
2013-03-03 01:03:33 +00:00
Kp
9bc42c0b32
Move */include/timer.h -> common/include/timer.h
2013-03-03 01:03:33 +00:00
Kp
f2fef2eef5
Move */include/byteswap.h -> common/include/byteswap.h
2013-03-03 01:03:33 +00:00