Commit graph

7254 commits

Author SHA1 Message Date
MascaraSnake
c8cfe08144 Merge branch 'mi-tinkers-with-lua-again' into 'master'
MI tinkers with lua again

See merge request STJr/SRB2Internal!392
2019-10-25 15:27:55 -04:00
MascaraSnake
a6b3491922 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
13edddc735 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
e8b788918f 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
604198280e 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
bd51ac8a70 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
4469294972 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
MascaraSnake
2e0af9ebf0 Merge branch 'waterlighting' into 'master'
Water lighting reversion (resolves #188 for now)

Closes #188

See merge request STJr/SRB2Internal!411
2019-10-25 15:17:35 -04:00
MascaraSnake
2cc74fc819 ...and also rename the palm tree leaves accordingly 2019-10-25 20:48:51 +02:00
MascaraSnake
6c45a17601 Removed palm tree trunks from the ZB config. They no longer exist as mapthings. 2019-10-25 20:17:50 +02:00
lachwright
69692d6088 Don't fuck nojumpspin characters who are capable of rolling 2019-10-25 18:51:41 +08:00
lachwright
c970d7c100 Put player in jump state after spinning during a wall transfer 2019-10-25 18:48:40 +08:00
toaster
58d4fce2bc 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
f80453fd5b 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
930be3dad2 Fix CEZ3's first phase being cheated by Fang. 2019-10-24 19:33:03 +01:00
toaster
1305c1cde8 Disable tailsbot in NiGHTS maps, not just Special Stages. (Resolves #261) 2019-10-24 19:16:53 +01:00
toaster
625f02ba3e 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
d079625b52 * 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
5dd1b52024 Disable restriction for `DEVELOP` builds only 2019-10-23 16:29:50 -04:00
MascaraSnake
230f5e4d78 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
21a0ea4d0e 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
7f1a276a6c Clang warnings 2019-10-22 19:18:56 -07:00
toaster
d3f59f5cd1 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
81d4bf8cd9 remove last few specks of Windows CE code I missed years ago 2019-10-22 16:39:44 +01:00
Nev3r
21353ae0bd 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
20af876282 Disable standalone hangable chains, since they're not a good mechanic. 2019-10-22 02:29:34 +02:00
James R
1a393dcfc3 lmao I forgot the backside FOF 2019-10-21 14:44:16 -07:00
James R
b14602bad9 Flatb 2019-10-21 12:42:04 -07:00
lachwright
3e584e5ad9 Add green flame sprites, state, and object 2019-10-21 16:22:20 +08:00
lachwright
53835bcb1a Add new ATZ gargoyle sprites 2019-10-21 13:43:02 +08:00
MascaraSnake
fe2a333220 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
aee4189d4d 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
dc08c96dc0 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
8914e70dff 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
MascaraSnake
d647e0e4a1 Clarified description of "strong" bustable blocks in the ZB config 2019-10-20 12:28:30 +02:00
Steel Titanium
4e2e2a0a61 Remove level select restrictions in Multiplayer 2019-10-19 21:37:03 -04:00
MascaraSnake
7129293121 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
0b1a264365 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
75eec0b5da 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
73b662c575 Fix mixed declaration and code error in A_RolloutRock (object_tweaks division 2) 2019-10-19 16:01:04 +01:00
toaster
47054bd461 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
5ad9779a38 Fix restoration of delayed linedef executors in P_NetUnArchiveThinkers for real 2019-10-19 14:51:24 +02:00
MascaraSnake
c1dcefcc9a 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
cf75d45555 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
7d5ebaf892 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
Monster Iestyn
1078c59cdd Merge branch 'master' into mi-tinkers-with-lua-again 2019-10-17 18:02:42 +01:00
LJ Sonic
c3fb7f4332 Merge branch 'resynch-fix' into 'master'
Fix clients being resynched at the wrong gametic

See merge request STJr/SRB2Internal!391
2019-10-16 19:42:20 -04:00
sphere
232a558f2e Fix standalone hangable chains being broken, thanks to toaster. 2019-10-17 01:01:40 +02:00
sphere
46567ab147 Undo grabbable chains being placeable for now, since they're bugged. 2019-10-16 22:31:57 +02:00
sphere
71d7e2fedb Correct some ZB config errors & remove grabbable chains. 2019-10-16 22:30:52 +02:00