Sally Coolatta
9d7ec0ab8f
Merge SRB2 next
...
Probably doesn't compile yet, but I got rid of all of the conflicts for anyone who wants to take a stab at it.
2021-02-27 05:18:36 -05:00
LJ Sonic
85cd429d1d
Revert "Replace all instances of P_AproxDistance with FixedHypot"
...
This reverts commit 498ff708bb
2021-02-13 17:45:20 +01:00
James R
caa7fe1b47
Merge branch 'player-new-frames' into 'master'
...
New player frames: Glancing and death
See merge request KartKrew/Kart!362
2021-02-06 05:57:11 -05:00
James R
8c047372a6
Line special 2003: respawn player if crossing this line
2021-02-04 18:40:50 -08: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
James R
fa696de12d
Merge branch 'fix-mobj-slidemove' into 'next'
...
Make sliding against objects actually work (Fixes #400 )
Closes #400
See merge request STJr/SRB2!1348
2021-01-26 20:43:17 -05:00
Sally Coolatta
94b8f97115
Keep trick when bonking walls
2021-01-13 02:42:55 -05:00
Sally Coolatta
03149d7810
Only do touch damage when confirming a bump
...
Should fix the mcdonalds rings
2021-01-06 23:16:02 -05:00
Sally Coolatta
cfda66103d
Merge branch 'master' into just-tumble
2021-01-06 23:02:51 -05:00
Sal
25264d2634
Merge branch 'no-waypoint-sight-check' into 'master'
...
Waypoints use trace for blocking lines, instead of a sight check
See merge request KartKrew/Kart!342
2021-01-06 20:44:07 -05:00
Sally Coolatta
56fba410ee
Waypoints use trace for blocking lines, instead of a sight check
2021-01-06 16:21:57 -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
James R
c76ae9a4fd
Actually put it on line type 81
2021-01-04 18:55:33 -08:00
James R
6070d14fa5
Line special 11: block monsters for this line
2021-01-04 17:40:06 -08:00
James R
90507126e4
Move block line checks to a single function
2021-01-04 17:34:10 -08:00
GoldenTails
becb2faa01
Make sliding against objects actually work
2020-12-21 02:03:44 -06:00
James R
498ff708bb
Replace all instances of P_AproxDistance with FixedHypot
2020-12-12 14:53:54 -08:00
James R
956fd338f0
Merge branch 'oldguards' into 'next'
...
Kill remaining HAVE_BLUA and SEENAMES
See merge request STJr/SRB2!1319
2020-12-12 17:34:04 -05:00
James R
887f4a0919
Merge branch 'master' into next
2020-12-12 02:38:51 -08:00
James R
19af2b9afe
Remove trailing whitespace
2020-12-12 02:37:03 -08:00
James R
41f1b3b97c
Kill SEENAMES
2020-12-12 02:11:23 -08: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
Tatsuru
0e92f1818c
Kill saloon doors without a tracer, add height check for non-blocking doors
2020-12-06 14:11:08 -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
Sally Coolatta
d0ca3b78c1
Merge branch 'master' into battle-rethink
2020-11-18 17:49:06 -05: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
Sally Coolatta
56a20d05df
Merge branch 'master' into battle-rethink
2020-11-11 00:11:18 -05:00
Sally Coolatta
8b5a78114e
Hitlag occurs on registered damage instead of being before damage calls
2020-11-09 21:35:08 -05:00
James R
6d665a856d
Merge branch 'step-up-goofs-2' into 'next'
...
Fix disabling step up/down not working
See merge request STJr/SRB2!1219
2020-11-09 17:52:41 -05:00
Sally Coolatta
0e28470228
Merge master
2020-11-08 02:34:24 -05:00
Sally Coolatta
470e399abe
Merge master, add support for hitlag jitter in OpenGL
2020-11-08 01:56:27 -05:00
GoldenTails
3af2031eae
Fix hyperwalls
2020-11-03 20:11:39 -06:00
James R
896b29f002
Replace special handling for picking up items from below with MF_PICKUPFROMBELOW
2020-11-01 22:33:42 -08:00
James R
4bdd3c809f
Major brother moment
2020-10-30 20:54:21 -07:00
James R
cb941050e2
Paper item hitbox extends just as far below
2020-10-28 23:48:16 -07:00
James R
81b8abed53
Merge remote-tracking branch 'origin/master' into paper-items-i-hate-my-life
2020-10-28 21:51:28 -07:00
Sally Coolatta
9dd43d4e4e
Remove modeltilt, use roll & pitch instead
...
Broken currently, about half of the slopes you can go into have the wrong tilt
2020-10-28 18:36:26 -04:00
James R
d19c96ee17
Revert step down changes
2020-10-26 20:20:04 -07:00
Sally Coolatta
b83f9afecb
Merge branch 'master' into battle-rethink
2020-10-26 22:22:40 -04:00
James R
df74b9265b
Check maxstep is not disabled before stepping up
...
Fixes infinite step up when it should be no step up.
2020-10-26 14:00:54 -07:00
James R
e5a9bfc968
Fix conflicting step up/down code
2020-10-25 17:04:06 -07:00
Sally Coolatta
2509d5a29c
Merge branch 'the-scary-22-merge' into battle-rethink
2020-10-24 21:39:32 -04:00
Sally Coolatta
7c2bd0d1c2
Merge remote-tracking branch 'srb2/next' into the-scary-22-merge
2020-10-24 20:50:58 -04:00
Sally Coolatta
0969ca1af9
Karma bombs rework
...
- Fixed the bugs with them in our last netgame
- Karma bombs are no longer slippery or have stat changes
- Karma bombs cannot pick up spheres. Their remaining spheres before they died are removed 1 per tic.
- Karma bombs are out of the game permanently when touching the overtime barrier
- When successfully hurting another player, instead of getting 0.5 bumpers, they steal ALL of the opponent's bumpers, effectively swapping places with them. One bumper is lost in the process, meaning bumpers are slowly flitered out the more people need to come back.
- Removed karma items/eggboxes... hopefully this is temporary and we can bring them back later, but currently we don't have a design for how they should work under the new rules :x. They are still in the code behind the `OTHERKARMAMODES` define
- Bumpers & comeback timer are now player_t variables instead of kartstuff shit
- eliminated boolean on player_t for checking when a player touched the barrier
2020-10-24 11:27:42 -04:00
Sally Coolatta
81a3a1c108
Steal bumpers from other players on any hit
2020-10-24 09:18:28 -04:00
James R
e10e4d79c3
Merge branch 'bustflags' into 'next'
...
Bustable Wall and Floor flags.
See merge request STJr/SRB2!1163
2020-10-18 16:42:15 -04:00
James R
f34a761d48
Merge branch 'perfstats' into 'next'
...
Performance stats
See merge request STJr/SRB2!1186
2020-10-18 15:33:20 -04:00
