toaster
|
7ade43f685
|
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
|
5ce5b1275d
|
Merge branch 'master' into mi-tinkers-with-lua-again
|
2019-09-30 20:51:29 +01:00 |
|
MascaraSnake
|
12f555de25
|
Merge branch 'master' into acz-fixes
|
2019-09-30 20:50:33 +02:00 |
|
MascaraSnake
|
e75767ece8
|
Fix various minus carrying bugs
|
2019-09-30 20:35:47 +02:00 |
|
lachwright
|
e8a85570f8
|
Improve glide bounces
|
2019-09-30 16:35:05 +08:00 |
|
lachwright
|
52e7ae5322
|
Allow camera movement while climbing; allow sliding while landing from a glide
|
2019-09-30 14:38:58 +08:00 |
|
Steel Titanium
|
edf4dd8e0a
|
Make comment more clear
|
2019-09-30 01:29:57 -04:00 |
|
Steel Titanium
|
b9234d1d8c
|
Fix the sky on the intro cutscene not scrolling.
|
2019-09-30 01:25:21 -04:00 |
|
lachwright
|
6f394319cc
|
Allow retention of momentum when climbing off surfaces
|
2019-09-30 10:55:57 +08:00 |
|
lachwright
|
741b2a4fad
|
Merge branch 'master' into knuxstuff
Update to master (necessary for climbing changes)
|
2019-09-30 09:56:04 +08:00 |
|
Jaime Passos
|
2740711092
|
png fix yes so cool
|
2019-09-29 19:10:49 -03:00 |
|
Jaime Passos
|
41ff5ef79c
|
sprite2info soc yummy yummy yes
|
2019-09-29 19:03:10 -03:00 |
|
MascaraSnake
|
4c0628b6bb
|
Fixed a bug with the ring lava melting
|
2019-09-29 23:22:38 +02:00 |
|
MascaraSnake
|
83b32eacbe
|
Lava now melts rings!
|
2019-09-29 23:11:21 +02:00 |
|
MascaraSnake
|
c1d06a1b49
|
Pterabytes can now swoop you off a rollout rock
|
2019-09-29 22:13:10 +02:00 |
|
lachwright
|
41cc52ce25
|
Resolve merge conflicts
|
2019-09-30 03:07:03 +08:00 |
|
lachwright
|
4a47b66990
|
(Hopefully) cover all cases for resetting rock usability
|
2019-09-30 03:05:08 +08:00 |
|
Jaime Passos
|
c373570584
|
better soc
|
2019-09-29 15:53:04 -03:00 |
|
TehRealSalt
|
9e3b818cce
|
Fix finish line occasionally failing for small players
|
2019-09-29 14:40:23 -04:00 |
|
MascaraSnake
|
4c6a4b76cc
|
Pterabyte: Don't drop off player in the first ten tics after grabbing
|
2019-09-29 19:51:27 +02:00 |
|
MascaraSnake
|
b169ff93d4
|
Pterabyte: Don't target players who are invincible after being hurt
|
2019-09-29 19:29:34 +02:00 |
|
Jaime Passos
|
61f29c9dd6
|
Giant mistake
|
2019-09-29 14:12:53 -03:00 |
|
MascaraSnake
|
ca9fdd4f0e
|
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
|
309d26069f
|
Implemented the Pterabyte grabbing mechanic
|
2019-09-29 18:42:17 +02:00 |
|
Jaime Passos
|
e07c7aae2c
|
I want to be able to stack skins in a sprite2 block
|
2019-09-29 12:41:15 -03:00 |
|
Jaime Passos
|
12fd1849bd
|
change comment and error message
|
2019-09-29 12:16:38 -03:00 |
|
Jaime Passos
|
dfe05a650c
|
hehee
|
2019-09-29 12:13:51 -03:00 |
|
lachwright
|
7cf2328e62
|
Remove unused locals
|
2019-09-29 21:29:37 +08:00 |
|
lachwright
|
949ef287b7
|
Resolve merge conflicts
|
2019-09-29 20:29:49 +08:00 |
|
lachwright
|
f67ef441b3
|
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
|
017d29ff76
|
Don't make the Pterabyte radius adjustable (doesn't work correctly right now)
|
2019-09-29 11:58:33 +02:00 |
|
MascaraSnake
|
c4f1085f02
|
Hardcoded the Pterabyte (without the grabbing mechanic)
|
2019-09-29 10:39:09 +02:00 |
|
sphere
|
a225970360
|
Use zones.pk3 instead of zones.dta.
|
2019-09-29 05:31:50 +02:00 |
|
Jaime Passos
|
c02c7fb28b
|
JIMITA DO THE SOC
|
2019-09-28 19:13:51 -03:00 |
|
Jaime Passos
|
5c8b7a142b
|
JIMITA DO TH EROTSPRITE
|
2019-09-28 17:56:27 -03:00 |
|
Monster Iestyn
|
d3c4a9a92b
|
whoops, didn't mean to include this
|
2019-09-28 20:45:44 +01:00 |
|
TehRealSalt
|
7c40a1c07b
|
Make sure it doesn't divide by 0
|
2019-09-28 15:18:01 -04:00 |
|
TehRealSalt
|
8fa5ada23d
|
Allow ring usage during Shrink
|
2019-09-28 15:16:08 -04:00 |
|
TehRealSalt
|
7321a95a65
|
Ring respawn timer is based on lap count (proportional to 3 laps)
|
2019-09-28 15:14:52 -04:00 |
|
Sal
|
1fa417f561
|
Merge branch 'more-transparent-pixel' into 'master'
Fixed some instances that weren't using TRANSPARENTPIXEL
See merge request KartKrew/Kart!178
|
2019-09-28 13:06:23 -04:00 |
|
Jaime Passos
|
2e493a3d4d
|
quick maths
|
2019-09-28 13:40:40 -03:00 |
|
Jaime Passos
|
b7748aa594
|
memory management
|
2019-09-28 12:50:07 -03:00 |
|
Jaime Passos
|
e2ce3988fb
|
Merge remote-tracking branch 'origin/master' into rotsprite_i
|
2019-09-28 12:14:55 -03:00 |
|
Steel Titanium
|
65bc2ef0d6
|
Fix crash if speed is too high
Also update libopenmpt
|
2019-09-27 23:53:19 -04:00 |
|
TehRealSalt
|
2c400487a5
|
not def 0
|
2019-09-27 23:11:43 -04:00 |
|
TehRealSalt
|
bc3f0568ee
|
Merge master
|
2019-09-27 23:09:54 -04:00 |
|
James R
|
e5b6ebaa4e
|
Disable unused functions in TESTERS build
|
2019-09-27 20:00:46 -07:00 |
|
James R
|
5ceff36ac1
|
Hide Multiplayer hosting options and Offline Mode
|
2019-09-27 19:58:55 -07:00 |
|
James R
|
7a201ea993
|
Hide Unlockables
|
2019-09-27 19:56:41 -07:00 |
|
James R
|
b64dccd498
|
Hide Record Attack in TESTERS build
|
2019-09-27 19:56:18 -07:00 |
|