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

5233 commits

Author SHA1 Message Date
MajorCooke
846f14c03d Remove the loop. 2016-01-27 14:56:06 -06:00
MajorCooke
79177cf98e Set up the subfunction. 2016-01-27 14:54:46 -06:00
rheit
f36bdc474d Merge pull request #421 from alexey-lysiuk/video_mode_menu 
Fixed selection of empty items in Video Mode menu
 2016-01-27 13:30:05 -06:00
Randy Heit
2d40874cfa Make finishgame CCMD net-aware 2016-01-27 13:19:15 -06:00
Randy Heit
b22a909829 Add nodelay handling to FastProjectile 2016-01-27 13:08:23 -06:00
MajorCooke
275cdcd958 Renamed A_FaceVelocity to A_FaceMovementDirection. 2016-01-27 10:12:13 -06:00
coelckers
c5379c749e Merge pull request #428 from MajorCooke/A_CheckSPecies 
Added A_CheckSpecies(state jump, name species, ptr = AAPTR_DEFAULT)
 2016-01-27 16:45:16 +01:00
Christoph Oelckers
7c6e070244 - fixed: line spacing was taken from a different variable in conversation display and mouse coordinate code. 2016-01-27 11:19:30 +01:00
Christoph Oelckers
4eb38f0381 - fixed: plane heighr calculations for Floor_Lower/RaiseByValue should be done at a point that's actually near the affected sector, not at (0,0), otherwise there's a risk of fixed point overflow. 2016-01-27 11:01:38 +01:00
Christoph Oelckers
c3047f448e - fixed: When MIDI->Open returns failure, the MIDI device needs to be deleted. Otherwise the dead device object can trigger an assert later. 2016-01-27 10:39:21 +01:00
Christoph Oelckers
f2666f70dd - removed unneeded check for 'listenactor' in S_UpdateSounds. 2016-01-27 09:56:40 +01:00
Christoph Oelckers
d2beec4585 - ensure that AInventory::Touch attributes everything to the correct player, even if the touching action results in a morph. 2016-01-27 00:56:40 +01:00
Christoph Oelckers
8993f84087 Merge branch 'master' of https://github.com/rheit/zdoom 2016-01-26 22:27:42 +01:00
Christoph Oelckers
2a1fa60aa6 Merge branch 'CheckProxExpPruned' of https://github.com/MajorCooke/zdoom 2016-01-26 18:49:03 +01:00
MajorCooke
1c0ef1d367 Removed CPXF_NODISTANCE. 2016-01-26 10:00:20 -06:00
coelckers
e397b5a475 Merge pull request #511 from MajorCooke/CheckLOFpitch 
A_CheckLOF Pitch FIx
 2016-01-26 14:44:05 +01:00
MajorCooke
cb43ce9cfc - Fixed: A_CheckLOF was doubling up on its pitch and reversing it when without a target. 2016-01-26 07:20:55 -06:00
Christoph Oelckers
4f0cfa29b4 - missed a '!'. 2016-01-26 10:50:31 +01:00
Christoph Oelckers
623276f5a6 - fixed: All access to weapon info in DECORATE functions should be restricted to when they get called from an actual weapon, not from a CustomInventory item. 
Issues this fixes:

 * all original Doom attack functions unconditionally altered the flash state.
 * A_FireOldBFG, A_RailAttack and A_Blast never checked for a valid ReadyWeapon.
 * CustomInventory items could deplete an unrelated weapon's ammo.
 2016-01-26 09:43:47 +01:00
Randy Heit
9f8dee45c4 Fixed: 0 was accidentally not allowed as transparent for grayscale 
- I don't know what I was thinking when I wrote that.
 2016-01-25 21:44:08 -06:00
Randy Heit
450b6de384 cRGBT::A should return 255, not 1. Whoops. 2016-01-25 21:31:21 -06:00
Randy Heit
0fc40cff0a Fix some rare PNG tRNS chunk cases 
- For grayscale images drawn with the paletted renderer, the value here
  was treated as always full range [0,65535]. The max value is actually
  determined by the bit depth.
