Commit graph

377 commits

Author SHA1 Message Date
kreatordxx a7d99b894c Move newmenu_get_filename to menu.c, call it get_filename and have it use newmenu_listbox1; support long demo filenames 2009-12-08 11:01:36 +00:00
kreatordxx 8d653f877e Make newmenu.c nearly identical between D1X and D2X 2009-12-05 09:48:18 +00:00
kreatordxx 7ebcf32e45 Make the automap into a 'window', make kconfig.c more similar between D1X and D2X 2009-12-02 13:49:54 +00:00
zicodxx 75bc8beed1 Renaming FSCALE to FIXSCALE preventing possible naming conflicts 2009-12-01 16:45:40 +00:00
zicodxx 37b4803493 Squishing string-related bugs in Bomb display and Weapon reordering 2009-12-01 14:50:09 +00:00
zicodxx 88f0fdc562 Fixed missing define introduced in the last revision 2009-11-30 23:18:51 +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 86fcdc5d81 Draw Endlevel sequence with correct DepthFunc 2009-11-30 19:11:46 +00:00
zicodxx 127af323e0 Reintroduced Newdemo_game_mode to prevent demo playback from entering code parts it should not and fixing a bug with Multiplayer demos along the way, introduced in rev. 953 2009-11-30 14:59:37 +00:00
kreatordxx 0d3460062e Update to not compile redundant net_ipx.c for Mac OS X 2009-11-30 13:04:58 +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
kreatordxx 886b202f47 Make Mac version numbers consistent, Xcode build settings tidy up 2009-11-29 06:02:45 +00:00
zicodxx e9d4eb051e Fixed building error on Windows caused by false socket variable; Fixed compiler Warnings on Mac; Updated Mac build files; Unification in version numbering 2009-11-28 20:57:57 +00:00
kreatordxx 9192b5ede6 Fix some compile errors, including for the non-NETWORK build 2009-11-28 07:51:06 +00:00
zicodxx 242b3531fa Again making the joining safer 2009-11-25 00:26:26 +00:00
zicodxx fb08673f54 Removed timer_get_approx_seconds() and replaced with timer_get_fixed seconds since it was too inaccurate and created significant offset 2009-11-24 22:43:41 +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 2c2dc3fc13 Remove the IP check when processing game info or version deny as the IP might be translated (IPv6 especially) 2009-11-24 12:12:15 +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
zicodxx 05ff20ccfb Adding cfile.h include to get CFILE definition work again 2009-11-22 11:07:25 +00:00
kreatordxx 96d305e54c Only list resolutions that can actually be used, using new gr_check_mode 2009-11-17 14:27:39 +00:00
kreatordxx d57c2981c2 Add endian converter for demos, read shareware demos, various bugfixes to demo system 2009-11-15 08:22:08 +00:00
kreatordxx 70bbac21b7 Read big endian savegames on little endian computers and vice versa 2009-10-05 02:51:37 +00:00
kreatordxx 31413b59df Fix compile error with ai_restore_state and include necessary ogl_init.h in state.c (whoops) 2009-09-11 05:15:53 +00:00
kreatordxx e7b5721797 Add program for extracting Mac data files from installer 2009-09-09 02:49:11 +00:00
kreatordxx 90c02b1ea3 Make state.c more similar between D1X and D2X 2009-08-22 07:21:19 +00:00
kreatordxx d7e33667bf Make the game screen into a \'window\', handling events through event_process 2009-08-10 10:47:17 +00:00
kreatordxx 16f615c6ff Make game.c more similar between D1X and D2X, making related changes to other files (\!) 2009-07-01 11:35:33 +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 78d9b8f15f Make inferno.c more similar between D1X and D2X 2009-05-31 07:20:26 +00:00
kreatordxx ab40bd7566 Add include directives for last commit (whoops) 2009-05-22 10:53:14 +00:00
kreatordxx 45ba0ca307 Add new window system, not used yet 2009-05-21 12:16:39 +00:00
kreatordxx d7d319624b Add option to force either Redbook or Jukebox to use the playing order for the game CD 2009-05-06 12:19:28 +00:00
kreatordxx f139dda3a6 Make some files more similar between D1X and D2X 2009-05-03 12:31:30 +00:00
kreatordxx db27b1723d Remove redundant conf.h directives 2009-04-30 13:01:31 +00:00
kreatordxx 36e6885115 Disable network support for Mac OS X for now 2009-04-30 12:30:14 +00:00
zicodxx 85b086c0ef Abstracting networking protocols - Step 3: Renaming network_* functions to net_ipx_*, writing wrappers for protocol dependend functions in multi.c, Implementing protocol selection and Cleanup - Next up: Implementing new UDP layer 2009-04-09 07:41:30 +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 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
kreatordxx f149ace782 Associate the jukebox with Redbook Audio via new 'extmusic' layer - separating from MIDI and making it handle ALL music (not just game music) 2009-03-03 12:55:27 +00:00
zicodxx abf43c66f8 Small positional correction for homing-warning bitmap 2009-02-23 10:21:25 +00:00
zicodxx 80debdb4d5 Made our Cockpit-Transparency decoding function a bit safer for current and possibly new code flow 2009-02-23 10:15:23 +00:00
kiplingw 586b27ed99 Updated: d1x-rebirth CHANGELOG.txt... 2009-02-23 00:39:19 +00:00
zicodxx 43190e625e Fixed param handling of expl_obj in do_explosion_sequence for the case that free_object_slots might have it set to OF_SHOULD_BE_DEAD before it's actually attached to another object 2009-02-22 10:53:10 +00:00
zicodxx d7a8f5ad84 Made Max_used_objects an absolute defined value; Made num_objects globally available; Restricted Weapon drops to MAX_USED_OBJECTS; When dropping Secondary weapon, drop 4-pack if possible 2009-02-17 11:34:16 +00:00
zicodxx 5618f08d2d Added list to keep trace of received PDATA packets so receiver won't interpret them several times 2009-02-15 19:03:57 +00:00
zicodxx 30590cf3b1 When creating new player, make sure string is long enough for use with players dir 2009-02-09 10:59:59 +00:00
zicodxx e6b7867b27 Removed PH_SCALE on Keyboard readings as caps movement not in sync to FrameTime; Removed scaled Joystick reading as it's not necessary anymore 2009-02-09 10:52:42 +00:00
zicodxx 4ee0b415ad Make sure HostAddr buffer is directly saved as soon as we confirm it in the entry field 2009-02-08 12:55:50 +00:00
zicodxx ecbcec78d3 Fixed connect-state mess in order of kmatrix flow 2009-02-08 12:49:27 +00:00
zicodxx 177a49ac63 Small docs update; Noloss thinking flaw correccted: Add a special type for PDATA packets that need to be ACK'd so other clients won't ACK everything 2009-02-06 09:40:00 +00:00
zicodxx 5c566411e1 Close out fire from queue list as this is not necessarily needed to keep games in sync; While processing the noloss queue, only process 5 packets max 2009-02-03 10:56:22 +00:00
zicodxx 39ce196542 Removed MULIT_POS_* hanldings as these signals are not created anymore 2009-02-02 10:56:12 +00:00
zicodxx 21d9308934 Made FPS string statically right-justified - unrelated to actual FPS string width preventing jumps 2009-02-02 09:02:29 +00:00
zicodxx fd8b425243 Defined some default cockpit modes in Demo mode so we do not get invalid values when demo starts in non-default-view mode (as new HUD modes are only triggered at beginning and end of event); Removed Newdemo_flying_guided global; Init seismic disturbances in demo mode just to make sure tey are switched off when coming from game mode; Made initialisation for Missile_viewer signature saving global so we can reset it for each new level and make sure we get a correct missile view; Fixed regression in Ai_last_missile_camera 2009-02-02 08:49:58 +00:00
zicodxx f84a267dd1 Added Packet-loss prevention code for Netgames 2009-01-31 23:47:15 +00:00
kreatordxx cb9afb9bdf Last track is endgame track for any audio CD, endgame track not played when a level is started, jukebox/redbook works in game even if no MIDI songs 2009-01-31 06:37:43 +00:00
zicodxx b63f988d37 New level render order for better seperation and blending between transculent level geometry and sprites 2009-01-30 11:50:25 +00:00
kreatordxx cf8981eb76 Update version to 0.55.1 for Mac 2009-01-26 05:41:45 +00:00
zicodxx 6ba4be9e2b Changed function naming convention in netdrv and below to general Descent code convention 2009-01-26 05:01:18 +00:00
zicodxx 1acc8031b6 Removed some old code to smooth FrameTime we don't need anymore 2009-01-24 22:44:57 +00:00
zicodxx 21738cdd2c New condition to switch to Interpolated demo playback - the old one did NOT make ANY sense at all 2009-01-22 12:30:32 +00:00
zicodxx 3699f316cc Took out old missile tracking code to be selectable over command-line to preserve consistency 2009-01-17 11:11:07 +00:00
zicodxx e6c160ca85 Made MouseFilter selectable over Controls menu while defaulting to OFF - Saved in PLX 2009-01-17 11:02:59 +00:00
zicodxx cf5c44321c Error handling while dumping TGA file - (partially) Patch by v66r 2009-01-16 00:12:04 +00:00
zicodxx e04250e266 Reduced size of vectorial reticle to match the size of the original one; Only scale fonts by float if Texture filtering is on - otherwise scale by int 2009-01-15 23:58:36 +00:00
zicodxx c37285c217 Fixed typo in mouse delta reading cleaning not up Z-Axis; Giving automap a nicer Frameloop; Small cleanup 2009-01-15 20:55:35 +00:00
zicodxx 007e23461e Cleaning up the mess from revision 892... 2009-01-15 01:05:31 +00:00
kiplingw 0b25644600 Updated: Change log... 2009-01-14 19:58:58 +00:00
zicodxx 6038280726 Added some randomness to collision sound delays and synced robot-player collision sprites to same steps 2009-01-13 16:53:10 +00:00
kreatordxx 81de582264 Use a 2D array to allow playing of songs by track number in future 2009-01-13 12:39:03 +00:00
zicodxx f1544295dd Adjusted D1 Lifter collision damage according to D2 to scale with FPS as Melee combats can happen in every frame; Actually set velocity from movement when colliding with objects 2009-01-13 01:19:19 +00:00
md2211 edfe0e0b47 Debian packaging scripts 2008-12-30 22:14:06 +00:00
kreatordxx b7a0db130b Increment Mac version number, update project for latest Xcode 2008-12-27 09:19:19 +00:00
kiplingw 3afde73ac6 Fixed: Segfault via buffer overflow when attempting to start or join a UDP/IP netgame in both d1x-rebirth and d2x-rebirth. Reproduceable on my box only in release mode and not debug... 2008-12-27 04:23:56 +00:00
kreatordxx b848edbdef Now the Mac D1X command keys work (whoops) 2008-12-24 06:09:53 +00:00
kreatordxx 7b9dc359bb Make Redbook the default for Mac, because MIDI is buggy 2008-12-23 10:05:23 +00:00
kreatordxx 410707171e Set SHAREPATH to "." so reading data from DXX's directory ACTUALLY WORKS 2008-12-21 08:59:17 +00:00
kreatordxx 33fb9fc7eb Fix Mac OS 9 compile issues, update Xcode project 2008-12-21 08:54:03 +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
zicodxx 828d753668 Seperated help screens for game, netgame and demo; Also show them in Controls menu; Small Menu UI fix for ScrollOffset when calling menus in a scrolled area of a menu 2008-12-13 12:58:57 +00:00
kreatordxx 0a7a505912 Fix short_frameinfo sending code for big endian processors 2008-12-13 04:05:30 +00:00
zicodxx 39b54f1686 Added /KillReactor command to blow up the reactor in Multiplayer games 2008-12-12 15:53:13 +00:00
zicodxx 616ddc6c45 Changing back the use of D*X_IVER for Version checking as IVER is already too big for ubyte 2008-12-12 02:05:30 +00:00
zicodxx 53efe6c01a Cleaned a frameinfo-packet related code and introduced more of D2X - especially for short packets (which is thankfully covered by Version checking) 2008-12-12 01:36:34 +00:00
zicodxx c87b860595 Made MULTI_D1X_PROTO use D1X-IVER so no different releases can play together with Version checking enabled 2008-12-08 15:45:12 +00:00
kreatordxx f257e48ddc Get Mac command keys working, MACINTOSH code cleanup, update Xcode project 2008-12-07 12:26:43 +00:00
zicodxx 58734beacb Restored vertical_thrust_time behaviour combined with slide_on to be inverted - respecting user's wishes 2008-12-01 09:31:21 +00:00
zicodxx c11f203abd Deactivated depth writing fo g3_draw_bitmap() sprites to prevent rendering errors when clipped in some cases 2008-11-26 01:24:58 +00:00
zicodxx 8466399451 Took out the disable_new_fvi-hack. After all we do not need that specific optimisation anymore and also without it we can have more accurate collisions with non-player objects. After playtesting for a while let's just do this. 2008-11-22 00:43:59 +00:00
zicodxx c19aa8c19a Increasing Render_depth to max. if OGL build (we probably should get rid of these variables, but may still be handy for non-3D-accellerated build optimisations) 2008-11-21 16:09:41 +00:00
zicodxx c5c4870573 Do not allow to restore games while player is dead... again - to much trouble right now; Solving small display issue when fading out weapons which ran out of ammo 2008-11-21 00:12:41 +00:00
zicodxx d09569b56c Small transparency fix for robot weapons; Some timer-Failsafe in robot/boss dying frames; Fixed logical flaw in create_small_fireball_on_object() closing out sound effects on robots 2008-11-20 18:02:42 +00:00
zicodxx 58d1871199 When we reached MAX_BOSS_TELEPORT_SEGS in init_boss_segments, make sure we also escape out of the for-loop - otherwise we still might overflow 2008-11-20 02:09:01 +00:00
zicodxx 335543283e Do a songs_init() each time a song is played and try to read a new descent.sng - supporting descent.sng files in hog archives 2008-11-19 15:52:07 +00:00
zicodxx 2e5cd378d3 Actually demand ANY valid key to abort the Death sequence 2008-11-19 12:34:50 +00:00
zicodxx 8702e9517a Changed keys for Automap Viewing Distance to F9/F10 - Minus/Equal is not Layout independent 2008-11-18 14:43:30 +00:00
zicodxx 1cbb44a897 Fixed Cheats 2008-11-18 14:34:52 +00:00
zicodxx 076e466009 Yet another UNICODE overhaul - Using seperate buffer for UNICODE chars and only use it in key_ascii() while still using keysyms for the rest of the program so we do not screw up readings by key values altered by modifers - possibly still room to optimize 2008-11-17 23:38:43 +00:00
zicodxx 53a15a829a When printing Gamelog, make sure canvas is NULL 2008-11-17 23:28:59 +00:00