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

352 commits

Author SHA1 Message Date
Kp 91928c2afc Rename 'new' to 'n' for C++ compatibility 2013-08-11 20:43:08 +00:00
Kp 85dc42189b Add extent to RankStrings to match D2X 2013-08-11 15:11:45 +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 01f155382e Removed chaff ability from D1X-Rebirth's proxys as they were never intended to do that 2013-08-09 17:29:10 +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 2cc0068fa9 Move */main/fvi.c -> similar/main/fvi.c 2013-08-09 03:13:33 +00:00
Kp 319b3ec5fd Mark more math as const correct 2013-08-09 03:04:18 +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
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 04949b1f75 Move */main/object.c -> similar/main/object.c 2013-08-07 02:33:18 +00:00
Kp 2c362aae80 Move */main/polyobj.c -> similar/main/polyobj.c 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 07d6e2c994 Fix format mismatch on Win32 newdemo 
Win32 makes sizeof(object) an unsigned int instead of unsigned long.
 2013-08-03 20:32:48 +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 4725ca5f73 Move */main/songs.c -> similar/main/songs.c 2013-07-24 01:43:02 +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 f84884cfa0 Move */main/gauges.c -> similar/main/gauges.c 2013-07-24 01:27:35 +00:00
Kp a05793fd84 Mark various things static 2013-07-23 02:09:12 +00:00
Kp d55f622691 Add missed const for Side_to_verts 2013-07-23 02:05:37 +00:00
Kp 1686732c4e Move */main/text.h -> common/main/text.h 2013-07-21 22:10:01 +00:00
Kp f8564907fa Make gauges.c more like D2X 2013-07-21 21:55:19 +00:00
Kp 4187648621 Remove redundant/obsolete declarations 2013-07-21 21:55:00 +00:00
Kp d0f2d66c89 Fix preprocessor guard for draw_outline 2013-07-21 21:40:46 +00:00
Kp 5874d7935c Remove unused gauge macros 2013-07-21 21:35:21 +00:00
Kp 4577dd3977 Merge branch 'd2x-rebirth/master' into unification/master 2013-07-21 21:34:46 +00:00
Kp a1ba420031 Mark various parameters and variables as const 2013-07-20 23:12:24 +00:00
Kp 9b50efca0e Make local_to_remote and remote_to_local static 2013-07-20 17:09:53 +00:00
Kp a5181a3208 Remove unused multi_allow_powerup_mask 2013-07-20 16:58:37 +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 06a2bb4c6b Move */main/aistruct.h -> common/main/aistruct.h 2013-03-03 01:03:33 +00:00
Kp a2b7e663df Move */main/weapon.c -> similar/main/weapon.c 2013-03-03 01:03:33 +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 89be67732b Fix powerup_basic warnings after merge 2013-06-04 03:12:35 +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 020cdecf31 Remove d*x-rebirth/main/gamemine.h 2013-03-03 01:03:33 +00:00
Kp e18fc92b68 Move */main/gamecntl.c -> similar/main/gamecntl.c 2013-03-03 01:03:33 +00:00
Kp c49fb2a68d Move */main/state.c -> similar/main/state.c 2013-03-03 01:03:33 +00:00
Kp 9fe359baae Move */main/game.c -> similar/main/game.c 2013-03-03 01:03:33 +00:00
Kp d607792030 Move */main/gameseg.c -> similar/main/gameseg.c 2013-03-03 01:03:33 +00:00
Kp fd710386b5 Move */main/gamerend.c -> similar/main/gamerend.c 2013-03-03 01:03:33 +00:00
Kp 1e0f0c8f1b Move */main/cntrlcen.c -> similar/main/cntrlcen.c 2013-03-03 01:03:33 +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 dbec5197f6 Move */main/vers_id.c -> similar/main/vers_id.c 2013-05-05 17:39:03 +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 ff96f3239d Move */main/controls.c -> similar/main/controls.c 2013-03-03 01:03:33 +00:00
Kp 86f373e4e0 Move */main/multibot.c -> similar/main/multibot.c 2013-03-03 01:03:33 +00:00
Kp 691b95a02c Move */main/physics.c -> similar/main/physics.c 2013-03-03 01:03:33 +00:00
Kp 0138d330b3 Move */main/inferno.c -> similar/main/inferno.c 2013-03-03 01:03:33 +00:00
Kp 4bf4710aff Move */main/menu.h -> common/main/menu.h 2013-03-03 01:03:33 +00:00
Kp dab72f3127 Move */main/robot.c -> similar/main/robot.c 2013-03-03 01:03:33 +00:00
Kp 4b18dcbff9 Move */main/text.c -> similar/main/text.c 2013-03-03 01:03:33 +00:00
Kp d2e3ed0228 Move */main/wall.c -> similar/main/wall.c 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 ccbb392fd4 Move */main/lighting.c -> similar/main/lighting.c 2013-03-03 01:03:33 +00:00
Kp e1c6fd9690 Move */main/config.c -> similar/main/config.c 2013-03-03 01:03:33 +00:00
Kp 0952484183 Move part of */main/hostage.c -> similar/main/hostage.c 2013-03-03 01:03:33 +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 40c71caf92 Move */main/credits.c -> similar/main/credits.c 2013-03-03 01:03:33 +00:00
Kp a622ccf07f Move */main/player.c -> similar/main/player.c 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 a42e743694 Move */main/effects.c -> similar/main/effects.c 2013-03-03 01:03:33 +00:00
Kp 828452910a Move */main/digiobj.c -> similar/main/digiobj.c 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 29c9334261 Move */main/vclip.c -> similar/main/vclip.c 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 543f6002b8 Move */main/texmerge.c -> similar/main/texmerge.c 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 83ba5b6241 Move */main/terrain.c -> similar/main/terrain.c 2013-03-03 01:03:33 +00:00
Kp 2b613ee05a Move */main/slew.c -> similar/main/slew.c 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 996cb3ee99 Move */main/scores.h -> similar/main/scores.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 21c078df5b Move */main/paging.c -> similar/main/paging.c 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 5cf2b5873b Move */main/newmenu.c -> similar/main/newmenu.c 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 cb64b8540b Move */main/morph.c -> similar/main/morph.c 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 85c4602199 Move */main/mglobal.c -> similar/main/mglobal.c 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 5fa1819e63 Move */main/kmatrix.c -> similar/main/kmatrix.c 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 c48a9ea87d Move */main/hud.c -> similar/main/hud.c 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 f418785edc Move */main/gamefont.c -> similar/main/gamefont.c 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 f938bd3845 Move */main/segment.h -> common/main/segment.h 2013-03-03 01:03:33 +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 db5239deee Move */main/console.c -> similar/main/console.c 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 bdb1377c5a Restructure struct segment to align better 2013-03-17 23:01:32 +00:00
Kp cd17326d84 Add stub which_bomb to match D2X code 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 ff949a5367 Mark main/snddecom.c data static 2013-03-17 23:01:31 +00:00
Kp d64e47bfed Remove unused main/mute.c, main/mute.h 2013-03-17 23:01:31 +00:00
Kp 9f2ac88556 Mark main/custom.c functions static 2013-03-17 23:01:31 +00:00
Kp 3d876bad8b Remove unused main/altsound.c, main/altsound.h 2013-03-17 23:01:31 +00:00
Kp 331a662869 Remove unused main/compbit.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 11306c249e Move */main/songs.h -> common/main/songs.h 2013-03-17 23:01:30 +00:00
Kp caaf44e358 Fix array underrun when searching for highest used object 2012-12-02 23:47:41 +00:00
Kp a8f8bb3682 Fix array boundary over-read in obj_get_signature 2012-12-02 23:28:56 +00:00
Kp b00d8130fa Move */main/render.h -> common/main/render.h 2013-03-03 01:03:33 +00:00
Kp ed2ca1d9ef Create Window_rendered_data to match D2X rendering 2013-03-09 04:36:35 +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 687b6284e6 Merge branch 'd1x-rebirth' into unification/master 2013-03-10 03:34:54 +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 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 beb0690633 Move d1x-rebirth source into subdirectory d1x-rebirth 2013-02-19 00:34:46 +00:00