TehRealSalt
|
640e0e09c6
|
Merge branch 'master' into sal-cleanup
|
2018-10-08 00:22:44 -04:00 |
|
Sryder
|
64ceed280a
|
Merge branch 'colors' into 'master'
Edit Pink, Navy, and Jet, add brown text
See merge request KartKrew/Kart!28
|
2018-10-07 09:39:22 -04:00 |
|
Sryder
|
da4853f4d5
|
Merge branch 'droptweaks' into 'master'
Droptweaks
See merge request KartKrew/Kart!27
|
2018-10-07 09:37:02 -04:00 |
|
TehRealSalt
|
d51e4c3140
|
Scale explosions properly
|
2018-10-04 22:09:12 -04:00 |
|
TehRealSalt
|
639a170c78
|
Merge branch 'master' into sal-cleanup
|
2018-10-04 18:51:45 -04:00 |
|
TehRealSalt
|
fef3c63740
|
Moved colors around yet again for nicer invincibility effect
- Ruby is closer to the pinks (and where purples would be if it wrapped around)
- Sapphire is closer to the cyans
- Dream is right before the teals
|
2018-10-03 21:18:07 -04:00 |
|
TehRealSalt
|
ad64279d28
|
Edit Pink, Navy, and Jet
|
2018-10-03 20:48:44 -04:00 |
|
toaster
|
fdf398d003
|
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into toast_misc
|
2018-10-03 21:04:34 +01:00 |
|
toaster
|
dcdbf911a5
|
Don't have all of your mines disappear into the aether if you have to shield-drop ONE, because they're not all out at once. (This is only really relevant to debug testing, given picking up additional HUD-dropped mines isn't very likely.
|
2018-10-03 20:56:43 +01:00 |
|
toaster
|
2f082d8265
|
Revert "Just realised the inputwheel jittering in Sryder's videos was my fault, so fix this even better"
This reverts commit 8aff76b8c3 .
|
2018-10-02 16:52:02 +01:00 |
|
toaster
|
445013b0f9
|
Wrong bracket level for flashing-set.
|
2018-10-01 22:44:17 +01:00 |
|
toaster
|
147b7a5786
|
Modified SPB to not route through P_DamageMobj (so wehave more control over the shield dropping/item obliteration, given Sryder picking up his own Thundershield...)
|
2018-10-01 21:48:52 +01:00 |
|
toaster
|
c9da6cd856
|
Minor HUD offset tweak for splitscreen eggnum.
|
2018-10-01 18:10:12 +01:00 |
|
toaster
|
f1267f8ae1
|
Don't allow a new driftboost of lesser magnitude to completely cancel an existing driftboost.
|
2018-10-01 12:27:35 +01:00 |
|
toaster
|
ab59504be0
|
Experimental: Making the ghetto waypoints we have right now their own mobj list in order to make them slightly less bullshit
|
2018-09-29 20:28:27 +01:00 |
|
TehRealSalt
|
68bf1f60f3
|
"TICRATE*1"?!
|
2018-09-27 18:44:14 -04:00 |
|
TehRealSalt
|
7c5d47deb5
|
No mashing in Record Attack
|
2018-09-27 18:42:42 -04:00 |
|
TehRealSalt
|
6d798f00e7
|
Yet another scale fix
|
2018-09-27 18:26:37 -04:00 |
|
TehRealSalt
|
30005ad39b
|
Scale fixes
|
2018-09-27 17:17:04 -04:00 |
|
toaster
|
fb102f8131
|
Fix dash-dust spawning not happening when drop-dashing, despite its function being called.
|
2018-09-27 18:39:54 +01:00 |
|
toaster
|
7f5b5ecb60
|
Spring *panels* now use sfx_kc2f again (but pogo spring *items* still do sfx_kpogos , in case you were worried).
|
2018-09-27 18:32:07 +01:00 |
|
TehRealSalt
|
a223375cc0
|
Remove the commented out SALLYALTRAINBOW define
The relative luminance tweak fixes what it was meant to fix, but without changing the core functionality
|
2018-09-26 20:40:26 -04:00 |
|
toaster
|
8aff76b8c3
|
Just realised the inputwheel jittering in Sryder's videos was my fault, so fix this even better
|
2018-09-25 22:37:04 +01:00 |
|
toaster
|
eb4a967d8e
|
Merge branch 'minimap_in_demos' into 'master'
Show minimap in demo playback
See merge request KartKrew/Kart!16
|
2018-09-23 18:14:09 -04:00 |
|
toaster
|
c9e994ae07
|
smoll to tiny
|
2018-09-23 23:07:38 +01:00 |
|
toaster
|
c0a16be662
|
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into thundershield-hell
# Conflicts:
# src/info.c
# src/info.h
# src/sounds.c
# src/sounds.h
|
2018-09-23 23:07:16 +01:00 |
|
toaster
|
de91eb9793
|
You're right, this works fine
|
2018-09-23 22:34:59 +01:00 |
|
toaster
|
a1ad4d79d0
|
Turns out Playing() evaluates to false when playing back demos. Who knew?
|
2018-09-23 19:58:15 +01:00 |
|
toaster
|
659810cd81
|
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into itemdrop
# Conflicts:
# src/dehacked.c
# src/info.c
# src/info.h
|
2018-09-23 11:47:29 +01:00 |
|
Sal
|
8ff0e976c2
|
Merge branch 'new-voices' into 'master'
New voices
See merge request KartKrew/Kart!15
|
2018-09-22 20:22:59 -04:00 |
|
toaster
|
d7f8d4507a
|
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into itemdrop
# Conflicts:
# src/sounds.c
# src/sounds.h
|
2018-09-22 23:11:14 +01:00 |
|
TehRealSalt
|
7256e99b12
|
Merge branch 'master' into this-is-a-sign
|
2018-09-22 17:58:35 -04:00 |
|
toaster
|
e63d4740ec
|
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into thundershield-hell
# Conflicts:
# src/info.c
|
2018-09-22 14:57:33 +01:00 |
|
TehRealSalt
|
e9d4fae5b9
|
Merge branch 'master' into new-voices
|
2018-09-21 21:13:46 -04:00 |
|
TehRealSalt
|
0e39bf2821
|
Slightly darker green backgrounds
|
2018-09-21 19:51:31 -04:00 |
|
Latapostrophe
|
f8c9ef9431
|
Did everything toaster suggested
|
2018-09-22 01:47:13 +02:00 |
|
Latapostrophe
|
23090e82b5
|
Changed thundershield sound
|
2018-09-22 01:15:04 +02:00 |
|
TehRealSalt
|
cb3c93e56e
|
Minor adjustments to the endsign color back table
|
2018-09-21 16:54:29 -04:00 |
|
toaster
|
80bc266f3f
|
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into itemdrop
# Conflicts:
# src/info.c
# src/k_kart.c
|
2018-09-21 21:05:47 +01:00 |
|
toaster
|
084b99a5c9
|
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into encore
# Conflicts:
# src/info.c
# src/m_menu.c
# src/y_inter.c
|
2018-09-21 20:54:38 +01:00 |
|
TehRealSalt
|
e441b2bce4
|
Address review
(for anything code I did, anyway)
|
2018-09-20 17:11:11 -04:00 |
|
Latapostrophe
|
73c66e3bc4
|
Spark radius now follows players
|
2018-09-20 18:31:38 +02:00 |
|
TehRealSalt
|
f425ba4423
|
Spindash boost dust, pogo spring sfx
|
2018-09-19 20:13:48 -04:00 |
|
TehRealSalt
|
f207140791
|
Merge remote-tracking branch 'origin/misc_plus_menustuffs' into sal-misc
|
2018-09-19 18:45:47 -04:00 |
|
TehRealSalt
|
8013a064ab
|
Spark fix
(please don't spread these fixes out across different branches :boi:)
|
2018-09-18 15:51:27 -04:00 |
|
toaster
|
a1045d232b
|
:boi:
(fix driftsparks, and subsequently sliptides because i copypasted most of the code for them, disappearing underwater)
|
2018-09-18 17:40:39 +01:00 |
|
TehRealSalt
|
864f2466fe
|
Booster+wipeout fix
|
2018-09-17 20:24:03 -04:00 |
|
toaster
|
c00e054979
|
correct oversight in merge
|
2018-09-17 11:36:22 +01:00 |
|
toaster
|
8618d7bbec
|
Merge branch 'sal-misc' of https://git.magicalgirl.moe/KartKrew/Kart.git into misc_plus_menustuffs
# Conflicts:
# src/k_kart.c
|
2018-09-17 11:19:17 +01:00 |
|
TehRealSalt
|
69cbbde7fc
|
Updated Dream
|
2018-09-17 02:48:10 -04:00 |
|