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
8c5c2a7e4b
Flatb
2019-10-21 12:42:04 -07:00
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
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
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
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
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
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
7e04cbbc16
Fix mixed declaration and code error in A_RolloutRock (object_tweaks division 2)
2019-10-19 16:01:04 +01:00
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
73c39990f9
Fix restoration of delayed linedef executors in P_NetUnArchiveThinkers for real
2019-10-19 14:51:24 +02:00
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
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
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
bb9a0de4f5
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
92b92dd3eb
Fix clients being resynched at the wrong gametic
2019-10-16 21:24:30 +02:00
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
cbcb113d8e
Update these files that I forgot to update.
...
Better than not updating it at all and having a inconsistency between versions reported from the header and internal lib version.
2019-10-14 20:41:37 -04:00
526d4a5e4b
Merge branch 'shatter_solid' into 'master'
...
Make shatter blocks solid to non-players
See merge request STJr/SRB2Internal!379
2019-10-14 15:06:29 -04:00
2f9a13d5e0
Make shatter blocks intangible to the player, but solid to everything else
2019-10-14 20:15:03 +02:00
a4ef99c8fe
Merge branch 'zb_config' into 'master'
...
Add ZB config to the repo
See merge request STJr/SRB2Internal!381
2019-10-14 14:01:30 -04:00
857adc980f
Changed Special 414's flags2text description to be less confusing
2019-10-14 19:59:07 +02:00
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
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
7eaa575dce
Added ZB config
2019-10-14 08:32:04 +02:00
0cf2774129
remove duplicate NearestColor prototype
2019-10-13 19:45:35 -03:00
88d19a2d9c
fix holey textures
2019-10-13 18:37:41 -03:00
ad4033ec9e
Make shatter blocks solid
2019-10-13 23:08:54 +02:00
63a7fb6956
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
46268214fc
Fix reverse gravity cacti (and all other A_ConnectToGround stuffs).
2019-10-13 17:48:40 +01:00
05a3023cb0
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
39a0644477
Merge branch 'hidegrade' into 'master'
...
Hide NiGHTS grade in singleplayer if ranking is below GRADE_A
Closes #250
See merge request STJr/SRB2Internal!377
2019-10-13 12:47:11 -04:00
dabd0b2e01
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
a5b5712be9
Fixed NiGHTS spawnpoint angle camera jump fuckups.
2019-10-13 16:15:46 +01:00
9bdb38df64
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
16a05d996e
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
01fbb91f7e
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
008e232d78
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
aa06696359
Merge branch 'kartport_bugfixes' into 'master'
...
Kart-port bugfixes (round 1)
See merge request STJr/SRB2Internal!371
2019-10-13 11:07:24 -04:00
57f756ddf1
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
d9129db5ed
Add scroll-wheel weapon changing to default controls
...
(resolves #248 )
2019-10-13 15:19:31 +01:00
e62d097265
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
636760760f
Fix for A_ConnectToGround on gravflipped objects, courtesy of toaster.
2019-10-13 14:41:17 +02:00
0350262a0f
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
6033f70b01
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into kartport_bugfixes
2019-10-13 12:18:00 +01:00
4b965fe43b
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
9ca227237a
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
5502242e8b
MD2 crash fix.
2019-10-13 11:59:38 +01:00
008f576560
Revert stupid 2.1-compat fuckup I did in slopes code.
2019-10-13 11:55:50 +01:00
a550eb79d3
Additional crash fix for papersprites.
2019-10-13 11:53:53 +01:00
Nev3r