Commit graph

14498 commits

Author SHA1 Message Date
fickleheart
88198bce13 I'M GONNA PISS MYSELF OF LAUGHER anyway fixed syncbombs 2020-03-07 12:40:45 -06:00
SteelT
3117d2782c Merge branch 'ss-damage-fix' into 'next'
Fix Special Stages crashing upon taking damage

See merge request STJr/SRB2!839
2020-03-06 17:59:57 -05:00
Sally Cochenour
558f8607c9 Merge branch 'master' into fullbright-boosters 2020-03-06 12:56:36 -05:00
Sally Cochenour
83c74af696 Fix bad master merge 2020-03-06 12:56:12 -05:00
Sally Cochenour
76188e89fb Fullbright boosters
We no longer have to maintain this standard manually. I actually suggest making booster sectors use the lightlevel of their surrounding sectors so that only the booster itself glows.

(OGL support is commented out, since it conflicts with sal-lighting and should probably be done there)
2020-03-06 12:54:54 -05:00
James R
5847d519d7 Merge branch 'parties-only' into parties 2020-03-05 21:41:28 -08:00
James R
18aa2972e5 Merge remote-tracking branch 'origin/master' into parties-only 2020-03-05 21:41:23 -08:00
Sal
5852b40482 Merge branch '22shadows' into 'master'
2.2 shadows port

See merge request KartKrew/Kart!203
2020-03-06 00:37:41 -05:00
James R
253ab49c07 Merge remote-tracking branch 'origin/master' into 22shadows 2020-03-05 21:36:58 -08:00
Sal
b13ebd6d15 Merge branch 'special-sector-tweak' into 'master'
Fix step-up on stairs for other objects (Orbinaut VS Toxic Palace Stairs)

See merge request KartKrew/Kart!201
2020-03-06 00:10:35 -05:00
Sal
9392282b23 Merge branch 'exists-fix' into 'master'
Prevent LF2_EXISTSHACK from ever getting removed

See merge request KartKrew/Kart!196
2020-03-06 00:10:20 -05:00
Sal
4b5b2462b5 Merge branch 'gentlemen' into 'master'
Gentlemen's ping agreement

See merge request KartKrew/Kart!197
2020-03-06 00:10:06 -05:00
Sal
10fe9434f6 Merge branch 'blizzard' into 'master'
Weather system refactor, Blizzard weather type

See merge request KartKrew/Kart!200
2020-03-06 00:09:43 -05:00
Sal
2448ab34e9 Merge branch 'no-charge' into 'master'
Disable charging drift sparks in bounce pad state

See merge request KartKrew/Kart!190
2020-03-06 00:09:27 -05:00
Sal
a0c1c68f5c Merge branch 'paper-signs' into 'master'
3D level end signposts

See merge request KartKrew/Kart!199
2020-03-06 00:08:35 -05:00
fickleheart
cf11f1ef6e SUPER EXPERIMENTAL FREEZE-B-GONE 2020-03-05 22:19:39 -06:00
Zipper
5c9e689d04 Update p_inter.c 2020-03-05 18:48:20 -05:00
Zipper
cc26d9d2bf Update p_inter.c 2020-03-05 18:30:27 -05:00
Latapostrophe
3a8e984e44 Merge branch 'fickle-replay-v1' into replay-freecam-rewind 2020-03-05 21:08:20 +01:00
TehRealSalt
7d32f9b6c3 Replay playback changes:
- Store level state periodically
- Load the closest usable level state when done rewinding for
  quicker resumes
- Make playback menu fade out after 5 seconds of no activity
  (but not while paused)
