zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-12-22 10:21:26 +00:00
Code Issues Projects Releases Packages Wiki Activity
9671 commits 6 branches 6 tags 107 MiB
Commit graph

9671 commits

This branch
This branch
All branches
Author SHA1 Message Date
Eevee (Lexy Munroe)
c08d865b1b Extend CheckActor*Texture to look at any non-solid floor 
Upon deep and personal reflection, I realize this is more consistent
with the TERRAIN change I made.
 2016-01-22 16:35:43 -08:00
Eevee (Lexy Munroe)
1ab9d15481 Make CheckActor*Texture also consider swimmable 3D floors 
An actor standing within a swimmable floor whose ceiling texture is X
and on a solid floor whose texture is Y will now be reported as standing
on both.
 2016-01-22 16:35:43 -08:00
Christoph Oelckers
6691358b0a Merge branch 'master' of https://github.com/rheit/zdoom 2016-01-22 19:15:24 +01:00
coelckers
81b3f48792 Merge pull request #504 from MajorCooke/floorprojectiles 
Projectiles Under Floor Fix
 2016-01-22 19:02:12 +01:00
MajorCooke
88f96950b5 Projectiles should set their z to floor, not add it. 2016-01-22 11:47:41 -06:00
Christoph Oelckers
da6fe6cad6 Merge branch 'master' of https://github.com/rheit/zdoom 2016-01-22 18:24:36 +01:00
Christoph Oelckers
f4f7bd5d34 - fixed a double/fixed_t mixup in P_SeekerMissile 2016-01-22 18:24:15 +01:00
coelckers
8a9df31db9 Merge pull request #501 from Edward850/MF5_NOINTERACTION-velz-fix 
Fixed cmf_aimdirection doubling up the spawn Z
 2016-01-22 12:32:08 +01:00
Christoph Oelckers
01aaef1528 - fixed: The P_DamageMobj call for damaging sectors should be skipped completely if godmode is on, so that instant damage sectors don't kill an invulnerable player. 2016-01-22 12:16:17 +01:00
Edward Richardson
2034f4e49f Fixed cmf_aimdirection doubling up the spawn Z 2016-01-22 23:06:09 +13:00
coelckers
da57f1e632 Merge pull request #500 from Edward850/MF5_NOINTERACTION-velz-fix 
Fixed Z-Velocity movement for MF5_NOINTERACTION
 2016-01-22 10:41:26 +01:00
Edward Richardson
2dff9a743c Fixed Z-Velocity movement for MF5_NOINTERACTION 2016-01-22 22:26:21 +13:00
coelckers
6f366f72a4 Merge pull request #498 from MajorCooke/ParticleParam 
A_SpawnParticle Reogrenized
 2016-01-22 09:36:19 +01:00
MajorCooke
823edc4a69 - Cleaned up leftovers. 2016-01-21 21:23:43 -06:00
MajorCooke
b51bbf66b0 - Fixed pointer setting not working due to requiring more than the SET* flags. 
- Changed search algorithm to be square and utilize fixed_t instead.
 2016-01-21 21:15:50 -06:00
MajorCooke
793fc90716 Once more homogenized! 
- DECORATE: color, flags, lifetime, size, angle, xyz offset/vel/accel, startalpha, fadestep.
- ACS: Similar, minus the angle parameter.
 2016-01-21 19:59:33 -06:00
MajorCooke
28502b9a80 - Reorganized A_SpawnParticle parameters. 
- Decorate order is now color, x/y/zoff, velx/y/z, lifetime, angle, flags, size, startalphaf, fadestepf, accelx/y/z.
- ACS order is now color, xyz offset, xyz velocity, lifetime, fullbright, size, startalpha, fadestep, xyz accel
 2016-01-21 18:34:39 -06:00
Christoph Oelckers
1a631670fb Merge branch 'master' of https://github.com/rheit/zdoom 2016-01-22 01:11:08 +01:00
Christoph Oelckers
841c7b275e Merge branch 'ParticleFlags' of https://github.com/MajorCooke/zdoom 
Conflicts:
	wadsrc/static/actors/actor.txt
 2016-01-22 00:58:42 +01:00
Christoph Oelckers
3b4ed8d7cd - made A_SpawnParticle's fadestep parameter a fixed point value as well. 2016-01-22 00:54:09 +01:00
MajorCooke
13dc6be5a1 - Added flags for A_SpawnParticle and angle parameter. 
- SPF_FULLBRIGHT makes the particle full bright.
- SPF_RELATIVE encapsulates the following flags:
- SPF_RELPOS: Position is relative to angle.
- SPF_RELVEL: Velocity is relative to angle.
- SPF_RELACCEL: Acceleration is relative to angle.
- SPF_RELANG: Add caller's angle to angle parameter for relativity.
 2016-01-21 16:36:58 -06:00
Christoph Oelckers
4ef44f408f Merge branch 'master' of https://github.com/rheit/zdoom 2016-01-21 20:14:19 +01:00
Christoph Oelckers
39014b1732 - make the startalpha parameter of A_SpawnParticle a float to be consistent with other functions that want an alpha value. 2016-01-21 20:13:55 +01:00
Randy Heit
1ac0d0690c Re-remove testglobalvar from constants.txt so scripting branch runs again 2016-01-21 12:46:12 -06:00
Randy Heit
9744b9e0d9 Merge branch 'master' into scripting 
Conflicts:
	src/actor.h
	src/dobject.h
	src/dobjgc.cpp
	src/p_local.h
	src/thingdef/thingdef_codeptr.cpp
 2016-01-21 12:45:06 -06:00
