Commit graph

8288 commits

Author SHA1 Message Date
Steel Titanium
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
James R
5007abee23 Collide with walls of FOF if both planes are intangible 2019-10-14 13:22:33 -07:00
MascaraSnake
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
lachwright
9ef72c0862 Fix directionchar issue from faulty merge conflict resolution 2019-10-15 02:57:18 +08:00
lachwright
b48d8cf68b Merge branch 'master' into knuxstuff 2019-10-15 02:50:59 +08:00
lachwright
9cad882626 Merge branch 'master' into knuxstuff 2019-10-15 02:49:44 +08:00
MascaraSnake
2f9a13d5e0 Make shatter blocks intangible to the player, but solid to everything else 2019-10-14 20:15:03 +02:00
MascaraSnake
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
MascaraSnake
857adc980f Changed Special 414's flags2text description to be less confusing 2019-10-14 19:59:07 +02:00
lachwright
2417c5aab2 Remove glide landing dust; put player in landing state after glide-sliding off a ledge 2019-10-15 01:40:56 +08:00
lachwright
0836062edd Limit climb camera rotation to a 180 degree cone 2019-10-15 01:19:58 +08: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
MascaraSnake
7eaa575dce Added ZB config 2019-10-14 08:32:04 +02:00
Jaime Passos
edd016690d A bunch of stuff 2019-10-14 02:24:44 -03:00
Steel Titanium
0f79396757
New intermission thinker hook 2019-10-13 20:50:46 -04:00
Steel Titanium
9e9a40cadb
Merge branch 'master' into newmenus 2019-10-13 20:12:48 -04:00
Steel Titanium
cb228c4938
Undo this 2019-10-13 20:12:28 -04:00
Steel Titanium
bf75a4c29f
New -port command line paramater 2019-10-13 20:04:45 -04: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
MascaraSnake
ad4033ec9e Make shatter blocks solid 2019-10-13 23:08:54 +02:00
lachwright
c71213155d Unfuck glide slide/landing dust's P_RandomRange parameters 2019-10-14 04:08:07 +08:00
MascaraSnake
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
toaster
46268214fc Fix reverse gravity cacti (and all other A_ConnectToGround stuffs). 2019-10-13 17:48:40 +01:00
MascaraSnake
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
MascaraSnake
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
toaster
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
toaster
a5b5712be9 Fixed NiGHTS spawnpoint angle camera jump fuckups. 2019-10-13 16:15:46 +01:00
MascaraSnake
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
MascaraSnake
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
MascaraSnake
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
MascaraSnake
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
MascaraSnake
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
toaster
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
toaster
d9129db5ed Add scroll-wheel weapon changing to default controls
(resolves #248)
2019-10-13 15:19:31 +01:00
toaster
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
sphere
636760760f Fix for A_ConnectToGround on gravflipped objects, courtesy of toaster. 2019-10-13 14:41:17 +02:00
toaster
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
toaster
6033f70b01 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into kartport_bugfixes 2019-10-13 12:18:00 +01:00
toaster
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
toaster
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
toaster
5502242e8b MD2 crash fix. 2019-10-13 11:59:38 +01:00
toaster
008f576560 Revert stupid 2.1-compat fuckup I did in slopes code. 2019-10-13 11:55:50 +01:00
toaster
a550eb79d3 Additional crash fix for papersprites. 2019-10-13 11:53:53 +01:00
MascaraSnake
a03ecac921 Merge branch 'openglskydome2' into 'master'
OpenGL sky dome

See merge request STJr/SRB2Internal!350
2019-10-12 11:06:47 -04:00
MascaraSnake
a7c0fe9672 Merge branch 'openmpt-crash-fix' into 'master'
libopenmpt related changes

See merge request STJr/SRB2Internal!351
2019-10-12 11:02:45 -04:00
MascaraSnake
71f93e7071 Merge branch 'sneakers-reduction' into 'master'
Reduce speed sneaker factor to 1.67x

See merge request STJr/SRB2Internal!368
2019-10-12 11:00:24 -04:00
MascaraSnake
6fab3d28b2 Merge branch 'OGL_regressions' into 'master'
Correct minor OGL regressions

See merge request STJr/SRB2Internal!361
2019-10-12 09:53:20 -04:00
MascaraSnake
8af715eb36 Merge branch 'left-right-ra-level-select' into 'master'
Left and Right Arrow keys also select level in Record Attack

See merge request STJr/SRB2Internal!363
2019-10-12 09:53:05 -04:00