Kp
|
3d20ee8c92
|
Move d1x-rebirth/editor/ehostage.c -> d1x-rebirth/editor/ehostage.cpp
|
2013-10-28 04:14:19 +00:00 |
|
|
Kp
|
5b0c4b10ac
|
Use accessor for most get/set object->id accesses
|
2013-10-20 22:49:09 +00:00 |
|
|
Kp
|
f9899a9f20
|
Mark various functions static
|
2013-10-03 03:11:51 +00:00 |
|
|
Kp
|
a881ee455e
|
Remove fix.h
|
2013-08-08 03:01:48 +00:00 |
|
|
Kp
|
306ab24486
|
Merge branch 'd1x-rebirth/master' into unification/master
|
2013-06-02 20:13:38 +00:00 |
|
|
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
|
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
|
9058a5c791
|
Move segment handling from editor.h
|
2013-03-17 23:01:32 +00:00 |
|
|
Kp
|
687b6284e6
|
Merge branch 'd1x-rebirth' into unification/master
|
2013-03-10 03:34:54 +00:00 |
|
|
Kp
|
beb0690633
|
Move d1x-rebirth source into subdirectory d1x-rebirth
|
2013-02-19 00:34:46 +00:00 |
|