Kp
004ca9780f
Move */main/segpoint.h -> common/main/segpoint.h
2013-03-03 01:03:33 +00:00
Kp
887449f51b
Move */main/screens.h -> common/main/screens.h
2013-03-03 01:03:33 +00:00
Kp
996cb3ee99
Move */main/scores.h -> similar/main/scores.h
2013-03-03 01:03:33 +00:00
Kp
14dc71243c
Move */main/scores.h -> common/main/scores.h
2013-03-03 01:03:33 +00:00
Kp
0af7543161
Move */main/robot.h -> common/main/robot.h
2013-03-03 01:03:33 +00:00
Kp
0866e9c7fd
Move */main/powerup.h -> common/main/powerup.h
2013-03-03 01:03:33 +00:00
Kp
e89d4d7765
Move */main/polyobj.h -> common/main/polyobj.h
2013-03-03 01:03:33 +00:00
Kp
3125d6bd52
Move */main/player.h -> common/main/player.h
2013-03-03 01:03:33 +00:00
Kp
4ee6714372
Move */main/physics.h -> common/main/physics.h
2013-03-03 01:03:33 +00:00
Kp
21c078df5b
Move */main/paging.c -> similar/main/paging.c
2013-03-03 01:03:33 +00:00
Kp
cb246551d9
Move */main/paging.h -> common/main/paging.h
2013-03-03 01:03:33 +00:00
Kp
ea2cd17e70
Move */main/object.h -> common/main/object.h
2013-03-03 01:03:33 +00:00
Kp
5cf2b5873b
Move */main/newmenu.c -> similar/main/newmenu.c
2013-03-03 01:03:33 +00:00
Kp
15f569d5b1
Move */main/newmenu.h -> common/main/newmenu.h
2013-03-03 01:03:33 +00:00
Kp
ff444c844b
Move */main/newdemo.h -> common/main/newdemo.h
2013-03-03 01:03:33 +00:00
Kp
6cc3560fbd
Move */main/net_udp.h -> common/main/net_udp.h
2013-03-03 01:03:33 +00:00
Kp
cb64b8540b
Move */main/morph.c -> similar/main/morph.c
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
d6073aa8d2
Move */main/mission.h -> common/main/mission.h
2013-03-03 01:03:33 +00:00
Kp
85c4602199
Move */main/mglobal.c -> similar/main/mglobal.c
2013-03-03 01:03:33 +00:00
Kp
3eaec8bb39
Move */main/laser.h -> common/main/laser.h
2013-03-03 01:03:33 +00:00
Kp
5fa1819e63
Move */main/kmatrix.c -> similar/main/kmatrix.c
2013-03-03 01:03:33 +00:00
Kp
bd6ae78911
Move */main/kmatrix.h -> common/main/kmatrix.h
2013-03-03 01:03:33 +00:00
Kp
30d53dca16
Move */main/kconfig.h -> common/main/kconfig.h
2013-03-03 01:03:33 +00:00
Kp
c48a9ea87d
Move */main/hud.c -> similar/main/hud.c
2013-03-03 01:03:33 +00:00
Kp
3aa3b1695f
Move */main/gameseq.h -> common/main/gameseq.h
2013-03-03 01:03:33 +00:00
Kp
f418785edc
Move */main/gamefont.c -> similar/main/gamefont.c
2013-03-03 01:03:33 +00:00
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
b5001feb2f
Move */editor/objpage.c -> similar/editor/objpage.c
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
7224dde00a
Move */editor/seguvs.c -> similar/editor/seguvs.c
2013-03-03 01:03:33 +00:00
Kp
93d6dc54bd
Move */editor/segment.c -> similar/editor/segment.c
2013-03-03 01:03:33 +00:00
Kp
47b6daaa7a
Move */editor/mine.c -> similar/editor/mine.c
2013-03-03 01:03:33 +00:00
Kp
cd4b771b30
Move */editor/medwall.c -> similar/editor/medwall.c
2013-03-03 01:03:33 +00:00
Kp
fa8217ff13
Move */editor/med.c -> similar/editor/med.c
2013-03-03 01:03:33 +00:00
Kp
631bc1e3a6
Move */editor/group.c -> similar/editor/group.c
2013-03-03 01:03:33 +00:00
Kp
75fc0d5e8a
Move */editor/ksegsize.c -> similar/editor/ksegsize.c
2013-03-03 01:03:33 +00:00
Kp
931b944cba
Move */editor/kgame.c -> similar/editor/kgame.c
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
1c7c90d038
Move */editor/eswitch.c -> similar/editor/eswitch.c
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
4ba0495b0a
Move */editor/eobject.c -> similar/editor/eobject.c
2013-03-03 01:03:33 +00:00
Kp
0d8cf57ab0
Move */editor/eglobal.c -> similar/editor/eglobal.c
2013-03-03 01:03:33 +00:00
Kp
043f12db26
Move */editor/curves.c -> similar/editor/curves.c
2013-03-03 01:03:33 +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
53c19f14f1
Move */editor/kmine.c -> similar/editor/kmine.c
2013-03-17 23:01:33 +00:00
Kp
7cb761f0a3
Move */editor/ksegmove.c -> similar/editor/ksegmove.c
2013-03-17 23:01:33 +00:00
Kp
4aeeab376b
Move */editor/ksegsel.c -> similar/editor/ksegsel.c
2013-03-17 23:01:33 +00:00
Kp
1692f38127
Move */editor/ktmap.c -> similar/editor/ktmap.c
2013-03-17 23:01:33 +00:00
Kp
baf0da84d2
Move */editor/kview.c -> similar/editor/kview.c
2013-03-17 23:01:33 +00:00
Kp
1030915f1c
Move */editor/medmisc.c -> similar/editor/medmisc.c
2013-03-17 23:01:33 +00:00
Kp
bff770f1d8
Move */editor/medsel.c -> similar/editor/medsel.c
2013-03-17 23:01:33 +00:00
Kp
5ca4d35bf5
Move */editor/texture.c -> similar/editor/texture.c
2013-03-17 23:01:33 +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
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
bdb1377c5a
Restructure struct segment to align better
2013-03-17 23:01:32 +00:00
Kp
a842ddca86
Move */editor/autosave.c -> similar/editor/autosave.c
2013-03-17 23:01:32 +00:00
Kp
bd9702463e
Move */editor/elight.c -> similar/editor/elight.c
2013-03-17 23:01:32 +00:00
Kp
1aa9ae721e
Move */editor/fixseg.c -> similar/editor/fixseg.c
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
756ded6007
Move */editor/info.c -> similar/editor/info.c
2013-03-17 23:01:32 +00:00
Kp
a338f81663
Move */editor/kbuild.c -> similar/editor/kbuild.c
2013-03-17 23:01:32 +00:00
Kp
af3707d1c0
Move */editor/kcurve.c -> similar/editor/kcurve.c
2013-03-17 23:01:32 +00:00
Kp
6b5336a4b3
Move */editor/kfuncs.c -> similar/editor/kfuncs.c
2013-03-17 23:01:32 +00:00
Kp
ead39c4cc8
Move */editor/khelp.c -> similar/editor/khelp.c
2013-03-17 23:01:32 +00:00
Kp
357b375ba1
Remove unused editor/kgroup.c
2013-03-17 23:01:32 +00:00
Kp
e66b36de14
Move */arch/sdl/gr.c -> similar/arch/sdl/gr.c
2013-03-17 23:01:32 +00:00
Kp
cd17326d84
Add stub which_bomb to match D2X code
2013-03-17 23:01:31 +00:00
Kp
6ef38884e1
Move */arch/sdl/key.c -> similar/arch/sdl/key.c
2013-03-17 23:01:31 +00:00
Kp
ddb26fa198
Move */arch/sdl/event.c -> similar/arch/sdl/event.c
2013-03-17 23:01:31 +00:00
Kp
b5c3902697
Move */arch/sdl/init.c -> similar/arch/sdl/init.c
2013-03-17 23:01:31 +00:00
Kp
d64f605f54
Move */arch/sdl/joy.c -> common/arch/sdl/joy.c
2013-03-17 23:01:31 +00:00
Kp
4bd3f0dbec
Move */arch/sdl/mouse.c -> similar/arch/sdl/mouse.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
ff949a5367
Mark main/snddecom.c data static
2013-03-17 23:01:31 +00:00
Kp
d64e47bfed
Remove unused main/mute.c, main/mute.h
2013-03-17 23:01:31 +00:00
Kp
9f2ac88556
Mark main/custom.c functions static
2013-03-17 23:01:31 +00:00
Kp
3d876bad8b
Remove unused main/altsound.c, main/altsound.h
2013-03-17 23:01:31 +00:00
Kp
331a662869
Remove unused main/compbit.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
0db5890d62
Remove unused */arch/linux
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
299b47656b
Move */misc/hash.c -> similar/misc/hash.c
2013-03-17 23:01:31 +00:00
Kp
68fec5f94a
Move */misc/physfsx.c -> similar/misc/physfsx.c
2013-03-17 23:01:31 +00:00
Kp
5c1f0f68cc
Move */mem/mem.c -> similar/mem/mem.c
2013-03-17 23:01:31 +00:00
Kp
78fde624f6
Move */arch/sdl/timer.c -> similar/arch/sdl/timer.c
2013-03-17 23:01:31 +00:00