Kp
|
b4e7d2e899
|
Move */main/game.h -> common/main/game.h
|
2013-03-03 01:03:33 +00:00 |
|
|
Kp
|
a51d4fccae
|
Move */main/fvi.h -> common/main/fvi.h
|
2013-03-03 01:03:33 +00:00 |
|
|
Kp
|
62d30ec457
|
Move */main/fuelcen.h -> common/main/fuelcen.h
|
2013-03-03 01:03:33 +00:00 |
|
|
Kp
|
947de0c94f
|
Move */main/fireball.h -> common/main/fireball.h
|
2013-03-03 01:03:33 +00:00 |
|
|
Kp
|
5294b473d7
|
Move */main/endlevel.h -> common/main/endlevel.h
|
2013-03-03 01:03:33 +00:00 |
|
|
Kp
|
ac43b52a74
|
Move */main/effects.h -> common/main/effects.h
|
2013-03-03 01:03:33 +00:00 |
|
|
Kp
|
fe25826fa9
|
Move */main/credits.h -> common/main/credits.h
|
2013-03-03 01:03:33 +00:00 |
|
|
Kp
|
b34b00a98f
|
Move */main/controls.h -> common/main/controls.h
|
2013-03-03 01:03:33 +00:00 |
|
|
Kp
|
4cabcb5d3d
|
Move */main/collide.h -> common/main/collide.h
|
2013-03-03 01:03:33 +00:00 |
|
|
Kp
|
c8bc4ec7ef
|
Move */main/automap.h -> common/main/automap.h
|
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
|
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
|
4662fe9490
|
Move */main/gamemine.h -> common/main/gamemine.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
|
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
|
5e89ce7cd3
|
Move */editor/data -> common/editor/data
|
2013-03-17 23:01:32 +00:00 |
|
|
Kp
|
a9123e0b45
|
Move */texmap/*.c -> common/texmap
|
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
|
f9f14afec5
|
Move */editor/func.c -> common/editor/func.c
|
2013-03-17 23:01:32 +00:00 |
|
|
Kp
|
d64f605f54
|
Move */arch/sdl/joy.c -> common/arch/sdl/joy.c
|
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
|
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
|
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
|
c34a25e1ed
|
Move */arch/sdl/digi_mixer_music.c -> common/arch/sdl/digi_mixer_music.c
|
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
|
68af7a81ba
|
Move */arch/sdl/rbaudio.c -> common/arch/sdl/rbaudio.c
|
2013-03-17 23:01:30 +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
|
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
|
29ede4c86c
|
Move */ui/button.c -> common/ui/button.c
|
2013-03-03 01:03:33 +00:00 |
|
|
Kp
|
ac04f4b247
|
Move */ui/checkbox.c -> common/ui/checkbox.c
|
2013-03-03 01:03:33 +00:00 |
|
|
Kp
|
7ecbc5b123
|
Move */ui/dialog.c -> common/ui/dialog.c
|
2013-03-03 01:03:33 +00:00 |
|
|
Kp
|
08e8d0e499
|
Move */ui/file.c -> common/ui/file.c
|
2013-03-03 01:03:33 +00:00 |
|
|
Kp
|
b42de62167
|
Move */ui/gadget.c -> common/ui/gadget.c
|
2013-03-03 01:03:33 +00:00 |
|
|
Kp
|
8657a99491
|
Move */ui/icon.c -> common/ui/icon.c
|
2013-03-03 01:03:33 +00:00 |
|
|
Kp
|
345b90bf3f
|
Move */ui/inputbox.c -> common/ui/inputbox.c
|
2013-03-03 01:03:33 +00:00 |
|
|
Kp
|
091b287c82
|
Move */ui/keypad.c -> common/ui/keypad.c
|
2013-03-03 01:03:33 +00:00 |
|
|
Kp
|
64708c932f
|
Move */ui/keypress.c -> common/ui/keypress.c
|
2013-03-03 01:03:33 +00:00 |
|
|
Kp
|
60f0b1e557
|
Move */ui/keytrap.c -> common/ui/keytrap.c
|
2013-03-03 01:03:33 +00:00 |
|
|
Kp
|
a0a6f508a5
|
Move */ui/listbox.c -> common/ui/listbox.c
|
2013-03-03 01:03:33 +00:00 |
|
|
Kp
|
2ecc20143a
|
Move */ui/menu.c -> common/ui/menu.c
|
2013-03-03 01:03:33 +00:00 |
|