- Remove wrapping from replay hut (original wrapping was broken
  at some point before 1.1 and it's not necessary anyway)
- Allow holding enter on frame advance for noisy slow-mo

from fickleheart
2020-03-05 21:04:56 +01:00
Latapostrophe
ee7ae2e5ca Merge branch 'master' of git.magicalgirl.moe:KartKrew/Kart into v2-master 2020-03-05 21:03:29 +01:00
ZipperQR
3ec5c0fa89 fix source player being nil 2020-03-05 12:26:27 +03:00
Zwip-Zwap Zapony
160b5b9b8e More gamepad deadzone tweakage 2020-03-04 21:44:57 +01:00
Zwip-Zwap Zapony
c2a7f0c98e Hotfix for 100% deadzone returning 0 input
It makes more sense for 100% deadzone to just make it so that
you have to push the axis all the way to trigger it,
rather than 100% deadzone resulting in no axis input
ever happening... So, let's make it be the former way instead
2020-03-04 21:11:55 +01:00
Zwip-Zwap Zapony
04921ab484 Fix division-by-0 crash with gamepad deadzones
Fix division-by-0 crash with gamepad deadzones
The problem was that it checked if A was more than B,
then lowered A to a max value, then subtracted B from A,
then divided something by that, without checking if A minus B was 0,
allowing division by 0 if B was the same as that max value

This fixes that by making sure that A is less than the max value
2020-03-04 17:31:52 +01:00
Jaime Passos
b800e013d0 Fix NiGHTS Attack crash after render mode change 2020-03-04 09:42:34 -03:00
James R
11930b41bf Use tic_t 2020-03-03 20:11:03 -08:00
James R
70d46ebb0a Merge branch 'parties-only' into parties 2020-03-03 20:05:30 -08:00
James R
74f47f83f2 Party yourself with ALL party members when being added to a party 2020-03-03 19:22:32 -08:00
James R
dd29a44ecc cancelinvite command to rescind a party invitation 2020-03-03 19:17:27 -08:00
James R
b3ef79953a Merge branch 'parties-only' into parties 2020-03-03 18:52:14 -08:00
James R
9b239e8252 Set extra displayplayers to displayplayers[0] instead of splitscreen for parties
This fixes P2's HUD drawing in P4's area in a 3P party, when the first local
player was P2.
2020-03-03 18:49:26 -08:00
James R
ac75b30400 r_splitscreen for opengl 2020-03-03 18:48:47 -08:00
Sally Cochenour
2b6ca4a384 Increase SPB speed & turn 2020-03-03 20:56:57 -05:00
Sally Cochenour
721fb369fd Move changes to K_GetBestWaypointForMobj so that K_GetClosestWaypointToMobj can stay the same 2020-03-03 18:34:17 -05:00
Sally Cochenour
d459407866 Forgotten player check here 2020-03-03 17:22:13 -05:00
Sally Cochenour
ff190b7a88 Fix unsigned/signed comparison 2020-03-03 17:05:04 -05:00
Sally Cochenour
7fff21acd4 Instead of vertical cap, quadruple z axis distance
Far more natural results!
2020-03-03 16:58:09 -05:00
Sally Cochenour
ac1d40d6c5 Sight check for player waypoints 2020-03-03 16:14:19 -05:00
Sally Cochenour
f068539bad Don't sight check through transparent FOFs
Maybe this should be a option somehow, like a distinction between "sight" and "ray-tracing", but I'm not sure how to go about that
2020-03-03 16:12:21 -05:00
Sally Cochenour
04b443d58c 2.2 sight checks backport 2020-03-03 15:49:10 -05:00
Sally Cochenour
1cbb4bea6b Limited vertical range on player waypoints 2020-03-03 15:47:02 -05:00
Sally Cochenour
8a19f6f208 Wrong sign here 2020-03-03 15:41:03 -05:00
Sally Cochenour
597e6820b6 Let's try out going back to closest check again 2020-03-03 14:47:41 -05:00
Sally Cochenour
d91e8205dc Don't update respawn point when mid-air 2020-03-03 14:22:52 -05:00
Tatsuru
0e281a12e1 Separate PvP damage from non-friendly gametypes 2020-03-03 11:56:57 -03:00
Tatsuru
06a2882dc9 Never forget who your enemy is 2020-03-03 11:40:35 -03:00
SteelT
84f90df6af Merge branch 'tolflag-fix' into 'next'
Fix G_TOLFlag returning the wrong type

See merge request STJr/SRB2!834
2020-03-02 21:27:45 -05:00
Steel Titanium
3d623577fb Merge branch 'master' into next 2020-03-02 15:26:01 -05:00
SteelT
800d277dec Merge branch 'fix-ogllib' into 'master'
Fix -OGLlib

See merge request STJr/SRB2!794
2020-03-02 15:21:50 -05:00