Commit graph

18040 commits

Author SHA1 Message Date
lachablock
f031177ca4 Add some generalized functions for getting floating item frames 2021-06-12 14:12:45 +10:00
toaster
bac7de2ea7 Merge branch 'kickstartdemo' into 'master'
Kickstartaccel demo fix

See merge request KartKrew/Kart!438
2021-05-27 16:51:04 -04:00
Sal
f55605f2f8 Merge branch 'zdebug-always-on' into 'master'
ZDEBUG is default

See merge request KartKrew/Kart!434
2021-05-27 12:47:38 -04:00
SteelT
a327b3f60c Merge branch 'new-titlecards' into 'master'
New titlecards

See merge request KartKrew/Kart!437
2021-05-27 12:41:12 -04:00
toaster
7fab92d73b Kickstartaccel demo fix
An absolute dogshit clown-level code blunder from me, now corrected.
2021-05-10 14:21:13 +01:00
Latapostrophe
f559f24c07 Encore support, gif fix and slight optimization 2021-05-02 11:38:33 +02:00
Latapostrophe
66740e96dc slight optimizations + undefs 2021-05-01 12:01:00 +02:00
Latapostrophe
aa04b5ce51 Merge branch 'master' of git.do.srb2.org:KartKrew/Kart into new-titlecards 2021-04-30 18:56:28 +02:00
Latapostrophe
f2f0a6cbe2 New titlecards 2021-04-30 18:11:36 +02:00
Sal
67c4fb328a Merge branch 'add-missing-sounds' into 'master'
Add missing mean bean machine sound enums to list of sounds

See merge request KartKrew/Kart!436
2021-04-30 06:44:59 -04:00
SteelT
5b0b29dbdc Add missing mean bean machine sound enums to list of sounds 2021-04-29 12:55:35 -04:00
Sal
47ab83c2d8 Merge branch 'mean-bean-sounds' into 'master'
Mean Bean Machine sound effects

See merge request KartKrew/Kart!432
2021-04-27 22:24:44 -04:00
Sal
ae3cfc690b Merge branch 'orbfterimages' into 'master'
Orbfterimages.

Closes #173

See merge request KartKrew/Kart!435
2021-04-27 17:08:56 -04:00
toaster
53806d41e0 Orbfterimages.
Fixes mistakes made in !408 and !418, resolving #173.
2021-04-27 20:29:30 +01:00
Sally Coolatta
44ed9fcd4c ZDEBUG is default
- ZDEBUG2 is now ZDEBUG ... although admittedly, it doesn't seem that useful, it just enables some CONS_Debug's ... but now there's a convenient way to enable them now I suppose
- Mostly just means the I_Errors give __FILE__ and __LINE__.
- Also enables a "memdump" command that just prints a bunch of zone memory info.

I don't think any of this should be guarded, so I went ahead and did this.
2021-04-26 14:49:45 -04:00
Sal
faed3170be Merge branch 'afterimg-fix' into 'master'
Fix Advance 2 afterimages conflicting with fade-out afterimages

See merge request KartKrew/Kart!431
2021-04-26 04:20:35 -04:00
Sally Coolatta
078ffa8914 Accidentally included one non-existent sound 2021-04-25 21:31:09 -04:00
Sally Coolatta
340c948c71 Fix being able to download our data files 2021-04-25 20:49:52 -04:00
Sally Coolatta
9ba424a6c4 Mean Bean Machine sound effects 2021-04-25 20:49:43 -04:00
Sally Coolatta
c0ba14a752 Use sounds.pk3 instead of sounds.wad 2021-04-25 20:42:25 -04:00
Sally Coolatta
0bc19152ca Fix Advance 2 afterimages conflicting with fade-out afterimages 2021-04-23 19:17:29 -04:00
Sal
be91f05393 Merge branch 'object-bumping' into 'master'
New solid object bouncing, and updated player bouncing

See merge request KartKrew/Kart!426
2021-04-23 12:58:30 -04:00
Sal
7e842735a3 Merge branch 'party-fix' into 'master'
Fix parties becoming black upon map load

See merge request KartKrew/Kart!428
2021-04-23 12:57:33 -04:00
Sally Coolatta
e5d899412c FIX PARTIES 2021-04-23 03:53:35 -04:00
Sal
42420eabc2 Merge branch 'more-mace-sound' into 'master'
More mace sound

