TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity
4178 commits 2 branches 28 tags 122 MiB
Commit graph

368 commits

Author SHA1 Message Date
Kp 0b36b406d9 Move common/ui/message.c -> common/ui/message.cpp 2013-08-04 18:01:03 +00:00
Kp 3f696829fb Move common/ui/menubar.c -> common/ui/menubar.cpp 2013-08-04 18:00:48 +00:00
Kp fca8ac2012 Move common/ui/menu.c -> common/ui/menu.cpp 2013-08-04 18:00:34 +00:00
Kp a9652f1b9b Move common/ui/listbox.c -> common/ui/listbox.cpp 2013-08-04 18:00:20 +00:00
Kp bf0498ab52 Move common/ui/keytrap.c -> common/ui/keytrap.cpp 2013-08-04 18:00:06 +00:00
Kp 11cb41d024 Move common/ui/keypress.c -> common/ui/keypress.cpp 2013-08-04 17:59:52 +00:00
Kp 1fdc080c17 Move common/ui/keypad.c -> common/ui/keypad.cpp 2013-08-04 17:59:37 +00:00
Kp c2b11da77d Move common/ui/inputbox.c -> common/ui/inputbox.cpp 2013-08-04 17:59:23 +00:00
Kp a9a464ba65 Move common/ui/icon.c -> common/ui/icon.cpp 2013-08-04 17:59:09 +00:00
Kp d66063497b Move common/ui/gadget.c -> common/ui/gadget.cpp 2013-08-04 17:58:55 +00:00
Kp 80b86f3f0d Move common/ui/file.c -> common/ui/file.cpp 2013-08-04 17:58:40 +00:00
Kp ad2d064410 Move common/ui/dialog.c -> common/ui/dialog.cpp 2013-08-04 17:58:26 +00:00
Kp 66874d419e Move common/ui/checkbox.c -> common/ui/checkbox.cpp 2013-08-04 17:58:12 +00:00
Kp 000774f49d Move common/ui/button.c -> common/ui/button.cpp 2013-08-04 17:57:20 +00:00
Kp 17d9dd4f1e Move common/texmap/tmapflat.c -> common/texmap/tmapflat.cpp 2013-08-04 17:57:06 +00:00
Kp 3c2b518d0d Move common/texmap/scanline.c -> common/texmap/scanline.cpp 2013-08-04 17:56:51 +00:00
Kp 33725eb510 Move common/texmap/ntmap.c -> common/texmap/ntmap.cpp 2013-08-04 17:56:36 +00:00
Kp 7412f0bfc1 Move common/misc/strutil.c -> common/misc/strutil.cpp 2013-08-04 17:56:21 +00:00
Kp 90b8cdbb1a Move common/misc/strio.c -> common/misc/strio.cpp 2013-08-04 17:56:05 +00:00
Kp 3e950a6b42 Move common/misc/ignorecase.c -> common/misc/ignorecase.cpp 2013-08-04 17:55:04 +00:00
Kp f8cb11d714 Move common/misc/hmp.c -> common/misc/hmp.cpp 2013-08-04 17:55:00 +00:00
Kp 48c1b7a321 Fix const mismatch in digi_win32_play_midi_song 2013-08-03 20:32:48 +00:00
Kp 4a67e8332a Always initialize fullscreen in display_win32_alert 2013-08-03 19:59:09 +00:00
Kp 3ac8fdc032 Move common/misc/error.c -> common/misc/error.cpp 2013-08-03 17:45:23 +00:00
Kp 2932582a2e Move common/maths/vecmat.c -> common/maths/vecmat.cpp 2013-08-03 17:45:23 +00:00
Kp 34f5ee1575 Move common/maths/tables.c -> common/maths/tables.cpp 2013-08-03 17:45:23 +00:00
Kp 1ef771136b Move common/maths/rand.c -> common/maths/rand.cpp 2013-08-03 17:45:23 +00:00
Kp bae5ce9a66 Move common/maths/fixc.c -> common/maths/fixc.cpp 2013-08-03 17:45:23 +00:00
Kp 09b1f8fab7 Move common/arch/sdl/window.c -> common/arch/sdl/window.cpp 2013-08-03 17:45:23 +00:00
Kp 97bea01c80 Move common/arch/sdl/rbaudio.c -> common/arch/sdl/rbaudio.cpp 2013-08-03 17:45:22 +00:00
Kp 9daacbdf81 Move common/arch/sdl/joy.c -> common/arch/sdl/joy.cpp 2013-08-03 17:45:22 +00:00
Kp d97e7b468b Move common/3d/setup.c -> common/3d/setup.cpp 2013-08-03 17:45:22 +00:00
Kp 040216910f Move common/3d/rod.c -> common/3d/rod.cpp 2013-08-03 17:45:22 +00:00
Kp fe9f99ead8 Move common/3d/points.c -> common/3d/points.cpp 2013-08-03 17:45:22 +00:00
Kp eaf449e144 Move common/3d/matrix.c -> common/3d/matrix.cpp 2013-08-03 17:45:22 +00:00
Kp 03832a8752 Move common/3d/instance.c -> common/3d/instance.cpp 2013-08-03 17:45:22 +00:00
Kp 1274540315 Move common/3d/globvars.c -> common/3d/globvars.cpp 2013-08-03 17:45:22 +00:00
Kp eb65b73b2a Move common/3d/draw.c -> common/3d/draw.cpp 2013-08-03 17:45:22 +00:00
Kp 3c5c8a8068 Make arg processing static 2013-08-03 17:45:22 +00:00
Kp 69535df7fd Compile out memory checker if not enabled 2013-07-28 23:20:33 +00:00
Kp e961be1c14 u_mem: split memory debugging from NDEBUG 2013-07-28 23:18:44 +00:00
Kp adfbb4129d Move common/3d/clipper.c -> common/3d/clipper.cpp 2013-07-27 22:30:54 +00:00
Kp 1259006db5 Move common/2d/scalec.c -> common/2d/scalec.cpp 2013-07-27 22:30:54 +00:00
Kp 18a42e3e40 Move common/2d/rle.c -> common/2d/rle.cpp 2013-07-27 22:30:54 +00:00
Kp a334ad0ab1 Move common/2d/rect.c -> common/2d/rect.cpp 2013-07-27 22:30:54 +00:00
Kp 63acd159cc Move common/2d/pixel.c -> common/2d/pixel.cpp 2013-07-27 22:30:54 +00:00
Kp c80a824136 Move common/2d/line.c -> common/2d/line.cpp 2013-07-27 22:30:54 +00:00
Kp 5832f0dbd9 Move common/2d/gpixel.c -> common/2d/gpixel.cpp 2013-07-27 22:30:54 +00:00
Kp 139a80b925 Move common/2d/disc.c -> common/2d/disc.cpp 2013-07-27 22:30:54 +00:00
Kp 46d02518bc Move common/2d/circle.c -> common/2d/circle.cpp 2013-07-27 22:30:54 +00:00
Kp b7abe1d77e Move common/2d/canvas.c -> common/2d/canvas.cpp 2013-07-27 22:30:54 +00:00
Kp 6169fc5abc Move common/2d/box.c -> common/2d/box.cpp 2013-07-27 22:30:54 +00:00
Kp f7a030483f Move common/2d/bitmap.c -> common/2d/bitmap.cpp 2013-07-27 22:30:53 +00:00
Kp c2895e5176 Move common/2d/bitblt.c -> common/2d/bitblt.cpp 2013-07-27 22:30:53 +00:00
Kp ff90315978 Use SConscript configure support to probe for format(printf) attribute 2013-07-27 22:17:13 +00:00
Kp 74bcb86cf4 Remove some const modifiers that broke SDL-only build 2013-07-27 21:29:01 +00:00
Kp 2f4ffebde6 Add const markers to some texture mapping code 2013-07-27 21:28:53 +00:00
Kp 2215c0848d Use SConscript configure support to probe for format_arg attribute 2013-07-26 02:54:33 +00:00
Kp 1b912463d3 Declare size of Text_string[] 2013-07-26 01:56:42 +00:00
Kp 862d1b561c Move */main/switch.h -> common/main/switch.h 2013-07-24 01:43:02 +00:00
Kp 90cd2f4938 Move */main/multi.h -> common/main/multi.h 2013-07-24 01:43:01 +00:00
Kp 90a20de57a Move d2x-rebirth/main/gamepal.h -> common/main/gamepal.h 
Add stub gamepal.h for d1x-rebirth to make merging easier.
 2013-07-23 02:29:25 +00:00
