stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-21 10:20:42 +00:00
Code Issues Projects Releases Packages Wiki Activity
7483 commits 172 branches 41 tags 280 MiB
Commit graph

6427 commits

Author SHA1 Message Date
toaster
f2bbf53c0d Change boost panel thing numbers per MS's request. 2019-10-19 14:32:15 +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
toaster
8e9ada1093 * Add MT_BANPYURA and MT_BANPSPRING to dehacked.c. 
* Correct spelling of `MT_BANPSPRING`.
 2019-10-18 20:32:35 +01:00
toaster
ad09f2603d * New object types! 
* Red and yellow Boost panels!
        * Added because SUBARASHII and KIMOKAWAIII had several levels using them, and I wanted to make them look better.
        * https://cdn.discordapp.com/attachments/359091121789468672/634486669202161674/srb20015.gif
        * Uses the mapthingnums of Glaber's SOC resource boosters, but absolutely nothing else - not even the magnitudes.
        * Apply MF_AMBUSH to force the player into a spin - even if they don't have a spin ability!
    * Banpyura!
        * A Crushstacean with a spring instead of a crushclaw.
        * https://cdn.discordapp.com/attachments/428262628893261828/634432099306176512/srb20019.gif
        * Wanted this for a while, finally added it.
* Improved springs.
    * Add pw_noautobrake to disable autobrake for half a second when touching yellow horizontal springs, and a second when touching red ones, even on the ground.
    * Add pw_justsprung to disable directionchar for a few tics while touching any springs with a horizontal component to their velocity.
    * Add the diagonal spring flag options Red and Yellow Diagonal Springs have to the Blue Diagonal Spring as well.
    * Started but decided against a tip of the hat to the CD spring spin, hidden behind #define SPRINGSPIN.
* Make directionchar "lag behind" a little bit in waterslides.
* Improved flame jets.
    * They now use new sprites for having their flames move upwards and sideways, instead of having them always face downwards like in 2.1!
* Fixed a mixed declaration and code error in A_RolloutRock. (Sorry Lach!)
* Make the Amy Cameo only spawn in SP, Record Attack, or Co-op unless it's the Clone Mode.
* Improved ZB config.
    * Add above new types.
    * Add Blue Diagonal Spring, which existed in the source but not the config.
    * Re-order enemies in ZB config by zone (but keep them in the Enemies section only).
 2019-10-18 18:33:45 +01: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
Monster Iestyn
c097ee563d Merge branch 'master' into mi-tinkers-with-lua-again 2019-10-17 18:02:42 +01:00
sphere
26fed77671 Fix standalone hangable chains being broken, thanks to toaster. 2019-10-17 01:01:40 +02:00
Steel Titanium
28607a81b5
Kill off SPR2_NTAG 2019-10-16 18:25:20 -04:00
Steel Titanium
edea290b0f
Show "Press ESC to exit" string on NiGHTS Attack menu too 2019-10-16 18:00:54 -04:00
Steel Titanium
dc0a1899ec
Fix ifselectvalnextmapnobrace indentation 2019-10-16 17:49:21 -04: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
e3e87d7655 Compile fix. 2019-10-16 17:39:38 +01:00
toaster
77160ae37b Just revert the respawn, retry and suicide stuff cuz it's apparently contentious. Who knew? 2019-10-16 17:38:38 +01:00
toaster
45e5f70eb8 Merge retry and respawn into one command, respawn. 2019-10-16 11:38:09 +01:00
Steel Titanium
38d044e475
Seperate name tag sprite into SPR2_NTAG 2019-10-16 00:22:05 -04:00
Steel Titanium
58ef85d591
Make nametag SPR2 frame be the last frame of SPR_XTRA 2019-10-15 23:41:01 -04:00
Steel Titanium
9c33f160a6
Lots of changes 
* Show emblem requirement on record attack menu
* Use bigger emblems on the menu.
* Display your best number of collected rings in yellow if reached perfect bonus.
* Adjusted XTRA frames (again)
 2019-10-15 22:54:21 -04:00
