Kp
|
5c5618f671
|
Merge branch 'unify-d1x-rebirth' into unify
Conflicts:
SConstruct
common/main/vers_id.h
d1x-rebirth/include/alloca.h
d1x-rebirth/include/bcd.h
d1x-rebirth/include/clipboard.h
d1x-rebirth/include/compare.h
d1x-rebirth/include/tracker/tracker.h
d1x-rebirth/main/desc_id.h
d1x-rebirth/main/script.h
|
2013-03-31 17:21:59 +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
|
687b6284e6
|
Merge branch 'd1x-rebirth' into unification/master
|
2013-03-10 03:34:54 +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 |
|
Kp
|
204b1e4700
|
Move */include/console.h -> common/include/console.h
|
2013-03-03 01:03:33 +00:00 |
|
Kp
|
6555abf09e
|
Move */include/hmp.h -> common/include/hmp.h
|
2013-03-03 01:03:33 +00:00 |
|
Kp
|
ac1af0a58a
|
Move */include/vecmat.h -> common/include/vecmat.h
|
2013-03-03 01:03:33 +00:00 |
|
Kp
|
ba96e9c7ff
|
Move */include/internal.h -> common/include/internal.h
|
2013-03-03 01:03:33 +00:00 |
|
Kp
|
88371ff28a
|
Move */include/fix.h -> common/include/fix.h
|
2013-03-03 01:03:33 +00:00 |
|
Kp
|
85c66cad08
|
Move */include/maths.h -> common/include/maths.h
|
2013-03-03 01:03:33 +00:00 |
|
Kp
|
4044caeb2d
|
Move */include/dxxerror.h -> common/include/dxxerror.h
|
2013-03-03 01:03:33 +00:00 |
|
Kp
|
1c2ab15475
|
Move */include/pstypes.h -> common/include/pstypes.h
|
2013-03-03 01:03:33 +00:00 |
|