Randy Heit
e7f427aa60
Merge branch 'maint'
2014-02-24 19:26:50 -06:00
Randy Heit
1d4f4b25d7
Don't free replaced textures that are used as patches.
...
- Fixed: If a part of a multipatch texture is replaced by a HIRESTEX
version, the original patch must not be deleted, since the multipatch
texture still needs it for compositing.
2014-02-24 19:01:36 -06:00
Randy Heit
5a5fb9b3d1
Clamp xy angle range in P_SetSlope()
...
- This function just assumed that every xy angle passed to it was within
the range [0,360). This is obviously bad, since anything outside that
range can result in accessing data outside the range of the finecosine
and finesine tables.
2014-02-24 18:16:18 -06:00
Randy Heit
a60918f601
Add NoPushWindowCheck compatibility flag
...
- For maps like xtheateriii that expect non-blocking push lines to
activate when you are standing on them and run into a completely different
line, there is now this compatiblity.txt-only flag.
2014-02-24 17:43:28 -06:00
Randy Heit
db4763b14a
Delay skin setting on save load until player class is known.
...
- Fixed: Loading players from savegames set the skin before their current
class was retrieved, so they could not validate their skins with the
correct class.
2014-02-24 16:27:57 -06:00
Randy Heit
7052d4e14e
Fixed: userinfo_t::SkinChanged() was unaware of player classes
2014-02-24 16:18:10 -06:00
Randy Heit
0f7ad00d9a
Ignore the minor version number when checking for DRO v1 files
...
- There exist files where the first word of the version number for DRO v1
files is not 0 but something else completely. (Maybe it's not actually a
version number?) Assume they are valid v1 files as long as the second
word is a 1.
2014-02-24 15:48:41 -06:00
Gaerzi
d430c18574
The wrong value was used here.
...
This caused crashes on some files (notably MBELLS from Cosmo and NUBC
from Body Count) in my port of this code to SLADE 3.
2014-02-24 15:37:59 -06:00
Gaerzi
c7301a0fbb
Some DOSBox Raw OPL v2 indices were off by one.
...
This caused access violation errors on perfectly fine DRO files. For
reference, scoredata[20] is the hardware type (OPL2, dual OPL2, or
OPL3).
2014-02-24 15:37:42 -06:00
rheit
3437b08c1a
Merge pull request #27 from Gaerzi/master
...
Some DOSBox Raw OPL v2 indices were off by one.
2014-02-24 15:22:20 -06:00
rheit
d0782d779d
Merge pull request #22 from edward-san/cmake_uninitialized_fix
...
- Fixed some cmake --warn-uninitialized messages
2014-02-24 15:20:56 -06:00
rheit
78f85340d8
Merge pull request #20 from edward-san/cmake_clang_flags_fix
...
- Remove clang check from GCC-related workaround
2014-02-24 15:19:35 -06:00
rheit
3111f8f93d
Merge pull request #19 from edward-san/unix_no_gtk_iwadpicker_fix
...
- Fixed scanf in IWAD picker without GTK
2014-02-24 15:18:24 -06:00
Gaerzi
9dacc9cc8d
The wrong value was used here.
...
This caused crashes on some files (notably MBELLS from Cosmo and NUBC
from Body Count) in my port of this code to SLADE 3.
2014-02-24 05:07:37 +01:00
Gaerzi
732ee11da1
Some DOSBox Raw OPL v2 indices were off by one.
...
This caused access violation errors on perfectly fine DRO files. For
reference, scoredata[20] is the hardware type (OPL2, dual OPL2, or
OPL3).
2014-02-23 23:07:10 +01:00
Christoph Oelckers
861a0f0f09
Merge branch 'master' of https://github.com/Gaerzi/zdoom
2014-02-16 18:59:02 +01:00
Gaerzi
02cd6eebf4
A_Log formatted text
...
Make DECORATE version of Log consistent with ACS version.
2014-02-16 18:29:01 +01:00
Alex Qyoun-ae
dd5f273128
Added possibly missing brackets
2014-02-14 05:10:48 +04:00
Edward Richardson
0db82f02cf
P_HitWater ignore extra floors below real floor
...
P_HitWater incorrectly assumed extra floors were always above the real
floor.
2014-02-12 20:30:37 +13:00
Randy Heit
3cff307e77
Add Get/SetLineActivation ACS functions
2014-02-04 19:53:10 -06:00
Randy Heit
8b02bb55aa
Fix compiling with FMOD 4.36
...
- That stuff I thought that went poof in FMOD Ex 4.37 was apparently
already gone in 4.36.
2014-01-30 20:30:40 -06:00
Christoph Oelckers
4e53df8bca
- fixed: The 'load' command in GAMEINFO only worked if the filename contained a slash.
2014-01-26 14:32:44 +01:00
Braden Obrzut
efa9e0c3ee
Merge branch 'maint'
2014-01-18 18:10:48 -05:00
Braden Obrzut
811a75ebf6
- Minor adjustments to SDL joystick code so that all axes have at least a small deadzone so that button mapping works properly.
2014-01-18 17:54:46 -05:00
Braden Obrzut
27f6b3c9f3
Merge branch 'maint' of github.com:rheit/zdoom into maint
2014-01-18 16:23:06 -05:00
Braden Obrzut
75fd674d31
- If the player doesn't have ` bound to open the console, don't close it with that key.
2014-01-18 16:20:52 -05:00
Braden Obrzut
919b928300
- Fixed: Taking an item in a Strife dialog didn't account for items that have the keep depleted flag set.
2014-01-18 15:45:11 -05:00
Braden Obrzut
ebcd0e9c49
- Removed redundant expression in R_FindPlane.
2014-01-18 15:40:48 -05:00
Braden Obrzut
7af8b78b9f
- Applied Chilly's patch to fix excessive name change notifications.
2014-01-18 15:18:35 -05:00
Braden Obrzut
e5d7077d74
- Fixed: Shareware games couldn't bother with the actor has no frames errors since we don't load mods.
...
- Fixed: Heretic shareware used a different border for the statusbar.
2014-01-18 15:09:12 -05:00
Braden Obrzut
6f7885210b
- Fixed: Some setups require the dynamic linking library to be linked explicitly, so specify it when using DYN_FLUIDSYNTH
2014-01-18 14:58:39 -05:00
Edoardo Prezioso
70717cd2fa
- Cover the ASM_SOURCES fix for NO_ASM users too
2014-01-18 02:21:49 +01:00
Christoph Oelckers
6824e8c931
Merge branch 'maint'
2014-01-18 01:12:06 +01:00
Christoph Oelckers
1fd1ac9bab
Merge branch 'cmake_uninitialized_fix' of https://github.com/edward-san/zdoom into maint
2014-01-18 01:10:33 +01:00
Edoardo Prezioso
b329a34a58
- Fixed some cmake --warn-uninitialized messages
2014-01-17 23:36:59 +01:00
Christoph Oelckers
e126c3ec2f
Merge branch 'maint'
2014-01-17 20:45:20 +01:00
Christoph Oelckers
9a74f96702
Merge branch 'viewpitch_overflow_fix' of https://github.com/edward-san/zdoom into maint
2014-01-17 20:43:03 +01:00
Christoph Oelckers
2d3a80fbd9
Merge branch 'cmake_clang_flags_fix' of https://github.com/edward-san/zdoom into maint
2014-01-17 20:43:00 +01:00
Edoardo Prezioso
884928687d
- Fixed overflow checking in some viewpitch code
2014-01-17 19:27:12 +01:00
Edoardo Prezioso
aafea851f0
- Remove clang check from GCC-related workaround
...
It caused a clang warning/error regarding the non-existing flags '-fno-tree-dominator-opts' and '-fno-tree-fre'.
2014-01-17 19:11:29 +01:00
Edoardo Prezioso
f51fcd90b3
- Fixed scanf in IWAD picker without GTK
...
If you try to kill the program with Ctrl-C, it would run the first IWAD available in the list instead of closing it.
2014-01-17 18:57:52 +01:00
Christoph Oelckers
af3e619232
Merge branch 'uniquetid_overflow_fix' of https://github.com/edward-san/zdoom
2014-01-16 11:38:53 +01:00
Edoardo Prezioso
2501dc6df6
Fixed signed overflow issue, which caused a non-intended aggressive optimization by GCC 4.8. Also, negative values of the 'limit' parameter in both ACS UniqueTID() and in 'utid' CCMD are ignored and replaced by 0.
2014-01-13 01:48:31 +01:00
Christoph Oelckers
725d3e3f53
Merge branch 'master' of https://github.com/Edward850/zdoom
2014-01-12 10:53:34 +01:00
Edward Richardson
6db974918a
Treat packets from unknown nodes differently
...
Instead of trying to decompress packets from unknown connections (and
failing them anyway), they are now reported and discarded without doing
anything else.
2014-01-12 18:39:19 +13:00
Braden Obrzut
db4a23e3c4
Merge branch 'origin/maint'
2014-01-10 02:19:14 -05:00
Braden Obrzut
44c4736de3
- Ignore unknown properties in the GAMEINFO lump instead of throwing an error.
2014-01-10 02:16:41 -05:00
Braden Obrzut
fa516c5ee6
- For some reason __MAC_10_6 is defined in the 10.5 SDK so use MAC_OS_X_VERSION_MAX to check SDK version instead.
2014-01-07 00:55:32 -05:00
Braden Obrzut
bbd3106cbb
Merge commit 'b3f5de356f14e2026cc9e5738e8b58e22e7daa44'
2014-01-06 04:04:51 -05:00
Braden Obrzut
d8ff4ec281
- Fixed: All clang 5.0 warnings.
...
- Renamed autostart/autozend since Xcode’s build process links in strictly alphabetical order.
2014-01-05 19:50:09 -05:00
Braden Obrzut
b3f5de356f
- Fixed: SBarInfo's gamemode command used to ignore unknowns (for cross compatibility). On top of restoring the old behavior, generate a warning for only the first ignored instance.
2014-01-05 15:46:11 -05:00
Braden Obrzut
b0f40c0733
- So we did end up restoring the variable that the last commit was compensating for.
2014-01-04 00:37:15 -05:00
Braden Obrzut
4770b9b27b
- Fixed: Rampage timer should only reset when the weapon is ready to be fired.
2014-01-03 01:21:21 -05:00
Braden Obrzut
511bdc7208
- Work around GCC 4.8 bug 54570
2014-01-02 19:41:53 -05:00
Braden Obrzut
50cec119a0
- Work around GCC 4.8 bug 54570
2014-01-02 19:12:03 -05:00
Christoph Oelckers
853c1c4f1e
Merge branch 'master' of https://github.com/Edward850/zdoom
2014-01-01 16:51:27 +01:00
Edward Richardson
455145d611
Stall testing for interpolation
...
Uncapped framerate never triggered the stall detection code, as it never
tried to process a frame to start with.
2014-01-02 00:04:32 +13:00
Christoph Oelckers
6e0f885135
- fixed: The 3D floor setup code treated alphas larger than 255 as translucent. This was causing problems with ZDCMP2 in GZDoom
2013-12-25 22:30:47 +01:00
Christoph Oelckers
ae49044f96
- let 'showloadtimes' measure UDMF parsing.
2013-12-19 17:59:58 +01:00
Christoph Oelckers
3e0325c8b0
Merge branch 'master' of https://github.com/rheit/zdoom
2013-12-17 17:24:43 +01:00
Christoph Oelckers
9a927c2030
Merge branch 'master' of https://github.com/Edward850/zdoom
2013-12-16 11:56:58 +01:00
Edward Richardson
a993b0288a
Stop prediction from playing and stopping sounds
...
Player prediction would play *jump and stop falling sounds, creating odd
cases of sound repetition before the gametic caught up.
2013-12-16 23:02:27 +13:00
Braden Obrzut
5904df7f56
Merge branch 'maint'
2013-12-13 03:05:06 -05:00
Braden Obrzut
12d45bbc33
- Use setenv for LC_NUMERIC since setlocale gets reset by the libraries on some systems.
2013-12-13 03:00:35 -05:00
Braden Obrzut
10c312f55c
- Silence GCC PCD_PRINTBINARY warning since we've been able to since GCC 4.6.
2013-12-13 02:51:15 -05:00
Christoph Oelckers
74dee4cd63
- removed ddraw.lib from CMake files because that library is not used anymore.
2013-12-09 11:24:58 +01:00
Christoph Oelckers
31c9a0b0e8
- Subtract should respect alpha.
2013-12-05 15:36:20 +01:00
Christoph Oelckers
c959b3f250
- added 'subtract' render style to DECORATE parser. This is actually 'reverse subtract'
2013-12-05 15:28:09 +01:00
Christoph Oelckers
86d7a326be
- allowdecals logic was nonfunctional.
2013-12-01 21:11:33 +01:00
Christoph Oelckers
25f60779fd
- fixed: The 'allowdecals' check in animated doors was wrong.
2013-12-01 20:20:26 +01:00
Christoph Oelckers
8b92597508
Merge branch 'master' of https://github.com/Edward850/zdoom
2013-12-01 18:29:46 +01:00
Edward Richardson
7045f195f3
Removed excess value from stall debug output
...
The debug output for a stalled Arbitrator had an excess Net_Arbitrator
value, bumping the gametic+counts value off the output.
2013-12-02 06:23:22 +13:00
Christoph Oelckers
c5b2c95572
- fixed placement and handling of 'allowdecals' for animated doors.
2013-12-01 15:11:41 +01:00
Christoph Oelckers
a89ecdad50
Merge branch 'master' of https://github.com/Edward850/zdoom
2013-12-01 10:27:40 +01:00
Edward Richardson
662bc7a3ac
cl_bloodtype could break playsim sync
...
Corrected entries were blood would spawn inconsistently because of
cl_bloodtype. Blood now always spawns but is marked invisible according
to cl_bloodtype.
2013-12-01 22:06:48 +13:00
Christoph Oelckers
7e062f394b
- fixed: animated door textures defined by index were not added to the sequence.
...
- fixed: animated doors should set 'no decals' for the texture.
- added 'allowdecals' option to override the above.
2013-12-01 01:26:30 +01:00
Christoph Oelckers
698495efc5
- fixed: missing return in playerinfo CCMD added.
2013-12-01 01:21:43 +01:00
Christoph Oelckers
e7225bced6
- check negative XScale on sprites to allow mirroring.
2013-12-01 01:15:10 +01:00
Braden Obrzut
c04a800e2b
- When doing OLDSTYLE builds we can use the RUNTIME_OUTPUT_DIRECTORY_<CONFIG> properties to force the output location properly.
2013-11-29 17:10:29 -05:00
Christoph Oelckers
cbed4624fa
- added a user-settable factor for earthquake intensity. Value can be between 0 (no shaking) and 1 (normal shaking.)
2013-11-29 13:24:38 +01:00
Christoph Oelckers
b9c032461e
- add a CMake option to enable/disable SSE2 with Visual C++. This is necessary because since VC 2012 SSE2 is the default instruction set.
2013-11-29 12:35:45 +01:00
Braden Obrzut
a8090dc22c
- Remove a hardcoded "zdoom" so that the name passed into the copy operation should always match that passed to /MAP.
2013-11-29 02:09:27 -05:00
Braden Obrzut
c21beb0b6c
- Fixed: Some versions of Visual Studio put the map file in a different location.
2013-11-29 01:54:46 -05:00
Christoph Oelckers
7cb70f60b3
- removed duplicate #define warning in fmodsound.cpp.
...
- commented out output of Cr0NpxState for floating point state because this variable was renamed in most recent Windows headers.
- added CMAKE option to generate assembly output for release builds.
- added my CMake-based project directory to .gitignore.
2013-11-28 11:03:19 +01:00
Braden Obrzut
0c1d92834a
- Fixed: Some setups require the dynamic linking library to be linked explicitly, so specify it when using DYN_FLUIDSYNTH
2013-11-26 17:58:55 -05:00
Braden Obrzut
c7632174d8
- Fixed error in manifest embedding that stopped the binary from working on Windows XP.
...
- Tweaked PK3 copying commands so that it shouldn't be possible to end up with files named Debug/Release.
2013-11-26 12:49:23 -05:00
Christoph Oelckers
8bf5872fc0
- always add DelayImp.lib for MSVC.
2013-11-24 10:27:08 +01:00
Randy Heit
fe67ae5e54
Merge branch 'maint'
2013-11-19 21:01:15 -06:00
Randy Heit
f4e9edccb9
Don't display the cost in dialogues twice
...
- Fixed: Commit 75dd5503
, which was to enable the use of LANGUAGE
substitutions for conversation items with a cost attached, neglected to
remove the original code that attached the cost to the end of the item,
so the cost got added twice.
2013-11-19 19:55:57 -06:00
Randy Heit
d4304c3bde
Change tspeed += 2 to *= 2
...
- Fixed: The initial keyboard turn rate used the running initial rate whether
+speed was down or not.
2013-11-19 19:49:17 -06:00
Braden Obrzut
c7099744bd
- Minor changes to the CMake since it looks like VS2005 doesn't support a few things that were added.
2013-11-11 23:56:58 -05:00
Edward Richardson
a967b05290
Improvements to restoring stalled netgames
...
- The waiting message is now always cleared, regardless if it needed to
be in the first place. It's a rather simple for-loop so I doubt it
matters.
- Nodes are also cleared from the list if they catch up while other
nodes are still behind.
- "lastglobalrecvtime" is now bumped after the waiting loop if a tic was
successful, rather then bumping it every time a packet was received. It
appears that you can receive a packet before the game knows it stalled,
thus stalling it anyway.
- Instead of comparing the nettics to the local node, all nodes are
tested against gametic+counts (the real reason why the game has
stopped).
- More then one node can be marked as late at any one time.
- In a packet-server game, the arbitrator is now assumed slow, rather
then testing it. There is no point, seeing as we already know the game
has stalled because of it.
2013-11-11 20:42:54 +13:00
Braden Obrzut
34457ce737
- Applied VoidMage's patch to strip color codes from system console on SDL platforms.
2013-11-06 13:42:05 -05:00
Braden Obrzut
f0b946c3cf
- Allow use of system GME library. It defaults to forcing the use of the internal library at least for now though.
2013-11-06 13:37:34 -05:00
Braden Obrzut
7dbf4ec38f
- Slight cleanup and I accidentally inverted the map generation flag.
2013-10-12 01:58:39 -04:00
Braden Obrzut
0759a4b438
- Actually, lets not use /Gm since it's incompatible with /MP which will be much faster on multi-core machines.
...
- Added ZDOOM_GENERATE_MAPFILE which enables linker map file generation.
2013-10-12 01:44:57 -04:00
Braden Obrzut
03b75ae7c1
- Fixed a few flags for Visual Studio compilation.
2013-10-12 00:56:49 -04:00
Braden Obrzut
b9a1528747
- DYN_FLUIDSYNTH now defaults to ON.
...
- Added ZDOOM_OUTPUT_OLDSTYLE (could probably use a more descriptive name) which causes CMake to vary the executable name by build type and place the exes and pk3s into the directory specified in ZDOOM_OUTPUT_DIR.
- ALL_BUILD will now launch ZDoom.
2013-10-10 17:40:15 -07:00
Randy Heit
d76dbcaa9d
Merge branch 'maint'
2013-10-09 22:33:58 -05:00
Randy Heit
02514dc9b2
- Fixed: AFSwordMissile::DoSpecialDamage had a unique prototype
...
so it would never actually be called.
2013-10-09 22:32:52 -05:00