Christoph Oelckers
585366f872
- fixed signedness warning.
2015-07-15 09:08:15 +02:00
Christoph Oelckers
d58d38a1d3
Merge branch 'master' of https://github.com/rheit/zdoom
...
Conflicts:
src/p_3dfloors.cpp
2015-07-13 21:36:19 +02:00
Christoph Oelckers
abf11f1a12
- print an error message if GL_ARB_sampler_objects cannot be found.
...
GZDoom requires this extension and all supported hardware has drivers implementing it but there still seem to be people out there who stuck to some older, obsolete drivers that don't.
2015-07-13 09:49:02 +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
ZZYZX
78ea00be59
Put line ID from args[1] for Hexen maps
2015-06-07 04:19:18 +03:00
ZZYZX
cd39c4b8a6
Merged mirrors with portals; Render part of mirrors done, render part of portals needs further testing
2015-06-07 04:19:17 +03:00
Eevee (Alex Munroe)
8fa9aa2627
Use the correct sidedef's middle scaling when drawing 3D floors.
...
This wants `curline->sidedef`, which is the 3D sidedef currently being
drawn. `sidedef` appears to be the last regular sidedef that happened
to be drawn? The perils of globals.
2015-06-06 18:17:50 -07:00
Eevee (Alex Munroe)
221c2d2d82
Transfer flat-based damage (P_PlayerOnSpecialFlat) to 3D floors.
2015-06-06 16:07:48 -07:00
Eevee (Alex Munroe)
8a428e69b6
Don't play a terrain splash if the player didn't take damage.
2015-06-06 16:07:48 -07:00
Eevee (Alex Munroe)
a87a86198c
Transfer friction to swimmable 3D floors.
2015-06-06 16:07:48 -07:00
Braden Obrzut
662345adb8
- Fixed: More endian issues in the ACS VM.
2015-06-05 22:22:54 -04:00
Braden Obrzut
7497b329c2
- Fixed: zipdir wrote the central directory incorrectly on PowerPC.
2015-06-05 21:57:42 -04:00
Christoph Oelckers
fbefe13bb2
Merge branch 'master' of https://github.com/rheit/zdoom
2015-06-04 09:27:17 +02:00
Christoph Oelckers
ae3b52a68a
- fixed: Software renderer's colormap variables should not be accessed from common renderer interface code.
2015-06-04 09:20:55 +02:00
coelckers
c1bbd81762
Merge pull request #333 from MajorCooke/laxtelefragdmg
...
* Added LAXTELEFRAGDMG. This flag forces all damage to be factored, …
2015-06-02 19:46:06 +02:00
