Kp
012d8e249b
Merge branch d1x-rebirth/master into unification/master
2013-07-19 22:32:28 +00:00
Kp
02a32e2f42
Use u_int32_t for grs_screen sc_mode to avoid sign mismatch warnings
2013-07-19 02:40:13 +00:00
Kp
853713190d
Make ogl_init_load_library static
2013-06-22 21:36:28 +00:00
Kp
9667abeaa7
Make d_splitpath const
2013-06-09 18:10:09 +00:00
Kp
a10dbc7d4b
Move 2d/2dsline.c -> 2d/2dsline.cpp
2012-11-11 22:12:51 +00:00
Kp
2e3159a15f
Mark gr 2dsline functions static
2013-06-14 03:40:50 +00:00
Kp
c69644dcf7
Wrap C++-incompatible statements with #ifndef __cplusplus
2013-06-14 03:40:50 +00:00
Kp
5648874a37
Merge branch d2x-rebirth/master into unification/master
2013-06-14 03:31:59 +00:00
Kp
22e31c0e8d
Remove unused argument to clear_warn_func
2013-06-08 23:12:44 +00:00
Kp
997c35c351
Move */include/loadgl.h -> common/include/loadgl.h
2013-03-03 01:03:33 +00:00
Kp
b87e7c2325
Merge branch 'd2x-rebirth/master' into unification/master
2013-06-02 20:14:42 +00:00
Kp
410b07d5c4
Merge branch 'd1x-rebirth/master' into unification/master
...
Conflicts:
SConstruct
2013-05-05 22:08:34 +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
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
9058a5c791
Move segment handling from editor.h
2013-03-17 23:01:32 +00:00
Kp
b14f7c2f5f
Move */arch/ogl/gr.c -> similar/arch/ogl/gr.c
2013-03-17 23:01:31 +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
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
3becab2461
Move */include/texmap.h -> common/include/texmap.h
2013-03-03 01:03:33 +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