James R
44ec94f287
Merge remote-tracking branch 'origin/master' into funny-spikes
2021-02-06 03:00:50 -08:00
James R
f9c6a5e8b5
Drop Funny Spikes when getting stung
...
DEBTA0-DEBTH0
Instead of dropping rings, drop non collectable spikes!
2021-02-06 02:31:24 -08:00
Sally Coolatta
e2e342f3f7
Update panim for the new states
2021-02-03 19:29:13 -05:00
Sally Coolatta
c698ddaa6c
Balloons by default will randomly pick CNZ colors
...
Would like this actually for CNZ instead of manually picking them by number & then the numbers get desynced... :v
2021-02-02 22:44:53 -05:00
Sally Coolatta
cc2704bc87
Death animation
...
Art is missing, but functionality is complete.
The kart corpse is also placeable as type 4095. No way to set its color currently, it simply defaults to SKINCOLOR_RED.
2021-02-02 22:36:56 -05:00
LJ Sonic
05a75758ab
Merge branch 'redundant-hypot' into 'next'
...
Replace P_AproxDistance with FixedHypot, and replace FixedHypot's algorithm with R_PointToDist2's
See merge request STJr/SRB2!1320
2021-01-25 18:08:25 -05:00
LJ Sonic
9a2a1d25d6
Merge branch 'jimita-why-you-done-this!!!' into 'next'
...
Fix mobj unarchiving code
See merge request STJr/SRB2!1384
2021-01-22 18:26:26 -05:00
Jaime Ita Passos
9fc1379668
Revert "Move a few mobj spawn defaults to its own function"
...
This reverts commit 3f36a51f5b
2021-01-17 23:17:46 +01:00
Sally Coolatta
cfda66103d
Merge branch 'master' into just-tumble
2021-01-06 23:02:51 -05:00
Sal
542e0b88df
Merge branch 'hitlag-fixes' into 'master'
...
Try and fix hitlag damage, lightning shield, & punting mines
See merge request KartKrew/Kart!340
2021-01-06 21:09:07 -05:00
Sally Coolatta
7c86c686cf
Merge branch 'master' into hitlag-fixes
2021-01-06 18:30:23 -05:00
Latapostrophe
fe4d9ce889
New trick panel shit (but only the gameplay part)
2021-01-06 21:20:28 +01:00
Latapostrophe
74a39837bb
Merge conflicts
2021-01-06 18:33:42 +01:00
Tatsuru
eb82ed7837
Allow water running in reverse gravity
2021-01-04 18:10:41 -03:00
Nev3r
38bc937887
Merge branch 'spritestuff2-archiving-fix' into 'next'
...
Fix archived mobjs having no default blend mode and sprite scales
See merge request STJr/SRB2!1300
2020-12-16 08:57:36 -05:00
James R
3a7941391f
Merge branch 'amys' into 'next'
...
fix amy meeting herself in mario mode
See merge request STJr/SRB2!1330
2020-12-15 20:57:16 -05:00
James R
b98d27a1ba
Merge branch 'circuit-finallap' into 'next'
...
Final lap text for circuit
See merge request STJr/SRB2!1303
2020-12-15 20:42:59 -05:00
katsy
d37fd1aa23
remove amy
2020-12-14 02:36:00 -05:00
James R
498ff708bb
Replace all instances of P_AproxDistance with FixedHypot
2020-12-12 14:53:54 -08:00
James R
20e0d99ea0
Remove trailing whitespace
2020-12-12 02:40:46 -08:00
Jaime Ita Passos
0d81a70397
Fix ERZ3 mode
2020-12-10 21:55:22 -03:00
James R
8cc312a16d
Merge branch 'saloondoor-revengeance' into 'next'
...
Saloon door fixes (closes #394 )
Closes #394
See merge request STJr/SRB2!1296
2020-12-10 15:43:31 -05:00
James R
10fd3606ce
Merge branch 'firemelt' into 'next'
...
Fix objects with MF_FIRE disappearing in lava (Closes #366 )
Closes #366
See merge request STJr/SRB2!1287
2020-12-10 15:37:57 -05:00
James R
ff6eecb64d
Merge branch 'metal-sigfpe' into 'next'
...
Fix a division by zero in BCZ2 Metal Sonic's routine
See merge request STJr/SRB2!1283
2020-12-10 15:35:03 -05:00
James R
ed9d5960ef
Merge branch 'lastlineshit' into 'next'
...
Allow player.lastlinehit and player.lastsidehit to be usable outside of Knuckles' climbing ability
See merge request STJr/SRB2!1271
2020-12-10 15:14:16 -05:00
James R
fc27bbc6e4
Merge branch 'no-spin-jump' into 'next'
...
Fix a Few Spin Related Bugs (Closes #286 and #360 )
Closes #286 and #360
See merge request STJr/SRB2!1256
2020-12-10 15:02:29 -05:00
Zippy_Zolton
629b6d3bab
CTF text 2, branch is finished
2020-12-08 16:09:51 -06:00
Jaime Ita Passos
3f36a51f5b
Move a few mobj spawn defaults to its own function
2020-12-06 17:46:35 -03:00
Tatsuru
0e92f1818c
Kill saloon doors without a tracer, add height check for non-blocking doors
2020-12-06 14:11:08 -03:00
Zippy_Zolton
dc53970fac
g
2020-12-03 02:05:10 -06:00
Zippy_Zolton
5fc6864cc2
Fix fire objects disappearing in lava
2020-12-03 01:28:54 -06:00
Tatsuru
2f44a9ab02
Don't spawn the projectile if you're just gonna delete it
2020-12-02 12:05:40 -03:00
SMS Alfredo
12f36719b4
Allow player.lastlinehit and player.lastsidehit to be used outside of Knuckles' climbing ability
2020-11-25 14:31:24 -06:00
Jaime Ita Passos
be274a4fa9
Merge branch 'next' into spritestuff2
2020-11-19 00:52:43 -03:00
Sally Coolatta
d0ca3b78c1
Merge branch 'master' into battle-rethink
2020-11-18 17:49:06 -05:00
SMS Alfredo
4272788c9a
Allow no spin characters to water skip while spinning
2020-11-18 12:35:40 -06:00
Sal
b2eb64ac09
Merge branch 'roll-and-tilt' into 'master'
...
Roll & pitch replace modeltilt
See merge request KartKrew/Kart!326
2020-11-17 20:03:48 -05:00
Sally Coolatta
e16c7d722f
Cherry-pick e1b265df2
2020-11-16 19:55:28 -05:00
Sally Coolatta
14b379fd27
Cherry-pick 4eb69a664
2020-11-16 19:52:26 -05:00
James R
34450fa028
Don't add translucency to THOK
...
Various visuals use THOKS, maybe there should be another barebones type with
no extra handling. But this is good enough for now.
2020-11-16 10:17:46 -08:00
Sally Coolatta
c31efd8631
Give bumper destruction some sound effects
2020-11-16 02:59:41 -05:00
Sally Coolatta
ef0da6ce9c
Finished bumper destruction
2020-11-16 02:38:13 -05:00
Sally Coolatta
0dc567973c
Overtime: Chaos Emeralds get deleted by the barrier, and respawn in the middle
2020-11-16 01:29:09 -05:00
Sally Coolatta
8c5abf41ea
Bumper destruction starts with the normal bumper sprite before transitioning into the giant bumper
2020-11-16 01:20:55 -05:00
Sally Coolatta
ae5d5abe24
Chaos Emeralds now sparkle
2020-11-16 00:51:00 -05:00
Sally Coolatta
42f411399a
Add bumper explosion effect
2020-11-15 12:56:03 -05:00
Sally Coolatta
827a1b5fca
Refactor stealing & destroying bumpers
...
- Prevents being able to farm extra bumpers off of karma players
- Paves the way for bumper destroy animation later
2020-11-15 06:25:38 -05:00
James R
e1a8a393a3
Merge branch 'udmf-multitag' into 'next'
...
UDMF: Multitag support
See merge request STJr/SRB2!1097
2020-11-14 19:18:14 -05:00
lachwright
ce06031f5e
Reallow P_MobjSpawn to change the scale of objects spawned from mapthings
2020-11-15 02:53:10 +11:00
Nev3r
003f46c18e
Add a level parameter to the iterators to account for nesting, and thus avoid variable shadowing.
2020-11-12 13:48:14 +01:00
