Commit graph

3480 commits

Author SHA1 Message Date
Kp 3cc87d57c6 Add support for cross-compilation 2013-05-05 17:39:03 +00:00
Kp 4aaaa53f60 Use program.srcdir, not self.srcdir for Win32PlatformSettings 2013-05-05 17:39:03 +00:00
Kp 9e5ef66204 Add Win32PlatformSettings.__init__ to fix SConstruct for Windows 2013-05-05 17:39:03 +00:00
Kp 1256332ebf Chain objects_editor property 2013-05-05 17:38:58 +00:00
Kp 813dcb8554 Chain objects_common lookup to simplify users 2013-05-05 17:35:44 +00:00
Kp 1efaa50f6a Allow source lists to carry extra attributes
Use it to move the transform_target parameter into the list itself.

Fix the non-OpenGL build, which should have had a transform_target
parameter and did not.
2013-05-05 04:03:45 +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 0afdb86910 Construct self.sources sooner so that code can always append to it 2013-04-20 23:52:17 +00:00
Kp 119a34e9cb Support cross-configuring SDL 2013-04-20 20:36:02 +00:00
Kp f387c32734 Store fixed values at class scope 2013-04-20 20:36:02 +00:00
Kp 2f6ac3cb53 Refactor SConstruct register_program handling 2013-04-20 20:36:02 +00:00
Kp 621c82f631 Move compiler flags/selection into a base class above DXXProgram 2013-04-20 20:36:02 +00:00
Kp 078ee16905 Remove -pedantic
It warns about the editor build and serves no purpose.
2013-04-20 20:36:02 +00:00
Kp ebc971be95 Support cross-configuring SDL 2013-04-20 20:35:58 +00:00
Kp 52a15a6e11 Add unused ai_restore_state parameter version to match D2X 2013-04-20 20:35:58 +00:00
Kp 63b1abc80a Store fixed values at class scope 2013-04-20 20:35:58 +00:00
Kp 528ea51ce4 Refactor SConstruct register_program handling 2013-04-20 20:35:58 +00:00
Kp 17ca9f15bd Move compiler flags/selection into a base class above DXXProgram 2013-04-20 20:35:58 +00:00
Kp 47aa7d000d Make CPPDEFINES consistent with unification branch 2013-04-20 20:35:58 +00:00
Kp e658660d21 Make name of GLES_CM library configurable 2013-04-20 20:35:58 +00:00
zico cb280a8ef4 Adjusted SB_PRIMARY_W_BOX_RIGHT_L to fit perfectly 2013-04-18 15:46:09 +02:00
zico 8ae018aa0c use const ubyte for multi_do_powcap_update() 2013-04-18 15:45:40 +02:00
zico fdf951673e Made UPID_GAME_INFO_SIZE, UPID_GAME_INFO_LITE_SIZE and UPID_SEQUENCE_SIZE change if NETGAME_NAME_LEN, MISSION_NAME_LEN or CALLSIGN_LEN changes 2013-04-18 15:31:28 +02:00
zico cd6c74e0a9 revert 2013-04-18 15:30:34 +02:00
zico a060ec45db Made UPID_GAME_INFO_SIZE, UPID_GAME_INFO_LITE_SIZE and UPID_SEQUENCE_SIZE change if NETGAME_NAME_LEN, MISSION_NAME_LEN or CALLSIGN_LEN changes, fixes bug where joining games was not possible anymore due to recent change of MISSION_NAME_LEN 2013-04-18 15:14:16 +02:00
zico b769485d9a Due to additive blending, transparent sprites will become invivible in font of white surfaces (lamps). Fix that with a little desaturation 2013-04-18 12:08:53 +02:00
zico 87ad1a97b7 Due to additive blending, transparent sprites will become invivible in font of white surfaces (lamps). Fix that with a little desaturation 2013-04-18 12:08:51 +02:00
zico 6d3dc4f1b1 Removed light_frame_count due to being unnecessary since lighting is now time-based and messed up deletion of dynamic light 2013-04-18 11:56:32 +02:00
zico a7692274fa Removed light_frame_count due to being unnecessary since lighting is now time-based and messed up deletion of dynamic light 2013-04-18 11:56:18 +02:00
zicodxx f9b244e0e2 Merge pull request #1 from dxx-rebirth/d2x-rebirth/indirect-ham
Add new mission type with support for HAM-by-reference
2013-04-08 06:11:53 -07:00
zico ebfa2211ff merging? 2013-04-08 15:09:06 +02:00
zico 0ceaaaf237 Added option to ignore cycling weapons that are not on autoselect list 2013-04-08 15:04:28 +02:00
zico dab702aba9 Added option to ignore cycling weapons that are not on autoselect list 2013-04-08 15:04:19 +02:00
zico c361a6ef91 Added 4th alternative HUD mode for no HUD rendering, aka Immersion mode 2013-04-08 14:28:55 +02:00
zico bf52256c8d Added 4th alternative HUD mode for no HUD rendering, aka Immersion mode 2013-04-08 14:28:41 +02:00
zico c60b007398 Increased ship wiggle from 20FPS- to 30FPS-base as I think this more representy the 486 play style - feels way more natural to me, too 2013-04-08 12:55:27 +02:00
zico 758f2d64f8 Support for Raspberry Pi - patch by derhass 2013-04-08 12:54:02 +02:00
zico 3553ea3cf7 Added Rankings functionality like in D2X-Rebirth while still utilizing eff file from original D1X source; Decrease personal score when killing multi buddy and don't increment towards kill goal 2013-04-08 12:46:05 +02:00
Chris Taylor c47dcf2b51 Update SDLmain.m from SDL 1.2.14 source, fixing a missing symbol 'NSAppleMenuController' when building using SCons for Mac. For Mac, using SCons, it finally builds and works again\! 2013-04-08 17:21:00 +08:00
Chris Taylor 0b00caaeae Extend #ifdef guards to around StandardAlert for the messagebox, fixing a missing symbol error in SCons for Mac 2013-04-08 17:21:00 +08:00
Chris Taylor 4d6d655072 For SCons in Mac OS X, make sure the frameworks are linked properly 2013-04-08 17:21:00 +08:00
Chris Taylor 7d5833007d Update SDLmain.m from SDL 1.2.14 source, fixing a missing symbol 'NSAppleMenuController' when building using SCons for Mac. For Mac, using SCons, it finally builds and works again\! 2013-04-08 17:08:54 +08:00
Chris Taylor 8e6d903ad2 Extend #ifdef guards to around StandardAlert for the messagebox, fixing a missing symbol error in SCons for Mac 2013-04-08 16:34:24 +08:00
Chris Taylor 77d4cccf56 Letting the Xcode project figure out its geography regions 2013-04-08 16:32:25 +08:00
Chris Taylor 175cad804c For SCons in Mac OS X, make sure the frameworks are linked properly 2013-04-08 16:21:53 +08:00
Chris Taylor f566bd1203 For Mac, in SCons link against physfs properly 2013-04-08 14:52:04 +08:00
Chris Taylor bf401f7c74 Allow SCons to find the HIServices framework for the Mac code in physfsx.c 2013-04-08 14:51:38 +08:00
Chris Taylor 5ee91b1a8e Merged in remote changes 2013-04-08 14:40:07 +08:00
Chris Taylor 7683d7998d For Mac in SCons, find the HIServices framework for physfsx.c 2013-04-08 14:35:48 +08:00