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 |
|
Jaime Passos
|
d67804cb9c
|
png fix yes so cool
|
2019-09-29 19:10:49 -03:00 |
|
Jaime Passos
|
7eb5155240
|
sprite2info soc yummy yummy yes
|
2019-09-29 19:03:10 -03: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 |
|
Jaime Passos
|
b2ac64f24c
|
better soc
|
2019-09-29 15:53:04 -03: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 |
|
Jaime Passos
|
318fde6ae7
|
Giant mistake
|
2019-09-29 14:12:53 -03: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 |
|
Jaime Passos
|
4a0848acd7
|
I want to be able to stack skins in a sprite2 block
|
2019-09-29 12:41:15 -03:00 |
|
Jaime Passos
|
82be346091
|
change comment and error message
|
2019-09-29 12:16:38 -03:00 |
|
Jaime Passos
|
c268743220
|
hehee
|
2019-09-29 12:13:51 -03: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 |
|
Jaime Passos
|
73e4e67595
|
JIMITA DO THE SOC
|
2019-09-28 19:13:51 -03:00 |
|
Jaime Passos
|
b74cfca3e2
|
JIMITA DO TH EROTSPRITE
|
2019-09-28 17:56:27 -03:00 |
|
Monster Iestyn
|
52562c4125
|
whoops, didn't mean to include this
|
2019-09-28 20:45:44 +01:00 |
|
Jaime Passos
|
8aefc03409
|
quick maths
|
2019-09-28 13:40:40 -03:00 |
|
Jaime Passos
|
6574e1a7d3
|
memory management
|
2019-09-28 12:50:07 -03:00 |
|
Jaime Passos
|
5118f8589d
|
Merge remote-tracking branch 'origin/master' into rotsprite_i
|
2019-09-28 12:14:55 -03:00 |
|
Steel Titanium
|
cf852e7d39
|
Fix crash if speed is too high
Also update libopenmpt
|
2019-09-27 23:53:19 -04:00 |
|
Jaime Passos
|
fe60902df5
|
Merge remote-tracking branch 'origin/master' into renderswitch
|
2019-09-27 22:53:57 -03: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 |
|
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 |
|
