Commit graph

927 commits

Author SHA1 Message Date
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
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
Latapostrophe
521234b411 ReaperThinker: Changed the conditions in the th iterations and moved that i=0 at the start of the loop. 2018-10-21 10:05:05 +02: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
toaster
df4e12ac15 No more whack-a-mole (not 100% certain all of these are correct, please check the diff closely before reinstating plusone sal) 2018-10-19 21:53:02 +01:00
TehRealSalt
1d81ddb3ca Slows down in the air 2018-10-19 14:02:55 -04:00
TehRealSalt
5df0a3f472 Completely stop when there's no targets possible
(if'd out self-destruct code too)
2018-10-19 02:37:45 -04:00
TehRealSalt
f559487527 SPB knockback is more punishing
Hopefully to prevent instances like the Megablock video, where SPB double-dips just because the 1st one wasn't enough but another is overkill
2018-10-18 20:49:30 -04:00
TehRealSalt
a0c32e771c Huge restructuring & more fine-tuned speed, following, & turn behavior 2018-10-18 19:51:36 -04:00
TehRealSalt
2ae44ab10e New SPB
May not make it to R1, but oh well
2018-10-18 04:43:50 -04:00
Sryder
18fd49b1f5 Merge branch 'fix-mixed-declarations' into 'master'
Fix the mixed declaration and code warnings

See merge request KartKrew/Kart!37
2018-10-09 14:09:33 -04:00
Sryder
9e1584fbb0 Fix the mixed declaration and code warnings that only don't appear currently because of a tiny Makefile issue. 2018-10-07 15:35:54 +01:00
toaster
e94465689e * Modify PIT_GrenadeRing to place less-complicated checks near the start of the function.
* Add the customary LUA_CallAction call to A_GrenadeRing.
* Revamp A_MineExplode into using a blockmap iterator. Having tested it it might be less laggy in some situations, but I think the drawing is causing the bulk of the problems here.
2018-10-03 20:51:15 +01:00
toaster
9e2e7e553d Update A_GrenadeRing to also take the mapheader scale into account. 2018-10-03 20:23:59 +01:00
toaster
cdc6a87ada Improve A_MineExplode.
* Re-order the conditions within it such that it quickly checks for shootability and absence of scenery BEFORE it performs the more costly range or parentage checks.
	* Make its explosion radius take mapscale into account. (This is the only off-topic change made in this branch. I have made it here because half of this commit, which doing the other half in a seperate branch would conflict with, is on-topic.)
2018-10-03 17:27:58 +01: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
mazmazz
b4ba440c1b MP Jingle: Fix underwater music not restoring on air bubble or shield 2018-09-21 15:44:52 -04:00
mazmazz
9d4ef0397c MP Jingle: Remove P_RestoreMusic from space countdown (no reason to have it) 2018-09-20 19:05:05 -04:00
TehRealSalt
c3c39182fb Address review
(for anything code I did, anyway)
2018-09-20 17:11:11 -04:00
Latapostrophe
45888ad593 Spark radius now follows players 2018-09-20 18:31:38 +02:00
mazmazz
dede6696ca MP Postboss: strnicmp -> boolean remove cast (buildbots) 2018-09-19 19:54:14 -04:00
mazmazz
77381cd984 musicplus-jingle 2.2 -> 2.1 backport 2018-09-18 15:10:00 -04:00
mazmazz
a1e2ee2e11 Postboss: S_ChangeMusicAdvanced -> Ex 2018-09-16 23:44:42 -04:00
mazmazz
5f5ea5eec6 Merge branch 'musicplus-core' into musicplus-feature-postboss 2018-09-16 23:32:18 -04:00
Latapostrophe
a487ab1913 Thunder Shield effect hardcode. 2018-09-16 10:31:24 +02:00
toaster
d0fdd09be5 Bugfix a Jawz crash Jeck got a few days ago.
Not menu-based, but I guess this branch is misc PLUS menu stuff, not just menu stuff based on sal-misc.
2018-09-08 17:50:53 +01:00
mazmazz
56d9522a62 Merge branch 'master' into nights-dronebox 2018-09-07 09:06:32 -04:00
mazmazz
fbd6b2c826 Flicky colors indexing fix 2018-09-06 13:20:55 -04:00
mazmazz
a430d133b4 Compiler errors 2018-09-06 13:16:50 -04:00
mazmazz
4dcf3835e3 Stray comments 2018-09-06 12:13:03 -04:00
mazmazz
7f404345f0 Make default flicky home radius 384 2018-09-06 11:59:55 -04:00
mazmazz
fd037fe763 Limit random fish color to SRB2's defaults 2018-09-06 11:56:55 -04:00
mazmazz
2b93a38f8e Change default radius to 448
* Put default radius back in FLICKY_CENTER states
2018-09-06 11:54:06 -04:00
mazmazz
7b3c4aee33 Impose home radius on aimless flickies; improve randomness of flickyhitwall angle 2018-09-06 11:17:08 -04:00
mazmazz
c61cbcdf22 Erase default home radius from states and impose default on home check 2018-09-06 10:20:01 -04:00
mazmazz
fe508088b2 Re-organize flags for FLICKY_CENTER
* Flickies can be in-place with just one flag (MF_GRENADEBOUNCE)
* Flickies can now hop whether orbiting, aimless, or in-place
* Removed ability to customize movedir for orbit; will always be random
* Removed ability to customize gravity sink for aimless flying flickies
* Misc: Use P_SetTarget to set actor->tracer for flicky center
2018-09-06 10:17:41 -04:00
mazmazz
2d86dddb00 Merge branch 'master' into flicky-things 2018-09-06 08:09:02 -04:00
mazmazz
0ff48976b1 Impose default radius for orbiting flickies 2018-09-06 08:08:53 -04:00
mazmazz
9ef7c09d89 Make default behavior: aimless flying flickies stay at Z height 2018-09-06 08:07:13 -04:00
mazmazz
6426d88141 Store extravalue1 (home radius) immediately in A_FlickyCenter, not during player look routine 2018-09-06 07:55:15 -04:00
Monster Iestyn
cd8a46b3a1 Fix mixed d+c in NiGHTS trigger code, fix stray "INT8" in A_ConnectToGround 2018-09-04 17:04:24 +01:00
mazmazz
73842cec71 Add MUSICPOSTBOSSFADEIN 2018-09-01 13:10:50 -04:00
TehRealSalt
5fa2ffd26e Jawz reticule 2018-08-30 19:24:22 -04:00
TehRealSalt
56e74678af More fundamental Jawz changes.
1.) Instead of prioritizing best angle above all else, it averages both distance and angle to figure out which is the best overall target.
2.) Jawz will completely cut out angles higher than 45 degrees, preventing instances where someone behind you is considered a better target than who you're looking at.
3.) Jawz does the 45 degree angle checking in Race as well, meaning that they will ignore racers that are neck & neck with you, even if they're technically the next place above you, so that Jawz doesn't take a hard left into a wall.
2018-08-30 15:30:27 -04:00
TehRealSalt
0fb69a859a Foolish 2018-08-29 18:12:18 -04:00
TehRealSalt
3bf3d6df33 - Revamped Jawz targetting for Battle Mode
- Cleaned up some redundant code
- Halved the speed of backwards thrown missiles (previously PROJSPEED/2, now is PROJSPEED/4)
2018-08-29 18:12:02 -04:00
mazmazz
f4e80bb0b0 Fix music fade out when MUSICPOSTBOSS is not specified or doesn't exist 2018-08-28 18:46:30 -04:00
mazmazz
c8a802bb6b Fixed post-boss music change with mapmusname comparison 2018-08-25 22:19:15 -04:00