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
74a39837bb
Merge conflicts
2021-01-06 18:33:42 +01:00
GoldenTails
a51fb151db
Have A_ThrownRing check for a player too
2020-12-19 21:30:13 -06:00
GoldenTails
75f495ac5e
Have A_DetonChase check for a player too
2020-12-19 21:12:09 -06:00
GoldenTails
4117196ba6
Actually check for a player smh
2020-12-19 20:33:29 -06:00
James R
498ff708bb
Replace all instances of P_AproxDistance with FixedHypot
2020-12-12 14:53:54 -08:00
James R
e305de037c
Merge branch 'player-speed' into 'next'
...
Make player->speed and other things use R_PointToDist2
See merge request STJr/SRB2!1309
2020-12-12 17:38:02 -05:00
James R
20e0d99ea0
Remove trailing whitespace
2020-12-12 02:40:46 -08:00
Zippy_Zolton
3c041d7304
snailer
2020-12-10 19:01:09 -06:00
Tatsuru
8502675e1b
Initialize junk line tag lists
2020-11-30 18:21:06 -03:00
LJ Sonic
079df8df4d
Merge branch 'fix-stacktrace' of https://git.do.srb2.org/STJr/SRB2.git into next
...
# Conflicts:
# src/dehacked.c
# src/dehacked.h
2020-11-29 21:54:15 +01:00
Louis-Antoine
ff7ca5450f
Only call the Lua API for overridden actions
2020-11-15 01:15:58 +01:00
Sally Coolatta
1a58d0d24b
Try and fix hitlag damage, lightning shield, & punting mines
2020-11-12 01:43:37 -05:00
Sally Coolatta
56a20d05df
Merge branch 'master' into battle-rethink
2020-11-11 00:11:18 -05:00
Sally Coolatta
94eca0f928
Don't explode mines multiple times while they're in hitlag
2020-11-10 23:50:59 -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
Sally Coolatta
619402666a
Better Jawz
...
- More friction in Battle
- Throwables take your momz (has been bothering me for an eternity)
2020-10-30 22:57:42 -04:00
James R
8ae579d672
Merge branch 'master' into paper-items-i-hate-my-life
2020-10-28 22:36:08 -07:00
James R
c609dffdab
Stupid P_MapStart crash because of flicky teleport before map load
2020-10-28 22:35:31 -07: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
Sally Coolatta
2509d5a29c
Merge branch 'the-scary-22-merge' into battle-rethink
2020-10-24 21:39:32 -04:00
Sally Coolatta
9b6aa946ea
Merge remote-tracking branch 'srb2/master' into the-scary-22-merge
2020-10-24 19:28:06 -04:00
Sally Coolatta
fda698a290
Merge master
2020-10-24 18:34:07 -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
Monster Iestyn
f13d938c57
A_Boss1Laser (pinch phase): Reset var1 to locvar1 each time so we don't accidentally spawn koopas (or something else) as a result of hitting enemies with the laser
2020-09-26 17:31:49 +01:00
Sally Coolatta
2f6962c103
Correct player angle when respawning from crushing
2020-09-26 03:12:22 -04:00
Sally Coolatta
285ec3e08c
Player death uses damage types
...
- Fixed last place elimination not working (again)
- Replaces squishing from level geometry with good old fashioned crush death
2020-09-25 16:31:10 -04:00
Sally Coolatta
861cb8e144
Fix springs giving you way too many
...
(Also removed a bunch of instances of PF_SPINNING since we haven't used it)
2020-09-25 02:24:19 -04:00
James R
ef108cbb36
Merge remote-tracking branch 'pub/next'
2020-09-20 14:07:54 -07:00
SteelT
d8bcc13fec
Merge branch 'master' into trick-panels
...
# Conflicts:
# src/d_player.h
# src/dehacked.c
# src/k_kart.c
# src/p_user.c
2020-09-18 00:54:45 -04:00
Tatsuru
57b1becfe0
Decolorize players as intended
2020-08-24 23:53:21 -03:00
Sally Coolatta
8e62efb79c
Merge branch 'master' into next
2020-08-23 04:44:27 -04:00
FlykeSpice
2424418390
Remove ESLOPE #ifdef(backport from srb2 2.2)
2020-08-20 13:02:13 -04:00
Sally Coolatta
3e446a167c
Restructure how damage works in kart COMPLETELY
...
Instead of doing its best to avoid P_DamageMobj, it embraces it, using the damagetype system to decide how the player takes damage. Overall less stupid.
2020-08-19 00:55:36 -04:00
Sally Coolatta
9863171879
Remove MF_BOUNCE, use MF_SLIDEME to enable P_SlideMove for an object
2020-08-16 03:03:04 -04:00
Sally Coolatta
8fd64ca607
Fix ring usage & gravity
2020-08-16 02:12:17 -04:00
Sally Coolatta
0dc21106e5
Lua stuff is done
2020-08-15 07:47:18 -04:00
Sally Coolatta
9efdc98de6
Makes it through all kart files
...
All that's left is SDL, OGL, maybe also Lua
2020-08-15 04:42:56 -04:00
Sally Coolatta
c665393bd0
actaully I was incorrect, it didn't make it past it. Now it makes it TO it at least :V
2020-08-14 21:21:17 -04:00
Sally Coolatta
5a6263c36b
Make it past p_mobj
2020-08-14 20:48:06 -04:00
Sally Coolatta
6ef0af4ba5
g_game and g_input now compile
2020-08-13 00:05:44 -04:00
Sally Coolatta
f9ca40e673
Merge branch 'master' into the-scary-22-merge
2020-08-12 20:59:09 -04:00
Sally Coolatta
8731c6b7a4
Another round of fixing up
...
- gametyperules are now fitting for kart, not applied to the whole codebase though
- a few more files compile
2020-08-11 16:13:17 -04:00
Sally Coolatta
c96bd5f64a
Many removals
...
Lots of NiGHTS code, lots of ringslinger code, revert actnum behavior back to vanilla
2020-08-10 21:45:51 -04:00
Sally Coolatta
ecec1e8a8f
OK the compiler still didn't like it, so just properly remove it entirely.
2020-08-10 17:22:55 -04:00
lachwright
51754b01ad
Merge p_enemy.c
2020-08-10 12:25:12 +08:00
Sally Coolatta
e296e1309a
YAY, round 2
2020-08-09 21:02:56 -04:00
Sally Coolatta
c14e9a23f7
Merge p_enemy.c
2020-08-06 11:00:49 -04:00