- For RGB images drawn with the paletted renderer, the tRNS chunk was
  ignored.
- For grayscale images drawn with the RGB renderer, having a tRNS chunk
  present resulted in undefined behavior.
- For RGB images drawn with the RGB renderer, the tRNS chunk was ignored.
 2016-01-25 21:23:53 -06:00
Randy Heit
61d033328b Don't show "exited the level" messages after the level has exited 2016-01-25 20:18:33 -06:00
Randy Heit
774c136532 Fixed: Player.FallingScreamSpeed used minz as the maxz as well 2016-01-25 18:55:05 -06:00
MajorCooke
0be09f54bd Particles can now scale up to 65535. 2016-01-25 15:44:11 -06:00
Christoph Oelckers
cf43eb6c6d - limit particle size to 127 2016-01-25 21:08:09 +01:00
Christoph Oelckers
73ee500bea Merge branch 'master' of https://github.com/rheit/zdoom 2016-01-25 18:58:42 +01:00
Christoph Oelckers
cef2cf4e6d fixed parameter count for Sector_SetDamage. 2016-01-25 18:58:23 +01:00
MajorCooke
ced35e98fb Remove needless check. 2016-01-25 10:07:00 -06:00
Braden Obrzut
4d225e7a00 - Fixed: Mac GCC errors due to not recognizing the newly disabled warnings. 2016-01-24 23:03:59 -05:00
coelckers
3c790a80eb Merge pull request #508 from ChillyDoom/wi_stuff-common-code 
- Removed duplicate autoskip code.
 2016-01-24 16:54:51 +01:00
Chris
1721d70212 - Removed duplicate autoskip code. 2016-01-24 14:44:47 +00:00
alexey.lysiuk
4b210a839a Fixed uninitialized variable in IOKit controller handler 2016-01-24 14:43:55 +02:00
Christoph Oelckers
be3b84e751 Merge branch 'master' of https://github.com/rheit/zdoom 2016-01-24 11:50:54 +01:00
Christoph Oelckers
67f644c898 - fixed inverted NULL pointer check in A_SetAngle. 
- let COPY_AAPTR check the most common case AAPTR_DEFAULT first instead of running through all the other cases for it.
 2016-01-24 11:50:21 +01:00
Braden Obrzut
fd4440cfe4 - Fixed: Intermissions with no screens (such as EndTitle) would result in a double wipe. 2016-01-23 23:34:07 -05:00
Braden Obrzut
fc15be8689 - Improved DrawSwitchableImage keyslot condition to include key species. 
- Fixed: currentpos command would crash if not in game.
 2016-01-23 22:24:12 -05:00
Braden Obrzut
5abacf0b2f - Fixed: Uninitialized variable on DrawSelectedInventory. 2016-01-23 21:40:19 -05:00
Braden Obrzut
20f7f524ca - Don't link against sndfile and mpg123 if not compiling with OpenAL support. 2016-01-23 20:09:39 -05:00
Braden Obrzut
88a616da75 - Removed what appears to be a debug breakpoint. 
- Cleared some GCC and Clang warnings. Mostly static analysis false positives, but one of them generated a pretty massive warning in a release build.
- Use -Wno-unused-result since I doubt we're going to address those unless they actually prove to be a problem (and they only appear in release builds).
 2016-01-23 19:36:13 -05:00
