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
7191 commits 172 branches 41 tags 280 MiB
Commit graph

7191 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
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
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
toaster
ee2d88d4b7 Merge branch 'internal-hotplug-stableid' into 'master' 
Controller hotplug support.

See merge request STJr/SRB2Internal!342
 2019-09-27 08:50:34 -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
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
lachwright
77613018f8 (Crudely) fixed camera jitter on certain FOF slopes 2019-09-25 21:15:19 +08:00
lachwright
264d82c8d0 Fixed Brak's flames not animating 2019-09-25 20:32:56 +08:00
lachwright
68ee7a6658 Fixed spectators taking unwarranted damage in splitscreen 2019-09-25 17:13:03 +08:00
Lachlan Wright
5de1225b3e Hopefully added the newline back? 2019-09-25 05:06:04 -04:00
Lachlan Wright
3b30b9d656 Add parentheses over change 2019-09-25 05:00:43 -04:00
lachwright
09868d2999 Dust devil fixes 2019-09-25 16:32:06 +08:00
Lachlan Wright
637490e2de AI players no longer take shield damage in Ultimate mode 2019-09-24 23:49:20 -04:00