toaster
360ae45994 Make use of MINVAL and MAXVAL consistent in COM_Help_f. 2019-10-15 13:46:45 +01:00
toaster
8f3e59b43d Improved "HELP" command! 
Ported from Kart, original commit also by me (toaster).
 2019-10-15 13:36:04 +01:00
toaster
aa9bc574da * Fix cv_pointlimit's weird behaviour in match mode by standardising the switching between "named" and "range" values in CV_AddValue. 
* Optimise M_ChangeCvar.
 2019-10-15 12:24:31 +01:00
toaster
3185a66191 Quick macro substitution to make sure MAXSCORE is consistent. 2019-10-15 11:55:40 +01:00
toaster
910df54fb5 Added some examples of cvars that can use named values. 
* Pandora's box now has infinite lives show up as "Infinite" instead of "-1".
* `pointlimit None`
* `timelimit None`
* Ported `basenumlaps` (with "Map default" value) from Kart to replace `usemaplaps`, for if Circuit ever gets shown any love ever again.
* `respawndelay Off`
* `resynchattempts Don't`
 2019-10-15 11:49:37 +01:00
toaster
911fd9576b Rework min/max cvars to allow for "named" values outside their range! 
Kart-port round 3, with the original commit written by me, toaster.
 2019-10-15 11:23:59 +01: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
Steel Titanium
313b534911
More record attack stuff. 
Show emblem requirements.

Committed because I need sleep...
 2019-10-15 01:55:50 -04:00
Steel Titanium
37101f826e
Allow access to players userdata outside levels. 
In exchange for preventing access to any mobj_t userdata outside levels, including player's own mobj_t.
 2019-10-14 22:12:26 -04:00
Steel Titanium
597949f370
Change this for consistency. 2019-10-14 21:47:20 -04:00
James R
5007abee23 Collide with walls of FOF if both planes are intangible 2019-10-14 13:22:33 -07: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
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
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
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
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
MascaraSnake
d401862714 Merge branch 'amytweaks' into 'master' 
Amy tweaks

See merge request STJr/SRB2Internal!366
 2019-10-12 09:52:44 -04:00
toaster
a2a5983256 Prevent Time Attack level handler always beeping. 2019-10-12 09:42:03 -04:00
MascaraSnake
d735e1b9c2 Merge branch 'rvz-hardcode' into 'master' 
RVZ hardcode

Closes #178

See merge request STJr/SRB2Internal!357
 2019-10-12 09:37:23 -04:00
MascaraSnake
68a82c3849 Merge branch 'amycameo' into 'master' 
Amy for Frozen Hillside (full pitch in description)

See merge request STJr/SRB2Internal!356
 2019-10-12 07:16:26 -04:00
MascaraSnake
15bba9e1b0 Merge branch 'hoop_drawdist' into 'master' 
Only apply NiGHTS draw distance to hoops

See merge request STJr/SRB2Internal!370
 2019-10-12 03:10:53 -04:00
MascaraSnake
0f562d27d7 Merge branch 'fastgoop' into 'master' 
Increased THZ goop speed by 25%

Closes #229

See merge request STJr/SRB2Internal!367
 2019-10-12 03:10:26 -04:00
lachwright
3600e1b140 Allow rollout rock's splash sound delay reduction to occur above water 2019-10-12 04:41:50 +08:00
lachwright
a01373741b Don't spam splash sounds on the rollout rock 2019-10-12 04:35:51 +08:00
lachwright
2daeb81f36 Create new linedef special type 153: Dynamically Sinking Platform 2019-10-12 04:23:11 +08:00
MascaraSnake
68599ccc63 Only apply NiGHTS draw distance to hoops, because it turns out they're pretty much the sole cause of NiGHTS lag 2019-10-11 21:02:11 +02:00
Steel Titanium
25971de368
Attempt to fix the offset issues. 
Better than the previous commit, but not quite there yet.
 2019-10-10 15:50:06 -04:00
toaster
1560453797 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into rvz-hardcode 
# Conflicts:
#	src/p_map.c
 2019-10-10 17:51:29 +01:00
