Commit graph

303 commits

Author SHA1 Message Date
toaster
7508e0e198 P_IsLocalPlayer changes
This is the function that controls whether a bunch of music-related function (and also whether certain error messages get printed).

* P_IsLocalPlayer now supports party players (currently untested, but the code is pretty airtight).
* P_IsLocalPlayer now always returns false in replays.
* P_IsMachineLocalPlayer now exists for the one situation the game determines local players that actually has a net-related function (kicking illegal character changes).
* Invincibility/grow sfx now operates based on whether the player is NOT local (it used to be whether it was NOT a displayplayer).
* Refactored P_SpectatorJoinGame to make future team support easier, and also reset the relevant camera focus, rather than always the consoleplayer's.
* Fix viewpoints on non-local players having overlapping viewpoint text.
2022-01-24 22:03:40 +00:00
SinnamonLat
191103fec1 Fix a dumb mistake, add DMG_WOMBO to orbinauts, jawz and banana hits 2022-01-22 11:41:49 +01:00
SinnamonLat
ba9ef23b31 Add MF_NOHITLAGFORME and DMG_WOMBO 2022-01-22 10:01:24 +01:00
Sally Coolatta
ef5a4f01d4 Merge branch 'master' into terrain-lump 2022-01-04 12:34:47 -05:00
Sally Coolatta
6c13ddca01 Rename PitchRoll stuff back
I did a find+replace because I realized the functions I added were named too similar to other ones & to make the purpose more obvious ... but it ended up changing them too anyway! Gah!
2021-12-24 13:00:12 -05:00
Sally Coolatta
cc250afd45 P_InitAngle, to fix angle interpolation on spawning objects 2021-12-24 12:45:51 -05:00
Sally Coolatta
da459a9c73 Add terrain splashes 2021-12-19 00:57:45 -05:00
Sally Coolatta
21e868216e Merge remote-tracking branch 'origin/getmobjzmovement' into terrain-lump 2021-12-18 21:25:20 -05:00
lachablock
e14af65d52 Merge remote-tracking branch 'origin/master' into getmobjzmovement 2021-12-19 13:22:59 +11:00
Sally Coolatta
0cd3efc76d Merge branch 'master' into terrain-lump 2021-12-18 18:36:05 -05:00
James R
1140410e2c Spawn SPHERE BOXES randomly in Battle
They look like random item boxes (the ones in Race) but
have a blue sphere inside of them. One box is worth 10
blue spheres. More boxes spawn during Overtime.

New sprite: SBOX
2021-12-14 01:05:42 -08:00
Sally Coolatta
19463d6b20 New bot prediction wall detection
Instead of searching for walls around the player, and then deciding to make the radius tighter if it found anyway, it instead checks if the waypoint it's trying to predict towards was blocked by any walls / hazards.

Needs adjusted some, I think its being pulled back too hard sometimes, but I am optimistic about some of the improvements I already saw.
2021-12-10 17:42:00 -05:00
Sally Coolatta
bf4b47a2cf Merge branch 'master' into terrain-lump 2021-12-09 03:46:01 -05:00
Sally Coolatta
150faf9de6 Add terrain pointer to mobj_t 2021-12-09 00:56:05 -05:00
James R
e07b296368 Merge branch 'waterrun' into 'master'
Water running

See merge request KartKrew/Kart!476
2021-12-08 00:36:16 +00:00
James R
9bde266f9f Water running
You can run on water in any case where you would have
slope resistance AND your speed is over 100%. You may run
on water regardless if you're speed is above 200%.
2021-12-05 22:41:25 -08:00
Sally Coolatta
83444ce5d5 Interpolate angle & nametags 2021-12-01 16:50:17 -05:00
toaster
e29f113047 Merge branch 'master' into capsules 2021-11-30 13:50:46 +00:00
Sally Coolatta
c43f8da5e6 P_SetOrigin & P_MoveOrigin to replace P_TeleportMove 2021-11-29 08:20:27 -05:00
James R
8e20ca4c04 TRIPWIRE
Set a sidedef's midtexture to "TRIPWIRE" to turn that line
into a tripwire.

Players can't drive through a tripwire and will bounce
back at high speed if they're in one of the following
states:

1. Invincibility / Grow
2. Sneakers
3. Flame Shield dash
4. >200% on the speedometer

Hitting a tripwire plays a sound, sends you into hitlag,
then plays another sound when the hitlag is over. The
sounds used depend on whether you can drive through the
tripwire.
2021-11-28 03:03:43 -08:00
lachablock
e2c0f6638f Fix item capsules in reverse gravity 2021-08-02 13:57:27 +10:00
lachablock
6471ab07bf Add P_GetMobjZMovement and apply it to various vfx 2021-07-19 20:45:54 +10:00
lachablock
459c5615af - Added respawn functionality to item capsules
- Restructured some item capsule code to reduce thinker density and allow the item capsule parts to think after the capsule
- Super Ring capsules are now semibright
2021-06-14 19:04:55 +10:00
toaster
b3d006b093 structs gunched 2021-04-17 00:27:13 +01:00
James R
f1a2a0a20d Tilt 90 degrees off half pipe 2021-04-06 16:25:25 -07:00
James R
22eb12c6a8 Drop nospin changes
Revert 35cecad868 & fdd02e35c8
2021-04-05 01:42:01 -07:00
James R
08348fcd43 Merge remote-tracking branch 'srb2/next' 2021-04-05 01:26:17 -07:00
James R
04b6911e21 Merge branch 'sloped-camera' into 22-merge-again 2021-04-01 20:55:22 -07:00
lachablock
35cecad868 Do not let nonspin characters enter sectors they could not enter if standing at full height 2021-03-23 15:09:04 +11:00
Sally Coolatta
9d7ec0ab8f Merge SRB2 next
Probably doesn't compile yet, but I got rid of all of the conflicts for anyone who wants to take a stab at it.
2021-02-27 05:18:36 -05:00
toaster
08d087c6b5 Acceleration Kickstart, my little hobby project.
It's no secret that holding down a button a lot can fuck with your wrists and fingers. It's too late for me to be damageless, but I can at least create an option to reduce further harm.

