Commit graph

538 commits

Author SHA1 Message Date
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 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 29c9334261 Move */main/vclip.c -> similar/main/vclip.c 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 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 6025ceaa80 Remove two-stage definition of lazy objects 2013-03-24 23:03:46 +00:00
Kp c94b48ca33 Use lazy object property for more source lists 2013-03-24 23:03:46 +00:00
Kp 996cb3ee99 Move */main/scores.h -> similar/main/scores.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 5cf2b5873b Move */main/newmenu.c -> similar/main/newmenu.c 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 85c4602199 Move */main/mglobal.c -> similar/main/mglobal.c 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 c48a9ea87d Move */main/hud.c -> similar/main/hud.c 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 1b69757872 Allow user to override endian check for cross-compilation 2013-03-23 02:46:45 +00:00
Kp 76f25e8d7c Support cross-configuring SDL 2013-03-17 03:29:48 +00:00
Kp b5001feb2f Move */editor/objpage.c -> similar/editor/objpage.c 2013-03-03 01:03:33 +00:00
Kp 7224dde00a Move */editor/seguvs.c -> similar/editor/seguvs.c 2013-03-03 01:03:33 +00:00
Kp 93d6dc54bd Move */editor/segment.c -> similar/editor/segment.c 2013-03-03 01:03:33 +00:00
Kp 47b6daaa7a Move */editor/mine.c -> similar/editor/mine.c 2013-03-03 01:03:33 +00:00
Kp cd4b771b30 Move */editor/medwall.c -> similar/editor/medwall.c 2013-03-03 01:03:33 +00:00
Kp 5722aee654 Move */editor/meddraw.c -> similar/editor/meddraw.c 2013-03-03 01:03:33 +00:00
Kp fa8217ff13 Move */editor/med.c -> similar/editor/med.c 2013-03-03 01:03:33 +00:00
Kp 631bc1e3a6 Move */editor/group.c -> similar/editor/group.c 2013-03-03 01:03:33 +00:00
Kp 75fc0d5e8a Move */editor/ksegsize.c -> similar/editor/ksegsize.c 2013-03-03 01:03:33 +00:00
Kp 931b944cba Move */editor/kgame.c -> similar/editor/kgame.c 2013-03-03 01:03:33 +00:00
Kp 1c7c90d038 Move */editor/eswitch.c -> similar/editor/eswitch.c 2013-03-03 01:03:33 +00:00
Kp 4ba0495b0a Move */editor/eobject.c -> similar/editor/eobject.c 2013-03-03 01:03:33 +00:00
Kp 0d8cf57ab0 Move */editor/eglobal.c -> similar/editor/eglobal.c 2013-03-03 01:03:33 +00:00
Kp 043f12db26 Move */editor/curves.c -> similar/editor/curves.c 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 53c19f14f1 Move */editor/kmine.c -> similar/editor/kmine.c 2013-03-17 23:01:33 +00:00
Kp 7cb761f0a3 Move */editor/ksegmove.c -> similar/editor/ksegmove.c 2013-03-17 23:01:33 +00:00
Kp 4aeeab376b Move */editor/ksegsel.c -> similar/editor/ksegsel.c 2013-03-17 23:01:33 +00:00
Kp 1692f38127 Move */editor/ktmap.c -> similar/editor/ktmap.c 2013-03-17 23:01:33 +00:00
Kp baf0da84d2 Move */editor/kview.c -> similar/editor/kview.c 2013-03-17 23:01:33 +00:00
Kp 1030915f1c Move */editor/medmisc.c -> similar/editor/medmisc.c 2013-03-17 23:01:33 +00:00
Kp bff770f1d8 Move */editor/medsel.c -> similar/editor/medsel.c 2013-03-17 23:01:33 +00:00
Kp 5ca4d35bf5 Move */editor/texture.c -> similar/editor/texture.c 2013-03-17 23:01:33 +00:00
Kp a9123e0b45 Move */texmap/*.c -> common/texmap 2013-03-17 23:01:32 +00:00
Kp db5239deee Move */main/console.c -> similar/main/console.c 2013-03-17 23:01:32 +00:00
Kp 51d79f7620 Store source lists at close scope and object lists at instance scope 2013-03-17 23:01:32 +00:00
Kp a707c053db Consistently use suffix of _sources for source lists 2013-03-17 23:01:32 +00:00
Kp ed188ea088 Store fixed values at class scope 2013-03-17 23:01:32 +00:00
Kp d55046eed1 Support building D1X and D2X into different build directories
This enables building the two games with different options.
2013-03-17 23:01:32 +00:00
Kp 909a5d6847 Show target build directory in non-verbose builds 2013-03-17 23:01:32 +00:00
Kp 54d57a37c9 Add support for out-of-tree build 2013-03-17 23:01:32 +00:00
Kp 6096c63ece Use lazy construction for DXXArchive common objects
These will always be constructed, but using lazy construction simplifies
the code.
2013-03-17 23:01:32 +00:00
Kp 8359c3cdd7 Give DXXArchive a private argument prefix of "common" 2013-03-17 23:01:32 +00:00
Kp afab0f4bb8 Allow user to override Raspberry Pi defaults 2013-03-17 23:01:32 +00:00
Kp a842ddca86 Move */editor/autosave.c -> similar/editor/autosave.c 2013-03-17 23:01:32 +00:00
Kp bd9702463e Move */editor/elight.c -> similar/editor/elight.c 2013-03-17 23:01:32 +00:00
Kp 1aa9ae721e Move */editor/fixseg.c -> similar/editor/fixseg.c 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 756ded6007 Move */editor/info.c -> similar/editor/info.c 2013-03-17 23:01:32 +00:00
Kp a338f81663 Move */editor/kbuild.c -> similar/editor/kbuild.c 2013-03-17 23:01:32 +00:00
Kp af3707d1c0 Move */editor/kcurve.c -> similar/editor/kcurve.c 2013-03-17 23:01:32 +00:00
Kp 6b5336a4b3 Move */editor/kfuncs.c -> similar/editor/kfuncs.c 2013-03-17 23:01:32 +00:00
Kp ead39c4cc8 Move */editor/khelp.c -> similar/editor/khelp.c 2013-03-17 23:01:32 +00:00
Kp e66b36de14 Move */arch/sdl/gr.c -> similar/arch/sdl/gr.c 2013-03-17 23:01:32 +00:00
Kp 6ef38884e1 Move */arch/sdl/key.c -> similar/arch/sdl/key.c 2013-03-17 23:01:31 +00:00
Kp ddb26fa198 Move */arch/sdl/event.c -> similar/arch/sdl/event.c 2013-03-17 23:01:31 +00:00
Kp b5c3902697 Move */arch/sdl/init.c -> similar/arch/sdl/init.c 2013-03-17 23:01:31 +00:00
Kp d64f605f54 Move */arch/sdl/joy.c -> common/arch/sdl/joy.c 2013-03-17 23:01:31 +00:00
Kp 4bd3f0dbec Move */arch/sdl/mouse.c -> similar/arch/sdl/mouse.c 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 299b47656b Move */misc/hash.c -> similar/misc/hash.c 2013-03-17 23:01:31 +00:00
Kp 68fec5f94a Move */misc/physfsx.c -> similar/misc/physfsx.c 2013-03-17 23:01:31 +00:00
Kp 5c1f0f68cc Move */mem/mem.c -> similar/mem/mem.c 2013-03-17 23:01:31 +00:00
Kp 78fde624f6 Move */arch/sdl/timer.c -> similar/arch/sdl/timer.c 2013-03-17 23:01:31 +00:00
Kp ea29654c53 Move */arch/sdl/jukebox.c -> similar/arch/sdl/jukebox.c 2013-03-17 23:01:31 +00:00
Kp 3fe3da9a25 Move */arch/ogl/ogl.c -> similar/arch/ogl/ogl.c 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 0087b144a9 Combine SConstruct register_program handling 2013-03-17 23:01:31 +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 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 a259ecf691 Move */include/editor/seguvs.h -> common/include/editor/seguvs.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 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 a79652dc9d Remove -pedantic
It warns about the editor build and serves no purpose.
2013-03-09 00:25:10 +00:00
Kp ff448b535f Switch from C99 to Gnu99 to make editor build work 2013-03-09 22:11:54 +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 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 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 1c2ab15475 Move */include/pstypes.h -> common/include/pstypes.h 2013-03-03 01:03:33 +00:00
Kp 5734989389 Move compiler flags/selection into a base class above DXXProgram 2013-03-03 00:53:35 +00:00
Kp 161aeb6a5c Use a unified SConstruct for both Descent programs 2013-03-02 20:53:47 +00:00
Kp beb0690633 Move d1x-rebirth source into subdirectory d1x-rebirth 2013-02-19 00:34:46 +00:00
Kp 05cb52d5e6 Support extra information, such as git describe, in version string 2012-06-09 15:19:29 +00:00
Kp b6fa24cafe Remove -pedantic
It warns about the editor build and serves no purpose.
2013-03-09 00:25:10 +00:00
Kp f6235cda9b Switch from C99 to Gnu99 to make editor build work 2013-03-09 22:11:54 +00:00
Kp f3ad08db91 Support extra information, such as git describe, in version string 2012-06-09 15:19:29 +00:00
Kp 914a72e76a Remove unused hostage dialog editor 2013-03-24 02:28:34 +00:00
zicodxx 6d3782996c Fixed some non-critical compiler warnings; Now compiling with -std=c99 -pedantic and fixed warnings (except for editor build) caused by this 2012-05-14 12:20:30 +02:00
zicodxx e3a21dce5e Fixed some non-critical compiler warnings; Now compiling with -std=c99 -pedantic and fixed warnings (except for editor build) caused by this 2012-05-14 12:20:27 +02:00
zicodxx 20b8e59305 Incremented version to 0.57.3; Added Release notes 2012-05-10 19:10:49 +02:00
zicodxx c5b3fc162e Incremented version to 0.57.3; Added Release notes 2012-05-10 19:10:45 +02:00
Chris Taylor b94d8f127e Remove redundant ui_event_process and duplicate mouse.c in ui/. All editor input is now event-based. 2012-03-18 18:04:16 +08:00
Chris Taylor 2d54617b91 Remove redundant ui_event_process and duplicate mouse.c in ui/. All editor input is now event-based. 2012-03-18 18:03:29 +08:00
zicodxx 2f08947f48 Introduced extra short based on MULTI_PROTO_VERSION for version-independent Multiplayer-compability-check; Changed version to 0.57.2 to make new version checking not cause problems with stable release 0.57.1; Removed old version_major/minor variables from netgame and player structures since DXX handles this independently; Cleaned up old version stuff and copyright messages 2011-11-02 01:04:42 +01:00
zicodxx 1371874e0d Introduced extra short based on MULTI_PROTO_VERSION for version-independent Multiplayer-compability-check; Changed version to 0.57.2 to make new version checking not cause problems with stable release 0.57.1; Removed old version_major/minor variables from netgame and player structures since DXX handles this independently; Cleaned up old version stuff and copyright messages 2011-11-02 01:04:38 +01:00
zicodxx e10975b3b4 Made the .desktop file follow the official specifications; Added explicit link to libmath for newer versions of binutils; Fixed crash using PhysFS 1.x in PHYSFSX_addArchiveContent() 2011-09-26 19:15:43 +02:00
zicodxx d8263a85b6 Made the .desktop file follow the official specifications; Added explicit link to libmath for newer versions of binutils; Fixed crash using PhysFS 1.x in PHYSFSX_addArchiveContent() 2011-09-26 19:15:39 +02:00
zicodxx d9ca3a2287 Removed support for IPX protocol and MS-DOS-Multiplayer-compability due to age and lack of real need and to really improve on the Multiplayer without adding too much complexity for backwards-compability 2011-09-14 01:15:32 +02:00
zicodxx 7638390173 Removed support for IPX protocol and MS-DOS-Multiplayer-compability due to age and lack of real need and to really improve on the Multiplayer without adding too much complexity for backwards-compability 2011-09-14 01:15:20 +02:00
zicodxx 7275fd8b87 Changed version to 0.57.1; Updated release notes 2011-07-16 21:21:14 +02:00
zicodxx 23c04c17e1 Changed version to 0.57.1; Updated release notes 2011-07-16 21:21:11 +02:00
zicodxx dbd7e83c35 Changed version from 0.56 to 0.57; Added first draft for RELEASE-NOTES.txt; updated docs 2011-05-07 02:51:21 +02:00
zicodxx 81f4e63f0c Changed version from 0.56 to 0.57; Added first draft for RELEASE-NOTES.txt; updated docs 2011-05-07 02:51:18 +02:00
zicodxx 10aca9a9fe Expanded possibilities for level authors: RLE- and Texture-cache accepts textures bigger than 64x64, only limit being Texture width must be equal height; Increased maximum amount of Segments from 900 to 9000 - not dynamically allocating them, yet 2011-04-22 10:33:04 +02:00
zicodxx 7890015efd Expanded possibilities for level authors: RLE- and Texture-cache accepts textures bigger than 64x64, only limit being Texture width must be equal height; Increased maximum amount of Segments from 900 to 9000 - not dynamically allocating them, yet 2011-04-22 10:33:03 +02:00
zicodxx 7f18afd5d7 Client-side implementation for Tracker support by Matt 1360 Vandermeulen including improvements in udp_dns_filladdr and IPv4/IPv6 compability; Very little adjustments by me, too including IPv6 support for Windows (untested); Actual tracker code will follow later as seperate branch when it's done 2011-04-05 02:24:34 +02:00
zicodxx 85f7be583f Client-side implementation for Tracker support by Matt 1360 Vandermeulen including improvements in udp_dns_filladdr and IPv4/IPv6 compability; Very little adjustments by me, too including IPv6 support for Windows (untested); Actual tracker code will follow later as seperate branch when it's done 2011-04-05 02:24:30 +02:00
zicodxx d6fbef4e43 Moved all these unsorted global cheat variables to a handy structure; Simplified reading of the cheats without trying to make it complicated so no one finds them (everyone can get the source); Removed one or two cheats which carry more garbage than they are worth; Added replacement for the bittersweet cheat; Made FPS Counter an option of Graphics menu 2011-02-14 22:27:07 +01:00
zicodxx 9f6cbc8c6c Retired most of the Assembler code except the generic i386 scanline renderer; Removed all leftovers of Direct3D implementation; On the way make a some code more similar between D1X-Rebirth and D2X-Rebirth 2011-01-19 21:35:14 +01:00
zicodxx c124b0883f Retired most of the Assembler code except the generic i386 scanline renderer; Removed all leftovers of Direct3D implementation; On the way make a some code more similar between D1X-Rebirth and D2X-Rebirth 2011-01-19 21:35:14 +01:00
zicodxx 65aeb5a291 opengles variable in SConstruct could be activated by command-line argument opengl 2011-01-17 19:27:55 +01:00
zicodxx 1eac00e0b5 opengles variable in SConstruct could be activated by command-line argument opengl 2011-01-17 19:27:54 +01:00
Chris Taylor eca34c30f5 Rename ui/window.c to ui/dialog.c to avoid confusion with arch/sdl/window.c, also rename UI_WINDOW to UI_DIALOG, rename all associated functions, constants, parameters, local variables etc too; make a window when making a UI_DIALOG (does nothing yet) 2011-01-17 22:42:18 +08:00
Chris Taylor 45930e9afe Rename ui/window.c to ui/dialog.c to avoid confusion with arch/sdl/window.c, also rename UI_WINDOW to UI_DIALOG, rename all associated functions, constants, parameters, local variables etc too; make a window when making a UI_DIALOG (does nothing yet) 2011-01-17 22:41:05 +08:00
zicodxx 449a5dffb1 Added OpenGL ES support - contributed by Florian Feucht and Oliver Haag 2011-01-06 12:43:58 +01:00
zicodxx 28bf026158 Added OpenGL ES support - contributed by Florian Feucht and Oliver Haag 2011-01-06 12:43:55 +01:00
zicodxx 8e23a0b452 More consistency in SConstruct command-line variables; Added automatic Endianess-checker; Set target to 'd2x-rebirth' no matter if OpenGL or not 2011-01-03 11:42:53 +01:00
zicodxx 182fa63ea8 More consistency in SConstruct command-line variables; Added automatic Endianess-checker; Set target to 'd1x-rebirth' no matter if OpenGL or not 2011-01-03 11:42:50 +01:00
Chris Taylor 2fa153489c Move main/editor to editor and move headers to include/editor, like d1x 2010-12-28 11:21:43 +08:00
Chris Taylor 0557c8bb43 Copy lots of editor stuff from d2x-rebirth to d1x-rebirth, getting it to work on Mac OS X 2010-12-24 12:26:24 +08:00
zicodxx e883f01ec9 Add support for Windows native error/warning boxes; Only print to stdout on Linux/other *nix; Fixed redundant printing of Error and Warning via stdout 2010-11-30 13:46:23 +01:00
zicodxx 427fb6d6b5 Add support for Windows native error/warning boxes; Only print to stdout on Linux/other *nix; Fixed redundant printing of Error and Warning via stdout 2010-11-30 13:46:10 +01:00
zicodxx 13c1093ca1 Added missing brackets gone missing in r936 2010-11-28 16:08:11 +01:00
zicodxx 0c9a9f4d62 Added missing brackets gone missing in r936 2010-11-28 16:07:39 +01:00
Chris Taylor 4fa20a3d9f Add support for OS native error/warning boxes, only implemented for Mac for now 2010-11-28 20:08:29 +08:00
Chris Taylor be82a68e77 Add support for OS native error/warning boxes, only implemented for Mac for now 2010-11-28 20:02:38 +08:00
zicodxx 733f6fc5d8 DXX-Rebirth release v0.56 2010-09-04 13:06:50 +00:00
zicodxx 7e6ab4745a DXX-Rebirth release v0.56 2010-09-04 13:06:50 +00:00
zicodxx 6c61d30ffa Added res-file to be linked in Windows build to show icon in Filemanager; converted icon file to be smaller 2010-08-21 17:08:53 +00:00
zicodxx aaae123e44 Added res-file to be linked in Windows build to show icon in Filemanager; converted icon file to be smaller 2010-08-21 17:08:53 +00:00
kreatordxx 4e238f2005 Add 'Resources' in .app bundle to searchpath for Mac; move bigger functions from physfsx.h to physfsx.c; resolve conflict with definition of 'bool' 2010-08-09 14:04:22 +00:00
kreatordxx 3ed285f469 Add 'Resources' in .app bundle to searchpath for Mac; move bigger functions from physfsx.h to physfsx.c; resolve conflict with definition of 'bool' 2010-08-09 14:04:22 +00:00
zicodxx 8c93390f4b Fix for last commit - forgot to add libs recognized by sdl-config 2010-07-30 12:10:28 +00:00
zicodxx fb7551f90c Fix for last commit - forgot to add libs recognized by sdl-config 2010-07-30 12:10:28 +00:00
zicodxx cd13732735 restricted parsing of sdl-config to *NIX and Mac builds as it's static on Win32 anyways; added verbosebuild as SCons option to print out all compiler/linker messages 2010-07-30 07:34:33 +00:00
zicodxx 48b60f63a8 restricted parsing of sdl-config to *NIX and Mac builds as it's static on Win32 anyways; added verbosebuild as SCons option to print out all compiler/linker messages 2010-07-30 07:34:33 +00:00
zicodxx 27c1d4733a Merged all HMP-related code into hmp.c/h; Also introduced new HMP to MIDI conversion functions based on JJFFE which use former Win32-related HMP-code - fixes some bugs in MIDI conversion and cleaner 2010-07-18 20:28:15 +00:00
zicodxx 9070771c47 Merged all HMP-related code into hmp.c/h; Also introduced new HMP to MIDI conversion functions based on JJFFE which use former Win32-related HMP-code - fixes some bugs in MIDI conversion and cleaner 2010-07-18 20:28:15 +00:00
zicodxx 4d5ff1bd29 Fixed Compiler-warning on Windows; Fixing Windows build which was not linking against SDL 2010-07-04 07:07:51 +00:00
zicodxx e22b62eee4 Make Version-check for UDP also cover Micro-versions; Making sure versioning will act same way as conf.h for MacOS 2010-02-23 15:05:50 +00:00
zicodxx 64af50c05a Make Version-check for UDP also cover Micro-versions; Making sure versioning will act same way as conf.h for MacOS 2010-02-23 15:05:50 +00:00
zicodxx ea927946a8 Removing svnmicro as micro numbering option since SVN-revisions will not really represent logical numbering; Some cleaning for libs usage; Small cleanup 2010-02-23 01:21:55 +00:00
zicodxx b9422063ab Removing svnmicro as micro numbering option since SVN-revisions will not really represent logical numbering; Some cleaning for libs usage; Small cleanup 2010-02-23 01:21:55 +00:00
zicodxx f782692332 Making files in 2d directory more similar and removed unused and broken code; Fixing a bunch of memory errors; Removed stack protecting flag for gcc in debug mode 2009-11-30 22:42:55 +00:00
zicodxx 75062a8d96 Making files in 2d directory more similar and removed unused and broken code; Fixing a bunch of memory errors; Removed stack protecting flag for gcc in debug mode 2009-11-30 22:42:55 +00:00
zicodxx 62b75469dd Adding macros USE_UDP and USE_IPX for the compiler to compile with either UDP- and/or IPX-support and removed the older IPX macros 2009-11-29 16:46:13 +00:00
zicodxx 6a00504d89 Adding macros USE_UDP and USE_IPX for the compiler to compile with either UDP- and/or IPX-support and removed the older IPX macros 2009-11-29 16:46:13 +00:00
zicodxx 1ec38c1503 Improved Disconnect-handling between levels; Improved Kick-handling; Do not say that IPv4 and IPv6 builds are not compatible in scons -h anymore 2009-11-24 15:20:09 +00:00
zicodxx cf3f852095 Improved Disconnect-handling between levels; Improved Kick-handling; Do not say that IPv4 and IPv6 builds are not compatible in scons -h anymore 2009-11-24 15:20:09 +00:00
zicodxx febe5d124d Abstracting networking protocols - Step 4: Implemented new UDP layer with Client/Server communication, Packet Loss Prevention and strict Version checking. Netgames list will follow later. 2009-11-24 09:48:53 +00:00
zicodxx dbf4d55839 Abstracting networking protocols - Step 4: Implemented new UDP layer with Client/Server communication, Packet Loss Prevention and strict Version checking. Netgames list will follow later. 2009-11-24 09:48:53 +00:00
kreatordxx 70bbac21b7 Read big endian savegames on little endian computers and vice versa 2009-10-05 02:51:37 +00:00
kreatordxx af0c2db749 Split game.c into game.c, gamecntl.c and gamerend.c like d2x 2009-06-07 11:28:12 +00:00
kreatordxx a1c9e3986e Add new window system, not used yet 2009-05-21 12:16:39 +00:00
kreatordxx 45ba0ca307 Add new window system, not used yet 2009-05-21 12:16:39 +00:00
zicodxx 0c36fecb42 Abstracting networking protocols - Step 2: Introducing new structure to hold protocol-dependend and -independend information about Netgame and it's Players; Further isolation of the IPX code and renaming the netdrv_* code to ipxdrv_* as this is now actually IPX-only; Next up: Renaming network_* functions to net_ipx_*, writing wrappers for protocol dependend functions in multi.c, Implementing protocol selection and Cleanup 2009-03-20 12:10:38 +00:00
zicodxx b3bf4813df Abstracting networking protocols - Step 2: Introducing new structure to hold protocol-dependend and -independend information about Netgame and it's Players; Further isolation of the IPX code and renaming the netdrv_* code to ipxdrv_* as this is now actually IPX-only; Next up: Renaming network_* functions to net_ipx_*, writing wrappers for protocol dependend functions in multi.c, Implementing protocol selection and Cleanup 2009-03-20 12:10:38 +00:00
zicodxx 0fc0fff7f1 Abstracting networking protocols - Step 1: Renaming network-related files; Removing net_ipx.h (former network.h) includes from as much files as possible to make isolation of IPX-related functions easier in Step 2; Version defines Cleanup - needed later for good Version-Checking 2009-03-04 21:04:43 +00:00
zicodxx 8da36f8873 Abstracting networking protocols - Step 1: Renaming network-related files; Removing net_ipx.h (former network.h) includes from as much files as possible to make isolation of IPX-related functions easier in Step 2; Version defines Cleanup - needed later for good Version-Checking 2009-03-04 21:04:43 +00:00
zicodxx 4d59723cc2 Added Packet-loss prevention code for Netgames 2009-01-31 23:47:15 +00:00
zicodxx f84a267dd1 Added Packet-loss prevention code for Netgames 2009-01-31 23:47:15 +00:00
md2211 edfe0e0b47 Debian packaging scripts 2008-12-30 22:14:06 +00:00
md2211 f176bd23da Debian packaging scripts 2008-12-30 22:14:06 +00:00
zicodxx eeb908f26d DXX-Rebirth release v0.55 2008-12-24 10:52:58 +00:00
zicodxx a4daf695a6 DXX-Rebirth release v0.55 2008-12-24 10:52:58 +00:00
zicodxx 2b5c8d2b77 Removed (#if 0) the unfinished Tracker stuff for our Release so it won't confuse the Win32 build 2008-12-20 11:57:03 +00:00
md2211 f92ded953a Implemented SConstruct optional behavior (svnmicro=1) to automatically use SVN rev number as micro
version
2008-12-18 23:12:01 +00:00
md2211 9e308457bc Implemented SConstruct optional behavior (svnmicro=1) to automatically use SVN rev number as micro
version
2008-12-18 23:12:01 +00:00
zicodxx aee0198f2e Using a clean flow for closing game data at the end of main() instead of using atexit; Now only use atexit for SDL stuff, error, mem, console (and editor which we do later); Small Cleanup 2008-11-14 16:56:40 +00:00
zicodxx 1de53497b2 Using a clean flow for closing game data at the end of main() instead of using atexit; Now only use atexit for SDL stuff, error, mem, console (and editor which we do later); Small Cleanup 2008-11-14 16:56:40 +00:00
zicodxx 52ed53f829 Revisited Kip's non-Tracker changes and implemented to D2X: Prettier SConstruct output, Forgotten newlines at end of files, Improvement in dl_list code, Revamped menu GUI defines; I am NOT HAPPY I have to do these changes seperately 2008-10-28 17:58:54 +00:00
zicodxx f108f30ffd Added new function to calculate common timesteps; Increased MAXIMUM_FPS to 200 for release and 1000 for debug; Used fixed sim_time for do_physics_sim and Interpolating to ensure collisions stay accurate at high FPS; New code and faster code for dot products by The_Lion; Disabled Nice-FPS and common Frame-Loop if VSync is active; More accurate delta timer for mouse (consider overhead); Added SDL_(Un)LockAudio for old SDL Audio interface; General support for up to 16 mouse buttons; Code cleanup; Made some AI movement and Player shaking FPS-independent 2008-09-30 00:07:07 +00:00
zicodxx 63d2c4a2cf Added new function to calculate common timesteps; Increased MAXIMUM_FPS to 200 for release and 1000 for debug; Used fixed sim_time for do_physics_sim and Interpolating to ensure collisions stay accurate at high FPS; New code and faster code for dot products by The_Lion; Disabled Nice-FPS and common Frame-Loop if VSync is active; More accurate delta timer for mouse (consider overhead); Added SDL_(Un)LockAudio for old SDL Audio interface; General support for up to 16 mouse buttons; Code cleanup; Made some AI movement and Player shaking FPS-independent 2008-09-30 00:07:07 +00:00
kiplingw 41e1b91dd4 Added: Much more work on tracker...
Changed: Added PROGRAM_NAME to list of CPPDEFINES. Needed for tracker protocol's useragent submission...
2008-08-11 05:30:42 +00:00
kiplingw 4328ddcb05 Added: Mostly stubbed out test code for game tracker server stuff...
Fixed: Cleaned up some GUI macro code in menu.c...
Updated: CHANGELOG.txt for end user level changes...
SConstruct: Cleaned up build system a bit with prettier build messages, added a feature or two, and included tracker source
Fixed: Fixed harmless warnings on no new line at end of some source files...
2008-07-26 17:57:13 +00:00
zicodxx 0c7621c98c DXX-Rebirth release v0.54 2008-06-28 10:56:33 +00:00
zicodxx 5c1301beaa DXX-Rebirth release v0.54 2008-06-28 10:56:33 +00:00
kreatordxx 565ea29e05 Add audio CD support to D1X, fix associated bugs 2008-05-24 08:59:35 +00:00
zicodxx e478ad4584 Updated docs 2008-05-21 14:25:00 +00:00
zicodxx f0e0d797da Updated docs 2008-05-21 14:25:00 +00:00
zicodxx ec7f8b68de Extended Jukebox capabilities for looping and continous playing and added jukebox_free() which allows calling jukebox_load() being able to load a new directory; Added Jukebox options to sound options menu; Removed loop hack for Windows MIDI playback; SDL_mixer implementation can now be used for Windows build as well 2008-05-01 21:40:34 +00:00
zicodxx 039b8b551e Extended Jukebox capabilities for looping and continous playing and added jukebox_free() which allows calling jukebox_load() being able to load a new directory; Added Jukebox options to sound options menu; Removed loop hack for Windows MIDI playback; SDL_mixer implementation can now be used for Windows build as well 2008-05-01 21:40:34 +00:00
zicodxx a40b362ced Made joy_flush also resetting button state; Improved glReticle; Implemented Fallback resolution if SDL may fail; Code cleanup 2008-04-19 19:11:32 +00:00
zicodxx 9bcea627d1 Made joy_flush also resetting button state; Improved glReticle; Implemented Fallback resolution if SDL may fail; Code cleanup 2008-04-19 19:11:32 +00:00
zicodxx 44bbb66101 Implemented Console-style game logging system to print graphics, to stdout and gamelog.txt; Added structure to keep values for descent.cfg; Added aspect and Texture Filtering to descent.cfg; Removed mono code - printing important stuff over console; Removed some obsolete or very common defines; Code cleanup and small fixes 2008-04-06 20:23:28 +00:00
zicodxx a172315d4a Implemented Console-style game logging system to print graphics, to stdout and gamelog.txt; Added structure to keep values for descent.cfg; Added aspect and Texture Filtering to descent.cfg; Removed mono code - printing important stuff over console; Removed some obsolete or very common defines; Code cleanup and small fixes 2008-04-06 20:23:28 +00:00
zicodxx 70973d6a5d Implemented D2X code for wepaon cycling and reordering; Added lock status for mouse axis weapon cycling because of scaled mouse delta; Due to player feedback (any my opinion) making homer turn rate smaller to make them a bit harder to dodge; Preventing write of player data while Demo playback; Small code cleanup and corrections 2008-03-23 13:03:26 +00:00
kreatordxx 10e956ccde allow dxx.ini to stay with the binary for *NIX systems, with Mac OS 9 don't put user-created files inside the .app bundle 2008-03-22 04:48:37 +00:00
kreatordxx 52721ef7a2 allow dxx.ini to stay with the binary for *NIX systems, with Mac OS 9 don't put user-created files inside the .app bundle 2008-03-22 04:48:37 +00:00
zicodxx 6479a897b2 Fixed some memory issues; Fixed some HUD element alignment; Only send NetDrv packets if NetDrvInstalled is true; Fixed demo glitches; Actually using Game_mode in demos to make Newdemo_game_mode hacking obsolete 2008-03-08 22:37:09 +00:00
zicodxx f3d8d50a94 Reworked fonts routines - makes easier to expand and scale correctly; Reworked menus with better border scaling, improved rendering and cleanups; Improved font priniting ingame, better alignment; Reworked Netgame list; Real Doublebuffering in SDL-mode; Removed old and unused sources 2008-02-24 14:41:27 +00:00
zicodxx 8eb5c965d2 Reworked fonts routines - makes easier to expand and scale correctly; Reworked menus with better border scaling, improved rendering and cleanups; Improved font priniting ingame, better alignment; Reworked Netgame list; Real Doublebuffering in SDL-mode; Removed old and unused sources 2008-02-24 14:41:27 +00:00
kreatordxx 3a188fa14d support PC shareware files in full version build, make game data loading code easier to follow 2008-02-11 12:12:57 +00:00
zicodxx 46c229a572 Renaming udp.* to netdrv_udp.* to fit naming convention; Small menu ui fixes 2008-01-29 15:57:59 +00:00
zicodxx 8d025c7aef Renaming udp.* to netdrv_udp.* to fit naming convention; Small menu ui fixes 2008-01-29 15:57:59 +00:00
zicodxx b6f477a398 Cleanung up arch/ a little bit; Added mouse delta time interval for more more accurate reading at high FPS 2008-01-29 14:49:54 +00:00
zicodxx fe98538b2b Cleanung up arch/ a little bit; Added mouse delta time interval for more more accurate reading at high FPS 2008-01-29 14:49:54 +00:00