Commit Graph

5908 Commits

Author SHA1 Message Date
Christoph Oelckers 4e1723eeb7 Merge branch 'master' of https://github.com/rheit/zdoom
Conflicts:
	wadsrc/static/compatibility.txt
2015-09-19 12:32:22 +02:00
coelckers e9a3f7f5fc Merge pull request #392 from ZzZombo/PCD_DROP-fix
-Fixed PCD_DROP affecting script result value.
2015-09-19 08:46:54 +02:00
ZzZombo 98bdbb1ad8 -Fixed PCD_DROP affecting script result value. 2015-09-19 09:40:19 +08:00
Christoph Oelckers b613db4ae5 Revert "Merge pull request #359 from Leonard2/master"
This reverts commit 364ca11b43, reversing
changes made to dae0e217d1.

Conflicts:
	src/r_data/r_interpolate.cpp
2015-09-18 17:41:16 +02:00
Christoph Oelckers 9d68fd8fe9 Merge branch 'master' of https://github.com/rheit/zdoom 2015-09-18 17:37:34 +02:00
coelckers 1ed0fe038b Merge pull request #391 from alexey-lysiuk/osx_sdl_output
Disabled loading of SDL output plugin for FMOD Ex on OS X
2015-09-18 12:59:46 +02:00
alexey.lysiuk 621116a289 Disabled loading of SDL output plugin for FMOD Ex on OS X
Long path to executable file corrupts stack inside FMOD library
This plugin is not being built for OS X, output through CoreAudio works just fine
2015-09-18 10:53:46 +03:00
coelckers fd2c17e5f8 Merge pull request #389 from alexey-lysiuk/eternal_map25_compat
Fixed compatibility issues on MAP25 of Eternal Doom
2015-09-17 11:31:14 +02:00
alexey.lysiuk 4de57cd296 Fixed compatibility issues on MAP25 of Eternal Doom
See http://forum.zdoom.org/viewtopic.php?f=2&t=49577
2015-09-17 10:14:54 +03:00
coelckers c12607724d Merge pull request #388 from alexey-lysiuk/pcd_consolecommand
Added "support" for PCD_CONSOLECOMMAND in ACS
2015-09-16 17:40:41 +02:00
alexey.lysiuk 924a2aaaa7 Added "support" for PCD_CONSOLECOMMAND in ACS
Now attempt to execute a console command from a script will not terminate its execution
An error message will be issued in the console on every such attempt
2015-09-16 16:56:43 +03:00
coelckers 029fa1e691 Merge pull request #387 from alexey-lysiuk/fix_unknown_pcode_crash
Fixed potential crash in ACS engine
2015-09-16 15:32:19 +02:00
alexey.lysiuk b2fa4970fd Fixed potential crash in ACS engine
Unknown p-code in compiled script may lead to a crash if the current module was changed during script execution, e.g. by function call
See http://forum.zdoom.org/viewtopic.php?f=2&t=48524
2015-09-16 16:13:56 +03:00
coelckers 211f12286a Merge pull request #386 from alexey-lysiuk/fix_dragonclaw_sound
Fixed missing hit sound for Heretic weapon Dragon Claw
2015-09-16 14:49:37 +02:00
alexey.lysiuk 6ee0672885 Fixed missing hit sound for Heretic weapon Dragon Claw
See http://forum.zdoom.org/viewtopic.php?f=2&t=49459
2015-09-16 13:38:47 +03:00
coelckers 011a71b7e5 Merge pull request #385 from alexey-lysiuk/compat_pointonline2
PointOnLine compatibility settings
2015-09-15 21:36:53 +02:00
alexey.lysiuk f4b637db62 Changed compatibility fix for Nuke Mine E1M2
http://forum.zdoom.org/viewtopic.php?f=7&t=34013
2015-09-15 19:30:32 +03:00
alexey.lysiuk 66437e32f6 Added compatibility setting for Return to Hadron E1M9
See http://forum.zdoom.org/viewtopic.php?f=2&t=49544
2015-09-15 19:29:43 +03:00
alexey.lysiuk fea2cb38cc Fixed compatibility flags comparison for point-on-line
Now it works in both cases: for compatibility mode set by user and for internal compatibility handler
2015-09-15 19:27:05 +03:00
coelckers 2ce8ee7154 Merge pull request #384 from alexey-lysiuk/compat_pointonline
Added compatibility flag for point-on-line algorithm
2015-09-15 17:52:48 +02:00
alexey.lysiuk 39b18a3447 Improved point-on-line compatibility feature
P_PointOnLineSide() and P_PointOnDivlineSide() functions from the initial Doom source code release are used in compatibility mode
2015-09-15 18:21:05 +03:00
alexey.lysiuk ee7eb3253a Added compatibility flag for point-on-line algorithm
It's possible to use original but buggy implementations of P_PointOnLineSide() and P_PointOnDivlineSide() function
See http://forum.zdoom.org/viewtopic.php?f=2&t=49544
2015-09-15 16:45:20 +03:00
Christoph Oelckers 0f425c4c3c Merge branch 'master' of https://github.com/rheit/zdoom
Conflicts:
	wadsrc/static/compatibility.txt
