Commit graph

6038 commits

Author SHA1 Message Date
MascaraSnake
0329b57e43 Fixed the Canarivore gas slowdown being much too weak 2019-06-18 19:29:53 +02:00
MascaraSnake
456efdfa38 ... 2019-06-18 19:06:05 +02:00
MascaraSnake
faa43ea92d Merge branch 'master' into new-acz-minecarts 2019-06-17 20:43:21 +02:00
MascaraSnake
6faaa1559d Adjusted the height difference for track switching 2019-06-17 08:41:51 +02:00
MascaraSnake
265350d527 Minecart stopper itself also needs MF_NOCLIPHEIGHT and MF_NOGRAVITY 2019-06-16 22:26:52 +02:00
MascaraSnake
4c3228ebeb Repaired the height difference check during track switching 2019-06-16 22:00:50 +02:00
MascaraSnake
c9a8505abc Fixed a bug with the Canarivore gas 2019-06-16 21:36:22 +02:00
MascaraSnake
85e7f4b2af Fixed a sound bug 2019-06-16 19:08:20 +02:00
MascaraSnake
50cade33ab Fixed the cacti heights 2019-06-16 18:14:15 +02:00
MascaraSnake
457f1df181 Finetuned the saloon door swinging 2019-06-16 17:57:03 +02:00
MascaraSnake
bdccfb9c35 (Hopefully) fixed the player sometimes landing on the solid part of the minecart stopper after being launched out of the minecart 2019-06-16 17:07:13 +02:00
MascaraSnake
64b63edfdd Added minecart support to A_MixUp 2019-06-16 16:49:18 +02:00
MascaraSnake
f272a29a8d Fixed a bug involving players being thrown out of minecarts 2019-06-16 16:39:06 +02:00
MascaraSnake
3dc4e1d950 Snapper head/legs and minecart segments flash when they're destroyed 2019-06-16 15:35:32 +02:00
Nev3r
fce498418c Merge branch 'portals2' into 'master'
Portal-based skybox rendering replacement for the software renderer

See merge request STJr/SRB2Internal!226
2019-06-16 04:08:00 -04:00
MascaraSnake
f1eebf270d Do death animation even when MF2_DONTDRAW is set 2019-06-15 22:29:30 +02:00
MascaraSnake
70882dc9d8 Don't jump repeatedly when holding jump 2019-06-15 21:58:58 +02:00
MascaraSnake
bfe3deb5d6 Streamlined the minecart death handling 2019-06-15 21:43:36 +02:00
MascaraSnake
efc1b7ef2b Kill minecarts that fall into death pits 2019-06-15 20:59:56 +02:00
MascaraSnake
852ae2d07b Many more bugfixes 2019-06-15 20:21:18 +02:00
MascaraSnake
4d27dac35a Simplified the setup for the Snapper/minecart death animations 2019-06-15 17:33:07 +02:00
MascaraSnake
ac692e2cdd Fixed minecart not exploding on death 2019-06-15 14:21:27 +02:00
MascaraSnake
18c0d32320 Removed an unnecessary tracer check 2019-06-15 13:52:27 +02:00
MascaraSnake
75afe898f3 You can now jump onto tracks that are running antiparallel to yours 2019-06-15 13:49:30 +02:00
MascaraSnake
e74447b0d3 Some more bugfixes 2019-06-15 00:59:13 +02:00
MascaraSnake
73554c09dd Another bugfix 2019-06-15 00:12:58 +02:00
MascaraSnake
e0dea69237 A bunch of bugfixes 2019-06-15 00:04:50 +02:00
MascaraSnake
18bd29c904 "Finished" minecart hardcoding (still untested and buggy) 2019-06-14 21:19:52 +02:00
MascaraSnake
fd39f4ce1e Merge branch 'acz-hardcode' into new-acz-minecarts 2019-06-13 21:52:08 +02:00
MascaraSnake
cadcc642c0 Set tracers via P_SetTarget and not directly 2019-06-13 21:51:31 +02:00
MascaraSnake
720d84f87f More incomplete minecart hardcoding 2019-06-13 21:45:30 +02:00
MascaraSnake
af024f9f53 Merge branch 'acz-hardcode' into new-acz-minecarts 2019-06-12 21:28:39 +02:00
MascaraSnake
1b491f2496 Forgot to hardcode the mobj.valid checks 2019-06-12 21:28:09 +02:00
MascaraSnake
01adbfc495 Hardcoded the saloon door 2019-06-12 21:20:14 +02:00
Nev3r
0c3f273745 Properly take skybox viewpoint angle into account. 2019-06-11 14:47:58 +02:00
MascaraSnake
ff6c8063af Fixed some angle business in the BASH code 2019-06-10 20:40:12 +02:00
MascaraSnake
67c3d87190 Hardcoded the new Snapper behavior 2019-06-10 20:32:50 +02:00
Nev3r
b0eef242e0 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal into portals2 2019-06-10 18:14:03 +02:00
Nev3r
52618bf895 Fix 1 extra column rendering on portal-clipped vissprites. 2019-06-10 17:59:12 +02:00
MascaraSnake
db6b94e7a7 Hardcoded the new Minus behavior 2019-06-10 17:42:37 +02:00
Nev3r
c5c4744652 Remove remnants of portalcullsector. 2019-06-10 17:13:04 +02:00
MascaraSnake
dc113269e9 Fixed the bug 2019-06-10 16:19:58 +02:00
MascaraSnake
a2c61983e5 Hardcoded the new BASH behavior (there's still a bug lurking somewhere) 2019-06-10 16:09:15 +02:00
MascaraSnake
4a91af1d59 Pushables that are also vulnerable no longer block crushers (because they die anyway). This allows us to make TNT barrels pushable again. 2019-06-10 14:10:37 +02:00
MascaraSnake
b8aac236f2 Hardcoded the Canarivore 2019-06-10 13:58:16 +02:00
Nev3r
b7e2b5612c Made Portal_Add static; move ffloors clip reset from R_RenderPlayerView to r_plane. 2019-06-09 22:48:54 +02:00
Monster Iestyn
67392baae0 Merge branch 'public_next'
# Conflicts:
#	src/doomdef.h
#	src/hardware/hw_draw.c
#	src/m_misc.c
#	src/sdl12/macosx/Srb2mac.xcodeproj/project.pbxproj
2019-06-09 20:04:08 +01:00
Nev3r
d62268ffd0 Fixed crash regarding opening reallocating. A thousand thanks go for MonsterIestyn for figuring this out.
I carelessly changed the line's drawsegs to curdrawsegs without researching what that piece of code did.
2019-06-09 20:04:07 +02:00
MascaraSnake
91ecf9c380 Hardcoded train dust and steam spawner 2019-06-09 17:16:07 +02:00
MascaraSnake
6f7b77f650 Hardcoded train cameo 2019-06-09 13:48:07 +02:00