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

395 commits

Author SHA1 Message Date
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 a4e396aa53 Remove -D_REENTRANT and instead pass -pthread 
Pass -pthread to let gcc define threading, instead of using -D_REENTRANT
directly.
 2013-03-03 22:24:12 +00:00
Kp 466e6e8f54 Move compiler flags out of SConstruct preprocessor line 2013-03-03 22:23:44 +00:00
Kp 9b8af60c2c Prepare for files to be in a subdirectory 2013-03-03 02:20:54 +00:00
Kp b92a7d14be Move register_program into subclass 2013-03-02 23:58:29 +00:00
Kp 13bb74f9ca Move net_udp.c reference to subclass 2013-03-02 23:17:38 +00:00
Kp e2c8e95cfc Move names of platform-specific sources into subclasses 2013-03-02 23:00:10 +00:00
Kp 2851dac581 Combine platform-specific settings construction 2013-03-03 01:54:44 +00:00
Kp e5b4664555 Use pkg-config to get libSDL settings 2013-03-03 01:52:59 +00:00
Kp b1b9775052 Copy source lists into individual program objects 
This is required once unification begins.
 2013-03-02 22:41:05 +00:00
Kp ef996d2772 Generate resource file at build time 2013-03-02 21:25:47 +00:00
Kp 6acace06f4 Move SCons rules into wrapper classes 2013-02-25 02:01:28 +00:00
Kp cbbc9740ae Remove ineffective LINKFLAGS assignment 2013-02-25 02:01:28 +00:00
Kp 8d07bf2b38 Move platform-specific settings into specialized settings classes 2013-02-25 02:01:28 +00:00
Kp 6ef163d02c Collapse ogldefines handling 
ogldefines is always set to ['OGL'], so remove the definitions of it and
just set that value explicitly when OpenGL is used
 2013-02-25 02:01:28 +00:00
Kp 35141d190c Simplify copying in compiler environment variables 2013-02-25 02:01:28 +00:00
Kp e2e89ec8f5 Move command line settable values into class Settings 2013-02-25 02:01:28 +00:00
Kp 38ce033428 Overload argument lookup to allow version-specific names 2013-02-25 02:01:28 +00:00
Kp d14a6860a4 Rename D1XMAJORi/D1XMINORi/D1XMICROi to DXX_VERSION_MAJORi/DXX_VERSION_MINORi/DXX_VERSION_MICROi 2013-02-25 02:01:28 +00:00
Kp f75513e03d Rename D1XMAJOR/D1XMINOR/D1XMICRO to VERSION_MAJOR/VERSION_MINOR/VERSION_MICRO 2013-02-25 02:01:28 +00:00
Kp 4f85c21f13 Fix incorrect usage of no_asm in SConstruct 
zico switched the variable to 'asm' in dac257e, so referring to no_asm
has no effect now.
 2013-02-24 05:14:11 +00:00
Kp fd22ea5726 Normalize comments and whitespace to match D2X 2013-02-21 00:20:52 +00:00
Kp 7f137ac493 Move arch_sdlmixer to the same relative position as in D2X SConstruct 2013-02-21 00:14:04 +00:00
Kp 4167cf9685 Move main/hash.c -> misc/hash.c to match D2X 2013-02-21 00:13:56 +00:00
zicodxx fb9c3b8cce Patch by A Future Pilot to hopefully fix bug which prevented building source within MinGW if Visual Studio installed 2013-01-08 17:53:10 +01:00
zicodxx 495333522d Some Sconstruct lovin': Respect LDFLAGS; Made D1XMAJORi/MINORi/MICROi compile time constants; Do not pass CFLAGS to CXX; Mark some more warnings as errors - patches by Kp 2012-07-28 01:41:30 +02: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
Kp a45411b31f Switch from C99 to Gnu99 to make editor build work 2013-03-09 22:11:54 +00:00
Kp d6dba018c7 Remove -D_REENTRANT and instead pass -pthread 
Pass -pthread to let gcc define threading, instead of using -D_REENTRANT
directly.
 2013-03-03 22:24:12 +00:00
Kp 3fdb558ecb Move compiler flags out of SConstruct preprocessor line 2013-03-03 22:23:44 +00:00
Kp 22d38bcace Prepare for files to be in a subdirectory 2013-03-03 02:20:54 +00:00
Kp 67f433b3f1 Move register_program into subclass 2013-03-02 23:58:29 +00:00
Kp b77e563e50 Move net_udp.c reference to subclass 2013-03-02 23:17:38 +00:00
Kp 1c52e588df Move names of platform-specific sources into subclasses 2013-03-02 23:00:10 +00:00
Kp c03c9f128c Combine platform-specific settings construction 2013-03-03 01:54:44 +00:00
Kp c282e0b852 Use pkg-config to get libSDL settings 2013-03-03 01:52:59 +00:00
Kp 39bbc74872 Copy source lists into individual program objects 
This is required once unification begins.
 2013-03-02 22:41:05 +00:00
Kp f9397bdfc5 Generate resource file at build time 2013-03-02 21:25:47 +00:00
Kp ed33108ae7 Move SCons rules into wrapper classes 2013-02-25 01:59:08 +00:00
Kp 96bf0f5bee Remove ineffective LINKFLAGS assignment 2013-02-25 01:59:08 +00:00
Kp dbf90c43db Move platform-specific settings into specialized settings classes 2013-02-25 01:59:08 +00:00
Kp e14d2ad601 Collapse ogldefines handling 
ogldefines is always set to ['OGL'], so remove the definitions of it and
just set that value explicitly when OpenGL is used
 2013-02-25 01:59:08 +00:00
Kp 857c8d30ac Simplify copying in compiler environment variables 2013-02-25 01:59:08 +00:00
Kp 87ac6ea221 Move command line settable values into class Settings 2013-02-25 01:59:08 +00:00
Kp f702d92c5a Overload argument lookup to allow version-specific names 2013-02-25 01:59:08 +00:00
Kp 93a23298ff Rename D2XMAJORi/D2XMINORi/D2XMICROi to DXX_VERSION_MAJORi/DXX_VERSION_MINORi/DXX_VERSION_MICROi 2013-02-25 01:59:08 +00:00
Kp 5e7db3626a Rename D2XMAJOR/D2XMINOR/D2XMICRO to VERSION_MAJOR/VERSION_MINOR/VERSION_MICRO 2013-02-25 01:59:08 +00:00
Kp 2c5ecf0829 Revert "Move main/bmread.c to be sorted in SConstruct" 
This reverts commit e3dd328e66.

Folding hid that this move migrated bmread.c from common_sources to
editor_sources.
 2013-02-25 01:59:05 +00:00
Kp 839c8d3c43 Normalize comments and whitespace to match D1X 2013-02-21 00:25:12 +00:00
Kp e3dd328e66 Move main/bmread.c to be sorted in SConstruct 2013-02-21 00:25:12 +00:00
zicodxx 125fbb0ab8 Support for Raspberry Pi - patch by derhass 2013-01-22 00:34:06 +01:00
zicodxx fa3a0c60fc Patch by A Future Pilot to hopefully fix bug which prevented building source within MinGW if Visual Studio installed 2013-01-08 17:53:12 +01:00
zicodxx f41c2443b3 Some Sconstruct lovin': Respect LDFLAGS; Made D2XMAJORi/MINORi/MICROi compile time constants; Do not pass CFLAGS to CXX; Mark some more warnings as errors - patches by Kp 2012-07-28 01:41:40 +02: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