2015-09-15 12:53:28 +02:00
coelckers b1b8f3a5f9 Merge pull request #380 from Blue-Shadow/master
dumpmapthings CCMD: Missing line break after "none".
2015-09-14 18:04:26 +02:00
Blue-Shadow d7a04b9e98 dumpmapthings CCMD: Missing line break after "none". 2015-09-14 17:22:41 +03:00
Braden Obrzut f02b52ef28 - Fixed: Initialization ordering warning in DPSpriteInterpolation. 2015-09-13 20:56:20 -04:00
coelckers afa438419d Merge pull request #379 from Edward850/sanitize
ACS module error was missing newline
2015-09-13 08:55:14 +02:00
Edward Richardson 36c7002628 ACS module error was missing newline 2015-09-13 13:46:02 +12:00
coelckers 890233d5fe Merge pull request #375 from XaserAcheron/master
Added FPF_NOAUTOAIM to A_FireCustomMissile
2015-09-10 11:29:03 +02:00
Xaser Acheron 5afbe8ca00 Fixed compiler warning for FPF_NOAUTOAIM flag check 2015-09-09 18:54:49 -05:00
coelckers 3a37a32cf9 Merge pull request #376 from edward-san/friendly_frag_crash
- Fixed a crash when a player dies in damage floors.
2015-09-09 21:35:41 +02:00
Edoardo Prezioso 19c702a608 - Fixed a crash when a player dies in damage floors. 2015-09-09 21:26:44 +02:00
Xaser Acheron 8948f5dc2b Added FPF_NOAUTOAIM to A_FireCustomMissile 2015-09-08 10:40:21 -05:00
coelckers 364ca11b43 Merge pull request #359 from Leonard2/master
Added weapon interpolation.
2015-09-08 09:06:40 +02:00
coelckers dae0e217d1 Merge pull request #374 from MajorCooke/A_SetFloatSpeed
- Added A_SetFloatSpeed.
2015-09-07 08:56:21 +02:00
MajorCooke 143a4c78a9 - Added A_SetFloatSpeed.
- Sets the FloatSpeed of the actor/pointer.
2015-09-06 19:57:43 -05:00
Christoph Oelckers 213216368a - more DECORATE fixing of Doom monsters, this time the Mancubus.
It looks like the definitions that got added on November 4th, 2006 had some issues that mostly went unnoticed over time...
2015-09-06 16:36:32 +02:00
Christoph Oelckers 23cc7da268 Merge branch 'master' of https://github.com/rheit/zdoom 2015-09-06 16:01:18 +02:00
Christoph Oelckers bca50c58b3 - removed A_NoBlocking call from Commander Keen. 2015-09-06 16:00:47 +02:00
coelckers d30b67dab6 Merge pull request #373 from alexey-lysiuk/wos29_compat
Compatibility fix for Whispers of Satan MAP29
2015-09-06 15:17:01 +02:00
alexey.lysiuk 68ea99016c Compatibility fix for Whispers of Satan MAP29
Insta-death pit (sector 1497) is now working as intended independently from compatibility settings
2015-09-06 15:45:10 +03:00
coelckers 6573902a26 Merge pull request #372 from ChillyDoom/SkullPopCamera
- Fixed: A_SkullPop did not work with spy mode.
2015-09-06 14:12:41 +02:00
Chris 99120d8442 - Fixed: A_SkullPop did not work with spy mode. 2015-09-06 12:12:57 +01:00
Christoph Oelckers 61e09da1be Merge branch 'master' of https://github.com/rheit/zdoom 2015-09-06 08:41:27 +02:00
coelckers 90d1e85aa2 Merge pull request #371 from edward-san/acs_strlen_invalid
- Fixed a crash in ACS strlen parsing with invalid argument.
2015-09-06 00:09:10 +02:00
Edoardo Prezioso e939d6885d - Fixed a crash in ACS strlen parsing with invalid argument. 2015-09-05 23:58:02 +02:00
coelckers 563188c14e Merge pull request #369 from Edward850/sanitize
Minor fixes from sanitize branch
2015-09-05 11:30:04 +02:00
Edward Richardson 9aabc85281 Fixed loading default map saves
- Just like normal maps, default map stores an FString as a map name.
2015-09-05 17:13:54 +12:00
Edward Richardson abb033d400 Fix deallocation of controllers with no axes 2015-09-05 14:18:48 +12:00
Edward Richardson 8ec4d431cf Fixed memory leak in joystick menu 2015-09-05 14:12:52 +12:00