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
MajorCooke
4c390d92a4
-...forgot this one.
2015-06-02 12:22:26 -05:00
MajorCooke
22570e079e
* Added LAXTELEFRAGDMG. This flag forces all damage to be factored, regardless being above or below the telefrag threshold.
...
- This only affects damage calculations being received by the end result. If the original damage was not a million or more, from the start, it will not hurt invulnerable-flagged or kill buddha-flagged monsters.
- Fixed: Damage was inconsistent by the time the function checked for player cheats/invulnerability and (monster and player) buddha, yet monster invulnerability checked the original damage prior to factor processing. This means a damage source that intended to damage another below the threshold could accidentally increase with a powerdamage multiplier or the recipient with a weakness for it, resulting in invulnerability/buddha foiling. Now, checks for telefrag damage using the raw original value on player godmode, player/monster invulnerability and buddha.
2015-06-02 12:10:45 -05:00
Christoph Oelckers
065b7f9ad2
- fixed: The CollectSectorStack functions had a local sector_t variable used by gl_FakeFlat which caused a stack overflow. Using the global one defined at the top of the file is ok here.
2015-05-29 12:03:50 +02:00
Christoph Oelckers
c1e3c16232
Merge branch 'master' of https://github.com/rheit/zdoom
2015-05-28 09:23:14 +02:00
Christoph Oelckers
65cc361e9b
- added Zandronum's text input menu items.
2015-05-28 09:22:48 +02:00
coelckers
7f68d88268
Merge pull request #332 from edward-san/pitch_fix
...
- Fixed SetActorPitch and ChangeActorPitch issue.
2015-05-28 09:04:55 +02:00
Edoardo Prezioso
4546df7dc3
- Fixed SetActorPitch and ChangeActorPitch issue.
...
The code did not take into account the player's limited pitch.
2015-05-28 00:41:07 +02:00
Christoph Oelckers
0b3a22d6d2
- fixed: The ending flat for No Rest For The Living was wrong.
2015-05-26 09:03:53 +02:00
Christoph Oelckers
733873351a
Merge branch 'master' of https://github.com/rheit/zdoom
2015-05-25 19:58:02 +02:00
Christoph Oelckers
9f208409f2
- fixed: The tag check in Sector_CopyScroller was inverted (it should reject sectors with the given tag, but it rejected everything else.)
2015-05-25 19:57:36 +02:00
Braden Obrzut
c9214c1ce9
- Fixed: Hexen's status bar top graphic was drawn 1 pixel too low.
...
- Fixed: Artiflash played on initial save loading. I seem to recall this looking like an intentional change, but perhaps I broke it since it's completely pointless to play the animation only on the first load of a save game if nothing has been loaded beforehand.
2015-05-20 13:10:08 -04:00
Braden Obrzut
e46b25f628
- Fixed: god2 didn't trigger invulnerability in SBarInfo.
2015-05-20 12:54:13 -04:00
