Ronald Kinard
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
RedEnchilada
d2c74e1b13
Fix the west/south blockmap issue without fucking up huge maps
2015-04-08 21:32:07 -05:00
MonsterIestyn
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
MonsterIestyn
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
MonsterIestyn
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
Alam Ed Arias
73b3287b19
SRB2 2.1.14 release
2015-01-01 14:50:31 -05:00
Alam Ed Arias
404b5f666c
SRB2 2.1.12 release
2014-11-11 19:55:07 -05:00
Alam Ed Arias
c028c83235
SRB2 2.1.9 release
2014-08-03 23:49:33 -04:00
wolfy852
a8f5406233
Add P_Telekinesis and P_IsFlagAtBase to Lua.
2014-05-25 21:41:05 -05:00
Wolfy
f509c56e3c
Unstatic P_DoSpring.
2014-05-24 12:49:15 -04:00
Wolfy
3f1038dcbe
Unstatic P_SpawnSpinMobj.
2014-05-24 12:46:10 -04:00
Wolfy
ed82755b6d
Unstatic P_SpawnThokMobj.
2014-05-24 12:30:33 -04:00
Alam Ed Arias
b93cb1b65a
SRB2 2.1 release
2014-03-15 13:11:35 -04:00