MascaraSnake
354429ca39 Merge branch 'intro-sky-fix' into 'master' 
Fix the sky on the intro cutscene not scrolling.

Closes #220

See merge request STJr/SRB2Internal!353
 2019-10-10 02:36:53 -04:00
MascaraSnake
7fedde9811 Merge branch 'promiscuousplanes' into 'master' 
Headbumps and associated

Closes #242

See merge request STJr/SRB2Internal!360
 2019-10-10 02:36:10 -04:00
MascaraSnake
c17a3227a0 Merge branch 'bumperstuff' into 'master' 
Change the time NiGHTS bumpers aren't responded to to 5 tics rather than 9.

Closes #246

See merge request STJr/SRB2Internal!365
 2019-10-10 02:35:33 -04:00
MascaraSnake
a138c0ebf2 Merge branch 'acz_touchups' into 'master' 
ACZ touchups

Closes #209, #208, and #158

See merge request STJr/SRB2Internal!359
 2019-10-10 02:34:46 -04:00
Steel Titanium
4af432e658
Basic outline color support. 
This is a huge hack as it requires another font set, with each character's offset manually being set using SLADE.
 2019-10-10 02:00:52 -04:00
lachwright
b2529136e0 Reduce speed sneaker's top speed factor to 1.67x 2019-10-09 21:39:51 +08:00
lachwright
d553b6a011 Add sounds to rollout rock in lava 2019-10-09 15:06:50 +08:00
lachwright
82fcdf4d43 Make MT_PUMA not hurt players' ears when placed in groups or loading the map (new functionality for A_PlaySound) 2019-10-09 14:24:27 +08:00
Steel Titanium
18bf8aa6e4
WIP: New character select name font 2019-10-09 00:28:01 -04:00
toaster
43e13b38c9 Change one of the Pyrefly captions. 2019-10-08 19:45:43 +01:00
toaster
1155a7c3a0 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into rvz-hardcode 
# Conflicts:
#	src/p_mobj.c
 2019-10-08 19:43:43 +01:00
toaster
4870107974 Increased THZ goop speed by 25%, per Cobalt's script. (Hardcoding it was way more difficult than it looked, I'm rusty at my maths :V ) 2019-10-08 16:38:53 +01:00
MascaraSnake
bc794a2227 Players can jostle free from Pterabytes 2019-10-08 00:00:41 +02:00
MascaraSnake
788415a4db Don't apply autobrake to Pterabyte-carried players 2019-10-07 22:33:06 +02:00
MascaraSnake
0fceb66e71 Make the Pyrefly glowing and damaging in its fire-spawning state 2019-10-07 22:23:52 +02:00
MascaraSnake
ce5d0691ac Merge branch 'rvz-hardcode' of git.magicalgirl.moe:STJr/SRB2Internal into rvz-hardcode 2019-10-07 19:12:03 +02:00
MascaraSnake
8062422f13 Fixed wrong sound being played by Pyreflies with Ambush 2019-10-07 19:11:36 +02:00
lachwright
3412eb655a Colorize non-buoyant rollout rocks (MF2_AMBUSH distinguishability) 2019-10-07 22:51:13 +08:00
lachwright
77dd5260ab Allow rock to disappear if unridden for 12 seconds 2019-10-07 22:22:51 +08:00
toaster
46a1d6897c Address checkbox 1 and 2 of #235. 
* If using twinspin and have melee ability too, go into melee landing when hitting the ground.
* Only have melee go directly forward if standing/idle, otherwise use drawangle.
 2019-10-07 15:03:28 +01:00
