zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-30 07:41:22 +00:00
Code Issues Projects Releases Packages Wiki Activity
6358 commits 131 branches 149 tags 203 MiB
Commit graph

6358 commits

This branch
This branch
All branches
Author SHA1 Message Date
Christoph Oelckers
43b4d452db Merge branch 'ChaseThresholdScript' of https://github.com/MajorCooke/zdoom 
# Conflicts:
#	src/version.h
 2016-02-08 13:06:08 +01:00
Christoph Oelckers
6d0ef7a9da - added conversion macros to convert floating point angles to angle_t, using xs_Float.h, and replaced all occurences in the code with them (let's hope I found everything.) 
Converting a floating point value that is out of range for a signed integer will result in 0x80000000 with SSE math, which is used exclusively for this purpose on modern Visual C++ compilers, so this cannot be used anywhere.
On ARM there's problems with float to unsigned int conversions.

xs_Float does not depend on these
 2016-02-08 12:10:53 +01:00
Randy Heit
7b42093dc9 Revert "- fixed incorrect code generation for '||' operator (at least I hope it's fixed now.)" 
This reverts commit 2a89a9f1d8.
 2016-02-07 21:59:45 -06:00
Randy Heit
ecef5647d4 Merge branch 'scripting' 2016-02-07 21:58:38 -06:00
Randy Heit
138cdccaf9 Fix code generation for && and || 
- The test condition should be the same for both sides of the operators.
 2016-02-07 21:56:56 -06:00
Christoph Oelckers
2a89a9f1d8 - fixed incorrect code generation for '||' operator (at least I hope it's fixed now.) 2016-02-07 21:36:02 +01:00
Christoph Oelckers
5b74d417fa Merge branch 'master' of https://github.com/rheit/zdoom 2016-02-07 16:32:11 +01:00
Christoph Oelckers
e3bf1dd92b - for ARM compatibility, direct float -> unsigned int conversions should be avoided. 2016-02-07 16:31:55 +01:00
coelckers
544d1d6da7 Merge pull request #548 from alexey-lysiuk/fix_uservar 
Fixed regression with getting/setting user variables
 2016-02-07 15:04:03 +01:00
alexey.lysiuk
7fa5cb788b Fixed regression with getting/setting user variables 
See http://forum.zdoom.org/viewtopic.php?t=50727
 2016-02-07 15:32:55 +02:00
Christoph Oelckers
f625be61a2 - fixed: CMake should not disable OpenAL on Windows if it can't find the library (which is neither needed nor requested anymore.) 2016-02-07 13:30:28 +01:00
Christoph Oelckers
111e97e47c Merge branch 'master' of https://github.com/rheit/zdoom 2016-02-07 12:27:29 +01:00
Christoph Oelckers
fcb7553166 - fixed offset calculation in A_VileAttack. 2016-02-07 12:27:11 +01:00
coelckers
f2f65d7f31 Merge pull request #545 from MajorCooke/facefix 
A_Face Fix
 2016-02-07 11:49:19 +01:00
Christoph Oelckers
7226a23d08 Merge branch 'master' of https://github.com/rheit/zdoom 2016-02-07 11:36:28 +01:00
Christoph Oelckers
3675492ab4 - fixed DEHACKED code pointer validation for real. 
The first fix missed a second place where this happened and was incomplete.
Anything usable by Dehacked must be VARF_ACTION and VARF_MEMBER in order to work as intended.
 2016-02-07 11:36:09 +01:00
coelckers
f1689c88b8 Merge pull request #546 from j-palomo/valuetextlanguagefix 
Fixed: ValueText didn't read language strings from OptionValues when …
 2016-02-07 10:51:01 +01:00
John Palomo Jr
0619245280 Fixed: ValueText didn't read language strings from OptionValues when using the third parameter. 2016-02-07 03:21:18 -05:00
MajorCooke
10fec95cd5 - Fixed: the last FAF_NODISTFACTOR flag was never removed. 2016-02-07 01:36:59 -06:00
Randy Heit
f3ab0ff41b Fix VC++'s problems with re2c 0.16 
- I'm surprised GCC didn't complain about all the struct/class mismatches.
- INFINITY is a macro in VC++ land, so rename it to INFINITI.
 2016-02-06 21:19:05 -06:00
Randy Heit
43c6c9b5ee Update re2c to version 0.16 2016-02-06 20:58:35 -06:00
Randy Heit
5ee988f607 Fixed: Applying reverb with FMOD 4.36.yy killed sound 
- It turns out that the FMOD_REVERB_PROPERTIES structure actually changed
  with 4.36.00 and not with 4.38.00.
 2016-02-06 19:29:13 -06:00
Randy Heit
cbfb24ef33 Disable -file "" 
- This isn't a real file or even a name, but the game would try and load
  it, including running through various permutations, potentially resulting
  in loading the current directory as an archive.
 2016-02-06 17:51:09 -06:00
Christoph Oelckers
20aa7c75de - added the case '0: switch the portal of to P_ChangePortal. 2016-02-07 00:30:27 +01:00
Christoph Oelckers
e726143c15 Merge branch 'master' of https://github.com/rheit/zdoom 2016-02-06 21:17:19 +01:00
Christoph Oelckers
77b9f41dff - added Line_SetPortalTarget action special so that portals can be assigned new targets. Setting the target to 0 disables the portal.cpp. Static linked portals can not be reassigned. 
Please note that these still require the portal to be set up in the map with Line_SetPortal. It will not create a new portal if none exists on any line with the given ID.
 2016-02-06 21:16:57 +01:00
MajorCooke
63735e4118 Turns out this token wasn't needed. 2016-02-06 13:52:08 -06:00
MajorCooke
ccf887c978 Fixed wrong type. 2016-02-06 13:49:16 -06:00
coelckers
1480fa7579 Merge pull request #542 from alexey-lysiuk/fix_openal_nonwin 
Fixed build with OpenAL on non-Windows systems
 2016-02-06 20:11:48 +01:00
Braden Obrzut
1101546e9c - Fixed: Possible CMake wrong number of parameters configuration error. 2016-02-06 13:06:25 -05:00
alexey.lysiuk
46267f52d6 Fixed build with OpenAL on non-Windows systems 
We still need to link with OpenAL library on OSes other than Windows
 2016-02-06 10:58:25 +02:00
Christoph Oelckers
0ab3051f75 - fixed: Heretic's timebombs were spawned at the wrong place. 2016-02-06 08:52:37 +01:00
Christoph Oelckers
34216ddd8e Merge branch 'master' of https://github.com/rheit/zdoom 
# Conflicts:
#	src/CMakeLists.txt
 2016-02-06 05:28:53 +01:00
Christoph Oelckers
275ced288b - we no longer link to the OpenAL import library so the respective handling can be removed from CMakeLists.txt. 2016-02-06 05:26:37 +01:00
Randy Heit
47d33c1ef5 Fixed: A_Set(Float)Speed take FIXED speed, not INT 2016-02-05 22:24:12 -06:00
Randy Heit
c978aa32b1 Fix FxRandomPick code generation for floats 2016-02-05 22:18:54 -06:00
Randy Heit
48dcbabd60 Emit a message when trying to use something non-integral as a boolean 
- It's not exactly optimal, since it silently removes the offending
  expression, but it's better than crashing.
 2016-02-05 22:18:54 -06:00
Randy Heit
09a17c2198 Quiet some narrowing conversion warnings from VS2015 2016-02-05 22:18:53 -06:00
Randy Heit
0892650465 Don't add /delayload for OpenAL stuff if OpenAL is disabled 
- Also, I believe openal32.dll no longer needs a /delayload flag since
  it's dynamically loaded now.
 2016-02-05 22:18:53 -06:00
Christoph Oelckers
d50e874d9b Merge branch 'master' of https://github.com/rheit/zdoom 2016-02-06 05:16:53 +01:00
Christoph Oelckers
d76bcee393 - added some line portal restrictions: 
* linked portals may never have a z-offset so the parameter for that needs to be ignored.
* for interactive portals, handling z-displacements when some distance calculation reaches through a portal is way too extensive and problematic to ever have a chance of really working. If such a portal gets defined it will be changed to a teleport-only portal and a message printed.
 2016-02-06 05:16:35 +01:00
Braden Obrzut
dce3f0f757 - Bump CMake version requirement to 2.8.7. This means that generator expressions must be supported as well as empty else and endif expressions (like most sane languages). ZDoom probably didn't work with 2.4 anymore anyway. 2016-02-05 21:19:29 -05:00
Randy Heit
4fb65d74fd Fix address NO_SANITIZE macro for Clang 
- Oops. In fixing it for GCC (since it doesn't like
  __has_feature(address_sanitizer), I broke it for Clang.
 2016-02-05 18:06:45 -06:00
Christoph Oelckers
501af18168 - added missing include. 2016-02-06 01:04:15 +01:00
Christoph Oelckers
ed7b7fc0ba - fixed: The backlink portal for EE-style definition needs to be done along with the first portal because the code won't find the anchor line itself. 2016-02-06 00:21:44 +01:00
Christoph Oelckers
ee3c41bf7b - fixed: The minimum parameter count for an action function is 3, so the DEHSUPP parser needs to take this into account when validating the code pointers. 2016-02-06 00:19:38 +01:00
Christoph Oelckers
95f3a9909c Merge branch 'master' of https://github.com/rheit/zdoom 2016-02-05 23:51:50 +01:00
Christoph Oelckers
e88901f4b7 - added the EE-Extradata parser I wrote for GZDoom so I can use the Vaporware demo map for testing portal stuff. 2016-02-05 23:51:28 +01:00
Randy Heit
cb6504669d Add return statements for DECORATE. 2016-02-05 16:34:51 -06:00
Christoph Oelckers
1201ad0366 Merge branch 'master' of https://github.com/rheit/zdoom 2016-02-05 23:16:06 +01:00