Kp
|
9667abeaa7
|
Make d_splitpath const
|
2013-06-09 18:10:09 +00:00 |
|
|
Kp
|
06a2bb4c6b
|
Move */main/aistruct.h -> common/main/aistruct.h
|
2013-03-03 01:03:33 +00:00 |
|
|
Kp
|
a2b7e663df
|
Move */main/weapon.c -> similar/main/weapon.c
|
2013-03-03 01:03:33 +00:00 |
|
|
Kp
|
5648874a37
|
Merge branch d2x-rebirth/master into unification/master
|
2013-06-14 03:31:59 +00:00 |
|
|
Kp
|
a49aff4897
|
Restore use of Windows icon file
|
2013-06-02 21:46:32 +00:00 |
|
|
Kp
|
72eacd118b
|
Move */main/ai.h -> common/main/ai.h
|
2013-03-03 01:03:33 +00:00 |
|
|
Kp
|
e0dbe97264
|
Move */main/bm.h -> common/main/bm.h
|
2013-03-03 01:03:33 +00:00 |
|
|
Kp
|
c1b6f8ef8c
|
Move */main/playsave.h -> common/main/playsave.h
|
2013-03-03 01:03:33 +00:00 |
|
|
Kp
|
5d487f4d4d
|
Move */main/state.h -> common/main/state.h
|
2013-03-03 01:03:33 +00:00 |
|
|
Kp
|
020cdecf31
|
Remove d*x-rebirth/main/gamemine.h
|
2013-03-03 01:03:33 +00:00 |
|
|
Kp
|
05a8aaccaf
|
Move */arch/sdl/digi_audio.c -> similar/arch/sdl/digi_audio.c
|
2013-03-03 01:03:33 +00:00 |
|
|
Kp
|
b09f96b31f
|
Move */arch/sdl/digi.c -> similar/arch/sdl/digi.c
|
2013-03-03 01:03:33 +00:00 |
|
|
Kp
|
544a07bffa
|
Move */2d/palette.c -> similar/2d/palette.c
|
2013-03-03 01:03:33 +00:00 |
|
|
Kp
|
61001e1d94
|
Move */2d/pcx.c -> similar/2d/pcx.c
|
2013-03-03 01:03:33 +00:00 |
|
|
Kp
|
606a455c88
|
Move */2d/font.c -> similar/2d/font.c
|
2013-03-03 01:03:33 +00:00 |
|
|
Kp
|
8d6698b4e6
|
Move */misc/args.c -> similar/misc/args.c
|
2013-03-03 01:03:33 +00:00 |
|
|
Kp
|
e18fc92b68
|
Move */main/gamecntl.c -> similar/main/gamecntl.c
|
2013-03-03 01:03:33 +00:00 |
|
|
Kp
|
c49fb2a68d
|
Move */main/state.c -> similar/main/state.c
|
2013-03-03 01:03:33 +00:00 |
|
|
Kp
|
9fe359baae
|
Move */main/game.c -> similar/main/game.c
|
2013-03-03 01:03:33 +00:00 |
|
|
Kp
|
d607792030
|
Move */main/gameseg.c -> similar/main/gameseg.c
|
2013-03-03 01:03:33 +00:00 |
|
|
Kp
|
fd710386b5
|
Move */main/gamerend.c -> similar/main/gamerend.c
|
2013-03-03 01:03:33 +00:00 |
|
|
Kp
|
1e0f0c8f1b
|
Move */main/cntrlcen.c -> similar/main/cntrlcen.c
|
2013-03-03 01:03:33 +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
|
c8a8f1847e
|
Merge branch 'd2x-rebirth/master' into unification/master
|
2013-05-05 22:17:48 +00:00 |
|
|
Kp
|
dbec5197f6
|
Move */main/vers_id.c -> similar/main/vers_id.c
|
2013-05-05 17:39:03 +00:00 |
|
|
Kp
|
a842e15d94
|
Merge branch d2x-rebirth into unification/master
Conflicts:
SConstruct
common/include/editor/ehostage.h
common/main/cntrlcen.h
common/main/laser.h
common/main/mission.h
common/main/net_udp.h
common/main/object.h
main/vers_id.h
similar/editor/kfuncs.c
similar/main/inferno.c
similar/main/lighting.c
similar/main/multibot.c
similar/main/newmenu.c
similar/main/physics.c
|
2013-04-21 04:52:22 +00:00 |
|
|
Kp
|
ff96f3239d
|
Move */main/controls.c -> similar/main/controls.c
|
2013-03-03 01:03:33 +00:00 |
|
|
Kp
|
86f373e4e0
|
Move */main/multibot.c -> similar/main/multibot.c
|
2013-03-03 01:03:33 +00:00 |
|
|
Kp
|
691b95a02c
|
Move */main/physics.c -> similar/main/physics.c
|
2013-03-03 01:03:33 +00:00 |
|
|
Kp
|
0138d330b3
|
Move */main/inferno.c -> similar/main/inferno.c
|
2013-03-03 01:03:33 +00:00 |
|
|
Kp
|
4bf4710aff
|
Move */main/menu.h -> common/main/menu.h
|
2013-03-03 01:03:33 +00:00 |
|
|
Kp
|
dab72f3127
|
Move */main/robot.c -> similar/main/robot.c
|
2013-03-03 01:03:33 +00:00 |
|
|
Kp
|
4b18dcbff9
|
Move */main/text.c -> similar/main/text.c
|
2013-03-03 01:03:33 +00:00 |
|
|
Kp
|
8d379f4f9c
|
Move */3d/interp.c -> similar/3d/interp.c
|
2013-03-03 01:03:33 +00:00 |
|
|
Kp
|
d2e3ed0228
|
Move */main/wall.c -> similar/main/wall.c
|
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
|
ccbb392fd4
|
Move */main/lighting.c -> similar/main/lighting.c
|
2013-03-03 01:03:33 +00:00 |
|
|
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 |
|