Zippy_Zolton
3015ee07ae
thanks zap
2020-11-30 16:39:24 -06:00
Zippy_Zolton
6bfccec3c3
oops
2020-11-30 12:05:45 -06:00
Zippy_Zolton
8c836971de
overhaul
2020-11-30 12:04:35 -06:00
James R
9c912f0cd4
Merge branch 'bot-fixes' into 'master'
...
Fix bots having weird rubberbanding in 2.2
See merge request KartKrew/Kart!337
2020-11-29 19:13:54 -05:00
James R
71553a8ad0
Merge branch 'battle-rethink' into 'master'
...
Battle rethink
See merge request KartKrew/Kart!335
2020-11-29 19:13:38 -05:00
Zippy_Zolton
556dd3bfca
P_GivePlayerRings
2020-11-29 17:39:54 -06:00
Zippy_Zolton
96ff6d002d
Make P_DoSuperTransformation (with giverings) add 50 rings instead of setting it
2020-11-29 17:16:57 -06:00
SMS Alfredo
6b83600300
Allow non-player objects to apply the CR_PLAYER carry type without crashing the game
2020-11-28 22:03:02 -06:00
toaster
f72108c4fa
A whole bunch of cleanup to get most record attack/replay stuff reasonably functional.
...
* Fix the screen being stuck black at the very start of start record attack.
* Bump up the demoversion to 7, because I want all previous v2 demos to be guaranteed kaput (it was previously 4, but 7 is a nice number).
* Fix a ton MORE shitcausing misalignments in the replay system, this time specifically focused on getting ghosts functional.
* Plug a few holes in the "best lap" record implementation that allowed for stupidly easy records due to the way v2's finish lines work.
* Make a few follower-related things sane, to prevent spurious console prints that were getting in the way of my test prints.
2020-11-27 20:30:28 +00:00
Zippy_Zolton
9a8493f1c4
Fix normal one-up sound playing in Mario mode
2020-11-25 21:46:45 -06: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
lachwright
9172661e47
Prevent non-CA2_SPINDASH characters from getting crushed by roll-jumping into a crevice
2020-11-24 14:56:22 +11:00
SMS Alfredo
d33aab487a
...snickerdoodles
2020-11-23 09:23:02 -06:00
SMS Alfredo
a60a74e33e
Remove PF_SPINNING when jumping if you have SF_NOJUMPDAMAGE
2020-11-23 09:21:00 -06:00
SMS Alfredo
21d9e870aa
Revert "Fix no spin characters being able to damage enemies with their jump out of a spin without removing PF_SPINNING"
...
This reverts commit 826a4429dd
2020-11-23 09:18:05 -06:00
SMS Alfredo
fee455ec7a
Remove unneeded S_PLAY_ROLL check
2020-11-22 23:23:35 -06:00
James R
78c2fa09a0
Merge branch 'flame-orb' into 'next'
...
Flame Shield & Thunder Shield Adjustment (Closes #363 )
Closes #363
See merge request STJr/SRB2!1220
2020-11-22 17:31:23 -05: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
ec291ec3e3
lmao formatting
2020-11-18 12:03:48 -06:00
SMS Alfredo
dc51465195
Don't force S_PLAY_SPIN when landing with PF_SPINNING if you have certain PA flags
2020-11-18 12:01:06 -06:00
SMS Alfredo
826a4429dd
Fix no spin characters being able to damage enemies with their jump out of a spin without removing PF_SPINNING
2020-11-18 11:28:31 -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
SMS Alfredo
e099631e3c
Do deh thing
2020-11-17 11:47:33 -06: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
6a4eb721bd
The real problem
2020-11-16 18:35:07 -05:00
Sally Coolatta
56a20d05df
Merge branch 'master' into battle-rethink
2020-11-11 00:11:18 -05:00
Sally Coolatta
2b3a86d4b4
Merge branch 'master' into hitlag-retry
2020-11-10 21:37:09 -05:00
Sally Coolatta
fc934b38e1
Merge public next
2020-11-10 15:32:48 -05:00
Nev3r
f94d9825b4
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into udmf-multitag
2020-11-10 11:46:53 +01:00
Sally Coolatta
827f4e1068
Merge branch 'master' into natural-camera-outrun
2020-11-09 20:38:27 -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
James R
e2df4cf027
:V
2020-11-05 22:18:41 -08:00
Zachary McAlpin
2764c283d2
Execute LUAh_PlayerThink(player) at the end if the player has a valid mobj_t object
2020-11-05 21:26:24 -08:00
Zachary McAlpin
7efb33a38e
Added PlayerThink hook
2020-11-05 21:23:22 -08:00
James R
a9a08046f0
Merge branch 'mobjghost-rollangle' into 'next'
...
Ghost mobj matches rollangle (Closes #362 )
Closes #362
See merge request STJr/SRB2!1211
2020-11-01 22:49:50 -05:00
Zippy_Zolton
16cc066e2e
thunder shield :D
2020-10-29 12:32:42 -05: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
Zippy_Zolton
39d003d6f7
Flame Shield Changes
2020-10-28 01:23:05 -05:00
Nev3r
df6a903592
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into udmf-multitag
...
# Conflicts:
# src/lua_baselib.c
# src/lua_maplib.c
2020-10-27 20:48:25 +01:00
James R
de936f4c7f
Don't reset drift off springs
...
Hopefully nothing requires drift reset from here.
2020-10-26 20:49:39 -07:00
Sally Coolatta
b83f9afecb
Merge branch 'master' into battle-rethink
2020-10-26 22:22:40 -04:00
James R
364b69c621
Let turn while light snaking
2020-10-26 03:46:49 -07:00
James R
88a8a09516
Make sneaker panels push you in spinout AGAIN LOL
...
The old condition for player movement was...
1. player hasn't finished
2. player not in pain, or player in pain but on the ground
The else condition to this is therefore player has finished or player in pain
and in the air.
I believe K_MomentumToFacing (prior to bots) was only for letting the player
turn around after crossing the finish line, to face the camera.
(K_MomentumToFacing also does nothing in the air.)
2020-10-26 02:05:14 -07:00
James R
a50d281658
Merge branch 'the-scary-22-merge' into battle-rethink
2020-10-25 13:44:43 -07:00
James R
2c35034960
Fix invincibility music not ending
2020-10-25 13:43:44 -07:00
Sally Coolatta
48d8bb242a
Merge branch 'the-scary-22-merge' into battle-rethink
2020-10-25 09:58:25 -04:00
