Kp
|
616a3a6b70
|
Merge branch d1x-rebirth into unification/master
Conflicts:
SConstruct
common/main/cntrlcen.h
common/main/fuelcen.h
common/main/fvi.h
common/main/gameseq.h
common/main/gauges.h
common/main/multibot.h
common/main/net_udp.h
common/main/object.h
common/main/player.h
common/main/vers_id.h
d1x-rebirth/main/hostage.c
d1x-rebirth/main/multi.c
main/controls.c
main/hostage.h
main/laser.h
main/screens.h
similar/arch/ogl/gr.c
similar/editor/centers.c
similar/main/inferno.c
similar/main/lighting.c
similar/main/multibot.c
similar/main/paging.c
similar/main/physics.c
similar/main/player.c
similar/main/robot.c
similar/main/wall.c
|
2013-04-21 04:51:35 +00:00 |
|
Kp
|
4bf4710aff
|
Move */main/menu.h -> common/main/menu.h
|
2013-03-03 01:03:33 +00:00 |
|
Kp
|
c1f9bcbf64
|
Move */main/cntrlcen.h -> common/main/cntrlcen.h
Also, adjust includes in source files that assumed cntrlcen.h would
include switch.h.
|
2013-03-03 01:03:33 +00:00 |
|
Kp
|
8a153d1f63
|
Allow common headers with private dependencies to be used in common
|
2013-03-24 20:32:01 +00:00 |
|
Kp
|
6ddc31fc33
|
Move */main/hostage.h -> common/main/hostage.h
|
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
|
ed814d313e
|
Move */main/multibot.h -> common/main/multibot.h
|
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
|
a3515545dd
|
Move */main/titles.h -> common/main/titles.h
|
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
|
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
|
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
|
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
|
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
|
d6073aa8d2
|
Move */main/mission.h -> common/main/mission.h
|
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
|
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
|
3aa3b1695f
|
Move */main/gameseq.h -> common/main/gameseq.h
|
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
|
c8bc4ec7ef
|
Move */main/automap.h -> common/main/automap.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
|
a9123e0b45
|
Move */texmap/*.c -> common/texmap
|
2013-03-17 23:01:32 +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
|
643293169c
|
Move */main/sounds.h -> common/main/sounds.h
|
2013-03-17 23:01:31 +00:00 |
|