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

1680 commits

Author SHA1 Message Date
Kp df69df56dc Remove unused common/ui/popup.cpp 2013-09-07 16:39:25 +00:00
Kp 2d964c414c Remove unused strcins/strndel 2013-09-07 16:39:25 +00:00
Kp a3883ab6ac Move restore_state into #if 0 2013-09-07 16:39:10 +00:00
Kp 4e177dd3fa Move common/arch/win32/messagebox.c -> common/arch/win32/messagebox.cpp 2013-09-02 23:59:31 +00:00
Kp cc90678647 Move common/arch/sdl/digi_mixer_music.c -> common/arch/sdl/digi_mixer_music.cpp 2013-09-02 23:59:31 +00:00
Kp d156a4c1ab Simplify D1X hostage handling 2013-09-02 23:59:31 +00:00
Kp c8f0c799b7 Use helper for setting menu items to type number 2013-09-01 23:50:55 +00:00
Kp 4fe618b325 Use helper for setting menu items to type slider 2013-09-01 23:50:55 +00:00
Kp 0645e96e17 Use helper for setting menu items to type radio 2013-09-01 23:50:54 +00:00
Kp 4c5eaded8d Use helper for setting menu items to type checkbox 2013-09-01 23:23:55 +00:00
Kp bb8b229dc2 Use helper for setting menu items to type input 2013-09-01 23:23:55 +00:00
Kp ce2dd25e3f Use helper for setting menu items to types menu and text 2013-09-01 22:24:13 +00:00
Kp ccb92fdefa Use macro to define advanced net UDP options 2013-09-01 21:11:27 +00:00
Kp 9d2d8bb552 Scrub netgame flags on load/save/send/recv 2013-09-01 21:09:01 +00:00
Kp f131fcd3da Move */main/menu.c -> similar/main/menu.c 2013-09-01 18:06:24 +00:00
Kp e23035e61f Move Last_afterburner_time into laser_info 2013-08-31 17:17:35 +00:00
Kp 31b9ad0bde Restructure misc options menu for merging 2013-08-31 17:17:34 +00:00
Kp 567b1d13c2 Remove broken COMPACT_SEGS code 
It has not built since at least 0c36fecb.
 2013-08-31 16:45:43 +00:00
zico f2cdd906a6 merge HOMING_MAX_TRACKABLE_DOT in builds, giving D2X same tracking as D1X as requested by testers 2013-08-30 23:07:55 +02:00
Kp 16039a3f99 Remove unused extern global hitobj_list 2013-08-27 02:44:09 +00:00
Kp 5bafa16e7f Fix level load hang on >=mingw32-gcc-4.7 
Starting in gcc 4.7 "Windows mingw targets are using the -mms-bitfields
option by default." <http://gcc.gnu.org/gcc-4.7/changes.html>.  This
causes __attribute__((packed)) not to be effective on structures that
are used to express the layout of on-disk data.  In turn, that causes
piggy.c to mishandle texture loads, eventually resulting in an infinite
loop.  Add a pragma pack to force the headers to pack tightly on
Windows.
 2013-08-25 17:16:41 +00:00
Kp af52e78a50 Move similar/arch/ogl/ogl.c -> similar/arch/ogl/ogl.cpp 2013-08-24 17:10:35 +00:00
Kp 828ced10a5 Declare newdemo_count_demos for D2 menu system 2013-08-24 16:44:30 +00:00
Kp afcbfe8e54 Rename d1x/d2x variables to unify names between D1X and D2X 2013-08-24 16:44:30 +00:00
Kp d909692148 Allow compiler to unroll pow2ize 2013-08-24 16:44:23 +00:00
Kp 20cf3f4cdb Mark various OGL functions static 2013-08-24 16:44:23 +00:00
Kp 8ef8371563 Use unsigned screen width/height 2013-08-24 16:44:23 +00:00
Kp 8d13642c9f Hide GM_CAPTURE tests behind static inline 2013-08-11 20:46:52 +00:00
Kp 0c3adc48df Hide GM_HOARD tests behind static inline 2013-08-11 20:46:52 +00:00
Kp 3226a57848 Remove unused MULTI_ACTIVE_DOOR 2013-08-11 20:43:08 +00:00
Kp de6422d58f Remove unused multi_send_audio_taunt 2013-08-11 20:43:08 +00:00
Kp afd2f5aea1 Remove unused GET/PUT_INTEL_INT64 2013-08-11 20:40:24 +00:00
Kp 4e6142d779 Move similar/arch/ogl/gr.c -> similar/arch/ogl/gr.cpp 2013-08-10 03:56:14 +00:00
Kp e750c90b00 Mark more math as const correct 2013-08-10 03:55:50 +00:00
Kp 33aa8937d9 Merge branch d1x-rebirth/master into unification/master 
Conflicts:
	SConstruct
	common/main/multi.h
	similar/main/gamerend.c
 2013-08-09 22:49:04 +00:00
