Kp
|
4187648621
|
Remove redundant/obsolete declarations
|
2013-07-21 21:55:00 +00:00 |
|
|
Kp
|
dc84c7967f
|
Remove use of enum forward declaration
It is valid C99, but not valid C++03.
|
2013-07-21 21:40:46 +00:00 |
|
|
Kp
|
4577dd3977
|
Merge branch 'd2x-rebirth/master' into unification/master
|
2013-07-21 21:34:46 +00:00 |
|
|
Kp
|
707f74883a
|
Make kconfig.h usable in common source files
|
2013-07-21 18:15:20 +00:00 |
|
|
Kp
|
e41fa25905
|
Make weapon.h usable in common source files
|
2013-07-21 18:15:20 +00:00 |
|
|
Kp
|
a1ba420031
|
Mark various parameters and variables as const
|
2013-07-20 23:12:24 +00:00 |
|
|
Kp
|
6c9c87e27c
|
Move */main/weapon.h -> common/main/weapon.h
|
2013-07-20 16:40:08 +00:00 |
|
|
Kp
|
012d8e249b
|
Merge branch d1x-rebirth/master into unification/master
|
2013-07-19 22:32:28 +00:00 |
|
|
Kp
|
02a32e2f42
|
Use u_int32_t for grs_screen sc_mode to avoid sign mismatch warnings
|
2013-07-19 02:40:13 +00:00 |
|
|
Kp
|
853713190d
|
Make ogl_init_load_library static
|
2013-06-22 21:36:28 +00:00 |
|
|
Kp
|
d78fd3561b
|
Move bitmap clipping to eliminate warning
|
2013-06-23 04:34:40 +00:00 |
|
|
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
|
a10dbc7d4b
|
Move 2d/2dsline.c -> 2d/2dsline.cpp
|
2012-11-11 22:12:51 +00:00 |
|
|
Kp
|
2e3159a15f
|
Mark gr 2dsline functions static
|
2013-06-14 03:40:50 +00:00 |
|
|
Kp
|
c69644dcf7
|
Wrap C++-incompatible statements with #ifndef __cplusplus
|
2013-06-14 03:40:50 +00:00 |
|
|
Kp
|
5648874a37
|
Merge branch d2x-rebirth/master into unification/master
|
2013-06-14 03:31:59 +00:00 |
|
|
Kp
|
88208fc228
|
Merge branch d1x-rebirth/master into unification/master
Conflicts:
SConstruct
d1x-rebirth/main/multi.c
similar/main/cntrlcen.c
similar/main/wall.c
|
2013-06-14 03:18:32 +00:00 |
|
|
Kp
|
22e31c0e8d
|
Remove unused argument to clear_warn_func
|
2013-06-08 23:12:44 +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
|
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
|
306ab24486
|
Merge branch 'd1x-rebirth/master' into unification/master
|
2013-06-02 20:13:38 +00:00 |
|
|
Kp
|
410b07d5c4
|
Merge branch 'd1x-rebirth/master' into unification/master
Conflicts:
SConstruct
|
2013-05-05 22:08:34 +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
|
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 |
|