Alam Arias
dfc83a5483
Merge pull request #128 from Yukitty/fix-animdefs
...
Fix ANIMDEFS process order
2016-10-28 22:45:37 -04:00
Monster Iestyn
c42e7ee4b4
Merge branch 'next' into slopes_n_objects
2016-10-24 16:50:06 +01:00
Prisima the Fox
b5988e082c
No more magic numbers
2016-10-21 16:27:15 -04:00
Prisima the Fox
c38457f23c
No more magic numbers
2016-10-21 16:25:07 -04:00
Prisima the Fox
6733152651
No more magic numbers
2016-10-21 16:16:54 -04:00
Prisima the Fox
defc7c1645
Oops; PlayerQuit isn't a boolean!
2016-10-20 23:26:41 -04:00
Prisima the Fox
fcf2fe79e0
Oops; PlayerQuit isn't a boolean!
2016-10-20 23:25:47 -04:00
Prisima the Fox
89e8766b77
"PlayerQuit" hook
2016-10-20 22:30:11 -04:00
Prisima the Fox
cfb2feff8e
"PlayerQuit" hook
2016-10-20 22:25:11 -04:00
Prisima the Fox
cb62f08364
"PlayerQuit" hook
2016-10-20 22:23:50 -04:00
Monster Iestyn
34d7b51c68
Merge branch 'next' into public_next
2016-10-20 16:38:16 +01:00
Monster Iestyn
8e660ce863
Merge branch 'drawscaled-scalefix' into 'next'
...
v.drawScaled negative scales fix
Lua now errors if you try to use negative scales with v.drawScaled, rather than crashing as it does in 2.1.16 currently. Not much else to say here.
See merge request !126
2016-10-19 21:11:44 -04:00
Yukita Mayako
cdb841ef54
Only P_InitPicAnims when wads are loaded.
...
Not in P_SetupLevel. That's just dumb.
2016-10-19 03:24:43 -04:00
Yukita Mayako
aa3e52f05e
Fix ANIMDEFS parsing to allow overwrite.
...
ANIMATED and ANIMDEFS are now processed in reverse order,
and duplicate definitions in ANIMDEFS are dropped.
2016-10-19 03:24:26 -04:00
Monster Iestyn
f72e8a8ff8
Merge branch 'reverseplatform_clippingfixed' into 'next'
...
Fixing FF_REVERSEPLATFORM clipping fixes
Forgot the case where == 0.
Tested by @wolfy852 in Top Down, where the bugs this caused were first discovered.
See merge request !121
2016-10-18 17:19:48 -04:00
Monster Iestyn
fc44e53056
Merge branch 'slopes-even-more-fixes' into 'next'
...
Even more slope-related fixes
What it says on the tin pretty much:
Currently included fixes:
* Pusher specials applied to FOFs did not properly account for slopes applied to the bottom plane; this probably was just a minor slipup that appeared on adding the support in the first place, I take it? (some waterfall in the last section of SUGOI's Fudge Canyon is the only place I can think of offhand where this bug is noticable)
See merge request !114
2016-10-18 17:19:13 -04:00
Monster Iestyn
e1baf02b7a
Lua now errors if negative scales are used with v.drawScaled
2016-10-18 22:07:20 +01:00
toasterbabe
6f1ce5c1ca
Merge branch 'next' of http://git.magicalgirl.moe/STJr/SRB2.git into slopes_n_objects
2016-10-18 21:56:40 +01:00
Monster Iestyn
491a381f4b
Merge branch 'next' into public_next
2016-10-15 22:30:50 +01:00
Monster Iestyn
ff0b1d1dfa
Split polyobj plane drawnode-creating code from ds->maskedtexturecol code, and add plane bounds checking
2016-10-11 22:35:46 +01:00
Monster Iestyn
b66925e467
R_FindPlane now has a polyobj argument, R_DrawPlanes now skips polyobj planes, like it does with FOF planes
2016-10-09 21:48:25 +01:00
Monster Iestyn
1c23a84aa5
set floorcenterz/ceilingcenterz for all of R_Subsector to use, not just FOF planes
2016-10-09 20:55:04 +01:00
Monster Iestyn
405237d364
Merge branch 'SLADE_textures' into 'next'
...
Treating " as whitespace in TEXTURES (and animdefs too i guess)
SLADE adds this character in its TEXTURES editor and makes SRB2 cry unless the lump is manually edited; this just treats it as whitespace so we don't have to think too hard about it.
Also, two I_Errors now refer to the correct lump name.
See merge request !122
2016-10-09 11:23:01 -04:00
Monster Iestyn
2c00c89a98
Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into public_next
2016-09-30 16:06:45 +01:00
toasterbabe
8881a413f3
Fixed that really annoying bug where you disappear when spindashing on top of a FOF whilst wearing a multi-layer shield.
...
(the problem was that MT_OVERLAY's default radius and height were never getting changed from 1*FRACUNIT, and that meant that when you spindashed, the game considered it completely below the surface of the flat you were standing on. Since you're not usually clipped on flats that don't belong to FOFs, we didn't notice this issue sooner.)
2016-09-27 17:17:23 +01:00
toasterbabe
5f4f6fdac8
Public remake of a merge request I shouldn't have put in Internal in the first place.
2016-09-26 18:35:13 +01:00
MonsterIestyn
3843533c24
Merge pull request #118 from ilag11111/linux-replay-fix
...
Fix demo recording in Linux
2016-09-24 19:54:49 +01:00
toasterbabe
8ad72232be
Helpful explanatory comments to assauge MI's fears.
2016-09-22 21:15:12 +01:00
toasterbabe
394ed30f44
Fixed the problem with the reverseplatform_clipping branch that caused springs to fall through platforms, as tested by Wolfs in TD.
2016-09-22 21:08:36 +01:00
toasterbabe
0568712a5e
Prevent overflow when attempting to calculate the space between floor and ceiling. (I didn't notice any bugs as a result of the previous behvaiour, but you never know.)
2016-09-22 12:01:13 +01:00
toasterbabe
fa16abf7ae
Fixed the thing where if you thok into a solid object you spin really fast in the air without moving OR losing your momentum.
2016-09-22 11:15:08 +01:00
toasterbabe
b8345aaf27
Solid objects are now no longer selectively intangible on slopes.
...
HOWEVER, since these changes to PIT_CheckThing do raise questions about whether there may be unintended side effects here. As a result, I may remake this for internal only if necessary.
2016-09-22 00:13:34 +01:00
ilag11111
3b503f1336
Use function va to avoid having to delcare a new variable. Thanks MonsterIestyn.
2016-09-11 14:59:24 -07:00
ilag11111
4abfe1e8f3
Fix MinGW/AppVeyor build.
2016-09-11 10:57:14 -07:00
ilag11111
2798bd5c16
Ensure demo files will save to srb2home, where SRB2 already looks for them.
2016-09-11 10:40:49 -07:00
ilag11111
c977d17416
Prevent truncation when resampling sounds with non-multiples of 11250.
2016-09-11 09:41:18 -07:00
Alam Ed Arias
c9aebc6f81
libz pkgconfig
2016-09-09 17:41:30 -04:00
Monster Iestyn
9f87841936
Fix bottom of FOF with a pusher special not accounting for slopes
2016-09-08 22:55:11 +01:00
Alam Ed Arias
ad32803370
appveyor: disable FTP upload and RDP
2016-09-06 21:32:01 -04:00
Alam Ed Arias
ae4f680888
appveyor: add both Mingw folders into the PATH
2016-09-06 21:23:28 -04:00
Alam Ed Arias
e38329e965
appveyor: reenable RDP
2016-09-06 21:04:16 -04:00
Alam Ed Arias
ad9956294c
appveyor: revert MINGW_SDK
2016-09-06 20:54:15 -04:00
Alam Ed Arias
1afe83250d
appveyor: let use CCACHE_PATH
2016-09-06 20:40:00 -04:00
Alam Ed Arias
d79804c119
appveyor: call up Mingw GCC directly
2016-09-06 20:14:32 -04:00
Alam Ed Arias
f5ae094e5b
appveyor: fixup PATH
2016-09-06 20:09:45 -04:00
Alam Ed Arias
ab322179f5
appveyor: compile with GCC 4.9 warning flags
2016-09-06 19:59:15 -04:00
Alam Ed Arias
df6d3de8ca
appveyor: use mingw32-gcc as compiler
2016-09-06 19:57:28 -04:00
Alam Ed Arias
038a9f19cb
appveyor: let use GCC 4.9.3 from Mingw32
2016-09-06 19:49:07 -04:00
Alam Ed Arias
7be8c0017e
appveyor: let see what version of GCC are here
2016-09-06 19:20:51 -04:00
Alam Ed Arias
e62c0794dc
Merge branch 'next'
2016-09-05 22:17:37 -04:00