Commit graph

4347 commits

Author SHA1 Message Date
Christoph Oelckers
fbe14d59bb - fixed: All powerup blend colors with an alpha of 0 were treated as 'has no color' for PowerupGivers. 2014-12-03 13:05:50 +01:00
Kyle Evans
c631ffc5fd Fixed SV_SAMESPAWNSPOT behavior -- When enabled, use the p->mo->z. Otherwise, rely on ONCEILINGZ/FLOATRANDZ/ONFLOORZ w/ or w/o UsePlayerStartZ as previously done 2014-12-03 00:50:05 -06:00
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
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
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
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
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
Edoardo Prezioso
4b2af7074e - Improve the 64 bit incompatibility patch.
- Reorder the operands. First the numerator, then the denominator :) .
- Add a comment regarding the motivations for this change.
2014-11-16 11:29:16 +01:00
alexey.lysiuk
fd85e116e5 Fixed another potential crash in word expansion API
Calling wordfree() may lead to a crash when wordexp_t instance is not zero-initialized
This happened usually on older OS X like 10.5 or 10.6
2014-11-16 10:29:03 +02:00
alexey.lysiuk
93a732f0ca Fixed empty application menu on 10.5 and earlier 2014-11-16 10:25:25 +02:00
alexey.lysiuk
bcdf22b910 Fixed potential crash in word expansion API
10.5.8 PPC crashed 100%, some versions of 10.6 i386 were affected too
2014-11-16 09:30:57 +02:00
Edward Richardson
9ccb839ae2 Fix slope inconsistency for 64bit
- Fixed: Slope logic would change between 32bit and 64bit due to float
math.
2014-11-16 16:23:15 +13:00
alexey.lysiuk
bccfdaacf7 Merge branch 'master' of https://github.com/rheit/zdoom into z_osx_clean 2014-11-15 22:17:41 +02:00
alexey.lysiuk
65ce06f274 Added ability to run without application bundle
You just need executable, zdoom.pk3 and IWAD
2014-11-15 19:11:01 +02:00
alexey.lysiuk
398b36064b Added usage of OpenGL client storage extension
This improves performance significantly of 10.4
2014-11-15 17:27:23 +02:00
alexey.lysiuk
cc8d8928ae Removed explicit set of activation policy for application
Bundle is used anyway but this method requires 10.6 or higher
2014-11-15 17:07:27 +02:00
Edward Richardson
92143f90fa Yet another pointer 2014-11-16 02:59:37 +13:00
Edward Richardson
2d5cbe1d8b Missed a save 2014-11-16 02:44:17 +13:00
Edward Richardson
21e7beb21b Fixed missing NULL pointer checks 2014-11-16 02:39:16 +13:00
alexey.lysiuk
06764c6aae Merge branch 'master' of https://github.com/rheit/zdoom into z_osx_clean 2014-11-15 13:35:29 +02:00
alexey.lysiuk
b63bd56da8 Removed .xib file and, therefore, dependency from ibtool
Menu is now created in code
2014-11-15 13:32:37 +02:00
alexey.lysiuk
4b5d7361cd Fixed exiting when window is closed by clicking close button
This happened on 10.6 and later when fullscreen mode was used before windowed
2014-11-15 11:47:05 +02:00
ChillyDoom
e38aee070c - Changed TThinkerIterator loops back to MAXPLAYERS loops.
- Added STAT_BOT.
2014-11-15 08:58:29 +00:00
Christoph Oelckers
23bb12b0b8 Merge branch 'cpf_noturn' of https://github.com/edward-san/zdoom 2014-11-15 08:58:36 +01:00
ChillyDoom
ee977f94d7 - Moved bot thinking logic into DBot. 2014-11-14 16:54:56 +00:00
Edoardo Prezioso
fd354dbe9a - Added CPF_NOTURN flag for A_CustomPunch. 2014-11-14 12:18:46 +01:00
alexey.lysiuk
9e4a262c87 Enabled building with SDK 10.4
Game controllers support will disabled in this case
2014-11-12 23:03:59 +02:00
MajorCooke
b54b18c8c5 -Added: CAUSEPAIN. Actors which deal damage (even if 0) while having this flag can cause other actors to trigger pain chances.
-Fixed: ALLOWPAIN should not trigger pain states if the damage is 0, but still allow for infighting to occur.
-Fixed: an unneeded logic call was processing damage modification when it was 0 to begin with.
2014-11-12 14:08:26 -06:00
alexey.lysiuk
d53e860d28 Moved supported by OS features checks to runtime
No more compile time checks via preprocessor macro definitions
This introduces dependency from Carbon framework, see SetSystemUIMode() function. It's available in 64-bit, and so, it's not deprecated
2014-11-10 22:59:40 +02:00
alexey.lysiuk
936ee41e41 Removed executable permission from HID Utilities source files 2014-11-10 22:37:53 +02:00
Edward Richardson
ad33afb8c1 Added text showing who paused a game in multiplayer 2014-11-11 02:19:24 +13:00
Edward Richardson
16e0f79fd7 Fix alt-tabbed desync with demos
- Fixed: Stop the game timer if the window looses focus
2014-11-11 02:18:52 +13:00
Edward Richardson
b08fcbf6b3 Added compat profile for TNT MAP31 2014-11-10 18:37:14 +13:00
alexey.lysiuk
a37459af2c Removed all code to support compilation using 10.4 SDK
10.5 is minimum version of OS X SDK to build. Deployment target can be 10.4 though
This reverts significant part of d061adf
2014-11-09 18:00:36 +02:00
alexey.lysiuk
c024b30e9d Availability of game controller API is now determined on runtime 2014-11-09 17:13:03 +02:00
alexey.lysiuk
660ebf2c6c Added auto-release pools to decrease memory fragmentation on older OS X like 10.5 or 10.6 2014-11-09 16:53:25 +02:00
alexey.lysiuk
70bb80e2bf Removed OS X version check
It didn't work correctly and .plist should set minimum OS version to run on
2014-11-09 16:49:26 +02:00
alexey.lysiuk
a40eb3443b Fixed infinite recursion when setting window style on OS X 10.6 or newer 2014-11-09 15:34:04 +02:00
alexey.lysiuk
fa1d62ffbf Fixed random junk that may appear in transparency (alpha) channel of mouse cursor image 2014-11-09 15:23:34 +02:00
alexey.lysiuk
fc8f260375 Merge branch 'master' of https://github.com/rheit/zdoom into z_osx_clean 2014-11-09 15:22:11 +02:00
Christoph Oelckers
5e6c375974 Merge branch 'DLevelScript-stack-fix' of https://github.com/Edward850/zdoom 2014-11-09 12:20:54 +01:00
Christoph Oelckers
22b5d0af8a Merge branch 'hotfix' of https://github.com/MajorCooke/zdoom 2014-11-09 12:13:13 +01:00
Christoph Oelckers
d273cb414f Merge branch 'BotNet' of https://github.com/ChillyDoom/zdoom 2014-11-09 12:12:51 +01:00
Christoph Oelckers
2ffff5763b Merge branch 'empty_st_funcs' of https://github.com/edward-san/zdoom 2014-11-09 12:12:35 +01:00
Christoph Oelckers
d64a4a17ff - fixed: PRINT_LOG no longer worked since replacing the console buffer. 2014-11-09 12:11:58 +01:00
alexey.lysiuk
a5993c4e2d Disabled usage of IOKit's HID Manager API on OS X prior to 10.5
Source code only, CMake needs to be updated too
2014-11-09 11:59:29 +02:00
Edward Richardson
5170abfeed DACSThinker can exist with no scripts 2014-11-09 22:57:14 +13:00
alexey.lysiuk
d061adfbd6 Fixed all compilation issues with 10.4 SDK except for HID Utilities 2014-11-09 11:18:20 +02:00
Edward Richardson
e3640b5bf5 Stop DLevelScript from recursively Serializing 2014-11-09 21:06:50 +13:00
MajorCooke
87207bdb6d - Fixed: The mask didn't incorporate RGF_MISSILES, causing it to fail. 2014-11-09 00:16:10 -06:00
Edoardo Prezioso
8b85e6d00b - Port an empty version of 'A_FaceConsolePlayer'.
Hissies will be happy now.
2014-11-08 18:49:16 +01:00
ChillyDoom
8532b52ffb - Bots are no longer removed when the net arbitrator disconnects. 2014-11-08 17:38:56 +00:00
ChillyDoom
a613da43dd - Bot movement is now calculated locally. 2014-11-08 17:38:09 +00:00
alexey.lysiuk
d2d6d2a7f8 Lowered minimum OS requirement to 10.5 Leopard 2014-11-08 13:30:41 +02:00
alexey.lysiuk
f0f0f2a24d Merge branch 'master' of https://github.com/rheit/zdoom into z_osx_clean 2014-11-08 10:42:44 +02:00
Christoph Oelckers
c28c0b8f0b Revert "Backport 'A_FaceConsolePlayer' from zandronum."
This reverts commit eab971500b.

