Commit graph

146 commits

Author SHA1 Message Date
TehRealSalt
f2bbcbefa2 Drafting 2019-03-14 19:43:58 -04:00
Sally Cochenour
2f9719f80e uncommited change...
💢
2019-03-05 21:25:37 -05:00
Alam Arias
380bce88a0 remove whitespaces 2019-02-05 15:42:37 -05:00
TehRealSalt
4507ee18fd Merge remote-tracking branch 'srb2public/next' into merge-next 2018-11-29 08:49:50 -05:00
TehRealSalt
1419eef5db Karma fireworks
Additionally:
- FZ boom no longer has that weird smoke bit before it spawns the smoke column
- Item blinking color is brighter
2018-11-26 02:17:14 -05:00
mazmazz
c91b2b4456 Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
TehRealSalt
bb88a9150e Remove duplicate/removed objects
As well as other compile errors
2018-11-18 03:43:33 -05:00
toaster
886613164f MT_POKEY, MT_ENEMYFLIP and the fancharacters - and the associated states/thinker modifications - gone. 2018-11-05 23:06:28 +00:00
TehRealSalt
ab02ea1e1a Merge branch 'master' into all_hardcode 2018-11-02 01:42:34 -04:00
TehRealSalt
9223b06ff4 Merge branch 'master' into brake-drift 2018-11-01 17:37:10 -04:00
TehRealSalt
e59102365f Battle points are visible 2018-11-01 00:57:38 -04:00
TehRealSalt
dd28bda75f Brake drfit effect 2018-10-31 21:35:17 -04:00
toaster
741ba90b74 Order of state enums was different to that of info table, so corrected. 2018-10-31 16:18:44 +00:00
toaster
a90006ef4e Merge branch 'wolfs_hardcode' of https://git.magicalgirl.moe/KartKrew/Kart.git into all_hardcode
# Conflicts:
#	src/dehacked.c
#	src/info.c
#	src/info.h
2018-10-31 15:19:39 +00:00
wolfy852
40ad082bcf SOC_CHAO hardcode
TODO: fix comment alignment
2018-10-30 20:35:33 -05:00
toaster
381264580d Merge branch 'sal-hardcode' of https://git.magicalgirl.moe/KartKrew/Kart.git into all_hardcode
# Conflicts:
#	src/info.c
#	src/info.h
#	src/p_mobj.c
2018-10-29 21:36:39 +00:00
TehRealSalt
193941945e The motherload: all of my Lua is hardcoded
This took like 6 straight hours of work, never ask me for anything ever again
2018-10-29 05:00:08 -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
a57c6af1f0 Merge branch 'master' into fz-time-over 2018-10-24 21:39:02 -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
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
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
TehRealSalt
71452edda2 Merge branch 'master' into new-spb 2018-10-19 17:45:06 -04:00
TehRealSalt
2ae44ab10e New SPB
May not make it to R1, but oh well
2018-10-18 04:43:50 -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
c57a2b0724 Fix dehacked list incongruence. 2018-09-29 16:43:00 +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
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
Latapostrophe
428ab9896d Did everything toaster suggested 2018-09-22 01:47:13 +02:00
TehRealSalt
932572abf8 Address review
- Reduced states
- Metal Sonic on sign roulette
- Landing sound
- New falling sound
2018-09-21 18:40:18 -04:00