zico 27a4a62b19 To compensate the change between D2's to D1's tracking code base, increased HOMING_MAX_TRACKABLE_DOT, making homing projectiles track a bit more agressivly than D1 to pose more of a challenge while not making them useless when having Afterburner 2013-08-09 17:50:11 +02:00
zico 830bcd7845 merge with ccea6b3547 2013-08-09 17:25:42 +02:00
zico a527348681 Added MULTI_FIRE_BOMB as alteration of MULTI_FIRE to keep bombs mapped in a Multiplayer match for later Host authority and to make their chaff ability work correctly. Additionally added MULTI_FIRE_TRACK to only send Network_laser_track if > -1. On the way I made laser.c a bit more similar between D1X and D2X 2013-08-09 17:21:03 +02:00
Kp 319b3ec5fd Mark more math as const correct 2013-08-09 03:04:18 +00:00
Kp 9ba729ca3a Print function and line when calling Error 2013-08-09 02:10:51 +00:00
Kp 2cd7748e93 Convert vsprintf to vsnprintf 2013-08-09 01:58:17 +00:00
Kp a01dbc59d6 Make ui_messagebox_n static 2013-08-09 01:56:34 +00:00
zico 40c5f10e20 Added definition of DESIGNATED_GAME_FPS as 30 and DESIGNATED_GAME_FRAMETIME based on the former. We use those for d_tick_count intervals and to scale other parts that have never been properly aligned to FrameTime before. In that regard, Release builds will take DESIGNATED_GAME_FPS as MINIMUM_FPS for -maxfps argument 2013-08-08 22:07:29 +02:00
Kp a881ee455e Remove fix.h 2013-08-08 03:01:48 +00:00
Kp 5ec78f320b Always use 64-bit math in vm_vec_dot3 2013-08-08 03:01:48 +00:00
Kp 4c87504b91 Always use 64-bit math in vm_vec_dotprod 2013-08-08 03:01:48 +00:00
Kp 6b48994596 Avoid unnecessary lookups in fix_sincos 2013-08-08 03:01:47 +00:00
Kp 400b18b78a Mark gauges variables const 2013-08-08 03:01:47 +00:00
zico bbaa3c21f3 HAMERS! Wait 33ms between each turn of a homing missile projectile, only scale turns if FPS are below 30 2013-08-08 00:29:56 +02:00
Kp 528d2e3ee7 Mark must_clip_tmap_face static 2013-08-07 03:04:11 +00:00
Kp 2c8aa517bc Mark must_clip_flat_face static 2013-08-07 03:03:55 +00:00
Kp c02a249263 Make gr_bitmap_scale_to static 2013-08-07 02:42:25 +00:00
Kp b81100d54d Make OGL_VIEWPORT static inline 2013-08-07 02:39:43 +00:00
Kp 68d3b08ef9 Remove unused function gr_rle_expand_scanline_generic_masked 2013-08-07 02:33:18 +00:00
zico 2b632008b2 Cleaned code for homing projectiles a bit and reverted to state of Descent 1 source release; Added ticks to rule target aquisition and adjusted turn rate scaling accordingly 2013-08-06 21:04:44 +02:00
Kp 7983086b40 Move common/editor/func.c -> common/editor/func.cpp 2013-08-04 18:02:42 +00:00
Kp c0c396b4fd Move common/ui/userbox.c -> common/ui/userbox.cpp 2013-08-04 18:02:28 +00:00
Kp 227da67a8d Move common/ui/uidraw.c -> common/ui/uidraw.cpp 2013-08-04 18:02:14 +00:00
Kp 1741f7ec57 Move common/ui/ui.c -> common/ui/ui.cpp 2013-08-04 18:01:59 +00:00
Kp c6c82f44ba Move common/ui/scroll.c -> common/ui/scroll.cpp 2013-08-04 18:01:45 +00:00
Kp 0a9e1a6e9a Move common/ui/radio.c -> common/ui/radio.cpp 2013-08-04 18:01:31 +00:00
Kp 5c32819c39 Move common/ui/popup.c -> common/ui/popup.cpp 2013-08-04 18:01:17 +00:00
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
Kp bb96e0ba5e Move */main/digi.h -> common/main/digi.h 2013-03-17 23:01:31 +00:00
Kp a0e2f7f12f Move */main/piggy.h -> common/main/piggy.h 2013-03-17 23:01:31 +00:00
Kp c34a25e1ed Move */arch/sdl/digi_mixer_music.c -> common/arch/sdl/digi_mixer_music.c 2013-03-17 23:01:31 +00:00
Kp 11306c249e Move */main/songs.h -> common/main/songs.h 2013-03-17 23:01:30 +00:00
Kp 68af7a81ba Move */arch/sdl/rbaudio.c -> common/arch/sdl/rbaudio.c 2013-03-17 23:01:30 +00:00
Kp eb8ebe40b9 Move */arch/sdl/window.c -> common/arch/sdl/window.c 2013-03-03 01:03:33 +00:00
Kp 504cf23746 Move */arch/win32/messagebox.c -> common/arch/win32/messagebox.c 2013-03-03 01:03:33 +00:00
Kp ccd65b83ae Move */include/editor/eswitch.h -> common/include/editor/eswitch.h 2013-03-03 01:03:33 +00:00
Kp b732616404 Move */include/editor/kdefs.h -> common/include/editor/kdefs.h 2013-03-03 01:03:33 +00:00
Kp 923633b2ac Move */include/editor/texpage.h -> common/include/editor/texpage.h 2013-03-03 01:03:33 +00:00
Kp 29ede4c86c Move */ui/button.c -> common/ui/button.c 2013-03-03 01:03:33 +00:00
Kp ac04f4b247 Move */ui/checkbox.c -> common/ui/checkbox.c 2013-03-03 01:03:33 +00:00
Kp 7ecbc5b123 Move */ui/dialog.c -> common/ui/dialog.c 2013-03-03 01:03:33 +00:00
Kp 08e8d0e499 Move */ui/file.c -> common/ui/file.c 2013-03-03 01:03:33 +00:00
Kp b42de62167 Move */ui/gadget.c -> common/ui/gadget.c 2013-03-03 01:03:33 +00:00
Kp 8657a99491 Move */ui/icon.c -> common/ui/icon.c 2013-03-03 01:03:33 +00:00
Kp 345b90bf3f Move */ui/inputbox.c -> common/ui/inputbox.c 2013-03-03 01:03:33 +00:00
Kp 091b287c82 Move */ui/keypad.c -> common/ui/keypad.c 2013-03-03 01:03:33 +00:00
Kp 64708c932f Move */ui/keypress.c -> common/ui/keypress.c 2013-03-03 01:03:33 +00:00
Kp 60f0b1e557 Move */ui/keytrap.c -> common/ui/keytrap.c 2013-03-03 01:03:33 +00:00
Kp a0a6f508a5 Move */ui/listbox.c -> common/ui/listbox.c 2013-03-03 01:03:33 +00:00
Kp 2ecc20143a Move */ui/menu.c -> common/ui/menu.c 2013-03-03 01:03:33 +00:00
Kp 53ef9150ed Move */ui/menubar.c -> common/ui/menubar.c 2013-03-03 01:03:33 +00:00
Kp eea0add439 Move */ui/message.c -> common/ui/message.c 2013-03-03 01:03:33 +00:00
Kp d07828f8d2 Move */ui/popup.c -> common/ui/popup.c 2013-03-03 01:03:33 +00:00
Kp 96c0c1f06b Move */ui/radio.c -> common/ui/radio.c 2013-03-03 01:03:33 +00:00
Kp 2c67ea8f66 Move */ui/scroll.c -> common/ui/scroll.c 2013-03-03 01:03:33 +00:00
Kp 9c047e69c0 Move */ui/ui.c -> common/ui/ui.c 2013-03-03 01:03:33 +00:00
Kp daa5fbf373 Move */ui/uidraw.c -> common/ui/uidraw.c 2013-03-03 01:03:33 +00:00
Kp 975df703a8 Move */ui/userbox.c -> common/ui/userbox.c 2013-03-03 01:03:33 +00:00
Kp 501f1d6a25 Move */include/ui.h -> common/include/ui.h 2013-03-03 01:03:33 +00:00
Kp 0d2a2910e5 Move */include/editor/editor.h -> common/include/editor/editor.h 2013-03-03 01:03:33 +00:00
Kp 5b2b6b1975 Move */include/editor/centers.h -> common/include/editor/centers.h 2013-03-03 01:03:33 +00:00
Kp 4b4ff91172 Move */include/editor/ehostage.h -> common/include/editor/ehostage.h 2013-03-03 01:03:33 +00:00
Kp 69679eed12 Move */include/editor/eobject.h -> common/include/editor/eobject.h 2013-03-03 01:03:33 +00:00
Kp 5fbeb7c27b Move */include/editor/info.h -> common/include/editor/info.h 2013-03-03 01:03:33 +00:00
Kp 70c4a8ea0f Move */include/editor/kfuncs.h -> common/include/editor/kfuncs.h 2013-03-03 01:03:33 +00:00
Kp 1f6fdba458 Move */include/editor/macro.h -> common/include/editor/macro.h 2013-03-03 01:03:33 +00:00
Kp ce742086b5 Move */include/editor/meddraw.h -> common/include/editor/meddraw.h 2013-03-03 01:03:33 +00:00
Kp ca7947a7ce Move */include/editor/medlist.h -> common/include/editor/medlist.h 2013-03-03 01:03:33 +00:00
Kp f9cd5142dc Move */include/editor/medmisc.h -> common/include/editor/medmisc.h 2013-03-03 01:03:33 +00:00
Kp dff777bca7 Move */include/editor/medrobot.h -> common/include/editor/medrobot.h 2013-03-03 01:03:33 +00:00
Kp ba84aecf73 Move */include/editor/medsel.h -> common/include/editor/medsel.h 2013-03-03 01:03:33 +00:00
Kp 5499dd374b Move */include/editor/medwall.h -> common/include/editor/medwall.h 2013-03-03 01:03:33 +00:00
Kp e3885cb709 Move */include/editor/objpage.h -> common/include/editor/objpage.h 2013-03-03 01:03:33 +00:00
Kp a259ecf691 Move */include/editor/seguvs.h -> common/include/editor/seguvs.h 2013-03-03 01:03:33 +00:00
Kp b00d8130fa Move */main/render.h -> common/main/render.h 2013-03-03 01:03:33 +00:00
Kp 863bcff083 Move */misc/dl_list.c -> common/misc/dl_list.c 2013-03-03 01:03:33 +00:00
Kp 54affd79a9 Move */misc/error.c -> common/misc/error.c 2013-03-03 01:03:33 +00:00
Kp 630344aa98 Move */misc/hmp.c -> common/misc/hmp.c 2013-03-03 01:03:33 +00:00
Kp 451c3746a5 Move */misc/ignorecase.c -> common/misc/ignorecase.c 2013-03-03 01:03:33 +00:00
Kp c5279ea5e8 Move */misc/strio.c -> common/misc/strio.c 2013-03-03 01:03:33 +00:00
Kp 610459c520 Move */misc/strutil.c -> common/misc/strutil.c 2013-03-03 01:03:33 +00:00
Kp 57dbf885ec Move */main/config.h -> common/main/config.h 2013-03-03 01:03:33 +00:00
Kp bb13bf5618 Move */main/vers_id.h -> common/main/vers_id.h 2013-03-03 01:03:33 +00:00
Kp fa26a436aa Move */main/gamefont.h -> common/main/gamefont.h 2013-03-03 01:03:33 +00:00
Kp 7f023bc8b0 Move */main/lighting.h -> common/main/lighting.h 2013-03-03 01:03:33 +00:00
Kp a0de8a594c Move */main/hudmsg.h -> common/main/hudmsg.h 2013-03-03 01:03:33 +00:00
Kp 6d10818c40 Move */include/func.h -> common/include/func.h 2013-03-03 01:03:33 +00:00
Kp b2382d7772 Move */include/makesig.h -> common/include/makesig.h 2013-03-03 01:03:33 +00:00
Kp 70d4274106 Move */include/rbaudio.h -> common/include/rbaudio.h 2013-03-03 01:03:33 +00:00
Kp 1abda3c5a6 Move */include/strio.h -> common/include/strio.h 2013-03-03 01:03:33 +00:00
Kp c90750e802 Move */include/dl_list.h -> common/include/dl_list.h 2013-03-03 01:03:33 +00:00
Kp 972da8a7c7 Move */arch/include/window.h -> common/include/window.h 2013-03-03 01:03:33 +00:00
Kp 2ab85c0413 Move */arch/include/messagebox.h -> common/include/messagebox.h 2013-03-03 01:03:33 +00:00
Kp 0b38376ebd Move */arch/include/key.h -> common/include/key.h 2013-03-03 01:03:33 +00:00
Kp 536203188c Move */arch/include/jukebox.h -> common/include/jukebox.h 2013-03-03 01:03:33 +00:00
Kp 2fc1cba2b5 Move */3d -> common/3d 
Move all the common 3d/ code into a common directory.  Substantial
differences exist in 3d/interp.c, so it is not yet common.
 2013-03-03 01:03:33 +00:00