lachwright
c64997bfe5 Add Ambush and Flip flag behaviors 2019-10-07 20:55:58 +08:00
toaster
d84564d9f2 Change the time NiGHTS bumpers aren't responded to to 5 tics rather than 9. 2019-10-07 13:08:49 +01:00
lachwright
95f6e2008f Better rollout behavior in lava 2019-10-07 15:25:32 +08:00
MascaraSnake
2113774a6a Don't deplete special stage timer in water if you have water protection 2019-10-07 09:01:17 +02:00
lachwright
bfb9bac5bd Collision polish 2019-10-07 14:51:32 +08:00
MascaraSnake
fe2f383997 Fixed a typo 2019-10-07 08:36:40 +02:00
lachwright
bed9dff077 Readability changes 2019-10-07 13:36:36 +08:00
lachwright
306779fac0 Readability changes 2019-10-07 13:35:10 +08:00
lachwright
7850d43725 Let ridden rollout rocks collide with other players 2019-10-07 13:14:23 +08:00
James R
6fd645ef27 A-arrows on Record Attack level select 
Menu code sucks, did you know?
 2019-10-06 14:45:42 -07:00
James R
0be3743450 Key handler to allow selecting map by arrow keys in Record Attack 
Enter still goes to the platter.
 2019-10-06 14:11:16 -07:00
MascaraSnake
058ed632de Fixed solid objects (such as Minus-carried TNT barrels) not colliding with players. 
Springs and gas jets are exempt because all hell might break loose otherwise.
 2019-10-06 19:53:54 +02:00
toaster
9b94fd3752 * Add rudimentary support for MF2_LINKDRAW in GL. 
* Allow MF_ENEMY objects to flash, just as they do in Software.
 2019-10-06 16:31:13 +01:00
toaster
a2f8b84b5a Good catch by MS. 2019-10-06 16:17:11 +01:00
toaster
d19aebb01a * Fix Minus being intangible after launch. 
* Implement MS's temp bodge-fix for the TNT getting stuck on the player.
 2019-10-06 16:15:13 +01:00
toaster
df172ee33f Fix Minus being intangible after it pops up. 2019-10-06 16:09:33 +01:00
toaster
8b1a20f415 Fix Minus causing crashes if it picks up a Snapper. 2019-10-06 16:04:19 +01:00
toaster
aec5f26819 Fix entering an intangible FOF causing minecart derailment explosions. (Probably; I didn't get the bug to happen in the first place, but this looks like a likely culprit.) 2019-10-06 15:44:24 +01:00
toaster
5bbc31c18f Merge branch 'acz-fixes' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into acz_touchups 
# Conflicts:
#	src/p_enemy.c
 2019-10-06 15:18:59 +01:00
lachwright
2d33950590 Merge branch 'rvz-hardcode' of https://git.magicalgirl.moe/STJr/SRB2Internal into rvz-hardcode 2019-10-06 22:12:47 +08:00
toaster
cc87ba39c2 There's code in B_RespawnBot that handles gravflip, but none in B_CheckRespawn. This commit fixes that. (Only done on this branch since bots had already been touched.) 2019-10-06 15:11:00 +01:00
toaster
79b95a53ed Fix Snapper's head snapping to higher planes, and add gravflip support. 2019-10-06 15:04:04 +01:00
toaster
a5704238c7 Resolve #242 by adding SF_TRIGGERSPECIAL_HEADBUMP, enabled by ML_EFFECT2. 
Also, readd SF_INVERTPRECIP, which was done in a random branch last year and then lost because it was never merged. Enabled by ML_EFFECT1.
 2019-10-06 14:34:25 +01:00
MascaraSnake
defffd667e Fixed and simplified the big fern leaf spawning code 2019-10-06 14:18:27 +02:00
toaster
93ce5bb94d Add solidity back to MT_SALOONDOOR, to work as a backup in case MT_SALOONDOORCENTER doesn't work (which it has issues with in one location in ACZ2 for some reason, and I can't identify why). 
Fully resolves #209, in any case.
 2019-10-06 12:14:18 +01:00
toaster
df2600cbea Resolve #208. 
* Tailsbots can't get into Minecarts.
* Tailsbots will stop trying to move around when the player gets pw_carry, which usually means some sort of big gimmick is happening and trying to move along with it would make the tailsbot look stupid.
 2019-10-06 12:13:13 +01:00
