Commit graph

1900 commits

Author SHA1 Message Date
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
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
2b3a86d4b4 Merge branch 'master' into hitlag-retry 2020-11-10 21:37:09 -05:00
Sal
27530dec06 Merge branch 'spindash-efx' into 'master'
Spindash EFX Part 1

See merge request KartKrew/Kart!331
2020-11-10 19:56:01 -05:00
Nev3r
c22dbe1d2e rename TAG_ITER_C to TAG_ITER_DECLARECOUNTER and remove the semicolon from the macro. 2020-11-10 12:22:55 +01:00
James R
d7a0c8ae0a Setting the ambush flag on any MF_SPRING thing toggles MF_NOGRAVITY 2020-11-08 20:15:17 -08:00
Sally Coolatta
39acb46903 Last 3/4s: Spindash wind 2020-11-08 15:32:30 -05:00
Sally Coolatta
0e28470228 Merge master 2020-11-08 02:34:24 -05:00
Sally Coolatta
9434dd3ae3 Make the stuff that lost it use K_MomentumAngle again 2020-11-08 02:10:53 -05:00
Sally Coolatta
470e399abe Merge master, add support for hitlag jitter in OpenGL 2020-11-08 01:56:27 -05:00
Jaime Passos
da0f2286e3 P_DeleteFloorSpriteSlope -> P_RemoveFloorSpriteSlope 2020-11-05 00:42:14 -03:00
Sally Coolatta
961ff69241 You can drop Chaos Emeralds 2020-11-02 00:41:41 -05:00
Sally Coolatta
91ed67bece Start on Chaos Emeralds
Functional! However, you don't drop them yet.
2020-11-01 23:44:54 -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
Sally Coolatta
64c321fbed Fix incorrect tilts 2020-10-28 21:05:58 -04: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
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
Jaime Passos
cdc4a6d86e Implement blend modes 2020-10-27 00:03:41 -03:00
Sally Coolatta
16e08d4388 Don't run P_RespawnBattleBoxes 2020-10-26 22:33:14 -04:00
Sally Coolatta
201f8365db Merge branch 'battle-rethink' of https://git.do.srb2.org/KartKrew/Kart into battle-rethink 2020-10-26 22:20:25 -04:00
Sally Coolatta
62139f144a Paper item spawners
Code is a little horrendous in a few places but I will hopefully fix later :V
2020-10-26 22:20:02 -04:00
James R
4570757c4e Fix item respawn time underflow 2020-10-25 15:42:54 -07:00
Sally Coolatta
48d8bb242a Merge branch 'the-scary-22-merge' into battle-rethink 2020-10-25 09:58:25 -04:00
Sally Coolatta
f121ed210a Fix flashing tics 2020-10-25 09:57:51 -04:00
Sally Coolatta
5db7b337d9 Speed up sphere respawn 2020-10-24 21:45:35 -04:00
Sally Coolatta
2509d5a29c Merge branch 'the-scary-22-merge' into battle-rethink 2020-10-24 21:39:32 -04:00
Sally Coolatta
afbbfc9b1f Fix cvars
My wrist burns...
2020-10-24 21:32:07 -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
9b6aa946ea Merge remote-tracking branch 'srb2/master' into the-scary-22-merge 2020-10-24 19:28:06 -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
7ce53ac104 Add blue spheres
Doesn't have animations, and doesn't have stat-specific buffs. But it's already a massive improvement
2020-10-22 02:52:33 -04:00