Kp 3becab2461 Move */include/texmap.h -> common/include/texmap.h 2013-03-03 01:03:33 +00:00
Kp 26cfa7b39c Move */2d/2dsline.c -> common/2d/2dsline.c 2013-03-03 01:03:33 +00:00
Kp 9951b893ab Move */2d/bitblt.c -> common/2d/bitblt.c 2013-03-03 01:03:33 +00:00
Kp cc67fd23a2 Move */2d/bitmap.c,bitmap.h -> common/2d/bitmap.c,bitmap.h 
Modify */2d/font.c to find the moved bitmap.h
 2013-03-03 01:03:33 +00:00
Kp ccd1268e9d Move */2d/box.c -> common/2d/box.c 2013-03-03 01:03:33 +00:00
Kp 733c0f34da Move */2d/canvas.c -> common/2d/canvas.c 2013-03-03 01:03:33 +00:00
Kp 016c2a44f5 Move */2d/circle.c -> common/2d/circle.c 2013-03-03 01:03:33 +00:00
Kp 55cb06f45f Move */2d/disc.c -> common/2d/disc.c 2013-03-03 01:03:33 +00:00
Kp 4adefcdfa1 Move */2d/gpixel.c -> common/2d/gpixel.c 2013-03-03 01:03:33 +00:00
Kp 2d84c85915 Move */2d/clip.h,line.c -> common/2d/clip.h,line.c 2013-03-03 01:03:33 +00:00
Kp 2e7c092bb0 Move */2d/pixel.c -> common/2d/pixel.c 2013-03-03 01:03:33 +00:00
Kp 11f7182d45 Move */2d/poly.c -> common/2d/poly.c 2013-03-03 01:03:33 +00:00
Kp 54c847a88b Move */2d/rect.c -> common/2d/rect.c 2013-03-03 01:03:33 +00:00
Kp 291e32b1e9 Move */include/3d.h -> common/include/3d.h 2013-03-03 01:03:33 +00:00
Kp 902e068d1c Move */2d/rle.c -> common/2d/rle.c 2013-03-03 01:03:33 +00:00
Kp 227d1377fa Move */2d/scalec.c -> common/2d/scalec.c 2013-03-03 01:03:33 +00:00
Kp 04b545ee29 Move */maths/vecmat.c -> common/maths/vecmat.c 2013-03-03 01:03:33 +00:00
Kp a872eb86a7 Move */maths/tables.c -> common/maths/tables.c 2013-03-03 01:03:33 +00:00
Kp 7099238a95 Move */maths/rand.c -> common/maths/rand.c 2013-03-03 01:03:33 +00:00
Kp 05e34150db Move */maths/fixc.c -> common/maths/fixc.c 2013-03-03 01:03:33 +00:00
Kp e6c78ed004 Move */main/slew.h -> common/main/slew.h 2013-03-03 01:03:33 +00:00
Kp 53e4ff58e0 Move */main/morph.h -> common/main/morph.h 2013-03-03 01:03:33 +00:00
Kp daeada6d98 Move */include/palette.h -> common/include/palette.h 2013-03-03 01:03:33 +00:00
Kp 88b0cd1cf4 Move */include/ogl_init.h -> common/include/ogl_init.h 2013-03-03 01:03:33 +00:00
Kp 1633f29eab Move */include/grdef.h -> common/include/grdef.h 
Drop the special case for Metrowerks in Descent I.
 2013-03-03 01:03:33 +00:00