MascaraSnake
17a2d1071c Spawn big fern leaves relative to angle 2019-10-06 10:30:22 +02:00
MascaraSnake
357baeaa60 Added gravflip support to lavafall, Pyre Fly and Pterabyte 2019-10-05 22:20:48 +02:00
MascaraSnake
a7d6ebd5bd Lavafall lava also kills rings 2019-10-05 20:37:48 +02:00
MascaraSnake
2f4edc0cb9 Players carried by Pterabyte cannot adjust their angle and are in their falling state 2019-10-05 20:29:47 +02:00
MascaraSnake
b9c3f72112 Grouped MFE_TOUCHLAVA together with the other liquid-related flags 2019-10-05 20:10:07 +02:00
MascaraSnake
16d077fde3 Coins don't melt in lava and lavafalls have displayoffset 1 2019-10-05 20:00:54 +02:00
toaster
0235d9e7ec Fix Saloon doors. 
* Make the center be the object stuff collides with, so that if the door is open people can't slip through.
* Add an MF_AMBUSH enhancement to allow non-minecart players to travel through.
* Make A_SaloonDoorSpawn more customisable. (var1 = object type, var2 = distance sides should be placed apart)
 2019-10-05 13:21:35 +01:00
MascaraSnake
99220ae48b Fixed a typo 2019-10-05 10:45:24 +02:00
MascaraSnake
cabc4e0294 Implemented lava splish. Feel free to suggest a different "splish" sound. 2019-10-05 10:00:59 +02:00
Jaime Passos
1750ed5383 nights attack 2019-10-02 22:02:13 -03:00
Jaime Passos
a7dcf534ca character select 2019-10-02 21:57:04 -03:00
Jaime Passos
a0e9fbfffe test 2019-10-02 21:28:02 -03:00
Jaime Passos
6a8539c8f1 test 2019-10-02 20:00:43 -03:00
lachwright
27c9fe5047 Fix false comment 2019-10-03 02:31:32 +08:00
Steel Titanium
625de1f4f6
Some changes. 
Restore the menu headers for record attack and character select menu.
Attempt to optimize the NiGHTS mode menu. (Help getting the scrolling to work in an efficient way would be nice).
 2019-10-01 23:40:59 -04:00
Steel Titanium
6b10ffb88f
Merge branch 'master' into newmenus 2019-10-01 16:52:31 -04:00
MascaraSnake
5c1fabfaae Lava is now either completely solid or completely intangible. No more half-assing 2019-10-01 21:58:18 +02:00
MascaraSnake
24e80c9b23 Made solid lava walls damaging 2019-10-01 21:17:33 +02:00
toaster
f224e03e1d Amy cameo for Frozen Hillside. Wait for the MR, I'll make a fuller pitch there... 2019-10-01 18:19:37 +01:00
Monster Iestyn
b72609f7f7 Merge branch 'master' into mi-tinkers-with-lua-again 2019-09-30 20:51:29 +01:00
MascaraSnake
5460e0e1f9 Merge branch 'master' into acz-fixes 2019-09-30 20:50:33 +02:00
MascaraSnake
e75dee7747 Fix various minus carrying bugs 2019-09-30 20:35:47 +02:00
lachwright
5bbd56b6fa Improve glide bounces 2019-09-30 16:35:05 +08:00
lachwright
7d57d53d45 Allow camera movement while climbing; allow sliding while landing from a glide 2019-09-30 14:38:58 +08:00
Steel Titanium
ebe99dad7a
Make comment more clear 2019-09-30 01:29:57 -04:00
Steel Titanium
592a98a3e8
Fix the sky on the intro cutscene not scrolling. 2019-09-30 01:25:21 -04:00
lachwright
c72b5d8a49 Allow retention of momentum when climbing off surfaces 2019-09-30 10:55:57 +08:00
lachwright
906a2b1f59 Merge branch 'master' into knuxstuff 
Update to master (necessary for climbing changes)
 2019-09-30 09:56:04 +08:00
