Commit graph

350 commits

Author SHA1 Message Date
zicodxx 10f39559bf Fixed wrong font width spacing, -gl_prshot, mission loading, null-terminatinon in several menus, cockpit glitch; Improved gl_reticle, -noredundancy; Some code cleanup 2008-02-27 22:05:58 +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 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
kreatordxx 9e47ebc29f allow custom MIDI in add-on hogs to be used without caching everything 2008-01-25 11:08:50 +00:00
zicodxx d7b3c878ed Fixed memory issue as Joystick freeing; Case-insensitive mission-loading; Added support for non-Hog'ed missions; Improved writing functions for config and player files 2008-01-23 17:28:28 +00:00
zicodxx 66ed0f62f1 Removed SDL Gammaramp code (obsolete); Improvements on Demo code 2008-01-13 13:27:58 +00:00
zicodxx a4c220c2e5 Fixing MAC compiling issues (hopefully); Re-Added IPX Socket option to Host menu for IPX games; Renamed netmisc.* to netpkt.*; Handling host disconnect for UDP games in network.c 2008-01-08 16:46:15 +00:00
zicodxx acdcb77711 Cleaned/Rewritten/Renamed lower level network layer to make it (look) less IPX-oriented 2008-01-02 15:36:51 +00:00
zicodxx 62f6f40ab3 Code cleanup - old/unused/obsolete multiplayer code and more 2007-12-29 14:18:49 +00:00
zicodxx d2ca16d4c1 Implemented new UDP/IP interface with Server-Relay (for firewalled users) and IPv6 compability; Fixed memory issues; If arguments -gl_mipmap and -gl_trilinear used both, always select -gl_trilinear 2007-12-17 22:45:45 +00:00
zicodxx df7a1ca071 Introduced timer_delay2 as replacement for timer_delay to sleep according to given FPS rate considering calc time between frames 2007-11-21 12:46:09 +00:00
kreatordxx 5cadba2207 print a more meaningful message when SDL fails to initialise OpenGL 2007-11-10 08:53:21 +00:00
kreatordxx e474abb5a0 port the jukebox to PhysicsFS for Mac OS 9 compatibility 2007-11-10 08:51:30 +00:00
kreatordxx fef59bdb3f various fixes towards getting it to build for Mac OS 9 again 2007-11-06 01:30:07 +00:00
md2211 c6407e0c2d Fixed crash on absent or invalid jukebox directory (testing scandir() return value) 2007-11-05 13:41:20 +00:00
kreatordxx a4beacd08a update Mac version info, set SHAREPATH to application folder for Mac OS X 2007-11-05 07:55:50 +00:00
kreatordxx 0907af33fc hack to remove warning when compiling on Mac OS X (constant/variable dirent parameter of file selection callback for scandir) 2007-11-03 05:50:45 +00:00
zicodxx 2d32bb7b3e Improvements for -gl_prshot; Improved show_netgame_info(); Removed obsolete multisave code 2007-10-31 00:49:45 +00:00
zicodxx 453cf2d609 Fixed problems with GameTime wraparound - delay sounds, cloak, invulnerability, ping; Added debug key to Reset GameTime for testing; Removed -gl_vidmem; Cheat-code cleanup; Some HUD message redundancy 2007-10-28 20:14:25 +00:00
md2211 b78a60d697 Fixed non-working jukebox next song advance (missing hook) 2007-10-28 16:52:22 +00:00
zicodxx 9577e61339 Small fixes; Code cleanup; Implemented PR-Screenshot feature 2007-10-18 14:44:02 +00:00
zicodxx b334ff5b97 Set SOUND_BUFFER_SIZE for SDL_mixer to 1024 to minimize delay; Removed MIDI-existance check and store all music to Music/ subdirectory of writedir - keeps clean if user has tons of levels; Added SDL_mixer command-line help output; Reworked PHYSFSX_init and removed SysUserDir so we can finally read args without a hassle; Stored MAXIMUM_FPS in game.h - where it belongs to 2007-10-13 23:52:17 +00:00
md2211 69492c702f Big args code refactoring, fixed issue with userdir d2x.ini, and a few other small things 2007-10-12 20:09:26 +00:00
zicodxx 6584e989a0 Fixed some command-line options 2007-10-12 19:36:16 +00:00
zicodxx 95533db358 Fixed some command-line options 2007-10-12 14:21:21 +00:00
zicodxx 487d3c55a9 Fixed port deformation while sending handshake 2007-10-12 14:02:34 +00:00
md2211 07245a0bc2 Enabled SDL_mixer sound backend for D2 movie playback. Works with SDL_mixer 1.2.8. 2007-10-11 13:23:00 +00:00
zicodxx b31fd2367e Changed name for Window Boxes - preventing redundancy in Windows build 2007-10-07 14:05:18 +00:00
zicodxx facee57d1f Not rendering additional transparency cockpit display anymore to ensure compability with custom cockpits; Improved overlay functions for cockpit elements 2007-10-05 23:47:16 +00:00
zicodxx 2a889d2d9c Moved Windows midi functions to digi_audio_* functions 2007-09-30 13:38:25 +00:00
zicodxx e955dff203 Updated docs; Removed GP2X support since I won't support this device anymore 2007-09-28 22:44:04 +00:00
md2211 a0b4cac982 * Removed executable flag on most files
* Reverted value of SOUND_MAX_VOLUME
2007-09-21 19:06:05 +00:00
md2211 84e32c1f4f Fixed missing stuff for NDEBUG in digi.c, in revisions 610/611 2007-09-18 19:24:44 +00:00
md2211 324c0df6a1 * Huge SDL_mixer refactoring; sound backend now selectable at runtime, in D1X & D2X
* Sound system now uses a set of function pointers (digi.c) as a single interface to either SDL or SDL_mixer
* Ported jukebox functionality to D2X
2007-09-18 13:37:39 +00:00
zicodxx 6391e10c83 If sdl_only=1 do not use Assembly code by default because of poor portability - switch asm=1 necessary now; Removed final remnants of glScissor 2007-08-28 00:01:25 +00:00
zicodxx b35d8bc170 Improved CPU cycles sleeping for -nicefps - moved out of main frame calc loop and taking care of 10ms timer inaccuracy 2007-08-25 23:35:19 +00:00
zicodxx be2eff9ae3 Moved piggy init loading for D1 missions to load_mission_d1 2007-08-24 13:36:01 +00:00
zicodxx 91c393fb54 Added ipx_check_ready_to_join for driver element CheckReadyToJoin, making sure communication between UDP/IP clients 2007-08-20 21:33:26 +00:00
zicodxx 2bc4cd32bb Cleanup in Config- and PLX-code; Saving Resolution in Config file so it will apply directly at game-init; Removed seperated resolution mode for menus, SCREEN_MENU now always uses Game_screen_mode; Last FindArg cleanups; Removed MenuHires(Available) and FontHires(Available) and replaced with HiresGFX(Available) to make a more common way to determinate if Hires data is used or not (interactive Demo); Improved support for Interactive Demo 2007-07-26 23:57:29 +00:00
zicodxx 2434d100a8 FindArg cleanup - GL-Debug and SDL arguments 2007-07-23 18:13:49 +00:00
zicodxx 3354c26219 Even more FindArg cleanups 2007-07-22 20:56:23 +00:00
zicodxx faa6122a4a Even more FindArg cleanups 2007-07-22 20:40:39 +00:00
zicodxx 860b964ee4 Code cleanup and small fixes 2007-07-22 01:34:00 +00:00
zicodxx 8e2aa8ea2a Cleaned up more FindArg's - general Debug Options; Cleanups 2007-07-18 20:13:17 +00:00
zicodxx 977084d457 Deletion of unused code 2007-07-16 02:46:47 +00:00
zicodxx 7d23cb6772 Cleaned up more FindArg's - Networking Options; Some fixes 2007-07-16 02:34:51 +00:00
zicodxx 29ef28bef3 Cleaned up more FindArg's - (most important) OpenGL Options 2007-07-15 21:22:07 +00:00
zicodxx a2a6959d39 Cleaned up more FindArg's - Graphics Options 2007-07-15 15:23:45 +00:00
zicodxx 8217e50e0c Cleaned up more FindArg's - Sound Options 2007-07-14 22:36:04 +00:00
zicodxx 8efe1ea653 Placing FindArg calls to seperated function, putting variables to a struct - frist step, not finished, yet; Large code cleanup 2007-07-14 20:33:42 +00:00
zicodxx cf14254e01 small code cleanup; improved texture caching in menus to save RAM 2007-06-15 12:32:44 +00:00
zicodxx 37b563d4cd complete removal of hmiplay-code usage 2007-06-15 08:10:19 +00:00
zicodxx b7f02568c0 fixed more compiler warnings 2007-06-11 15:54:09 +00:00
zicodxx e22e079b56 fixed a bunch of compiler warnings 2007-06-11 09:06:14 +00:00
zicodxx 5bcb0e1ed5 introduced new bitmap flag to draw cockpit bitmap with transparency; draw transparent cockpit bitmap over gauges to make it more pixel-correct; code cleanups 2007-06-10 16:21:53 +00:00
kreatordxx 82a39224b9 fix more Mac errors for new UDP/IP 2007-06-10 04:52:39 +00:00
kreatordxx 4f0ab045ff fix Mac errors involving use of 'VERSION' 2007-06-10 02:27:12 +00:00
zicodxx f1134f0bc3 Removed old UDP/IP and MCAST4 code; Implemented online-capable UDP/IP interface 2007-05-30 14:16:49 +00:00
kreatordxx 657e71fc93 look for music files in "Music" dir, store MIDI's in "Music/<hogfile>" to better support custom MIDI music 2007-05-27 05:27:17 +00:00
kreatordxx 0de587cadf make sure gl functions are not called before OpenGL is initialised, when fullscreen switching 2007-05-23 11:34:53 +00:00
zicodxx f20ec1e42e Added config field to map a Mouse Axis/Wheel to cycle Primary and Secondary weapons; lots of controls-related code cleaning 2007-05-14 13:38:44 +00:00
zicodxx d758d1bda6 update viewing values at Fullscreen Toggle; added Fullscreen Toggle to Menus and Demo Playback 2007-05-09 09:44:45 +00:00
zicodxx 49eaa12468 removed deprecated Makefile stuff 2007-05-03 15:16:27 +00:00
kreatordxx 8067b11be7 add Mac OS X support to SConstruct 2007-04-25 02:39:10 +00:00
zicodxx f1d191f665 removed -nocdrom argument, only use Redbook audio if specified with -redbook 2007-04-15 11:02:55 +00:00
kreatordxx 4ff4ddd0a3 include SDL/SDL.h for all platforms and physfs/physfs.h for Mac OS X to avoid having to add some hard-coded include paths 2007-04-09 02:41:45 +00:00
kreatordxx e89311954f move determination of WORDS_BIG_ENDIAN to pstypes.h as SCons can't do it (as far as I know). SCons doesn't make conf.h 2007-04-09 01:16:31 +00:00
kreatordxx 55bd12c349 remove final remains of VR_current_page and VR_use_paging, resolution variable cleanup - remove VGA_current_mode, VR_screen_mode, VR_render_buffer[0].cv_bitmap.bm_w/h and VR_render_width/height (Game_screen_mode is the actual resolution put in an int, not an index) 2007-04-05 13:23:44 +00:00
zicodxx 3d2063153f fixed typo in default broadcast 2007-04-03 22:16:19 +00:00
zicodxx b41a8a437a Use Doublebuffer in OGL for all parts of the game and properly redraw elements, fixed Profiler build 2007-03-22 11:32:22 +00:00
kreatordxx 21c844b377 remove final remnants of VR_current_page and VRF_USE_PAGING, also allowing -nodoublebuffer switch for all platforms. Fix single buffering for d2xgl 2007-03-21 12:35:35 +00:00
kreatordxx 751cbe1a91 add gr_flip, allowing significant cleanup including the moving of gr_show_canvas, Pages and VR_screen_pages to arch/dos/gr.c 2007-03-21 11:32:33 +00:00
zicodxx 558977d846 make Joystick Deadzone save in PLX file (Thanks xatmes) 2007-03-04 15:41:11 +00:00
zicodxx 28f3d619c2 removed WANT_AWE32 flag - too buggy; scaled space between Hud-messages; block Hudlog output messages beginning with you (your ... maxed out, you already have ...) 2007-03-04 15:01:17 +00:00
zicodxx 89ec716e75 improved DepthTest, fixing Clipping bugs 2007-02-26 13:32:00 +00:00
zicodxx effde7d236 Added ENTER as Game key 2007-02-19 23:28:43 +00:00
zicodxx 24c673dc13 SDL compile fix 2007-02-19 14:02:28 +00:00
md2211 7db969b9fe * Going back to PHYSFS_file type (lower-case 'f') for compatibility
* Turning off sound debug flags
* Optional micro versions (see SConstruct)
* Makefile emulation for SCons
2007-02-14 21:02:46 +00:00
zicodxx 7c9f8bf7fe set MENU_SCREEN_MODE at init to set movie according to -menu parameter and also prevent unnecessary screen changes 2007-02-09 12:38:21 +00:00
zicodxx 068c023f3b on-screen network error messages 2007-02-07 12:50:08 +00:00
zicodxx b8b765e9a9 removed -gl_transparency debug message 2007-02-02 13:30:31 +00:00
zicodxx b8d2f3e038 don't draw bombs with transparency even if -gl_transparency is enabled 2007-02-02 12:58:59 +00:00
zicodxx 58847c344e corrected UDP/IP error output 2007-01-30 00:00:53 +00:00
zicodxx f9788e5b5f added transparency effects for some bitmaps like explosions, powerups, weapons, etc. - to enable with -gl_transparency 2007-01-29 23:31:20 +00:00
zicodxx d4de0c28d3 write screenshots to subdirectory 2007-01-25 10:30:33 +00:00
zicodxx 184a7e133a fixed PRINTSCREEN key for WINDOWS 2007-01-22 10:52:01 +00:00
zicodxx a58dc03bab special WINDOWS fixes and cleanups, corrected automated UDP broadcast 2007-01-22 10:40:14 +00:00
zicodxx 31ef2e7066 in g3_draw_sphere align rad according to canvas so it is always in round shape 2007-01-20 17:18:42 +00:00
zicodxx 8382861962 gr_upixelc now able to scale pixels to current resolution 2007-01-19 19:52:11 +00:00
kreatordxx 48a163cf1f update to Novacron's 128x128-bit icon 2007-01-13 13:43:54 +00:00
kreatordxx 09f0b8d45f add Mac OS X icon 2007-01-07 00:27:32 +00:00
kreatordxx 96ee4e1082 use PhysicsFS to write MIDI file, make hmp2mid use PhysicsFS exclusively 2006-12-30 05:29:21 +00:00
kreatordxx 72a4f98889 allocate 'pixels' and 'texbuf' according to current screen resolution, saving over a hundred megabytes of memory 2006-12-29 09:50:21 +00:00
kreatordxx 83574d83b7 update version info, use DESCENT_VERSION instead of PACKAGE_NAME 2006-12-26 03:42:13 +00:00
kreatordxx 1437f3d2bc fix compile errors when building on Mac OS 9 using SDL 1.2.10 (conflicting macros, use of putenv) 2006-12-25 13:59:28 +00:00
kreatordxx 5d10e0bb25 use d_strdup instead of strdup to avoid errors when compiling on Mac OS 9, free the joystick button texts when closing 2006-12-24 08:56:39 +00:00
kreatordxx eae5a79ef2 add MIDI stubs for Mac, it doesn't have the 'real' functions yet 2006-12-24 08:46:12 +00:00
kreatordxx f6616058c1 allow universal binaries to be built using Xcode 2.1 or later (from D2X CVS) 2006-12-24 08:23:23 +00:00
kreatordxx a59b4363ad avoid loading OpenGL textures before they have been paged in, bug found by loading Abalyon 5 (from D2X CVS) 2006-12-24 07:38:33 +00:00
kreatordxx ae2621d33b use PhysicsFS to check for existing screenshots, previous method may have caused writing over of open screenshots (from D2X CVS) 2006-12-24 01:49:43 +00:00
zicodxx 3d3188473b GP2X handheld support; added SConstruct file (MAC support incomplete); code optimisations for software renderer; fixed memleaks 2006-12-19 02:25:50 +00:00
md2211 b77a53e44b * music volume now properly restored and remembered in D1 and D2, using a static int
* removed ugly hack that fixed this bug in D1 (inferno.c, revision 230)
2006-12-12 21:47:17 +00:00
md2211 a833d73d44 SDL_mixer backend implementation files for D2 2006-11-22 22:07:43 +00:00
md2211 452ae2d800 Repository cleanup: removing leftover Makefile.in file 2006-11-06 23:36:36 +00:00
md2211 a4597bc8be Initial integration of SDL_mixer sound system for Linux 2006-11-06 23:30:32 +00:00
zicodxx d4a6facf93 improved joystick code for more buttons 2006-11-02 13:35:45 +00:00
zicodxx 8cc35e82c7 command-line to set glScissor off if needed 2006-11-02 01:24:10 +00:00
zicodxx 8de8a3f968 made lines width scale to resolution; fixed compiler warnings 2006-10-20 23:18:04 +00:00
zicodxx d350a6b244 make write_bmp use PhysFS 2006-10-19 09:38:07 +00:00
zicodxx a4bc871cf8 fixing mem corruptions while closing joysticks - part 2 2006-10-17 22:28:10 +00:00
md2211 8f004f86a6 Fix for inherent limitation of pow2ize() and wrong description thereof 2006-10-17 18:19:20 +00:00
zicodxx 097bbbf81a fixing mem corruptions while closing joysticks; removed Joystick calibration which should be unnecessary with SDL 2006-10-16 23:22:32 +00:00
zicodxx 26e2bf1d0c re-activated Weapon Keys menu - aka D2X keys 2006-10-15 23:42:59 +00:00
zicodxx fd2090c761 fixing OGL compile bug; fixing calculation of object light before and after restoring a saved game 2006-10-15 12:26:13 +00:00
zicodxx a38b0674b4 once again better restricion for glClear while screen change 2006-10-13 09:58:31 +00:00
zicodxx 5510ef2d44 switching SDL gammaramp off by default because uses too much CPU 2006-10-12 09:55:32 +00:00
zicodxx 18974b921a re-enabled SDL_SetGammaRamp; removed FSAA because no function on all platforms; fixed offscreen render; better restriction to show menus ingame 2006-10-10 23:42:33 +00:00
zicodxx 9967ade7fb windows-related ogl code cleanups 2006-10-10 14:57:10 +00:00
zicodxx a1dcf39e3b if player is deleted also delete PLX file; removed date strings, not necessary; added Menu_special 2006-10-10 09:53:58 +00:00
zicodxx fd609ae169 introduced FSAA; fixed fullscreen toggle glitches; adjusted OGL_TEXTURE_LIST_SIZE and OGLTEXBUFSIZE; code cleanup; fixed memleak in game pause; restored font.c (oops) 2006-10-09 21:44:24 +00:00
zicodxx fb5445e09a print joystick dialog to stdout; print time with hud messages; fixing some graphical glitches; repaired brightness slider (oops); code cleanup 2006-10-08 23:19:46 +00:00
zicodxx 09ae63542c corrected demo-related font positions; fixed window view glitch in demo playback; merged ogl_ubitmapm_cs and ogl_ubitmapm_cf 2006-10-08 15:57:11 +00:00
zicodxx c251074930 added new control type: Joystick & Mouse (Thanks to The_Lion) 2006-10-07 01:12:25 +00:00
zicodxx 7b8399bfc6 clear up automake stuff, additions in DXX-COMPILE.TXT 2006-10-02 17:00:26 +00:00
zicodxx fa2329a901 compiler related changes (thanks to Chris Taylor) -part2: correction for digi stubs for MACINTOSH 2006-10-02 14:46:07 +00:00
zicodxx f841d7a5a3 compiler related changes (thanks to Chris Taylor) 2006-10-02 14:36:19 +00:00
zicodxx 0efe8e5ad7 don't allow MPW build to run in OS X (d2x-cvs takeover) 2006-10-02 13:12:15 +00:00
zicodxx f04d18371b added joystick deadzone feature 2006-09-29 21:42:32 +00:00
zicodxx a86ae94762 scalable HUD, improvements for HUD and cockpits, cleaner code, fixes to get SDL renderer working again 2006-09-29 00:57:57 +00:00
zicodxx 6bec053b4b some fixes for menus and automap; new aspect code; improved code to scale window for cockpits; introducing new variable in playsave.c to store game resolution and saving Game_window_h/h again properly - fixes bugs with screwed resolutions; making menus in game-resolution as default and re-activating old command-line arg '-menu<X>x<Y>' to scale menus 2006-08-30 18:12:04 +00:00
zicodxx 76707efea7 new code for ogl_offscreen_render, used it to reduce flickering in credits 2006-08-22 00:01:06 +00:00
zicodxx a522685568 made fonts scalable, added command-line to enable fixed fonts, made savegame thumbs scalable, reworked menu borders, new way to display level info in automap to get right with scaled fonts. additionally layed out special characters to newmenu.h, showing savegame thumbnail in save game window as well 2006-08-18 09:47:07 +00:00
zicodxx 7e3d272f62 show borders in SDL and OGL, optimized and cleaned 2006-08-07 00:27:18 +00:00
zicodxx 8dac6902ef disabled GL_CULL_FACE at ogl_end_frame to avoid problems with menus after player's death 2006-07-16 15:55:10 +00:00
zicodxx 05b378230d improved use of Depth Test, added experimental hack for 4D levels; removed two Asserts which fail with 4D levels 2006-07-11 16:14:17 +00:00
zicodxx 65dc458dcb corrected call of hmp_play 2006-05-06 12:03:06 +00:00
zicodxx 1081f38953 added variable aspect function, changed cmd-help, changed ini file 2006-05-06 09:44:44 +00:00
zicodxx a43384d92a midi repeat improvements 2006-05-05 14:18:42 +00:00
zicodxx 249088e477 added GL functions to fix the portal-bug; added exception boolean value tempNoDepthTest to render d1 endlevel correctly; code reformatting 2006-05-05 13:24:29 +00:00
zicodxx a039ad4945 improved cut_trough() to make misic sound better by limiting incrementation of j 2006-04-27 20:49:47 +00:00
zicodxx 6c882bee88 added cut_trough(), a clone of stop_all that is called to flush notes while playing a song to improve song switching 2006-04-27 20:38:15 +00:00
zicodxx c695946bab changed ogl_loadtexture to deal with transparent walls 2006-04-23 13:50:29 +00:00
zicodxx e106bedcce increased number of possible hats to resolve issues with axes recognition with two or more devices 2006-04-18 10:16:06 +00:00
zicodxx 0d0887ff75 small hack to prevent undefinied reference in windows build. need to be resolved 2006-04-16 05:12:31 +00:00
zicodxx 7a26d08501 removed fullok hack for fullscreen changing, added set_screen_mode call to prevent black screen at fullscreen toggle in windows build 2006-04-14 20:28:44 +00:00
zicodxx 4664ea8bea added 16to10 support 2006-04-08 18:54:35 +00:00
zicodxx 394cd7fe63 added mipmap operator to ogl_bitblt_i, added if to MovieShowFrame to switch off movie mipmap if argument -nomoviesmooth given, added command-line option, added new options to d2x.ini 2006-04-08 15:12:26 +00:00
zicodxx 2d1c7c02d7 added widescreen aspect with command-line option for SDL and OGL build 2006-04-03 21:16:40 +00:00
zicodxx 767ad29e19 set ogl_setgammaramp_ok to 0. no use of SDL_SetGammaRamp anymore, that would flash the whole screen 2006-03-28 12:04:16 +00:00
zicodxx b94413b91b initial import 2006-03-20 17:12:09 +00:00