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

351 commits

Author SHA1 Message Date
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 e0d8afc8e1 Remove d1x-rebirth/editor/meddraw.c 2013-06-30 21:22:10 +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 a49aff4897 Restore use of Windows icon file 2013-06-02 21:46:32 +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 05a8aaccaf Move */arch/sdl/digi_audio.c -> similar/arch/sdl/digi_audio.c 2013-03-03 01:03:33 +00:00
Kp b09f96b31f Move */arch/sdl/digi.c -> similar/arch/sdl/digi.c 2013-03-03 01:03:33 +00:00
Kp 544a07bffa Move */2d/palette.c -> similar/2d/palette.c 2013-03-03 01:03:33 +00:00
Kp 61001e1d94 Move */2d/pcx.c -> similar/2d/pcx.c 2013-03-03 01:03:33 +00:00
Kp 606a455c88 Move */2d/font.c -> similar/2d/font.c 2013-03-03 01:03:33 +00:00
Kp 8d6698b4e6 Move */misc/args.c -> similar/misc/args.c 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 997c35c351 Move */include/loadgl.h -> common/include/loadgl.h 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 8d379f4f9c Move */3d/interp.c -> similar/3d/interp.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 acbe1209e8 Move */arch/sdl/digi_mixer.c -> similar/arch/sdl/digi_mixer.c 2013-03-03 01:03:33 +00:00
Kp 2679c2be10 Move */editor/texpage.c -> similar/editor/texpage.c 2013-03-03 01:03:33 +00:00
Kp a27d667716 Move */editor/medrobot.c -> similar/editor/medrobot.c 2013-03-03 01:03:33 +00:00
Kp 8263b74663 Move */editor/centers.c -> similar/editor/centers.c 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