Commit Graph

5163 Commits

Author SHA1 Message Date
Christoph Oelckers 689b39ed30 Merge branch 'bug-47011' of https://github.com/kevans91/zdoom 2014-12-02 09:06:20 +01:00
Kyle Evans 3af08f1983 Fixed weapon drawing rules to account for the death camera [backported from gzdoom], also fixed drawing rules for crosshair 2014-12-01 22:03:22 -06:00
Kyle Evans 8b88f14c96 Destroy mod-created CVars when 'restart' is invoked 2014-12-01 21:04:50 -06:00
Christoph Oelckers 717c82ee4a - On Intel, we have to disable shader storage buffers because their complier contains a bug disallowing unsized arrays. 2014-12-01 09:58:23 +01:00
Christoph Oelckers ed5b0d902a Merge branch 'BotFunctions' of https://github.com/ChillyDoom/zdoom 2014-11-29 20:22:21 +01:00
ChillyDoom e7da849f77 - Moved bot specific functions into DBot. 2014-11-29 17:03:58 +00:00
Christoph Oelckers 020b02e073 - changed deprecated texture sampler access function names. 2014-11-28 12:28:45 +01:00
Edward Richardson a418f564e9 Fixed message duplication in logs
- Any printed hud messages would have duplicate entries in logs.
2014-11-28 16:34:42 +13:00
Christoph Oelckers 3e2b0e4c71 Merge branch 'raise' of https://github.com/MajorCooke/zdoom 2014-11-27 22:37:36 +01:00
MajorCooke 94f08aa593 - Added: Boolean to specify if A_Raise functions should perform CopyFriendliness based upon who raised it. By default, this is false. 2014-11-27 15:12:33 -06:00
khokh2001 e1fdcdfb93 opl3 emulator update 2014-11-28 04:07:33 +09:00
Christoph Oelckers ec627d94dd - fixed: The depth clamp setting needs to be tracked per portal so that it can be properly restored afterward.
Regular skies need it off but SkyViewpoints need it on - and all others need to use the parent's setting.
So without engine side tracking we can end up rendering the sky with this setting off, resulting in omission of the fog layer.
2014-11-27 12:26:52 +01:00
Christoph Oelckers eb753a0b7c - fixed: We also should use the proper 'copied' info for the non-inverted planes. 2014-11-27 10:49:03 +01:00
Christoph Oelckers 99d81621f9 - fixed: The 'copied' information of a 3D floor plane should only apply to that particular plane, but never the opposite one of the same 3D floor. 2014-11-27 10:46:28 +01:00
Christoph Oelckers 1389cd03ca Merge branch 'hqnx_intrinsics' of https://github.com/alexey-lysiuk/gzdoom 2014-11-27 10:10:25 +01:00
alexey.lysiuk 60d78bcdf6 - implemented hqNx image scaling algorithms using MMX and SSE2 intrinsics 2014-11-27 10:58:34 +02:00
Christoph Oelckers b2fdd32b0a Merge branch 'fade' of https://github.com/MajorCooke/zdoom 2014-11-25 20:56:54 +01:00
MajorCooke 08570ec48e - Added flags for A_Fade functions:
- FTF_REMOVE: Removes the actor when the alpha hits a certain level.
- - A_FadeIn - 1.0
- - A_FadeOut - 0.0
- - A_FadeTo - Alpha target level reached
- FTF_CLAMP: Automatically fixes the alpha so it won't leave the range [0.0, 1.0].
2014-11-25 13:24:35 -06:00
Edoardo Prezioso 629f3c1a8a - Oops comment typo. 2014-11-25 19:23:49 +01:00
Edoardo Prezioso 8fbed78c21 - Add new function for the new slope calculations.
Fixed also two MSVC warnings.
2014-11-25 19:15:25 +01:00
Christoph Oelckers a67ac5d940 Merge branch 'slope64_comment' of https://github.com/edward-san/zdoom 2014-11-25 17:39:08 +01:00
Edoardo Prezioso cc4e66f976 - Fix the division by 0, improve comments.
- Avoid doing the division if the result would be outside the ]0,1<<24[ range:
-- if the numerator is nonpositive, ie <=0, truncate the result to 0,
-- if the numerator is greater or equal than the denominator, the result will be outside the allowed range, hence truncate the result to 1<<24.
-- otherwise, the result will be inside the range. Knowing that the denominator is greater than the numerator, if the numerator has the last 24 bits non zero, the denominator can't be less than 1<<24, hence the denominator won't be truncated to 0.
- Add comment details to help who doesn't know math. Big deal!
2014-11-25 17:02:22 +01:00
Christoph Oelckers 29ecbac963 - fixed: The demo buffer was allocated with conflicting methods, because M_ReadFile used new whereas the rest of the demo code assumed malloc. Added a new M_ReadFileMalloc function to handle this case without rewriting other things. 2014-11-25 17:00:17 +01:00
Christoph Oelckers 6665ac5837 - fixed: With P_ExplodeMissile now working properly it is no longer valid to terminate a looping sound in a missile's death state because it now gets called after the death sound has been started. 2014-11-25 16:49:27 +01:00
Christoph Oelckers a7a2d55695 Merge branch 'master' of https://github.com/rheit/zdoom
Conflicts:
	src/sdl/iwadpicker_cocoa.mm
2014-11-25 16:39:56 +01:00
Christoph Oelckers 4a3427fe50 Merge branch 'opl3emu' of https://github.com/khokh2001/zdoom 2014-11-25 16:32:52 +01:00
Christoph Oelckers b6ccc79ca3 Merge branch 'fixes' of https://github.com/MajorCooke/zdoom
Conflicts:
	src/p_interaction.cpp
2014-11-25 16:32:42 +01:00
Christoph Oelckers 7f8c0b4f64 Merge branch 'ACS_check' of https://github.com/Edward850/zdoom 2014-11-25 16:29:02 +01:00
Christoph Oelckers 64d88166cc Merge branch 'APROP_DamageMultiply' of https://github.com/Edward850/zdoom 2014-11-25 16:28:36 +01:00
Christoph Oelckers 5ae5d2e7eb Merge branch 'master' of https://github.com/rheit/zdoom 2014-11-25 16:14:49 +01:00
Christoph Oelckers ad5c5af6f2 Merge branch 'BotThinker' of https://github.com/ChillyDoom/zdoom 2014-11-25 16:13:10 +01:00
Braden Obrzut 46eb5ce265 - Move cursor variables again due to shared code with Cocoa and SDL backends. 2014-11-24 23:26:38 -05:00
Braden Obrzut 0123279a1f - Work around an i386 specific optimizer bug in Apple's GCC 4.2 (GCC 4.0 has worse bugs).
- Fixed: zdoom-info.plist used some non-existant/wrong variables.
2014-11-24 22:22:29 -05:00
MajorCooke 7e579a0a2a - Fixed: Godmode didn't stop ALLOW/CAUSE/FORCEPAIN because the code execution always ended prematurely.
- Optimized checks for fake pain and forced pain. Fake pain now calls a subfunction so the code is cleaner.
2014-11-24 18:30:17 -06:00
Braden Obrzut eacb9aa105 - Fixed more non-OSX issues. 2014-11-24 19:18:07 -05:00
alexey.lysiuk 877bfcd328 Cleaned up support for older OS X SDKs 2014-11-23 22:18:41 +02:00
alexey.lysiuk b4ff34dae5 Use recently added OS version detection to check for HID Manager API availability 2014-11-23 12:48:05 +02:00
alexey.lysiuk e9b24a10a1 OS version detection without deprecated API 2014-11-23 12:47:04 +02:00
khokh2001 5ed70d97a6 New OPL3 emulator. 2014-11-23 02:18:40 +09:00
khokh2001 88f4305e7e new opl3 emulator 2014-11-23 00:39:26 +09:00
khokh2001 e9075334a3 new opl3 emulator 2014-11-23 00:36:22 +09:00
alexey.lysiuk 3e1bb9017b Merge branch 'master' of https://github.com/rheit/zdoom into z_osx_clean 2014-11-22 12:09:50 +02:00
Edward Richardson c494063eb9 Forgot version bump 2014-11-21 17:53:33 +13:00
Edward Richardson 3437f4fcab Check ACS module size in saved games 2014-11-21 17:49:57 +13:00
Edward Richardson e303833e5f Inventory damage needs multiplying first 2014-11-20 22:12:16 +13:00
Edward Richardson 99b2cfa147 Added APROP_DamageMultiply
- Used with Set/GetActorProperty, adds a generic multiplier for damage a
source deals.
2014-11-20 18:57:40 +13:00
Christoph Oelckers 52acaa07a2 Merge branch 'master' of https://github.com/rheit/zdoom 2014-11-19 00:40:54 +01:00
Braden Obrzut 601852d224 - Fixed: fixrtext isn't needed with Win64 builds. 2014-11-17 21:56:16 -05:00
alexey.lysiuk 64e34d883b Fixed build on UNIX systems other than OS X 2014-11-17 14:54:46 +02:00
alexey.lysiuk 1bda54f3cd Fixed a few endian issues in ACS system
KDiZD Intro, a.k.a. Title Map, is now played correctly; camera on Z1M1 is functional
2014-11-16 13:15:56 +02:00