Kp
e1c6fd9690
Move */main/config.c -> similar/main/config.c
2013-03-03 01:03:33 +00:00
Kp
0952484183
Move part of */main/hostage.c -> similar/main/hostage.c
2013-03-03 01:03:33 +00:00
Kp
6ddc31fc33
Move */main/hostage.h -> common/main/hostage.h
2013-03-03 01:03:33 +00:00
Kp
acbe1209e8
Move */arch/sdl/digi_mixer.c -> similar/arch/sdl/digi_mixer.c
2013-03-03 01:03:33 +00:00
Kp
2679c2be10
Move */editor/texpage.c -> similar/editor/texpage.c
2013-03-03 01:03:33 +00:00
Kp
a27d667716
Move */editor/medrobot.c -> similar/editor/medrobot.c
2013-03-03 01:03:33 +00:00
Kp
8263b74663
Move */editor/centers.c -> similar/editor/centers.c
2013-03-03 01:03:33 +00:00
Kp
3e93f2d707
Move */main/gauges.h -> common/main/gauges.h
2013-03-03 01:03:33 +00:00
Kp
40c71caf92
Move */main/credits.c -> similar/main/credits.c
2013-03-03 01:03:33 +00:00
Kp
a622ccf07f
Move */main/player.c -> similar/main/player.c
2013-03-03 01:03:33 +00:00
Kp
ed814d313e
Move */main/multibot.h -> common/main/multibot.h
2013-03-03 01:03:33 +00:00
Kp
a42e743694
Move */main/effects.c -> similar/main/effects.c
2013-03-03 01:03:33 +00:00
Kp
828452910a
Move */main/digiobj.c -> similar/main/digiobj.c
2013-03-03 01:03:33 +00:00
Kp
d2b9accbf0
Move */main/wall.h -> common/main/wall.h
2013-03-03 01:03:33 +00:00
Kp
29c9334261
Move */main/vclip.c -> similar/main/vclip.c
2013-03-03 01:03:33 +00:00
Kp
a3515545dd
Move */main/titles.h -> common/main/titles.h
2013-03-03 01:03:33 +00:00
Kp
543f6002b8
Move */main/texmerge.c -> similar/main/texmerge.c
2013-03-03 01:03:33 +00:00
Kp
1b6433ec70
Move */main/texmerge.h -> common/main/texmerge.h
2013-03-03 01:03:33 +00:00
Kp
84248c65df
Move */main/terrain.h -> common/main/terrain.h
2013-03-03 01:03:33 +00:00
Kp
83ba5b6241
Move */main/terrain.c -> similar/main/terrain.c
2013-03-03 01:03:33 +00:00
Kp
2b613ee05a
Move */main/slew.c -> similar/main/slew.c
2013-03-03 01:03:33 +00:00
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
5722aee654
Move */editor/meddraw.c -> similar/editor/meddraw.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
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
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
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
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