MascaraSnake
d301d2bba4 Fixed a bug with the ring lava melting 2019-09-29 23:22:38 +02:00
MascaraSnake
4375ea8089 Lava now melts rings! 2019-09-29 23:11:21 +02:00
MascaraSnake
3d985c1b9e Pterabytes can now swoop you off a rollout rock 2019-09-29 22:13:10 +02:00
lachwright
6c0e4a154d Resolve merge conflicts 2019-09-30 03:07:03 +08:00
lachwright
e57b0f7126 (Hopefully) cover all cases for resetting rock usability 2019-09-30 03:05:08 +08:00
MascaraSnake
cd45bca848 Pterabyte: Don't drop off player in the first ten tics after grabbing 2019-09-29 19:51:27 +02:00
MascaraSnake
c00144a4f8 Pterabyte: Don't target players who are invincible after being hurt 2019-09-29 19:29:34 +02:00
MascaraSnake
9431497f7d Merge branch 'rvz-hardcode' of git.magicalgirl.moe:STJr/SRB2Internal into rvz-hardcode 
# Conflicts:
#	src/d_player.h
#	src/dehacked.c
#	src/p_map.c
#	src/p_user.c
 2019-09-29 18:49:53 +02:00
MascaraSnake
26ecab14d7 Implemented the Pterabyte grabbing mechanic 2019-09-29 18:42:17 +02:00
lachwright
60cbc2e6b4 Remove unused locals 2019-09-29 21:29:37 +08:00
lachwright
71603006dc Resolve merge conflicts 2019-09-29 20:29:49 +08:00
lachwright
8abb6129c1 Hardcode pumice ball 
Current known issues: players detached from the ball via any means other than jumping or pain do not have their ball reset properly
 2019-09-29 20:18:40 +08:00
MascaraSnake
22e3c37e5d Don't make the Pterabyte radius adjustable (doesn't work correctly right now) 2019-09-29 11:58:33 +02:00
MascaraSnake
598047ae8b Hardcoded the Pterabyte (without the grabbing mechanic) 2019-09-29 10:39:09 +02:00
sphere
bea7224ebf Use zones.pk3 instead of zones.dta. 2019-09-29 05:31:50 +02:00
Monster Iestyn
52562c4125 whoops, didn't mean to include this 2019-09-28 20:45:44 +01:00
Steel Titanium
cf852e7d39
Fix crash if speed is too high 
Also update libopenmpt
 2019-09-27 23:53:19 -04:00
