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
|
0fa427a481
|
Add proximity bomb ID test helper
|
2013-03-30 20:46:13 +00:00 |
|
|
Kp
|
fd8261b1c4
|
Add multi_send_robot_explode unused parameter isthief to match D2X
|
2013-03-24 23:29:37 +00:00 |
|
|
Kp
|
659de68da9
|
Add proximity bomb ID test helper to match D2X
|
2013-03-30 20:46:13 +00:00 |
|
|
Kp
|
a0a6fcb4f0
|
Fix debug=1 build break from fe7cf3bc ("Move segment handling from editor.h")
When debug is enabled, gamecntl references symbols that moved to the new
header.
|
2013-03-31 15:37:51 +00:00 |
|
|
Kp
|
2b47808451
|
Add helper to get pointer to reactor definition
|
2013-03-31 15:04:41 +00:00 |
|
|
Kp
|
b3ac602f69
|
Use ubyte/const ubyte consistently in multiplayer messaging
|
2013-03-30 19:41:33 +00:00 |
|
|
Kp
|
64ee7c2439
|
Simplify logic for robot to drop proximity bomb
|
2013-03-30 04:31:09 +00:00 |
|
|
Kp
|
2c479508e9
|
Add stubs to make physics code more like D2X
|
2013-03-30 20:29:16 +00:00 |
|
|
Kp
|
58e3e1e535
|
Merge branches 'd1x-rebirth' and 'd2x-rebirth' into unification/master
|
2013-03-17 23:18:37 +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
|
51d79f7620
|
Store source lists at close scope and object lists at instance scope
|
2013-03-17 23:01:32 +00:00 |
|
|
Kp
|
a707c053db
|
Consistently use suffix of _sources for source lists
|
2013-03-17 23:01:32 +00:00 |
|
|
Kp
|
ed188ea088
|
Store fixed values at class scope
|
2013-03-17 23:01:32 +00:00 |
|
|
Kp
|
d55046eed1
|
Support building D1X and D2X into different build directories
This enables building the two games with different options.
|
2013-03-17 23:01:32 +00:00 |
|
|
Kp
|
909a5d6847
|
Show target build directory in non-verbose builds
|
2013-03-17 23:01:32 +00:00 |
|
|
Kp
|
54d57a37c9
|
Add support for out-of-tree build
|
2013-03-17 23:01:32 +00:00 |
|
|
Kp
|
6096c63ece
|
Use lazy construction for DXXArchive common objects
These will always be constructed, but using lazy construction simplifies
the code.
|
2013-03-17 23:01:32 +00:00 |
|
|
Kp
|
8359c3cdd7
|
Give DXXArchive a private argument prefix of "common"
|
2013-03-17 23:01:32 +00:00 |
|
|
Kp
|
afab0f4bb8
|
Allow user to override Raspberry Pi defaults
|
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
|
4e3f3f3103
|
Move prototype of which_bomb to weapon.h
|
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 |
|