Commit graph

1184 commits

Author SHA1 Message Date
toaster
3516b11b33 toaster: not good at stuff (signpost z offset fix) 2018-10-27 22:23:44 +01:00
toaster
503985d48d Minor correction - Jeck initially got it wrong, but informed me after lots of testin's. 2018-10-27 21:30:41 +01:00
toaster
889064527a dumbass who forgot to stage most of the actual changes because she actually deleted all the changes and then remade them by accident 2018-10-27 16:25:25 +01:00
toaster
90f904241b Felt like cleaning up the character frame list. Definitely won't merge conflict with anything else.
Requires charscleanup.kart. Ezo, if you want me to, I can fix up bonuschars for this tweaked system.
2018-10-27 15:43:33 +01:00
toaster
0adfc93327 Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into toast_hardcode 2018-10-25 19:09:22 +01:00
Sal
f5a9ae016a Merge branch 'karma-touchups' into 'master'
Karma touchups

See merge request KartKrew/Kart!59
2018-10-25 14:06:22 -04:00
toaster
a7940d068b Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into toast_hardcode
# Conflicts:
#	src/dehacked.c
#	src/info.c
#	src/info.h
#	src/p_enemy.c
#	src/p_mobj.c
2018-10-25 10:46:18 +01:00
TehRealSalt
6f76b2b827 Fix merges
(Don't bother me hastily to merge something in again, please)
2018-10-24 21:51:43 -04:00
TehRealSalt
a57c6af1f0 Merge branch 'master' into fz-time-over 2018-10-24 21:39:02 -04:00
TehRealSalt
268fa6337e Fullbright explosion and fire 2018-10-24 21:25:22 -04:00
TehRealSalt
b6f10baa00 Merge branch 'master' into fz-time-over 2018-10-24 21:20:51 -04:00
Latapostrophe
a16864f79e Resolved conflict 2018-10-25 01:35:55 +02:00
TehRealSalt
f34bd5ff8c Update SPB hitbox too
Even more consistency!
2018-10-24 17:22:58 -04:00
TehRealSalt
f3d838b2b5 Merge branch 'master' into karma-touchups 2018-10-24 17:21:34 -04:00
TehRealSalt
bb70f08e0c Give karma items their own hitbox size
Bombs & fakes get 24, items get 36. Technically a slight nerf to bomb, but it's more consistent and it's so tiny of a change that it'll be unnoticeable I feel :V
2018-10-24 17:16:32 -04:00
toaster
d9ad9fba8b Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into toast_hardcode
# Conflicts:
#	src/info.c
#	src/p_inter.c
2018-10-24 22:15:08 +01:00
toaster
6bb2329800 SPR_VAPE on S_VVVAPING1 2018-10-24 21:48:09 +01:00
Latapostrophe
2301cc322e Reaper new anim + fast spawn for testing 2018-10-24 21:07:25 +02:00
TehRealSalt
e11fe766ef fzboom.wad hardcode 2018-10-23 17:48:09 -04:00
toaster
45616eb4bb With the permission of Sev, SOC_SEV, SOC_SG, SOC_PEAC and SOC_DHST are now done. 2018-10-23 22:16:40 +01:00
toaster
83fcfc45c1 SOC_COAT and SOC_SMOK.
To make the MT_PETSMOKER make vaping clouds for Volcanic Valley instead, apply MTF_OBJECTSPECIAL on the spawnpoint.

Since I had to compile, I ALSO discovered SOC_PALM's palmtree was already hardcoded as well!!!! Gosh dang inconsistencies...
2018-10-23 20:44:54 +01:00
toaster
b461a69a04 Remove all of the DKRBALLOON stuff I added from SOC_PALM, as the object already existed as MT_DOOD_BALLOON. 2018-10-23 17:47:15 +01:00
Latapostrophe
7be547950a I'm an idiot and COMPLETELY forgot about dehacked, also removed whitespaces 2018-10-23 18:31:34 +02:00
Latapostrophe
7e16795c64 Jack In The Box + Color Drive hardcode 2018-10-23 17:59:19 +02:00
toaster
5a11bdc580 SOC_XMAS (untested). Well, mostly. At least, all elements with sprites provided - there are two bushes that, weirdly enough, do not have their graphics provided in gfx.kart but ARE soc'd, and I feel like there's no point hardcoding that stuff..?
Also, I'm being cheeky and doing this in the middle of a lecture. :shitsfree:
2018-10-23 14:59:09 +01:00
toaster
c98d00a8f6 SOC_PALM (untested) 2018-10-22 23:28:38 +01:00
toaster
3abcf552b0 D2 Balloon Panic, plus minor, minor touchup to Rusty Rig lamp's light positioning. (Sorry, Drt.) 2018-10-22 22:36:04 +01:00
toaster
b3392d0e33 Rusty Rig plus minor touchups to what I did already (I haven't made a new exe this stuff is simple enough, and I'll test it when I do the balloon panic stuff) 2018-10-22 21:56:14 +01:00
toaster
11a3eb5122 Hardcoding start! toast's stuff specifically.
* Marble Zone!
	* Torch decoration.
	* Incense burner decoration.
* CD Special Stage 1!
	* The UFO, now with improved death animation!
	* Turns out I duplicated sounds that already existed in sounds.kart. When we touch up the files later, yalls can remove both `DSFUFOx`'s from it.
2018-10-22 00:34:47 +01:00
TehRealSalt
d189fdf1c6 Karma SPB instead of confusing Mine gfx 2018-10-20 21:02:25 -04:00
Latapostrophe
7bf766eb25 Mementos hardcode 2018-10-20 21:17:13 +02:00
TehRealSalt
4e4a8debda Finish visuals
Sprites, animation, & speed lines
2018-10-20 14:41:49 -04:00
Latapostrophe
1a31fa726c Midnight Channel hardcode 2018-10-20 16:10:40 +02:00
Monster Iestyn
27435053a1 Fix slipup from when the smashing spikeballs from HHZ were hardcoded 2018-10-20 12:54:40 +01:00
TehRealSalt
71452edda2 Merge branch 'master' into new-spb 2018-10-19 17:45:06 -04:00
Sal
d64295a19f Merge branch 'sweet-new-kicks' into 'master'
Sweet new kicks

See merge request KartKrew/Kart!39
2018-10-19 15:49:51 -04:00
TehRealSalt
2ae44ab10e New SPB
May not make it to R1, but oh well
2018-10-18 04:43:50 -04:00
toaster
6469956d6a Final weather stuff.
* Multiplied rain speed by 3, per Oni's request.
* Disable weather density - force to 1 if weather draw distance, otherwise zero
* Move the ceilingpic check into a more convenient part of the weather spawning loop.
* `drawdist_precip_cons_t` - replaces "Infinite" with "None".
* Disable the lowest normal draw distance (256), given... both kart and srb2 are basically unplayable like that.
* Disable cv_drawdist_nights entirely.
2018-10-14 22:32:34 +01:00
TehRealSalt
0f2ec53255 Removed bumping
K_KartBouncing is so flaky, I have no idea why it refuses to work.
2018-10-10 17:31:09 -04:00
TehRealSalt
b8db9581c2 Last batch of tweaks
- Rocket sneaker meter depletes more slowly when idle, but depletes much more when using it. This balances out to give it a couple more boosts when you use it well, but allows you to waste it more quickly when you don't want it anymore. Also demonstrates better to new players to not spam it like a gold shroom!
 - Vibrating frames on sneakers when they aren't being used.
 - Shoe weight is less strong.
2018-10-10 14:56:50 -04:00
TehRealSalt
b2a9193e3b Merge branch 'master' into sweet-new-kicks 2018-10-10 13:43:05 -04:00
TehRealSalt
68a06a14c8 Rocket Sneakers appear beside you 2018-10-07 18:53:46 -04:00
toaster
49472858d9 Karma Eggman. Does what it says on the egg. Tried very hard not to merge conflict with frameperfectegg.
Also includes some adjustments to:
* Horizontal offset of Eggman countdown in splitscreen again. It's not perfectly centered either way, but on second thought I like this better.
* Sound of Lat`'s Mine/SPB explosions - now uses same sound as Karma bombing, instead of that shitty paraloop.
* Correctly wipe k_eggmanblame when it is appropriate to do so.
2018-10-07 11:40:06 +01:00
toaster
dd5247811f 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
toaster
54234ba8d9 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
b12c2516ec 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
TehRealSalt
a32f87fab2 New sparkles 2018-09-22 19:55:26 -04:00
toaster
ae002fa578 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
2e0365645e Merge branch 'master' into this-is-a-sign 2018-09-22 17:58:35 -04:00
toaster
ba9df6d0d5 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