Kp a05793fd84 Mark various things static 2013-07-23 02:09:12 +00:00
Kp 1686732c4e Move */main/text.h -> common/main/text.h 2013-07-21 22:10:01 +00:00
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
Kp ff444c844b Move */main/newdemo.h -> common/main/newdemo.h 2013-03-03 01:03:33 +00:00
Kp 6cc3560fbd Move */main/net_udp.h -> common/main/net_udp.h 2013-03-03 01:03:33 +00:00
Kp 30c7274c17 Move d2x-rebirth/include/interp.h -> common/include/interp.h 
Prior to the Bazaar import, an unidentified committer moved some
function declarations from 3d.h to interp.h, but only for Descent II.
Replicate those changes in Descent I, and move the Descent II header
interp.h to become common.
 2013-03-03 01:03:33 +00:00
Kp d6073aa8d2 Move */main/mission.h -> common/main/mission.h 2013-03-03 01:03:33 +00:00
Kp 3eaec8bb39 Move */main/laser.h -> common/main/laser.h 2013-03-03 01:03:33 +00:00
Kp bd6ae78911 Move */main/kmatrix.h -> common/main/kmatrix.h 2013-03-03 01:03:33 +00:00
Kp 30d53dca16 Move */main/kconfig.h -> common/main/kconfig.h 2013-03-03 01:03:33 +00:00
Kp 3aa3b1695f Move */main/gameseq.h -> common/main/gameseq.h 2013-03-03 01:03:33 +00:00
Kp b4e7d2e899 Move */main/game.h -> common/main/game.h 2013-03-03 01:03:33 +00:00
Kp a51d4fccae Move */main/fvi.h -> common/main/fvi.h 2013-03-03 01:03:33 +00:00
Kp 62d30ec457 Move */main/fuelcen.h -> common/main/fuelcen.h 2013-03-03 01:03:33 +00:00
Kp 947de0c94f Move */main/fireball.h -> common/main/fireball.h 2013-03-03 01:03:33 +00:00
Kp 5294b473d7 Move */main/endlevel.h -> common/main/endlevel.h 2013-03-03 01:03:33 +00:00
Kp ac43b52a74 Move */main/effects.h -> common/main/effects.h 2013-03-03 01:03:33 +00:00
Kp fe25826fa9 Move */main/credits.h -> common/main/credits.h 2013-03-03 01:03:33 +00:00
Kp b34b00a98f Move */main/controls.h -> common/main/controls.h 2013-03-03 01:03:33 +00:00
Kp 4cabcb5d3d Move */main/collide.h -> common/main/collide.h 2013-03-03 01:03:33 +00:00
Kp c8bc4ec7ef Move */main/automap.h -> common/main/automap.h 2013-03-03 01:03:33 +00:00
Kp 49046095f5 Move */*/hash.h -> common/include/hash.h 2013-03-03 01:03:33 +00:00
Kp f39cd4dbf6 Centralize RDL/RL2 file extension text 2013-03-17 22:18:42 +00:00
Kp 04a6716b90 Move */main/gameseg.h -> common/main/gameseg.h 2013-03-03 01:03:33 +00:00
Kp 7002c4be66 Move */main/gamesave.h -> common/main/gamesave.h 2013-03-03 01:03:33 +00:00
Kp 4662fe9490 Move */main/gamemine.h -> common/main/gamemine.h 2013-03-03 01:03:33 +00:00
Kp f938bd3845 Move */main/segment.h -> common/main/segment.h 2013-03-03 01:03:33 +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 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 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 9058a5c791 Move segment handling from editor.h 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 d64f605f54 Move */arch/sdl/joy.c -> common/arch/sdl/joy.c 2013-03-17 23:01:31 +00:00
Kp 5aeec83d49 Move */main/vclip.h -> common/main/vclip.h 2013-03-17 23:01:31 +00:00
Kp 92a2bfe1fc Move */main/textures.h -> common/main/textures.h 2013-03-17 23:01:31 +00:00
Kp b14f7c2f5f Move */arch/ogl/gr.c -> similar/arch/ogl/gr.c 2013-03-17 23:01:31 +00:00
Kp 8979873ee8 Move */include/pcx.h -> similar/include/pcx.h 2013-03-17 23:01:31 +00:00
Kp 643293169c Move */main/sounds.h -> common/main/sounds.h 2013-03-17 23:01:31 +00:00