Jaime Passos
0aba0aa4b9 Merge remote-tracking branch 'origin/master' into openglskydome2 2019-09-27 22:47:10 -03:00
Monster Iestyn
fa444a37eb Added < 0 checks to all three variables added in last commit 
(no point checking >= MAXPLAYERS tbh, there's no reason the game would even set those values that I can think of offhand)
 2019-09-27 23:15:38 +01:00
Monster Iestyn
240aa34794 Added consoleplayer, displayplayer and secondarydisplayplayer, by popular request 2019-09-27 21:16:11 +01:00
toaster
ff8c43664a Merge branch 'addons-menu-cleanup' into 'master' 
Addons menu cleanup

See merge request STJr/SRB2Internal!316
 2019-09-27 08:55:36 -04:00
toaster
55a2f1ee1f Merge branch 'bossprovements' into 'master' 
ACZ3 intro

Closes #217

See merge request STJr/SRB2Internal!346
 2019-09-27 08:55:19 -04:00
toaster
40a7b67a86 Merge branch 'dsz3shockwave' into 'master' 
Deep Sea Zone 3 hardcoding

Closes #185

See merge request STJr/SRB2Internal!349
 2019-09-27 08:54:57 -04:00
toaster
65d9c52884 Merge branch 'automap-fixes' into 'master' 
Automap fixes

See merge request STJr/SRB2Internal!348
 2019-09-27 08:52:59 -04:00
toaster
3f1d84a6b3 Merge branch 'patch-fixes' into 'master' 
Patch fixes (Resolves #230)

Closes #230

See merge request STJr/SRB2Internal!347
 2019-09-27 08:52:41 -04:00
toaster
4d058d1d25 Merge branch 'lachfixes' into 'master' 
Several bug fixes!

Closes #210, #192, and #189

See merge request STJr/SRB2Internal!345
 2019-09-27 08:52:23 -04:00
toaster
c091174f2e Merge branch '231-tails-ai-should-die-when-taking-damage-in-ultimate' into 'master' 
Resolve "Tails AI should die when taking damage in Ultimate"

Closes #231

See merge request STJr/SRB2Internal!344
 2019-09-27 08:51:11 -04:00
toaster
c97037e98e Merge branch 'inputstuff' into 'master' 
Trigonometric input capping

See merge request STJr/SRB2Internal!343
 2019-09-27 08:50:55 -04:00
sphere
bc128dffdc Fix compiling errors, thanks to toaster. 2019-09-26 23:15:52 +02:00
lachwright
264c60fb70 P_SetTarget fixes, added SPR_SHCK to hw_light.c 2019-09-27 02:13:02 +08:00
toaster
ec1712064c * Add vwre vwre intro for Fang Clone Fighter battle. (Still skipped with presence of MTF_AMBUSH) 
* https://cdn.discordapp.com/attachments/428262628893261828/626792815451701259/srb20006.gif
* Add fadeout instead of slapstick for Fang Clone Fighter death.
* Allow placed Fang and Metal Sonic objects to be marked as Clone Fighters always through presence of MTF_EXTRA.
 2019-09-26 17:06:29 +01:00
lachwright
d5e0ac1450 Added A_Boss3ShockThink to dehacked.c 2019-09-26 18:57:25 +08:00
lachwright
c9c9f95057 Lowered shockwave speed 2019-09-26 17:12:03 +08:00
lachwright
0cd3e4fd62 Hardcoded DSZ3 shockwave 2019-09-26 05:27:51 +08:00
Monster Iestyn
75ee3193f4 Write a new hack for getting sector->linecount from sector->lines in Lua, to put my mind at rest about it at last. 
1) In sector_get, actually push the memory address of the lines array within sector_t, rather than push the value of "lines" itself (essentially, we we want a pointer to a double pointer, or rather a TRIPLE pointer haha)
2) In the sectorlines_* functions, use offsetof to shift the memory address so we can obtain the value of linecount within the sector_t struct, and dereference the result to obtain the value of linecount itself
3) ??? profit

Untested and uncompiled atm, but I have some confidence this might work
 2019-09-25 20:27:41 +01:00
lachwright
fb9248793a Fix errormode compilation error 2019-09-25 23:09:05 +08:00
toaster
313fed2a59 Correctly restrict MF_NOCLIPTHING-objects from being interacted with from both moving and non-moving side. 2019-09-25 15:49:37 +01:00
lachwright
c1750d9359 Fixes shield ability usage when pressing spin on ACZ ropes (and also changes flame shield angling) 2019-09-25 22:36:48 +08:00
toaster
9504d078e4 Don't lock on if something is literally intangible. 2019-09-25 15:12:19 +01:00
toaster
2a452ddcf5 Remember when Lach recorded their live reaction to 2.2 so far? Do you recall what the reaction to ACZ3 was? 
If you don't, the reaction was "WHAT?? Why is he here? This is GREAT but, what??" And while the reaction is on the positive end of things, it's stll clearly not advisable for our defining Big Reveal of the already huge update.

To this end: Here is a mini cutscene! https://cdn.discordapp.com/attachments/428262628893261828/626207624043429898/srb20005.gif
* He's digging through Eggman's trash.
* Clearly doesn't expect to see you!
* Ready for a fight all the same.
* You can attack him during the mini cutscene if you're impatient.
* Skipped if you give him MTF_AMBUSH.
* Requires new assets (including map) to test, but I'm not ready to make a MR yet because I have other thoughts first.

Also, since I was poking around in p_enemy.c, I fixed A_Boss1Laser's issues (not working with direct 2.1 port states and having the weird secondary attack).
 2019-09-25 14:36:20 +01:00