6209 commits

Author	SHA1	Message	Date
MascaraSnake	d7480f20fa	Merge branch 'intangible-flats-tangible-sides' into 'master' ... Collide with walls of FOF if both planes are intangible See merge request STJr/SRB2Internal!385	2019-10-25 15:26:54 -04:00
MascaraSnake	080ff854b8	Merge branch 'be-more-nice-with-levelselect-mp' into 'master' ... Remove level select restrictions in DEVELOP Multiplayer Closes #238 See merge request STJr/SRB2Internal!399	2019-10-25 15:26:09 -04:00
MascaraSnake	829706a090	Merge branch 'walltransfermove' into 'master' ... Let players move after spinning off a wall transfer See merge request STJr/SRB2Internal!412	2019-10-25 15:20:20 -04:00
MascaraSnake	5a28c03a26	Merge branch 'superminecarts' into 'master' ... Super and Minecarts fixes (resolves #259) Closes #259 See merge request STJr/SRB2Internal!408	2019-10-25 15:19:47 -04:00
MascaraSnake	2ee42c498b	Merge branch 'nonightsbot' into 'master' ... Disable tailsbot in NiGHTS maps (resolves #261) Closes #261 See merge request STJr/SRB2Internal!409	2019-10-25 15:19:05 -04:00
MascaraSnake	7a09a8bd3a	Merge branch 'cezfangcheat' into 'master' ... CEZ3 Fang cheat fix (resolves #262) Closes #262 See merge request STJr/SRB2Internal!410	2019-10-25 15:18:16 -04:00
lachwright	2d458059c8	Don't fuck nojumpspin characters who are capable of rolling	2019-10-25 18:51:41 +08:00
lachwright	d5b1467e79	Put player in jump state after spinning during a wall transfer	2019-10-25 18:48:40 +08:00
toaster	d89d8acc59	I can't figure out how to make this consistent at all, so in order to have the water look good in levels designed for it, I think it's necessary to effectively revert everything with SHITPLANESPARENCY to a roughly 2.1-equivalent behaviour.	2019-10-24 20:40:03 +01:00
toaster	4ff46d14dd	Added an experiment with an alternate CEZ3 pinch behaviour (but keep it disabled because it was kind of boring).	2019-10-24 19:55:02 +01:00
toaster	ea0fe50f5a	Fix CEZ3's first phase being cheated by Fang.	2019-10-24 19:33:03 +01:00
toaster	527254584d	Disable tailsbot in NiGHTS maps, not just Special Stages. (Resolves #261)	2019-10-24 19:16:53 +01:00
toaster	989e089e0a	resolve #263 (this is going into master because it's literally just the line being present twice)	2019-10-24 19:00:54 +01:00
toaster	a215eeabf0	* Fix Super players who die being eternally super. ... * Fix music stack corruption in multiplayer where a super player dies and it's not you. * Fix players in minecarts having their state eternally set to S_PLAY_STND (bug discovered/evident while super, so goes in this branch). Resolves #259.	2019-10-24 18:51:12 +01:00
Steel Titanium	bfce75d5cd	Disable restriction for `DEVELOP` builds only	2019-10-23 16:29:50 -04:00
MascaraSnake	0ef50557c2	Merge branch 'spinbust' into 'master' ... Make spinbust behavior consistent with other bustable blocks Closes #254 See merge request STJr/SRB2Internal!398	2019-10-23 02:51:47 -04:00
MascaraSnake	8cd0ebb679	Merge branch 'atz-hazards' into 'master' ... Azure Temple Hazards See merge request STJr/SRB2Internal!404	2019-10-23 02:51:00 -04:00
James R	d62674c184	Clang warnings	2019-10-22 19:18:56 -07:00
toaster	386ac78600	Merge branch 'mace-place' into 'master' ... Make maces normally placeable in maps. See merge request STJr/SRB2Internal!390	2019-10-22 13:29:06 -04:00
Monster Iestyn	520deac658	remove last few specks of Windows CE code I missed years ago	2019-10-22 16:39:44 +01:00
Nev3r	dbd8e563b4	Merge branch 'soundex_tweak' into 'master' ... Tweak Line Special 414's behavior See merge request STJr/SRB2Internal!382	2019-10-22 05:31:22 -04:00
sphere	57a8af1557	Disable standalone hangable chains, since they're not a good mechanic.	2019-10-22 02:29:34 +02:00
James R	acd28c001e	lmao I forgot the backside FOF	2019-10-21 14:44:16 -07:00
lachwright	3a3122e255	Add green flame sprites, state, and object	2019-10-21 16:22:20 +08:00
lachwright	d6411b9549	Add new ATZ gargoyle sprites	2019-10-21 13:43:02 +08:00
MascaraSnake	57d29a9b65	Merge branch 'platterwrap' into 'master' ... Prevent wraparound on Level platter when there are less than 3 rows See merge request STJr/SRB2Internal!383	2019-10-20 06:45:05 -04:00
MascaraSnake	7c481744a4	Merge branch 'kartport_dedi' into 'master' ... Kart-port dedicated server Lua fix (round 2) See merge request STJr/SRB2Internal!387	2019-10-20 06:43:54 -04:00
MascaraSnake	41dd9c4f0a	Merge branch 'flats-fixes-13102019' into 'master' ... Transparent flat fixes (Resolves #249) Closes #249 See merge request STJr/SRB2Internal!384	2019-10-20 06:42:17 -04:00
MascaraSnake	54847b1949	Merge branch 'mapthingtweaks' into 'master' ... Mapthing tweaks (object_tweaks division 1) See merge request STJr/SRB2Internal!396	2019-10-20 06:33:01 -04:00
Steel Titanium	b219be6f5e	Remove level select restrictions in Multiplayer	2019-10-19 21:37:03 -04:00
MascaraSnake	1604e4d439	Make spinbust behavior consistent with other bustable blocks and rename FF_ONLYKNUX to FF_STRONGBUST	2019-10-19 22:20:48 +02:00
Monster Iestyn	9c36cf00d8	Merge branch 'fix-player-state-resynch' into 'master' ... Fix player state resynching See merge request STJr/SRB2Internal!393	2019-10-19 16:15:19 -04:00
MascaraSnake	3f42834a98	Merge branch 'thinkerlists_oops' into 'master' ... Fixed a netgame crash that was caused by a closing brace being in the wrong place :v See merge request STJr/SRB2Internal!395	2019-10-19 13:34:28 -04:00
toaster	7e04cbbc16	Fix mixed declaration and code error in A_RolloutRock (object_tweaks division 2)	2019-10-19 16:01:04 +01:00
toaster	920736ac8b	Grouped ports from object_tweaks. ... * Make the Amy Cameo only spawn in SP, Record Attack, or Co-op unless it's the Clone Mode. * Add the diagonal spring flag options Red and Yellow Diagonal Springs have to the Blue Diagonal Spring as well. * Put diagonal blue spring in config.	2019-10-19 15:57:01 +01:00
MascaraSnake	73c39990f9	Fix restoration of delayed linedef executors in P_NetUnArchiveThinkers for real	2019-10-19 14:51:24 +02:00
MascaraSnake	c7fd22f98a	Fixed a netgame crash that was caused by a closing brace being in the wrong place :v	2019-10-19 12:08:15 +02:00
Monster Iestyn	246a6489e9	Fix missing & which I totally forgot about in writing this fix (yes this is the "compile error" everyone was talking about)	2019-10-18 13:37:42 +01:00
Monster Iestyn	07c02f075b	Fix sprite-related console errors that occur in netgames whenever the game attempts to synch the player's state. ... Turns out the code was using P_SetMobjStateNF to "fix" the player's state ...which got things all wrong, lol.	2019-10-17 18:22:06 +01:00
sphere	26fed77671	Fix standalone hangable chains being broken, thanks to toaster.	2019-10-17 01:01:40 +02:00
sphere	2cc129c5c0	Undo grabbable chains being placeable for now, since they're bugged.	2019-10-16 22:31:57 +02:00
Louis-Antoine	92b92dd3eb	Fix clients being resynched at the wrong gametic	2019-10-16 21:24:30 +02:00
sphere	42de16b904	Make the maces and related objects normally placeable.	2019-10-16 21:12:04 +02:00
toaster	079ef023c9	Fix dedicated server extra lua variables not being synched for joiners. ... Original fix written by Lat`.	2019-10-15 10:49:14 +01:00
James R	5007abee23	Collide with walls of FOF if both planes are intangible	2019-10-14 13:22:33 -07:00
MascaraSnake	2f9a13d5e0	Make shatter blocks intangible to the player, but solid to everything else	2019-10-14 20:15:03 +02:00
toaster	2f26cfad01	Prevent wraparound on Level platter when there are less than 3 rows. ... Addresses #251 - I wanted to keep the scrolling because it looks nice and because I don't want to fuck with these drawers too bad.	2019-10-14 17:17:00 +01:00
Nev3r	c935797a34	Encapsulate the second behavior branch into an else. ... When a tag is provided, the tagged sector-related branch is run exclusively now. This prevents playing the same sound again from the caller object's origin and other unwanted behaviors. Signed-off-by: Nev3r <apophycens@gmail.com>	2019-10-14 16:30:20 +02:00
Jaime Passos	0cf2774129	remove duplicate NearestColor prototype	2019-10-13 19:45:35 -03:00
Jaime Passos	88d19a2d9c	fix holey textures	2019-10-13 18:37:41 -03:00