6ad1086128
Merge branch 'public_next' into master
2015-09-03 15:58:16 -04:00
2fb03a7cff
Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into angles
...
Conflicts:
src/p_map.c - Automatically resolved by mergetool
2015-08-22 09:52:11 -04:00
c0ae3fa895
Merge remote-tracking branch 'private/public_next' into private_master
2015-08-14 18:26:33 -04:00
fa935be129
Fixed the issue where diagonal springs couldn't teleport you to their centers anymore (guess whose fault that was! =D ). Basically I just made P_DoSpring boolean, which probably could be useful to Lua peeps as well. (it returns true if you were sprung, false if not)
2015-07-28 19:28:51 +01:00
fb5cba78d3
Merge branch 'public_next' into private
...
Conflicts:
src/p_mobj.c
2015-06-18 10:54:53 -04:00
b88600dac6
tmfloorthing and tmhitthing are set to NULL at the start of P_MobjThinker, preventing any weird cases of carrying over the previous mobj's floor object or such.
...
This fixes the issue with upside-down springs shooting downwards if you touch another of its kind. Also fixes one of the issues with monitors in Icicle Falls (after you phase inside the East-most float-bob FOF's monitor via the other bug and jump up to break it while there, the NEXT monitor moves upwards too)
2015-05-31 13:57:27 +01:00
a9dba0ffd1
Condense GetFloor/CeilingZ into fewer functions, and use macros for the rest
2015-05-24 11:27:52 -05:00
3f8e7b1739
Revert/remove unused/broken junk from original slopes port
...
m_vector removal to come later. The little thing commented out in it
is so I could revert the weird tables.c change.
2015-05-22 20:57:58 -05:00
3d2b71b24c
Make cameras properly collide with slopes
2015-05-21 09:36:20 -05:00
d138f7e14f
Collision with FOF slopes (might be unfinished, idk)
2015-05-17 11:53:28 -05:00
1f0f6b64c1
Store the slope an object is resting on (if applicable)
2015-04-29 00:33:04 -05:00
776b5254e6
Slope collision fixes
2015-04-29 00:29:51 -05:00
58dd6d42af
Add P_GetFloorZ and P_GetCeilingZ as boilerplate to facilitate better slope collision
...
I have not used this anywhere in the code yet.
2015-04-27 13:18:12 -05:00
923fae476e
Merge branch 'fury-gh/slopes' into angles
...
Conflicts:
src/p_maputl.c
2015-04-19 15:56:55 -05:00
91934d5aec
Merge branch 'next' into internal-master
...
Synchronize the following MRs to internal:
* STJr/SRB2!6
* STJr/SRB2!8
* STJr/SRB2!9
* STJr/SRB2!10
Conflicts:
src/doomdef.h
src/p_map.c
2015-04-14 19:33:38 -05:00
d2c74e1b13
Fix the west/south blockmap issue without fucking up huge maps
2015-04-08 21:32:07 -05:00
34c396825f
tmsprung is dead, long live MFE_SPRUNG a bunch of other painful tweaks to springs to fix this long-standing "AAA IM STUCK FOREVER UNDER A SPRING" thing when you touch a vertical spring from below (or above for reverse)
...
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9037 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-03-31 18:00:13 -04:00
e83fa3dc43
Partial damage system overhaul: P_DamageMobj, P_KillMobj, P_HitDeathMessages and P_RingDamage now all take a "damagetype" variable that determines what type of damage was dealt. Does not replace the "damage" variable, we'll have to see if that is worth keeping another time?
...
Currently the main benefit of these changes is that a number of non-Object-related hazards/deaths no long rely on dummy MT_NULL objects or other hacks to tell the game how you were hurt/killed, yay
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9039 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-02-24 02:09:18 -06:00
55c1ad4368
tmsprung is dead, long live MFE_SPRUNG a bunch of other painful tweaks to springs to fix this long-standing "AAA IM STUCK FOREVER UNDER A SPRING" thing when you touch a vertical spring from below (or above for reverse)
...
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9037 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-02-24 02:09:17 -06:00
73b3287b19
SRB2 2.1.14 release
2015-01-01 14:50:31 -05:00
54f0d0c110
IN PROGRESS: porting eternity slopes from srb2cb
2014-11-18 18:45:57 -06:00
404b5f666c
SRB2 2.1.12 release
2014-11-11 19:55:07 -05:00
c028c83235
SRB2 2.1.9 release
2014-08-03 23:49:33 -04:00
a8f5406233
Add P_Telekinesis and P_IsFlagAtBase to Lua.
2014-05-25 21:41:05 -05:00
f509c56e3c
Unstatic P_DoSpring.
2014-05-24 12:49:15 -04:00
3f1038dcbe
Unstatic P_SpawnSpinMobj.
2014-05-24 12:46:10 -04:00
ed82755b6d
Unstatic P_SpawnThokMobj.
2014-05-24 12:30:33 -04:00
b93cb1b65a
SRB2 2.1 release
2014-03-15 13:11:35 -04:00
Alam Ed Arias