This accessibility feature, when enabled (kickstartaccel and kickstartaccel2/3/4 in the console) behaves with the following properties:
* Hold accelerate for 1 second to lock it down.
* Press again to release.
* Short holds/presses do nothing (good for POSITION).
* Continue holding it during the releasing press to re-lock it.
* A small triangular UI element is added next to the speedometer sticker, which displays the current state of the acceleration kickstart for visual feedback. (NO SPLITS SUPPORT YET)

In addition:
* Add PF_ACCELDOWN and PF_BRAKEDOWN, and BT_REALACCELERATE (which ACCELDOWN tracks). Even if this feature never gets merged, BT_REALACCELERATE is required because sneakers and boosters force it on too (extending this is how I implemented it).
* Fix the dehacked playerflag list being out of shape.
* I replaced some existing flags during development of this branch, so their old uses have been whittled away.
2021-02-20 23:10:18 +00:00
Sal
3ea8e23337 Merge branch 'ring-burst-reverse-gravity' into 'master'
Fix caltrop dropping in reverse gravity as well as not disappearing under some slope conditions

See merge request KartKrew/Kart!388
2021-02-18 18:07:47 -05:00
James R
56dc373f76 n 2021-02-16 10:17:00 -08:00
James R
81d162d19c Add some helper functions for objects in reverse gravity 2021-02-16 04:42:27 -08:00
James R
0cf41dade0 Improve P_SpawnMobjFromMobj by factoring the scale from P_SpawnMobj in
This will copy the parent object's scale to the child, but scale it by the
child's original scale relative to the map scale. Also uses the child's actual
height, instead of the mobjinfo version. Might be useful if either the scale
or height was changed in P_SpawnMobj. Say, from a Lua hook.
2021-02-16 03:55:37 -08:00
toaster
b66965185a Caltrop calstop (resolves #114).
If a ring isn't lost from the counter, don't drop a caltrop.

This is done by changing the function signature of P_GivePlayerRings to return the number of rings it has successfully given (or taken away) (which can differ from the rings provided to it). This change has been done for Lua as well.

Super Ring absorbtion now uses this system too, so you only need to change one location to modify the maximum and minimum number of rings a player can have (as far as I am aware).
2021-02-14 21:48:55 +00:00
Jaime Ita Passos
9fc1379668 Revert "Move a few mobj spawn defaults to its own function"
This reverts commit 3f36a51f5b.

# Conflicts:
#	src/p_mobj.c
2021-01-17 23:17:46 +01:00
Sally Coolatta
cfda66103d Merge branch 'master' into just-tumble 2021-01-06 23:02:51 -05:00
Sally Coolatta
56fba410ee Waypoints use trace for blocking lines, instead of a sight check 2021-01-06 16:21:57 -05:00
Nev3r
38bc937887 Merge branch 'spritestuff2-archiving-fix' into 'next'
Fix archived mobjs having no default blend mode and sprite scales

See merge request STJr/SRB2!1300
2020-12-16 08:57:36 -05:00
James R
41f1b3b97c Kill SEENAMES 2020-12-12 02:11:23 -08:00
Jaime Ita Passos
3f36a51f5b Move a few mobj spawn defaults to its own function 2020-12-06 17:46:35 -03:00
Sally Coolatta
d0ca3b78c1 Merge branch 'master' into battle-rethink 2020-11-18 17:49:06 -05:00
Sally Coolatta
14b379fd27 Cherry-pick 4eb69a664 2020-11-16 19:52:26 -05:00
Sally Coolatta
827a1b5fca Refactor stealing & destroying bumpers
- Prevents being able to farm extra bumpers off of karma players
- Paves the way for bumper destroy animation later
2020-11-15 06:25:38 -05:00
Sally Coolatta
9dd43d4e4e Remove modeltilt, use roll & pitch instead
Broken currently, about half of the slopes you can go into have the wrong tilt
2020-10-28 18:36:26 -04:00
Sally Coolatta
7c2bd0d1c2 Merge remote-tracking branch 'srb2/next' into the-scary-22-merge 2020-10-24 20:50:58 -04:00
Sally Coolatta
9b6aa946ea Merge remote-tracking branch 'srb2/master' into the-scary-22-merge 2020-10-24 19:28:06 -04:00
James R
619484259f Merge branch 'ceilingz' into 'next'
Add P_CeilingzAtPos function

See merge request STJr/SRB2!1164
2020-10-12 17:44:51 -04:00
James R
737ea51ace Merge remote-tracking branch 'origin/the-scary-22-merge' into sloped-camera 2020-10-04 16:32:19 -07:00