Kp
|
c258115b30
|
Move */main/bm.c -> similar/main/bm.c
|
2013-12-01 22:51:44 +00:00 |
|
Kp
|
4411532b6a
|
Restructure bm.c for merging
|
2013-11-24 23:50:43 +00:00 |
|
Kp
|
2714679284
|
Mark private functions static
|
2013-11-02 04:23:55 +00:00 |
|
Kp
|
c58c4e4d06
|
Move declarations to headers
|
2013-10-03 03:11:52 +00:00 |
|
Kp
|
aa9127e3c1
|
Enable -Wwrite-strings
|
2013-09-15 21:34:03 +00:00 |
|
Kp
|
c3bbc41796
|
Remove !defined(NETWORK) code
Rebirth has always defined NETWORK, so checking for it clutters the code.
|
2013-09-15 21:01:06 +00:00 |
|
Kp
|
af52e78a50
|
Move similar/arch/ogl/ogl.c -> similar/arch/ogl/ogl.cpp
|
2013-08-24 17:10:35 +00:00 |
|
Kp
|
5d80dfb562
|
Remove unused function tmap_info_read_n_d1
|
2013-08-07 02:33:19 +00:00 |
|
Kp
|
4577dd3977
|
Merge branch 'd2x-rebirth/master' into unification/master
|
2013-07-21 21:34:46 +00:00 |
|
Kp
|
e0dbe97264
|
Move */main/bm.h -> common/main/bm.h
|
2013-03-03 01:03:33 +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
|
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
|
7cda97cc74
|
Move d2x-rebirth source into subdirectory d2x-rebirth
|
2013-02-19 00:34:46 +00:00 |
|