Christoph Oelckers
d8ea128f38
Merge branch 'master' into scripting
...
Conflicts:
src/p_effect.cpp
src/p_effect.h
src/p_local.h
src/p_map.cpp
src/thingdef/thingdef_codeptr.cpp
2015-07-16 20:37:17 +02:00
coelckers
7be6041f57
Merge pull request #347 from edward-san/xs_float_infinite_loop
...
- Fixed a dangerous typo in xs_Float code.
2015-07-16 20:26:21 +02:00
coelckers
e857d875cc
Merge pull request #346 from edward-san/uninitialized_build_stairs
...
- Fixed an uninitialized variable in stairs code.
2015-07-16 20:25:46 +02:00
coelckers
a8fbdb425f
Merge pull request #345 from edward-san/keyconf_empty_lines
...
- Fixed a KEYCONF parser issue with empty lines.
2015-07-16 20:25:23 +02:00
Edoardo Prezioso
f57e23989b
- Fixed a dangerous typo in xs_Float code.
...
The function 'xs_CeilToUInt' would call itself, leading to infinite loop, due to a typo. It should call 'xs_CeilToInt' instead.
2015-07-16 19:54:27 +02:00
Edoardo Prezioso
1bd23150aa
- Fixed an uninitialized variable in stairs code.
...
'floor->m_Hexencrush' was left uninitialized in all the floor movers after the first one.
2015-07-16 19:46:54 +02:00
Edoardo Prezioso
99683f0e7d
- Fixed a KEYCONF parser issue with empty lines.
...
The code attempted to access an array outside its bounds when it tried to parse empty lines.
Discovered with the Address Sanitizer.
2015-07-16 19:43:30 +02:00
Christoph Oelckers
add52d48cd
- fixed: INPUT_XInput must also be available when compiling without XInput support so that the corresponding JoyDevice can be accessed.
2015-07-15 14:44:37 +02:00
Christoph Oelckers
47303b26c7
- define GET_XBUTTON_WPARAM for MinGW in all file which need it.
2015-07-15 14:09:21 +02:00
Christoph Oelckers
c677dd37f5
- changed I_PrintStr so that it doesn't add everything to the RichEdit control right away.
...
The RichEdit control can become quite slow with large amounts of text being added constantly.
Since anything that gets added while the game is running can't be seen anyway unless a fatal error is produced, it buffers the text locally now, without any processing, and only adds it to the RichEdit control in case a fatal error causes the control to be displayed again.
2015-07-15 12:53:58 +02:00
Christoph Oelckers
1e4bec25c5
- fixed the distance check for unblocking overlapping monsters. It tested for half the radius as distance threshold when it should have used the full radius
2015-07-15 10:15:12 +02:00
Christoph Oelckers
19d15d7fc8
- fixed: Levels could be exited multiple times, triggering special exit actions for each one.
2015-07-15 09:25:04 +02:00
Christoph Oelckers
b5033d2940
- fixed a bad check from pull request #325 .
2015-07-15 09:11:08 +02:00
Christoph Oelckers
585366f872
- fixed signedness warning.
2015-07-15 09:08:15 +02:00
Christoph Oelckers
fe2e293d02
- added some error checks for trying to create unsupported animations for textures with full path names.
2015-07-13 09:08:08 +02:00
Christoph Oelckers
eeaea59828
- fixed: FTagManager::RemoveSectorTags must check if the StartForSector array is large enough to contain the sector whose information is to be removed.
2015-07-13 08:42:42 +02:00
coelckers
d8bfaf188c
Merge pull request #344 from marrub--/oal-bug
...
(openal) fix menus muting themselves when the volume is changed
2015-07-12 16:57:23 +02:00
Marrub
9e1a82a830
fix menus muting themselves when the volume is changed
2015-07-10 08:45:15 +00:00
Braden Obrzut
3adda344b6
- Missing common resolution 1680x1050 added to resolution list of SDL and Cocoa.
2015-07-06 02:58:01 -04:00
Randy Heit
9edf409ea2
Add British English "translation", because u's matter
2015-06-30 13:11:33 -05:00
Randy Heit
0fa0dc5f9e
Add support for alias parameter substitution in quoted strings
...
- For backward compatibility, you need to indicate that substitution is
allowed in the string by prepending it with a % character:
alias asay "say %\"%1\""
The above will substitute the alias parameter.
alias asay "say \"%1\""
The above will not substitute the alias parameter but use the string
literal "%1" directly.
2015-06-30 13:01:48 -05:00
Marrub
08e9d75538
removed sv_fastweapons 4 as it may cause issues
2015-06-27 15:00:31 -04:00
Marrub
4208993f22
use sv_fastweapons 3 and 4 instead
2015-06-27 08:26:48 -04:00
Marrub
873ef3fea8
that works better
2015-06-25 10:15:40 -04:00
Marrub
bbc3173629
yep
2015-06-25 09:47:37 -04:00
coelckers
f0b73b30c0
Merge pull request #341 from Edward850/railfix
...
Add missing MF7_FORCEDECAL flag for rail attacks, and changed operation to doubles
2015-06-25 08:57:03 +02:00
Edward Richardson
2a69ae2a43
Change all float calcs in rails to doubles
2015-06-25 13:57:36 +12:00
Edward Richardson
8670b7ecf7
Use puff decal with MF7_FORCEDECAL
2015-06-25 12:53:46 +12:00
Christoph Oelckers
85449a6b8a
- fixed: A_BFGSpray checked the spray actor's class for MTHRUSPECIES, not the actual shooter.
2015-06-21 13:04:47 +02:00
Christoph Oelckers
ffa77ff7a6
Merge branch 'master' of https://github.com/rheit/zdoom
2015-06-18 10:20:28 +02:00
Christoph Oelckers
76c401a41e
- added 'nopushwindowcheck' for Hexen's MAP30 which abuses a glitch with a 'projectile impact' line on a two-sided wall.
2015-06-18 10:20:04 +02:00
Randy Heit
1482070207
Comment out SCOPE parsing for now
2015-06-13 18:19:38 -05:00
Randy Heit
245a46735d
Fix warning in assert statement
2015-06-13 18:19:09 -05:00
coelckers
266af2e872
Merge pull request #339 from eevee/strict-switch-range
...
Don't allow pressing a checkswitchrange switch that's in the floor
2015-06-09 22:57:49 +02:00
Eevee (Alex Munroe)
911b35370e
Let's go wild and do it for the ceiling, too.
2015-06-09 13:41:48 -07:00
Eevee (Alex Munroe)
3b2126ba95
Don't allow pressing a checkswitchrange switch that's in the floor.
2015-06-09 13:20:10 -07:00
ZZYZX
d0df4c1744
Upgraded the portal code to work with the new tagManager system. Was uncompilable
2015-06-07 21:27:20 +03:00
ZZYZX
31cad858d9
Fixed odd merge bugs
2015-06-07 20:54:36 +03:00
coelckers
5adc8cf167
Merge pull request #338 from alexey-lysiuk/osx_fix_nofmod
...
Fixed build on OS X without FMODEx
2015-06-07 11:23:06 +02:00
alexey.lysiuk
2200569793
Fixed build on OS X without FMODEx
2015-06-07 11:31:53 +03:00
Christoph Oelckers
7ba577e1b0
Merge branch 'master' into scripting
...
Conflicts:
src/g_heretic/a_hereticweaps.cpp
src/thingdef/thingdef_codeptr.cpp
2015-06-07 09:43:54 +02:00
Christoph Oelckers
4444d3c0c5
- removed the _3DFLOOR #define because we really do not want to comment this out anymore, right?
2015-06-07 09:41:44 +02:00
Christoph Oelckers
3fea074d35
- respect FF_INVERTSECTOR when checking a 3D floor's terrain.
2015-06-07 09:33:15 +02:00
Christoph Oelckers
2b59a35e84
Merge branch 'texture-scaling-3d-floors' of https://github.com/eevee/zdoom
2015-06-07 09:09:55 +02:00
Eevee (Alex Munroe)
15b97c1409
Fix scaling of 3D floor wall textures.
...
The scale factors are now taken from the same part of the sidedef that
provides the texture.
2015-06-06 18:26:13 -07:00
ZZYZX
a520d35d89
Merge branch 'portals2_visual' of github.com:jewalky/zdoom into portals2_visual
...
Conflicts:
src/p_setup.cpp
src/p_udmf.cpp
2015-06-07 04:21:08 +03:00
ZZYZX
b3764f4ee2
Fixed trivial bug with two-sided portals not clipping stuff correctly
2015-06-07 04:19:21 +03:00
ZZYZX
29880026a6
Fixed sprite clipping with drawsegs (removed unnecessary portal check)
2015-06-07 04:19:21 +03:00
ZZYZX
f07d43943a
Made a CVar to limit recursions; Made a CVar to highlight portal borders; Fixed slight logical bug in unique portal identifiers
2015-06-07 04:19:20 +03:00
ZZYZX
b066b0891a
Fixed portal detection in R_AddLine
2015-06-07 04:19:19 +03:00