Commit graph

6189 commits

Author SHA1 Message Date
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
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
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
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
Louis-Antoine
656f88ad56 Fix clients being resynched at the wrong gametic 2019-10-16 21:24:30 +02:00
sphere
57a82e1a79 Make the maces and related objects normally placeable. 2019-10-16 21:12:04 +02:00
toaster
69197211d6 Fix dedicated server extra lua variables not being synched for joiners.
Original fix written by Lat`.
2019-10-15 10:49:14 +01:00
MascaraSnake
ecf7b6735f Make shatter blocks intangible to the player, but solid to everything else 2019-10-14 20:15:03 +02:00
toaster
442c22f456 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
b9c0f542d8 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
0881c8542a remove duplicate NearestColor prototype 2019-10-13 19:45:35 -03:00
Jaime Passos
08c3210e52 fix holey textures 2019-10-13 18:37:41 -03:00
MascaraSnake
ce72421d35 Make shatter blocks solid 2019-10-13 23:08:54 +02:00
MascaraSnake
b9b43dffcb Merge branch 'anotherctgfix' into 'master'
Fix reverse gravity cacti (and all other A_ConnectToGround stuffs)

See merge request STJr/SRB2Internal!378
2019-10-13 13:27:24 -04:00
toaster
940785a665 Fix reverse gravity cacti (and all other A_ConnectToGround stuffs). 2019-10-13 17:48:40 +01:00
MascaraSnake
4c8a9efc00 Merge branch 'nightsangle' into 'master'
Fixed NiGHTS spawnpoint angle camera jump fuckups

See merge request STJr/SRB2Internal!376
2019-10-13 12:47:32 -04:00
toaster
ce85daeaca Hide NiGHTS grade in singleplayer if ranking is below GRADE_A, on Rob's request.
(Resolves #250)
2019-10-13 16:30:29 +01:00
toaster
d501ff895e Fixed NiGHTS spawnpoint angle camera jump fuckups. 2019-10-13 16:15:46 +01:00
MascaraSnake
9f07b50098 Merge branch 'lenient_acz3' into 'master'
Make ACZ3 Boss damage while bouncing more lenient

See merge request STJr/SRB2Internal!375
2019-10-13 11:08:26 -04:00
MascaraSnake
925eb63632 Merge branch 'scrollwep' into 'master'
Add scroll-wheel weapon changing to default controls

Closes #248

See merge request STJr/SRB2Internal!374
2019-10-13 11:08:13 -04:00
MascaraSnake
ea6b6be758 Merge branch 'bogus_requestskin' into 'master'
Fix bogus "requested skin not found!" print

Closes #247

See merge request STJr/SRB2Internal!373
2019-10-13 11:07:59 -04:00
MascaraSnake
c885f3a3d2 Merge branch 'connect-to-ground-fix' into 'master'
Fix for A_ConnectToGround on gravflipped objects

See merge request STJr/SRB2Internal!372
2019-10-13 11:07:46 -04:00
toaster
a07b747d9c Fix condition which was MEANT to allow attacking Fangboss from the side while bouncing, but instead made it extremely difficult to pull off. 2019-10-13 15:30:51 +01:00
toaster
8f7a13137b Add scroll-wheel weapon changing to default controls
(resolves #248)
2019-10-13 15:19:31 +01:00
toaster
176ee4499f Fix "requested skin not found!" print happening whenever you select an unlockable character.
Also, since I'm less paranoid now - readd the skin number to its print.
2019-10-13 15:10:19 +01:00
sphere
f585b7c896 Fix for A_ConnectToGround on gravflipped objects, courtesy of toaster. 2019-10-13 14:41:17 +02:00
toaster
fd1a880805 On the recommendation of Sryder, revert everything relating to the cpusleep changes except for the new default value of 1. 2019-10-13 13:12:07 +01:00
toaster
ac0ca69456 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into kartport_bugfixes 2019-10-13 12:18:00 +01:00
toaster
ce4f322af7 Mixed declaration + out-of-bounds GCC error fixes for OpenMPT fixes (can't believe I didn't catch the former earlier) 2019-10-13 12:17:24 +01:00
toaster
6a045930fa Better cpusleep command. Sal said it better than I can, so in her words:
* Default to 1, which means potential for a 1-frame loss every once in a while but no longer a complete cpu hog
* New minimum is 0, since -1 just did the exact same thing as 0 except slightly more optimized.
2019-10-13 12:05:12 +01:00
toaster
4a7ed2d9ec MD2 crash fix. 2019-10-13 11:59:38 +01:00
toaster
9cf3bd2e74 Revert stupid 2.1-compat fuckup I did in slopes code. 2019-10-13 11:55:50 +01:00