zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-24 13:01:47 +00:00
Code Issues Projects Releases Packages Wiki Activity
6313 commits 86 branches 139 tags 124 MiB
Commit graph

6313 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
98a9d7210a - fixed the definitions for script access to AActor::x, y, z. 
(Note: These should be made read only when real scripting becomes available!)
 2016-01-20 15:19:35 +01:00
Christoph Oelckers
c78344c19d Merge branch 'master' into scripting 
Conflicts:
	src/actor.h
	src/p_user.cpp
	src/thingdef/thingdef_expression.cpp
 2016-01-20 15:16:06 +01: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
4b9647e539 Merge branch 'master' into scripting 
Conflicts:
	src/actor.h
	src/g_hexen/a_hexenspecialdecs.cpp
	src/g_strife/a_thingstoblowup.cpp
	src/thingdef/thingdef_codeptr.cpp
 2016-01-20 11:45:57 +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
coelckers
ed0b740d8d Merge pull request #486 from Edward850/savePRNG-fix 
Fixed load order for saves
 2016-01-20 08:57:07 +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
b73e1e65f5 Merge branch 'master' into scripting 
Conflicts:
	src/actor.h
	src/p_local.h
	src/thingdef/thingdef_codeptr.cpp
 2016-01-19 20:17:34 +01: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
coelckers
9282eda306 Merge pull request #484 from ChillyDoom/wi_stuff-sizeof-fix 
Minor Intermission Fix
 2016-01-19 16:39:32 +01:00
Christoph Oelckers
354b55c0a3 Merge branch 'master' into scripting 
Conflicts:
	src/g_shared/a_debris.cpp
	src/g_strife/a_thingstoblowup.cpp
	src/thingdef/thingdef_codeptr.cpp
 2016-01-19 16:11:05 +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