Commit graph

5395 commits

Author SHA1 Message Date
coelckers
c1496ea1bf Merge pull request #390 from MajorCooke/SetPainThreshold
- Added A_SetPainThreshold for the calling actor('s pointer).
2015-10-11 15:55:32 +02:00
coelckers
8e2810865b Merge pull request #411 from alexey-lysiuk/randomspawner_warning
Fixed MSVC warning in a_randomspawner.cpp
2015-10-11 09:41:05 +02:00
alexey.lysiuk
fe61b8064a Fixed MSVC warning in a_randomspawner.cpp
...\src\g_shared\a_randomspawner.cpp(32): warning C4800: 'DWORD' : forcing value to bool 'true' or 'false' (performance warning)
See http://forum.zdoom.org/viewtopic.php?t=49737
2015-10-11 09:28:38 +03:00
coelckers
ba651ebff7 Merge pull request #410 from MajorCooke/CloserZDisable
A_JumpIfCloser Z Check Toggle
2015-10-10 23:11:06 +02:00
MajorCooke
21dc45bdec This did not save out properly... 2015-10-10 15:30:18 -05:00
MajorCooke
455b70630d - Added A_JumpIfCloser NoZ boolean. Disables Z distance checking if true. 2015-10-10 10:11:59 -05:00
coelckers
3b2e8f3401 Merge pull request #409 from alexey-lysiuk/back_overlap_crash
Fixed crash when clicking on back button in main menu
2015-10-10 16:13:48 +02:00
coelckers
45d573a2f2 Merge pull request #393 from alexey-lysiuk/fix_random_spawner
Small improvements for random spawner
2015-10-10 16:12:17 +02:00
alexey.lysiuk
bad9961376 Fixed crash when clicking on back button in main menu
If menu item selection overlaps back button in main menu, clicking on back button with mouse caused a crash
See http://forum.zdoom.org/viewtopic.php?t=49711
2015-10-10 15:03:14 +03:00
coelckers
75c5b563d1 Merge pull request #408 from alexey-lysiuk/fix_menu_texture
Fixes for missing menu textures
2015-10-07 12:55:18 +02:00
alexey.lysiuk
99dd664029 Print warning to console if unknown texture found in menu definition 2015-10-07 12:13:11 +03:00
alexey.lysiuk
005e468fa9 Fixed crash when menu item uses non-existent texture
See http://forum.zdoom.org/viewtopic.php?t=49696
2015-10-07 12:11:27 +03:00
Braden Obrzut
df9053ea99 Merge branch 'CheckBlock' 2015-10-06 22:36:24 -04:00
rheit
9ff2ac684f Merge pull request #398 from ChillyDoom/DuplicateCheck
- Removed duplicate 'acceleratestage' check.
2015-10-05 17:26:10 -05:00
MajorCooke
2f3b69e770 Optimize a little more... 2015-10-04 16:12:35 -05:00
MajorCooke
154e023800 - Added A_CheckBlock(state block, int flags, int ptr).
- Performs a jump if an actor or a line is in the way.
- Can be used without a jump state if the desire is only to have a pointer change.
- CBF_NOLINES disables jumping if a line is involved.
- CBF_SET* flags set the target, master or tracer to whoever is blocking, for the actor calling the function.
- CBF_SETONPTR causes the pointer changing flags to apply to the pointed actor instead of itself.
2015-10-04 16:00:40 -05:00
Christoph Oelckers
125afcf3de Merge branch 'master' of https://github.com/rheit/zdoom 2015-09-28 09:11:52 +02:00
Christoph Oelckers
f58b67b11d . added MBF dog sounds to Dehacked sound table. 2015-09-28 09:09:52 +02:00
coelckers
beb2a4fc64 Merge pull request #396 from alexey-lysiuk/console_dbgout
Make console text to appear in Windows debug output
2015-09-23 09:47:09 +02:00
alexey.lysiuk
37dde2e77d Make console to Windows debug output controlled by CVAR
DebugView can be used to view output without debugger attached
2015-09-23 10:18:57 +03:00
coelckers
676b710b84 Merge pull request #395 from khokh2001/master
Nuked OPL3 Update
2015-09-23 01:48:30 +02:00
alexey.lysiuk
c743b19e6d Make console text to appear in Windows debug output
This works in Debug configuration only
Color escape sequences are stripped from text before output
2015-09-22 15:19:44 +03:00
khokh2001
c6aceccab3 Merge branch 'opl3' of https://github.com/khokh2001/zdoom 2015-09-20 02:17:26 +09:00
khokh2001
b1b17beaf6 nuked opl emulator update 2015-09-20 02:14:24 +09:00
khokh2001
23577f4be8 nuked opl emulator update 2015-09-20 02:11:03 +09:00
alexey.lysiuk
96ff716046 Added error message about missing class to drop from RandomSpawner 2015-09-19 18:29:59 +03:00
alexey.lysiuk
49519db257 Fixed crash in RandomSpawner with -nomonsters
See http://forum.zdoom.org/viewtopic.php?f=2&t=49520
2015-09-19 18:29:07 +03: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
MajorCooke
6730525855 - Added A_SetPainThreshold for the calling actor('s pointer). 2015-09-17 09:07:13 -05: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
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