Christoph Oelckers
0dabaca7df - added some range checks to PgUp(PgDown code for option menus. 2016-01-23 21:23:02 +01:00
Christoph Oelckers
c4377b7039 - removed the implicit fixedvec -> TVector conversions because they caused too many problems. Also reviewed all uses of these and made the necessary adjustments. Problems were present in P_SpawnMissileXYZ and P_Thing_Projectile. 
- replaced some single precision float math with doubles.
 2016-01-23 20:44:33 +01:00
Christoph Oelckers
f860a344cc Merge branch 'master' of https://github.com/rheit/zdoom 2016-01-23 17:50:01 +01:00
Christoph Oelckers
5c8fd4750f - fixed: FInterpolator::DoInterpolations did not handle terminated interpolations properly. 2016-01-23 17:00:24 +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
Edward Richardson
2dff9a743c Fixed Z-Velocity movement for MF5_NOINTERACTION 2016-01-22 22:26:21 +13: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
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
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
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
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
5421213711 - typo in interpolation stuff. 2016-01-21 12:37:26 +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
Randy Heit
1a356dfa51 Fixed: MIDI meta events were completely discarded, including their delays 
(unless the event was for setting the tempo) This left the following
events in the track to happen at the wrong time.
 2016-01-20 14:53:56 -06:00
Christoph Oelckers
68c0f929dc - refactoring complete. The source compiles again with the renamed position variable. 2016-01-20 15:12:51 +01:00
Christoph Oelckers
13e25faea7 - p_sight.cpp, p_spec.cpp and p_switch.cpp refactored. 2016-01-20 14:20:14 +01:00
Christoph Oelckers
4d8070927d - p_maputl.cpp done. 2016-01-20 14:04:47 +01:00
Christoph Oelckers
25107ed421 - since I had to shuffle around the first variables in AActor, let's better commit that change. 2016-01-20 13:49:52 +01:00
Christoph Oelckers
35271187a5 - took care of the rest of p_map.cpp. 2016-01-20 13:48:05 +01:00
Christoph Oelckers
83cbf6cae5 Merge branch 'master' of https://github.com/rheit/zdoom 
Conflicts:
	src/g_hexen/a_wraith.cpp
 2016-01-20 11:41:27 +01:00
Christoph Oelckers
500bc2b852 - fixed two refactoring errors: 
* A_BridgeOrbit had its radius as an int, not a fixed_t.
* PIT_CheckThing used the wrong coordinate for checking actor distance.
 2016-01-20 11:39:41 +01:00
Christoph Oelckers
e9b23cf833 - keep evaluation order of Random() calls defined. 2016-01-20 09:25:30 +01:00
Edward Richardson
5c8ebf487d Fixed load order for saves 
- Make sure the PRNG tables are restored after the base level is loaded,
otherwise the tables will restore in a modified state.
 2016-01-20 19:14:43 +13:00
Christoph Oelckers
7ea3e49332 - refactored p_mobj.cpp and the first half of p_map.cpp. 2016-01-20 01:48:57 +01:00
Randy Heit
9b9008ecc7 Restore original offset range for WraithFX5 spawn 2016-01-19 18:00:46 -06:00
Christoph Oelckers
7658111566 - refactoriung of thingdef_codeptr.cpp - probably the ugliest file in the entire project... 2016-01-19 20:15:45 +01:00
Christoph Oelckers
97620b0645 - fixed some leftover unused variable warnings. 
- match the variable names in thingdef_codeptr.cpp to the ones in the scripting branch to reduce the amount of merge conflicts in upcoming changes.
 2016-01-19 16:09:44 +01:00
Chris
119c2f36b2 - Fixed an incorrect memset parameter in wi_stuff.cpp. 
- Removed some whitespace from wi_stuff.h.
 2016-01-19 13:20:32 +00:00
Christoph Oelckers
27aeb6a656 - g_shared refactored 2016-01-19 13:26:05 +01:00
Christoph Oelckers
9f78bcd1e6 - Strife game code refactored for coordinates. 2016-01-19 11:50:07 +01:00
Christoph Oelckers
c02d922014 Merge branch 'master' of https://github.com/rheit/zdoom 2016-01-19 01:11:13 +01:00
Christoph Oelckers
2326928ff7 - the last bits of Hexen refactored 
This also fixes a problem with some of Hexen's Wraith's effects which did some repositioning without properly linking them into the blockmap.
 2016-01-19 01:10:57 +01:00
coelckers
5c7f72278b Merge pull request #483 from kevans91/ndebug-fixes 
*BinPack fixes -- disjointRects only defined #ifdef _DEBUG
 2016-01-18 22:39:40 +01:00
Christoph Oelckers
ef7be016c4 - all those 'actor->SetZ(actor->Z() +...) calls weren't pretty so now there's an AddZ method, too. 2016-01-18 22:32:36 +01:00