Commit graph

23092 commits

Author SHA1 Message Date
mazmazz
71b1a78f76 Merge branch 'master' into le-fadefof 2018-09-06 18:12:24 -04:00
toaster
bc9fe026fa Merge branch 'sal-misc' of https://git.magicalgirl.moe/KartKrew/Kart.git into itemdrop 2018-09-06 22:18:54 +01:00
toaster
99fd66fb6d Dropping items!
* Shield Drop...
	* Whatever you've got orbiting or trailing you, DROP THEM WHERE THEY STAND. (Except for the ghost sink. That one's OK.)
	* Pops your Thunder Shield.
	* Happens upon ANY hit, except for deathpits.
* HUD Drop...
	* Also does the above, except for the Thunder Shield thing.
	* If there's any item left in your item box, pop it out as a little hovering, rotating Minecraft item!
	* You can pick up the Minecraft item by driving over it if your item box is sufficiently empty, or the item which is contained within it is of the same type.
	* Happens upon Size Down and battle elimination.
	* Can also be forced on with `cv_kartdebughuddrop on`!
* Some other random stuff.
	* Fix a bunch of `a->scale = b`'s into `P_SetScale(a, b)` form, for maximum validity.
	* Make K_CleanHnextList and K_UpdateHnextList one function, since they only differed by one continue clause (and the type of their input parameter).
	* Allow shrunken players to pick up item boxes again.
	* Fix MF_NOCLIPTHING. (Gonna pass this fix to vanilla when I get the chance, too.)
	* Break NiGHTS a little through my machinations.
2018-09-06 22:17:29 +01:00
TehRealSalt
81af98fd91 Forgot this 2018-09-06 16:09:17 -04:00
TehRealSalt
50f8186651 Player arrows can show x10
Requires new patch.kart
2018-09-06 16:06:37 -04:00
TehRealSalt
0d5aaa65c6 More Jawz tweaking
- Z pos checking is Battle-only now
- Made the Z pos limit much higher
- Increased its range in Battle
2018-09-06 16:05:57 -04:00
Digiku
8d015bd7cc Merge branch 'flicky-things' into 'master'
Flicky Thing Types

See merge request STJr/SRB2Internal!154
2018-09-06 16:02:19 -04:00
TehRealSalt
8866bd9818 Sink bug fix
Sink would only spawn its trail ever if you threw it on a tic that was (leveltime % 4 == 0), because it called its action every 4 tics instead of every tic
2018-09-06 15:52:27 -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
TehRealSalt
84d4efe5f1 Boost tweaks
Fix offroad not affecting you as soon as it did before, and tweaking boost cam to be stronger
2018-09-06 13:02:08 -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
TehRealSalt
4a597b7ef4 Wrote a new function for MT_SOLID object bumping
A lot more similar to the code used for player wall bumping, and is much less likely for you to just... pass through the object if you keep trying hard enough.

Also, falling rocks get pushed aside by invinicible players with no resistance.
2018-09-06 11:49:58 -04:00
mazmazz
7b3c4aee33 Impose home radius on aimless flickies; improve randomness of flickyhitwall angle 2018-09-06 11:17:08 -04:00
mazmazz
04a59aacc4 Only allow flicky bounce (MF_NOCLIPTHING) if also in-place (MF_GRENADEBOUNCE) 2018-09-06 10:32:26 -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
mazmazz
a095b47980 Change flicky thing #s to 2200s 2018-09-06 07:24:46 -04:00
TehRealSalt
8f11dca314 Boost cam 2018-09-05 11:19:00 -04:00
TehRealSalt
9514d51684 Change a few cvar defaults 2018-09-04 21:18:20 -04:00
TehRealSalt
b53bdc9e67 Lowest speed happens slower 2018-09-04 21:14:42 -04:00
TehRealSalt
4a7399b62d Heavy as shit now 2018-09-04 20:51:16 -04:00
TehRealSalt
1ecb8c5c8b If the game would normally end in a bomb kill, then always switch their places 2018-09-04 20:16:42 -04:00
TehRealSalt
147f4520ec Addressed some of Chrome's thoughts
- Don't drag
- Shield isn't visible to anyone but yourself
- Projectile is twice as heavy
2018-09-04 19:58:20 -04:00
TehRealSalt
7012d94f15 Ghost sink "shield"
Sink shield that makes it double-press to use, gives the trailing item slowdown, and shows other people that you have it, but doesn't have any collision
2018-09-04 19:14:44 -04:00
TehRealSalt
c46bf86bf3 Jawz ignores targets too high/low 2018-09-04 18:47:30 -04:00
TehRealSalt
be92535dba Splitscreen fix
Just changed order of operations
2018-09-04 18:27:36 -04:00
TehRealSalt
3d16179524 Alternate demo replay camera
Not good, but less bad than before :V
2018-09-04 18:21:55 -04:00
TehRealSalt
23efd60910 Revert a few of the changes from last commit
Ended up not liking them
2018-09-04 17:07:53 -04:00
TehRealSalt
25410d82bf Misc camera fixes
- Fixed remaining instances where camera position would scale with the player instead of the level; the camera should almost 100% certainly not change now when you get Grown/Shrunk
- Reset camera when switching viewpoint, to make it not look *as* weird when switching after you've finished (needs tested)
2018-09-04 16:10:59 -04:00
TehRealSalt
cb126527be Camera panning for drifts 2018-09-04 16:08:37 -04:00
TehRealSalt
2864c4b272 Camera outrunning 2018-09-04 15:11:14 -04:00
Monster Iestyn
9066f82842 Wrap the text and snap to bottom 2018-09-04 19:52:50 +01:00
Monster Iestyn
83f2951f93 Add V_DrawTutorialBack for drawing a console-like background box, add Lorem ipsum as filler test 2018-09-04 19:21:58 +01:00
Monster Iestyn
d91d1886fa Merge branch 'master' into tutorial-time 2018-09-04 17:06:50 +01: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
Monster Iestyn
dbff92ea30 Add "tutorialmode" var to help the game know when we're in a tutorial or not, add placeholder for tutorial HUD to test it works 2018-09-04 16:58:49 +01:00
Monster Iestyn
cc20eed183 Merge branch 'master' into tutorial-time 2018-09-04 15:54:50 +01:00
Monster Iestyn
82e46d101c Merge branch 'public_next'
# Conflicts:
#	src/r_main.c
2018-09-04 15:53:07 +01:00
TehRealSalt
f7f70e5f10 Z pos smoothing 2018-09-04 02:51:00 -04:00
TehRealSalt
95d9725ade This was not meant to be commited 2018-09-03 21:21:40 -04:00
TehRealSalt
e758f611a5 Camera now sticks close behind you, only the angle is lagged 2018-09-03 20:40:46 -04:00
Monster Iestyn
6774933263 Merge branch 'addfile-verify-fix' into 'next'
Addfile command verify fix.

See merge request STJr/SRB2!272
2018-09-03 17:17:46 -04:00