Randy Heit
d190da9e2e Silence pointer truncation warnings in Ppmd7.c 2016-01-21 12:03:52 -06:00
MajorCooke
9638cbb844 Updated A_CheckProximity Expansion Pruned Edition. 2016-01-21 11:39:13 -06:00
Christoph Oelckers
995721836b Merge branch 'SpawnParticle' of https://github.com/Edward850/zdoom 
Conflicts:
	src/actor.h
 2016-01-21 17:04:52 +01:00
coelckers
eeb2a979e1 Merge pull request #494 from alexey-lysiuk/intersect_fix 
Fixed actors intersection check
 2016-01-21 15:26:00 +01:00
alexey.lysiuk
f10dd68ca6 Fixed actors intersection check 2016-01-21 16:21:09 +02:00
coelckers
65662a9cfa Merge pull request #493 from alexey-lysiuk/dialog_fixes 
Fixes for Strife dialog
 2016-01-21 14:57:21 +01:00
Christoph Oelckers
68fcbc0c92 - fixed: loading sector damage information from an old savegame could retrieve invalid data due to an uninitialized variable. 2016-01-21 14:54:14 +01:00
alexey.lysiuk
598bccbe93 Added warning when next dialog page is incorrect 2016-01-21 15:53:58 +02:00
alexey.lysiuk
673ac1295c Fixed broken 'closedialog' property in Strife dialogs 
See http://forum.zdoom.org/viewtopic.php?t=50524
 2016-01-21 15:53:35 +02:00
Christoph Oelckers
102e59036c Merge branch 'master' of https://github.com/rheit/zdoom 2016-01-21 12:37:52 +01:00
Christoph Oelckers
5421213711 - typo in interpolation stuff. 2016-01-21 12:37:26 +01:00
Christoph Oelckers
5816049510 - made necessary adjustments for the coordinate refactoring in ZDoom. 2016-01-21 12:36:37 +01:00
Christoph Oelckers
8f7be01dd4 Merge branch 'master' of https://github.com/rheit/zdoom 
Conflicts:
	src/r_data/r_interpolate.cpp
 2016-01-21 12:09:12 +01:00
Christoph Oelckers
cf2ee1eb3f - fixed: Interpolations were deleted too early. 
They were immediately deleted when the associated thinker was destroyed. But this was too early because it missed the final tic of movement, resulting in a visible jump when a moving platform with a player on it came to a halt.
Changed it so that DelRef no longer destroys the interpolation itself. Instead the ::Interpolate method will check if the reference count is 0, and if so and there was no more movement, will then destroy the interpolation.
This ensures that it keeps running until it has interpolated all remaining bits of movement induced by the thinker.

Now moving up a lift is 100% smooth, even with movement interpolation on.
 2016-01-21 11:58:44 +01:00
Christoph Oelckers
d347415aee - fixed some garbage collection issues with interpolations: 
* FInterpolator depended on external references to prevent its content from getting GC'd.
* none of the pointers in the interpolation objects were declared to the GC.

The result of these issues was that changing anything about the life cycle of interpolation objects caused corrupted memory crashes when a level was changed.
 2016-01-21 11:36:37 +01:00
Christoph Oelckers
e4982b1ced Merge branch 'master' of https://github.com/rheit/zdoom 2016-01-21 10:24:03 +01:00
Christoph Oelckers
03d7418f51 - fixed: Since sector movement is done after P_PlayerThink is called, any player position change induced by this is not factored into player_t::viewz and needs to be added explicitly. 
This fixes the infamous 'view squats down a bit when riding up an elevator' effect. It is also there in the other cases but far less pronounced.
 2016-01-21 10:23:20 +01:00
coelckers
8b4194a3e0 Merge pull request #491 from MajorCooke/TF_SensitiveZ2 
A_Teleport TF_SensitiveZ
 2016-01-21 09:10:33 +01:00
MajorCooke
09733d8083 - Don't set both self and pointer's z to spotz when teleporting. 2016-01-20 18:50:30 -06:00
Randy Heit
710fa55288 Port recent SMF changes to XMI and HMI: 
- Handle SysEx messages instead of ignoring them.
- Don't lose time for unhandled events with delays.
 2016-01-20 18:37:05 -06:00
Randy Heit
7f6b421e87 Make sure all unhandled delayed MIDI events generate NOPs 
- Looking over the code again, I see that discarded SysEx messages can
  cause the same issue as unhandled meta events, so generalize the
  returning of a NOP for everything.
 2016-01-20 18:27:04 -06:00
MajorCooke
93aff2413f Fixed an issue which caused A_Teleport to set the caller and itself to SpotZ's z position. 2016-01-20 18:18:00 -06:00
MajorCooke
116e157447 Nevermind this. 2016-01-20 15:52:56 -06:00
MajorCooke
d20a7516c9 Updated A_FaceVelocity to remove conflicts. 2016-01-20 15:51:11 -06:00
Edward Richardson
e5c67cee83 Merge branch conflicts fix 
- CONFLICT (content): Merge conflict in src/p_acs.cpp
- Updated position variables
 2016-01-21 10:49:57 +13:00