As Edward850 pointed out, this feature is broken by design and therefore completely useless.
2014-11-08 08:53:32 +01:00
Edoardo Prezioso
eab971500b Backport 'A_FaceConsolePlayer' from zandronum.
By Dusk, who authorized me to do this.
2014-11-08 00:31:16 +01:00
MajorCooke
71ce4bcf06 - Fixed: Rail attacks didn't properly respect FOILINVUL.
- Added: FOILBUDDHA support for rail attacks.
2014-11-05 23:16:01 -06:00
MajorCooke
95bd6bde9a - Added FOILBUDDHA check for A_BFGSpray. 2014-11-05 23:06:28 -06:00
MajorCooke
c63adf920a - Fixed: BUDDHA flag on a player wasn't considered. 2014-11-05 22:05:21 -06:00
Christoph Oelckers
88ff33c26e Merge branch 'fix_acs_big_endian' of https://github.com/alexey-lysiuk/gzdoom 2014-11-02 17:30:48 +01:00
Christoph Oelckers
32cd4eb7c6 Merge branch 'LerpAdjustments' of https://github.com/Edward850/zdoom 2014-11-02 17:30:41 +01:00
alexey.lysiuk
eb98a999b2 Fixed color channels displacement on Big Endian targets, take two :( 2014-11-02 16:18:28 +02:00
alexey.lysiuk
63eedf9e26 Merge branch 'fix_acs_big_endian' into z_osx_clean 2014-11-02 16:01:18 +02:00