Kp 139ed37bc8 Move */include/gr.h -> common/include/gr.h 2013-03-03 01:03:33 +00:00
Kp 9a236566b8 Move */include/args.h -> common/include/args.h 2013-03-03 01:03:33 +00:00
Kp 4033f2020b Move */main/inferno.h -> common/main/inferno.h 
Add preprocessor symbols to detect which version of Descent is built,
since some headers are not identical between the two versions, but are
close enough to be worth sharing.
 2013-03-03 01:03:33 +00:00
Kp 0c2a08ec01 Move */include/physfsx.h -> common/include/physfsx.h 2013-03-03 01:03:33 +00:00
Kp 2afbfda4ee Move */include/ignorecase.h -> common/include/ignorecase.h 2013-03-03 01:03:33 +00:00
Kp a05d292255 Move */include/u_mem.h -> common/include/u_mem.h 
The Descent I reference to virtual_memory_on is unused, so drop it.
 2013-03-03 01:03:33 +00:00
Kp d9ee4c7dce Move */include/strutil.h -> common/include/strutil.h 2013-03-03 01:03:33 +00:00
Kp d99d197f8d Move */include/iff.h -> common/include/iff.h 2013-03-03 01:03:33 +00:00
Kp 781d4abdf2 Move */include/rle.h -> common/include/mouse.h 2013-03-03 01:03:33 +00:00
Kp 8298b3c7e6 Move */arch/include/mouse.h -> common/include/mouse.h 2013-03-03 01:03:33 +00:00
Kp 10260197f6 Move */arch/include/joy.h -> common/include/joy.h 2013-03-03 01:03:33 +00:00
Kp 896865c4c4 Move */arch/include/digi_mixer_music.h -> common/include/digi_mixer_music.h 2013-03-03 01:03:33 +00:00
Kp 94e1ee629a Move */arch/include/digi_mixer.h -> common/include/digi_mixer.h 2013-03-03 01:03:33 +00:00
Kp c6e0882f51 Move */arch/include/digi_audio.h -> common/include/digi_audio.h 2013-03-03 01:03:33 +00:00
Kp 27953049cf Move */arch/include/event.h -> common/include/event.h 2013-03-03 01:03:33 +00:00
Kp 9bc42c0b32 Move */include/timer.h -> common/include/timer.h 2013-03-03 01:03:33 +00:00
Kp f2fef2eef5 Move */include/byteswap.h -> common/include/byteswap.h 2013-03-03 01:03:33 +00:00
Kp 204b1e4700 Move */include/console.h -> common/include/console.h 2013-03-03 01:03:33 +00:00
Kp 6555abf09e Move */include/hmp.h -> common/include/hmp.h 2013-03-03 01:03:33 +00:00
Kp ac1af0a58a Move */include/vecmat.h -> common/include/vecmat.h 2013-03-03 01:03:33 +00:00
Kp ba96e9c7ff Move */include/internal.h -> common/include/internal.h 2013-03-03 01:03:33 +00:00
Kp 88371ff28a Move */include/fix.h -> common/include/fix.h 2013-03-03 01:03:33 +00:00
Kp 85c66cad08 Move */include/maths.h -> common/include/maths.h 2013-03-03 01:03:33 +00:00
Kp 4044caeb2d Move */include/dxxerror.h -> common/include/dxxerror.h 2013-03-03 01:03:33 +00:00
Kp 1c2ab15475 Move */include/pstypes.h -> common/include/pstypes.h 2013-03-03 01:03:33 +00:00