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

3636 commits

This branch
This branch
All branches
Author SHA1 Message Date
Kp 2e3159a15f Mark gr 2dsline functions static 2013-06-14 03:40:50 +00:00
Kp c69644dcf7 Wrap C++-incompatible statements with #ifndef __cplusplus 2013-06-14 03:40:50 +00:00
Kp 5648874a37 Merge branch d2x-rebirth/master into unification/master 2013-06-14 03:31:59 +00:00
Kp 88208fc228 Merge branch d1x-rebirth/master into unification/master 
Conflicts:
	SConstruct
	d1x-rebirth/main/multi.c
	similar/main/cntrlcen.c
	similar/main/wall.c
 2013-06-14 03:18:32 +00:00
Kp b685253fef Use enum for multiplayer message numbers 2013-06-14 03:04:23 +00:00
Kp 9af78b7217 Compute message_length limit automatically 2013-06-14 03:04:23 +00:00
Kp d59f9085ff Make piggy_find_bitmap input mostly const 2013-06-14 03:04:23 +00:00
Kp f37a127b1f Use inline function to compute placement names 2013-06-14 03:04:23 +00:00
Kp ac97642962 Simplify left rotation to help the compiler 2013-06-14 03:04:23 +00:00
Kp c60c2dea30 Remove obsolete advice about level saving 
Levels are no longer maintained under DOS.  Remove the obsolete advice.
 2013-06-14 03:04:23 +00:00
Kp 3057daab4c Use symbolic indexes for secondary weapon names 2013-06-14 03:04:23 +00:00
Kp a7ed209c21 Use enum for multiplayer message numbers 2013-06-14 03:00:23 +00:00
Kp f1615122ca Compute message_length limit automatically 2013-06-14 03:00:23 +00:00
Kp 0493a80ba3 Remove obsolete advice about level saving 
Levels are no longer maintained under DOS.  Remove the obsolete advice.
 2013-06-14 03:00:23 +00:00
Kp a85927fc68 Use inline function to compute extra-short secondary names 2013-06-14 03:00:23 +00:00
Kp 55664f0a8a Convert text index macros to ternary expressions 2013-06-14 03:00:23 +00:00
Kp f39e99f9be Avoid some weapon name copying 2013-06-14 03:00:23 +00:00
Kp 0674740490 Remove unused gr_bm_ubitblt0x_rle parameter masked 2013-06-13 03:23:25 +00:00
Kp 37ac3f635c Use MENU_DIFFICULTY_TEXT for pause dialog 2013-06-13 03:23:25 +00:00
Kp fe2e19d655 Convert text index macros to ternary expressions 2013-06-13 03:23:25 +00:00
Kp e9f483a3e3 Move demo ammo recording up so it works in immersion mode 
Immersion mode bypasses draw_hud, so the calls to record ammo into the
demo were skipped.
 2013-06-13 03:23:25 +00:00
Kp 4a817f2cfa Avoid some weapon name copying 2013-06-13 03:23:25 +00:00
Kp 64b8cfd4d6 Remove unused SW_* variables 2013-06-13 03:23:24 +00:00
Kp ace282222f Use inline function to compute extra-short secondary names 2013-06-13 03:23:24 +00:00
zico 8148ddd416 merge 2013-06-11 12:21:38 +02:00
zico 93ce131fe0 merge 2013-06-11 12:21:26 +02:00
zico 0353baad82 removed silly debugging message I forgot to remove recently 2013-06-11 12:21:05 +02:00
zico 918b08e688 Consider FrameTime overhead when calculating time to allow next weapon fire. Should work perfectly as long as FPS >= Shots-per-second. Also set Omega firing rate to 20 shots per second for both single- and multiplayer 2013-06-11 12:19:03 +02:00
zico ac095f84c7 Consider FrameTime overhead when calculating time to allow next weapon fire. Should work perfectly as long as FPS >= Shots-per-second. 2013-06-11 12:18:47 +02:00
Kp 1aeffee153 Add Win32PlatformSettings.__init__ to fix SConstruct for Windows 2013-06-11 02:28:07 +00:00
Kp c9e638d8ef Remove obsolete TXT_ macros 2013-06-11 02:28:07 +00:00
Kp d1e260e582 Add Win32PlatformSettings.__init__ to fix SConstruct for Windows 2013-06-11 02:27:59 +00:00
zico bffa6ac838 Fixed case where it wasn't possible to switch to view of a player > X if player X was missing 2013-06-11 01:19:56 +02:00
zico 28419bcd32 Changed message regarding VSync and Multisampling indicating not all OSes need a restart to apply (mysteries of SDL) 2013-06-11 01:07:12 +02:00
zico 7482ffee9e Changed message regarding VSync and Multisampling indicating not all OSes need a restart to apply (mysteries of SDL) 2013-06-11 01:07:06 +02:00
zico 9b3e6dd50a Don't try to free Current_mission->alternate_ham_file if not allocated 2013-06-11 01:00:37 +02:00
zico c7f2ed7bb1 Fixed briefing_screens array for Descent 1 Shareware 2013-06-11 00:48:23 +02:00
zico f28f9a07e4 Fixed briefing_screens array for Descent 1 Shareware 2013-06-11 00:48:16 +02:00
zico c1578e6937 Made wall_damage() and blast_blastable_wall() similar to D2X-Rebirth code base. Also fixing regression introduced in a4068234b4 causing blast_blastable_wall() being called multiple times and causing high damage 2013-06-11 00:17:00 +02:00
zico c65b0a5d3c Removed call of digi_stop_digi_sounds() from DoPlayerDead(). Since it was killing persistent sounds which were only started once a level it would forever mute fans, waterfalls, etc.. Also closing Game_wind kills all sounds anyways so there is no point doing it on player death 2013-06-10 23:58:30 +02:00
zico 112866ef3d merge 2013-06-10 22:07:49 +02:00
zico 4a223d102c merge 2013-06-10 22:07:43 +02:00
zico bb57521ef1 re-init digi system after re-setting sample rate for shareware 2013-06-10 17:19:37 +02:00
zico fc26c7c605 Made hmp code actually read tempo. Due to missing documentation of the format I can only guess it's a 4 bit int 2013-06-10 16:34:52 +02:00
zico 6b0e493500 Made hmp code actually read tempo. Due to missing documentation of the format I can only guess it's a 4 bit int 2013-06-10 16:34:45 +02:00
Kp 22e31c0e8d Remove unused argument to clear_warn_func 2013-06-08 23:12:44 +00:00
Kp 49b547cb45 Fix font prototype mismatch in SDL-only case 
Commit 33bf139002 changed OGL
gr_internal_color_string to take a const char, but left SDL
gr_internal_color_string with non-const char.
 2013-06-08 17:38:36 +00:00
Kp 2cece43d4b Fix recvfrom prototype mismatches 
Win32 uses int* instead of unsigned int*.  Fortunately, socklen_t is
defined to the correct type in both cases, so use socklen_t and let the
compiler sort it out.
 2013-06-08 17:43:35 +00:00
Kp 105be723f8 Adjust handling of weapon cycle with superlaser 2013-06-08 02:58:06 +00:00
Kp b29c4e8120 Mark bitblt.c functions static 2013-06-08 23:35:21 +00:00