51aa7692d8
Merge branch 'master' into next
2016-03-30 20:15:08 -04:00
d90536967d
removed/remline ununsed code
2016-03-30 14:05:07 -04:00
ac03ce39c8
*_Random is now *_RandomByte.
...
P_RandomChance is now a macro for something that should happen a
certain percentage of time.
P_SignedRandom was moved to a macro. Nobody cared.
# Conflicts:
# src/p_inter.c
2016-03-29 16:27:55 -07:00
5a38088623
Well, we don't need "experimental" slopes anymore either
...
Not when we have properly working ones!
2016-03-09 01:09:21 -08:00
7ae87cc2c6
Revert "No more stupidity for No More Enemies special plz"
...
This reverts commit 474ad01b46
2016-03-08 22:22:30 -08:00
694220155e
Revert "MF2_PUSHED is now MFE_PUSHED, for the simple reason that it makes more sense as an eflags object flag than a flags2 object flag!"
...
This reverts commit c8c7878005
2016-03-08 21:30:12 -08:00
a8bca89dbd
Merge branch 'backport_unslot-music' into 'next'
...
BACKPORT: removal of music slots
Relevant commits cherry-picked. Basically everything except the internal music track name switches.
See merge request !43
2016-03-03 22:31:21 -05:00
c7ba1d1532
Make sure target sector's lightlist is reset whenever FOF flags are changed.
...
This fixes how removing certain flags (such as FF_EXISTS) from FOFs can cause HOMs on walls bordering their target sectors. Also fixes how the force-FOF-to-vanish linedef special can leave behind the FOF's shadow
2016-02-26 18:11:12 +00:00
caab150c92
Fixed LD413
...
(cherry picked from commit 1e4c2f8aad
2016-02-09 02:48:34 -08:00
8c17dac589
The concept of "music slots" doesn't exist anymore.
...
Use whatever names you want for your music. So long as you prefix the lumps with O_ or D_, it doesn't matter anymore.
DISCLAIMER: Linedef type 413 (change music) and Lua scripting is not tested.
(cherry picked from commit 025ca413a2
2016-02-09 02:48:33 -08:00
80fb282334
Fixed math for calculating current texture in texture animations
2016-01-23 18:59:17 +00:00
69550e98fe
Since cv_pointlimit is handled in P_CheckPointLimit, I've just created P_CheckTimeLimit for cv_timelimit.
...
It helps make P_UpdateSpecials less messy-looking anyway.
2016-01-14 16:32:30 +00:00
8cad9a6dc8
We can compile the slopes code now, yay! My brain hurts.
...
Compiling errors fixed in this commit:
* Various cases of mixed declaration and statement code
* Implicit declaration of slope functions (read: you forgot to put "include "p_slopes.h" in MORE than a few places)
* an odd case of a bad fixed_t to float typecase, cause by using P_GetZAt directly inside FIXED_TO_FLOAT
* a few minor cases of bad unsigned-signed comparisons
* no prototypes for some of the new slope functions. For goodness sake Red, this is basic stuff!
2016-01-03 10:30:36 -06:00
d9d3752b4e
Unbreak FOF specials
2015-05-25 11:46:09 -05:00
bddcf98355
Remap slope line specials to 7xx range: shim old values for now
2015-05-24 15:59:17 -05:00
a9d49cd9fa
Make all specials reliant on floor touch work right with sloeps
...
(I might've missed some, though)
2015-05-24 12:53:30 -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
4e11d6d615
Make FOF planes render slopedly if set
2015-05-16 22:32:12 -05:00
6fcdac494f
Spawned things spawn relative to slope floor/ceiling heights now
...
This was a headache. :<
2015-05-16 00:02:01 -05:00
6694480f68
Overhaul slope collision (NOT PHYSICS) to work almost perfectly
2015-04-27 13:20:50 -05:00
0c477c685d
Removing unused cruft
2015-04-26 22:20:03 -05:00
6fa1448f59
More cleanup, and made dynamic sloping more efficient/fixed memory leak
2015-04-26 21:50:50 -05:00
923fae476e
Merge branch 'fury-gh/slopes' into angles
...
Conflicts:
src/p_maputl.c
2015-04-19 15:56:55 -05:00
09345ce929
Revert "Guess what major breaking-news bug I just fixed B)"
...
This reverts commit 9e306394dd
2015-04-08 20:50:49 -05:00
9e306394dd
Guess what major breaking-news bug I just fixed B)
...
...
(It's that infamous intangible West/South linedefs bug, which was really a blockmap-related bug all along. AND IT WAS SO SIMPLE TO FIX!)
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9048 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-03-31 18:00:14 -04:00
c8c7878005
MF2_PUSHED is now MFE_PUSHED, for the simple reason that it makes more sense as an eflags object flag than a flags2 object flag!
...
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9009 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-03-31 18:00:13 -04:00
474ad01b46
No more stupidity for No More Enemies special plz NME special now acts similarly to Each Time, checking all sectors sharing the same tag as itself for any enemies/bosses hiding within. This also supports cases where the tagged sectors are FOF control sectors. When the situation is asitsaysonthetin, NME acts like a normal trigger linedef should and executes all linedef execs around the sector it's located in.
...
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9005 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-03-31 18:00:12 -04: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
7cb77075d1
SRB2 2.1.11 release
2014-08-26 23:56:30 -04:00
d6c29e19ab
SRB2 2.1.10 release
2014-08-05 19:59:40 -04: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
ed72bd8fa1
SRB2 2.1.4 release
2014-03-21 19:21:06 +00:00
2fed5d1270
SRB2 2.1.3 release
2014-03-18 13:56:54 -04:00
b93cb1b65a
SRB2 2.1 release
2014-03-15 13:11:35 -04:00
Alam Ed Arias