alexey.lysiuk
d1c4215fb5
Merge branch 'master' of https://github.com/rheit/zdoom into z_osx_clean
2014-10-25 16:57:58 +03:00
Christoph Oelckers
fc0025963b
Merge branch 'master' of https://github.com/rheit/zdoom
2014-10-25 15:11:29 +02:00
Christoph Oelckers
0124d41931
Merge branch 'Bloodtype' of https://github.com/Edward850/zdoom
2014-10-25 15:07:06 +02:00
Christoph Oelckers
d4c50b1662
- fixed: AActor::IsTeammate must consider monsters friendly to a specific player as members of the same team as the owning player. Such monsters cannot be made members of a designated team, though, because their association needs to change if the player changes teams.
2014-10-25 14:59:30 +02:00
Edward Richardson
9435cdc5c9
Fixed NULL refrence in P_SpawnBlood
2014-10-26 01:09:19 +13:00
Christoph Oelckers
2e1fa70cbf
- some parentheses to silence GCC.
2014-10-25 13:12:57 +02:00
Christoph Oelckers
ad2e16576c
- fixed_ P_ExplodeMissile skipped most of its logic when the missile got destroyed by having no death state.
...
Apparently a band-aid fix was applied to this function because AActor::Destroy could not be called on an already destroyed actor again which could happen here due to incorrect ordering of actions.
Moving the state change to a later point in this function - after hitting a sky has been checked and decals have been spawned - returns everything to a safe state and ensures that nothing gets skipped.
2014-10-25 13:10:38 +02:00
Christoph Oelckers
edd53f22a1
- fixed: The buddha powerup set the wrong flag.
2014-10-25 12:34:46 +02:00
Christoph Oelckers
dcc318fdee
- print a warning when a state label can't be found. Preferably this would be an error but the oversight had been in the engine for too long so nobody knows
2014-10-25 12:33:08 +02:00
Christoph Oelckers
ef5707d73b
- added a compatibility option for stopping sounds when the owning actor is destroyed.
2014-10-25 12:12:06 +02:00
Christoph Oelckers
fc40e9723a
- fixed: CHANGELEVEL_RESETINVENTORY may not change the player's health.
...
APlayerPawn::GiveDefaultInventory altered the player_t's health value which was ok as long as this function was only called from G_PlayerReborn. For all other cases this initialization was wrong and G_PlayerReborn should do this itself.
2014-10-25 11:51:29 +02:00
Christoph Oelckers
cfe97b0f0f
- Fixed: Killing a morphed monster must trigger A_BossDeath on its unmorphed self.
2014-10-25 11:33:28 +02:00
Christoph Oelckers
0d3908a4f3
- fixed: Hitscan traces crossing a two sided line right at the height of the back sector's floor or ceiling must not be considered a hit.
2014-10-25 10:44:00 +02:00
Christoph Oelckers
8edace83c5
- made CheatKey and EasyKey vector graphics configurable through MAPINFO.
2014-10-25 10:19:14 +02:00
Christoph Oelckers
313245dd77
- added a Buddha powerup
2014-10-25 09:53:23 +02:00
MajorCooke
a19620968d
- Follow-up of the previous commit.
...
- Cleaned up the DoDamage and DoKill functionality.
- Added DMSS_FOILBUDDHA and KILS_FOILBUDDHA.
2014-10-25 09:39:10 +02:00
MajorCooke
d1dc6fd59a
- Added: BUDDHA and FOILBUDDHA.
...
- Fixed: mugshot didn't take the god2 cheat into account.
2014-10-25 09:39:00 +02:00
MajorCooke
b980069367
- Added GOD2 and BUDDHA2 cheats.
...
- Ensures that not even telefrag damage can kill the player.
- Fixed: Players with NODAMAGE could still hurt and kill themselves via
voodoo dolls.
2014-10-25 09:38:40 +02:00
Christoph Oelckers
1c500cead6
- fixed: A_Respawn did not restore the flags6 and flags7 fields.
2014-10-25 01:27:34 +02:00
Christoph Oelckers
5513966165
- fixed: Strife's peasants couldn't harm the player because they were defined as friendly.
2014-10-25 01:15:39 +02:00
Christoph Oelckers
aa338a4dc6
- fixed: G_FinishTravel must synchronize the CF_FLY flag with MF2_FLY.
2014-10-25 01:00:40 +02:00
Christoph Oelckers
83be901ad6
- fixed: damage of amount TELEFRAG_DAMAGE should not be reduced by armors absorbing some damage, it'd lose its magic-ness, that is needed to ensure a guaranteed kill. The same applies to autousing health items.
2014-10-25 00:52:27 +02:00
Christoph Oelckers
5ac7e4fc38
- added HARMFRIENDS flag.
2014-10-25 00:30:36 +02:00
Christoph Oelckers
b6f4862024
- fixed: A_Warp didn't initialize oldx/y/z in all situations.
2014-10-25 00:05:52 +02:00
Christoph Oelckers
e81c404b04
- fixed some bad logic operations.
2014-10-25 00:01:04 +02:00
Christoph Oelckers
e28234a8b8
- replaced pistol pickup sprite.
2014-10-24 23:19:57 +02:00
Christoph Oelckers
6f7b83faa1
- fixed: EV_DoFloor was a bit too selective about which movement types were allowed to crush. Changed so that the crush parameter is always used. Also changed all non-crushing calls to explicitly pass -1 as crush damage instead of relying on EV_DoFloor to ignore the passed value.
2014-10-24 23:12:38 +02:00
Christoph Oelckers
15b1c71257
- use proper CheckCheatMode semantics for throwing players out of chasecam mode if DF2_CHASECAM gets unset.
2014-10-24 23:02:02 +02:00
Christoph Oelckers
e662e4321a
- fixed: Creating an OPL MIDI device can fail if no GENMIDI lump is found, and an exception is thrown. We need to handle this exception to prevent an abort.
2014-10-24 22:56:10 +02:00
Christoph Oelckers
9402bcf6cd
- fixed: The targeter must reset its HUD sprites when being reactivated during the blinking phase.
2014-10-24 22:47:40 +02:00
Christoph Oelckers
5a91fd0ad4
- fixed: DMD models didn't load their triangle data.
...
- fixed: MD2 models didn't handle the triangles' byte order.
2014-10-24 13:03:26 +02:00
Christoph Oelckers
f8016bef86
- fixed: voxels didn't set their index count.
2014-10-24 11:52:45 +02:00
Christoph Oelckers
e5cd90f323
- use separate vertex buffers per model to avoid large memory usage peaks. Also delete the geometry data for the models once it has been copied into the vertex buffer.
2014-10-24 11:43:25 +02:00
John Palomo Jr
4496885366
Added Inventory.AlwaysRespawn flag.
2014-10-24 04:46:43 -04:00
Christoph Oelckers
6824605154
- added pickup sprite and editor number for Heretic's gold wand.
2014-10-24 00:06:18 +02:00
Christoph Oelckers
bca47bb9bc
- removed debug code.
...
- fixed: planes that are created by splitting translucent 3D-floors may never be rendered.
2014-10-23 17:35:58 +02:00
Christoph Oelckers
f907de15b0
Merge branch 'master' of https://github.com/rheit/zdoom
2014-10-23 17:34:30 +02:00
Christoph Oelckers
d6a33a601d
- fixed: The sorting of 3D floors was incomplete and missed cases where translucent volumes overlapped non-translucent ones only at their top. It also didn't account for one translucent volume being intersected by more than solid one.
2014-10-23 17:33:42 +02:00
Christoph Oelckers
36b35e85f3
- fixed: overflow checks for dynamic light buffer were not correct.
2014-10-23 12:06:00 +02:00
Christoph Oelckers
066e53ae4c
- fixed: sprites rendered as 'bright' should not be affected by dynamic lights.
2014-10-23 10:54:26 +02:00
Christoph Oelckers
618c23303f
- fixed: The interpolation factor for models was never passed to the shader.
2014-10-23 09:57:27 +02:00
Christoph Oelckers
5302a10a7d
- diable software lighting for textured automap.
...
* since it is designed for software-style light diminishing it doesn't work for 2D.
* additionally it left the lighting state in an unsuitable setting for further 2D rendering.
2014-10-23 09:19:30 +02:00
Christoph Oelckers
111205a0f5
Merge branch 'master' of https://github.com/rheit/zdoom
2014-10-23 08:51:16 +02:00
Christoph Oelckers
89ce0b8cb7
- test if GLSL version 1.4 can handle uniform buffers on old Intel hardware without making problems...
2014-10-22 16:54:26 +02:00
ChillyDoom
acd4a71de2
- Fixed: New DBot instances were missing write barriers.
2014-10-21 19:33:48 +01:00
ChillyDoom
6166e83d28
- Fixed: Only setting controllers should be able to remove bots.
2014-10-21 19:32:15 +01:00
ChillyDoom
c9bc9b427c
- Removed p_leader.
2014-10-21 19:31:11 +01:00
Christoph Oelckers
fafb0a672c
Merge branch 'handshake-hotpatch' of https://github.com/Edward850/zdoom
2014-10-21 14:28:50 +02:00
Christoph Oelckers
ccbdcfea81
Merge branch 'master' of https://github.com/j-palomo/zdoom
2014-10-21 14:28:31 +02:00
Christoph Oelckers
09e0758507
Merge branch 'fix_cmake_unix' of https://github.com/alexey-lysiuk/gzdoom
2014-10-21 14:27:37 +02:00