Rachael Alexanderson
80f762f8a4
Merge https://github.com/coelckers/gzdoom
2017-02-16 20:40:07 -05:00
Christoph Oelckers
18925d07be
- fixed a typo.
2017-02-16 23:17:19 +01:00
Christoph Oelckers
b523aa13c8
- fixed crash with bad state labels.
2017-02-16 21:51:32 +01:00
Christoph Oelckers
1d52037779
- skip the Direct3D setup if building with a non-XP toolset on Visual Studio.
2017-02-16 21:01:52 +01:00
Christoph Oelckers
36e5bab657
- removed the fixed search path for FMod on drive E: because this can cause problems with automated builds on unknown systems.
...
This should never have been set up like this.
2017-02-16 19:45:03 +01:00
Christoph Oelckers
944f2bf266
- fixed armor save percentage values in Dehacked.
2017-02-16 19:29:07 +01:00
Christoph Oelckers
ccb083ed25
- fixed initialization of joystick menu with bogus MENUDEFS
2017-02-16 18:55:36 +01:00
Christoph Oelckers
cfeb1724fe
- added a Door_AnimatedClose special.
2017-02-16 18:35:58 +01:00
Christoph Oelckers
4d99b58f96
- allow using the default menu settings classes when none is specified in MENUDEFS.
2017-02-16 17:45:51 +01:00
alexey.lysiuk
59db1a882f
Fixed compilation warnings reported by MSVC
...
src\s_sound.cpp(1259): warning C4244: 'argument': conversion from 'double' to 'float', possible loss of data
src\c_bind.cpp(479): warning C4101: 'c': unreferenced local variable
2017-02-16 11:01:06 +02:00
Rachael Alexanderson
ef22d10756
Merge https://github.com/coelckers/gzdoom
2017-02-15 20:08:21 -05:00
Christoph Oelckers
304e989496
- allow splashing on non-swimmable, non-solid 3D floors if they are marked liquid and have a splash assigned.
2017-02-15 23:06:24 +01:00
Christoph Oelckers
4df2a221a8
- fixed: The special called by the InterpolationSpecial actor must have no activator.
...
This required splitting A_CallSpecial into a direct wrapper around P_ExecuteSpecial and implementing itself as a script function calling ExecuteSpecial so that this special case can use a version of the function that can be used without an activator.
2017-02-15 22:49:13 +01:00
Christoph Oelckers
b3d7980b90
- fixed: PowerProtection clamped its damage minimum to 1, but should do it to 0.
2017-02-15 21:20:11 +01:00
Rachael Alexanderson
bf1aa71194
Merge https://github.com/coelckers/gzdoom
2017-02-15 11:19:51 -05:00
Rachael Alexanderson
bd86abede3
- fixed Skulltag rune bugs.
...
1) When used in a hub, returning to a previous level in the hub deactivated the runes if they were a permanent powerup.
2) When picking up two different runes with the same effect, one rune wearing off removed the effect completely.
3) This entire system was done through an extremely hacky CheatFlags implementation. This was a gross hack, and it was no wonder it didn't always work properly.
2017-02-15 16:37:45 +01:00
Magnus Norddahl
c95a52166d
Merge branch 'master' of https://github.com/raa-eruanna/qzdoom into qzdoom
2017-02-15 13:26:52 +01:00
Magnus Norddahl
01cbb14f14
Change wall project to use the fixed version from GZDoom as it was most likely more tested
2017-02-15 13:26:43 +01:00
Christoph Oelckers
46d12635ce
- fixed warning
2017-02-15 13:17:20 +01:00
Christoph Oelckers
67f6f28b55
- fixed: When finding the highest floor plane on a given side of a linedef, the necessary tests may not depend on the actual highest floor, which may originate from the other side of the line and cause valid planes that are between the currently set plane and the actual highest floor to be skipped.
2017-02-15 13:14:59 +01:00
Rachael Alexanderson
e01895bf80
Merge https://github.com/coelckers/gzdoom
2017-02-15 07:06:52 -05:00
Magnus Norddahl
fc97ef0913
Fix palette fog boundary rendering error
2017-02-15 13:01:00 +01:00
Christoph Oelckers
d8b8767ee9
- disabled render events pending further discussion and evaluation.
2017-02-15 12:27:50 +01:00
Christoph Oelckers
c8db1f151e
- fixed: All FNames inside actor classes need to be FNameNoInit or their constructor will overwrite them after copying the defaults.
2017-02-15 12:16:24 +01:00
Christoph Oelckers
d8ebbcfc08
- fixed: When loading a savegame the player class in the userinfo needs to be updated.
...
- fixed: Class pointers should not be added to the list of garbage collected pointers.
- fixed several warnings in the event code.
2017-02-15 11:55:08 +01:00
Rachael Alexanderson
5dad292c56
Merge remote-tracking branch 'remotes/gzdoom/master'
2017-02-15 05:43:15 -05:00
Rachael Alexanderson
2b8db72cef
Merge commit '2234d36c7ac531fd802803216f747f82b58be8c2'
...
# Conflicts:
# src/r_main.cpp
# src/r_plane.cpp
# src/r_things.cpp
2017-02-15 05:42:57 -05:00
Rachael Alexanderson
959ac8c65b
Merge commit '9caf5c641b374848c065059b5152339806fa7734'
2017-02-15 05:28:38 -05:00
Christoph Oelckers
6fef653aa1
- exported GetUDMF methods to scripting.
2017-02-15 01:03:47 +01:00
Christoph Oelckers
8d7a64bd17
- added a virtual 'used' method that gets called when the player presses use on an actor. This method will only be called if the actor does not have the USESPECIAL flag - that one will be handled as before.
2017-02-15 00:43:30 +01:00
Christoph Oelckers
c01289e999
- added ZScript property handling for names, sounds and colors.
2017-02-14 23:28:49 +01:00
Christoph Oelckers
2f1b5c375e
- fixed: Line_SetPortal crashed with one-way portals.
2017-02-14 23:13:29 +01:00
Christoph Oelckers
c5204f34ca
- fixed: The code to play the mage lightning's attack sound was converted wrong, because it used the same structure as looping sounds normally so, but doesn't actually loop.
2017-02-14 22:51:53 +01:00
Christoph Oelckers
a6156297ce
- don't adjust sprite offsets of IWAD sprites in sequences which have been replaced partially. This can be overridden by specifying 'iwadforced' in the SPROFS lump.
2017-02-14 22:04:52 +01:00
Christoph Oelckers
3170591e32
- restated some weird number manipulation in SBARINFO for powerup time. This appears to be needed to distinguish between non-expiring items and non-present items.
2017-02-14 22:04:52 +01:00
alexey.lysiuk
a9f650c3f2
Fixed compilation warnings reported by GCC/Clang
...
src/events.cpp:167:66: warning: format specifies type 'char *' but the argument has type 'char' [-Wformat]
src/events.cpp:167:84: warning: data argument not used by format string [-Wformat-extra-args]
src/events.cpp:1036:20: warning: comparison of integers of different signs: 'int' and 'unsigned long' [-Wsign-compare]
2017-02-14 22:13:31 +02:00
alexey.lysiuk
dd0f55e8d8
Fixed compilation of Cocoa backend
2017-02-14 22:02:47 +02:00
Christoph Oelckers
b7b0e64471
- separated splash detection from water level setting.
...
This could cause problems if 3D floors with different properties for slashing and waterlevel were occupied at the same time. By keeping the slash code separate both parts can be handled without having to look out for the other.
2017-02-14 20:11:30 +01:00
Christoph Oelckers
9e769f29c3
- the native part wasn't saved.
2017-02-14 19:34:01 +01:00
Christoph Oelckers
6e2b0bc961
- renamed the internal InpuEvent to deconflict from the version in the event system.
2017-02-14 19:32:44 +01:00
Christoph Oelckers
2234d36c7a
Merge branch 'thereisnospoon' of https://github.com/jewalky/gzdoom
...
# Conflicts:
# src/dobject.h
2017-02-14 19:10:02 +01:00
Christoph Oelckers
9caf5c641b
- don't let menu number widgets not lock up the menu if their associated CVAR does not exist.
2017-02-14 19:06:45 +01:00
Christoph Oelckers
2e5ada5f25
- fixed texture clamping calculations for negative scales.
2017-02-14 18:20:21 +01:00
Christoph Oelckers
2e11b4f346
- fixed: The S_Sound script export did not call the actual function.
2017-02-14 17:03:31 +01:00
Christoph Oelckers
7b1645d239
- fixed the item check in OptionMenuItemCommand.
...
This was calling the wrong GetItem function.
2017-02-14 16:50:10 +01:00
Magnus Norddahl
7f81e0bd26
Merge remote-tracking branch 'gzdoom/master' into qzdoom
2017-02-14 14:55:02 +01:00
Christoph Oelckers
443ac50887
- fixed: DMenu::CallTicker called the Drawer methods of the menu instead of the Ticker methods.
2017-02-14 13:19:37 +01:00
alexey.lysiuk
08bf08f297
Restored effect of negative horizontal texture scale in software renderer
2017-02-14 12:33:27 +02:00
Magnus Norddahl
eac98ac226
Calculate sprite dynamic light contribution and pass it along to the sprite drawer
2017-02-14 06:37:06 +01:00
Magnus Norddahl
5ef8ecce2a
Fix wall scroller direction
2017-02-14 02:52:41 +01:00