See merge request KartKrew/Kart!421
2021-04-23 01:15:33 -04:00
Sal
6a159cc3ab Merge branch 'stair-janking' into 'master'
Yes, punish me more Stairs

See merge request KartKrew/Kart!417
2021-04-22 21:07:52 -04:00
Sally Coolatta
5ac5ca89d0 New solid object bouncing, and updated player bouncing
- Solid objects have new bouncing physics, it's a mix of the object bumping and wall bumping. It replaces the "solid" option on K_KartBouncing.
- Goomba stomp momentum is decided in K_KartBouncing itself instead of needing to be manually passed in as a boolean, so you'll be able to goomba stomp all objects instead of just players.
- Fixed bumping not carrying all of its intended momentum, due to a bug making friction apply very strongly.
2021-04-22 20:29:59 -04:00
Sally Coolatta
48c8843feb Merge branch 'master' into stair-janking 2021-04-21 21:44:23 -04:00
Sally Coolatta
dcee9269dd FLAGS IS NOT LATENCY
UH OH STINKY COPY PASTE!!!!
2021-04-21 20:51:57 -04:00
SteelT
55bcfe48f4 Merge branch 'purple-spark' into 'master'
Purple sparks

See merge request KartKrew/Kart!424
2021-04-21 05:51:32 -04:00
lachablock
80977e1d1f Change red-to-blue spark transition color to SKINCOLOR_NOVA 2021-04-21 16:58:16 +10:00
lachablock
5e001a43ef Bump to 33% 2021-04-21 14:55:09 +10:00
lachablock
aeaf6c94f5 Give purple & rainbow driftboosts a 30% speed boost 2021-04-21 14:40:13 +10:00
Sally Coolatta
80ff9f2203 Some fixes
- Use SKINCOLOR_PURPLE instead of SKINCOLOR_THISTLE for the drift boost explosion.
- Use steering instead of cmd.turning in a few places. I dunno if I forgot to change these, or if it was accidentally reverted, or what. (Anything with a specific reason to use cmd.turning over steering will have a comment near it saying why.)
2021-04-20 13:21:26 -04:00
Sally Coolatta
5827c0c0b2 Original timings 2021-04-20 13:04:39 -04:00
toaster
905eb41778 Fix some compile-time errors. 2021-04-20 10:13:50 +01:00
toaster
c08c716682 Merge branch 'master' into purple-spark
# Conflicts:
#	src/k_kart.c
#	src/p_spec.c
2021-04-20 09:59:22 +01:00
lachablock
19b453f7fb Reduce purple spark time even more 2021-04-20 17:40:23 +10:00
lachablock
bd79169f48 Reduce time it takes to get purple sparks 2021-04-20 17:33:20 +10:00
lachablock
1b02e90fec Fix typo from merge 2021-04-20 16:47:34 +10:00
lachablock
b96394415b Spawn electric sparks on first blood 2021-04-20 16:25:43 +10:00
lachablock
5e327e09c6 Merge master (resolve structgunch conflicts) 2021-04-20 16:09:59 +10:00
lachablock
6e9c3cd864 Lightning sparks when releasing purple/rainbow drifts 2021-04-20 15:57:45 +10:00
SteelT
1b9c43e687 Merge branch 'structgunch' into 'master'
Structs gunched

Closes #167

See merge request KartKrew/Kart!422
2021-04-20 01:40:10 -04:00
toaster
6a55eb2f04 Resolve #167 - Rocket Sneakers now properly die if you rush their timer to 0. 2021-04-19 18:08:01 +01:00
lachablock
d0a3447ad4 Merge remote-tracking branch 'origin/master' into structgunch 2021-04-19 15:42:43 +10:00
SteelT
c2f00d1a30 Merge branch 'invinc-state-crash' into 'master'
Fix invincibility related crash accessing array index out of bounds

See merge request KartKrew/Kart!423
2021-04-19 01:41:57 -04:00
SteelT
a58a2dc58b Fix crash accessing array index out of bounds 2021-04-19 01:21:06 -04:00
lachablock
5aa2dd4cf0 Archive player->rings as SINT8 2021-04-19 14:28:41 +10:00
lachablock
9552dd4f80 Shift drift electricity scales with input direction 2021-04-18 00:25:31 +10:00