Commit graph

17936 commits

Author SHA1 Message Date
James R
69eb874a9e Merge branch 'yet-another-next-merge' into 'master'
I merged srb2 next again because of a dumb compile warning

See merge request KartKrew/Kart!410
2021-04-07 01:19:02 -04:00
James R
b6568d82da Merge branch 'tilting-tweaks' into 'yet-another-next-merge'
Tilting Tweaks

See merge request KartKrew/Kart!413
2021-04-07 01:18:43 -04:00
James R
d5e4fb6bfa Turn sprite less while sliptiding 2021-04-06 21:56:37 -07:00
James R
7e74a1d823 Cap camera tilt at 45 degrees; remove excess airborne easing 2021-04-06 21:53:14 -07:00
James R
a8c443f2aa Stop lifting the jart when sliptides end due to drift 2021-04-06 20:54:30 -07:00
James R
5660cac3ad Stronger tilt on sliptiding + turn to face the camera
Oni's Sick Nasty
2021-04-06 20:45:47 -07:00
James R
9dcce02e5e Don't add tumble/sliptide rollangle to camera tilt 2021-04-06 20:43:31 -07:00
James R
0818be1b8a Tilt camera less quickly with more air time 2021-04-06 19:16:48 -07:00
James R
1fc942e47a Fix tilting on backward slopes 2021-04-06 18:17:04 -07:00
James R
46ba47785d Ease camera tilting quickly toward a steep angle, slowly toward a shallow angle 2021-04-06 17:52:03 -07:00
James R
0642e2206e Rotate sprite correctly in reverse gravity 2021-04-06 16:25:25 -07:00
James R
f1a2a0a20d Tilt 90 degrees off half pipe 2021-04-06 16:25:25 -07:00
James R
bdc4b50de2 Let viewrollangle be independent of camera tilting 2021-04-06 16:25:25 -07:00
James R
f313eece7e Use pitch/roll for camera tilting 2021-04-06 16:25:25 -07:00
James R
696e405038 Lift the wheels of your jart a little when sliptiding 2021-04-06 16:25:25 -07:00
James R
c74e02d9dc Tweak camera tilting
- Grow divisor with delta. Reduce divisor base from 32 to
  17. This makes small changes in tilt snappier, while
  larger ones ease in.
- Added tilting during quakes is subtler.
2021-04-06 16:25:25 -07:00
James R
1eca138b21 Revert "Rumble rumble"
This reverts commit c82ac33c0c.
2021-04-06 16:25:25 -07:00
James R
c4af0c2374 Merge remote-tracking branch 'srb2/next' into yet-another-next-merge 2021-04-06 16:20:44 -07:00
James R
a5c035b4ce Merge branch 'master' into next 2021-04-06 16:19:15 -07:00
James R
e9b305c0b0 Makefile: fix object file not depending on headers
BRUH MOMENT
2021-04-06 03:55:57 -07:00
Lach
26a5c5d41a Merge branch 'dashmode-crash' into 'next'
Fix jet fume crash when dashmode is above DASHMODE_MAX

See merge request STJr/SRB2!1450
2021-04-05 21:30:16 -04:00
James R
a5d7bc3fd2 Brackets 2021-04-05 18:10:34 -07:00
James R
79e4ca6d13 Revert "Add PlayerHeight and PlayerCanEnterSpinGaps Lua hooks"
This reverts commit b5c61a8a2a.
2021-04-05 17:03:31 -07:00
Sally Coolatta
68c3ab8f68 Fix jet fume crash when dashmode is above DASHMODE_MAX
I would like to use higher dashmode values for extra leniency, the jet fume kicks and screams when this happens.
2021-04-05 16:59:02 -04:00
LJ Sonic
a048a3023f Merge branch 'uppercase-tty' into 'next'
Let uppercase letters thru dedicated console

See merge request STJr/SRB2!1449
2021-04-05 07:33:42 -04: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
e5c2ec2992 Merge branch '22-merge-again' into 'master'
2.2 merge again

Closes #150, #147, #136, #145, and #139

See merge request KartKrew/Kart!409
2021-04-05 03:57:38 -04:00
James R
0522355135 Make important wads important again 2021-04-04 23:06:52 -07:00
James R
d6dc33e024 Add spindash to gamecontrolname 2021-04-04 22:47:57 -07:00
Sally Coolatta
8bb1fa57d4 Merge branch 'master' into 22-merge-again 2021-04-05 01:11:26 -04:00
Sally Coolatta
a7156c80a7 Freeze tilt when exiting 2021-04-05 01:08:39 -04:00
James R
aefc6fadbe Remove code that converts uppercase letters to lower, when coming from dedicated console 2021-04-04 17:01:54 -07:00
Sryder
4a099fd98d Duplicate code from merge that was writing out of range for 4p splitscreen 2021-04-04 16:48:48 +01:00
Sryder
216d282484 Fix team spinfire states missing in dehacked. 2021-04-04 15:43:15 +01:00
toaster
c11ad8c297 Make offroad dust solid, resolving #150. 2021-04-03 19:53:09 +01:00
toaster
c5d842d05e Remove a duplicate call to LUAh_MapChange (which should only fire once, in G_InitNew). 2021-04-03 19:49:07 +01:00
toaster
d302693946 Fix replays, which were broken because all the player struct info was being clobbered IMMEDIATELY after reading it from the demo :mothpensive: 2021-04-03 19:48:50 +01:00
toaster
690244825b * Fixed blending in OpenGL.
* Caught a UDMF-only crash for Software (where linedef alpha is low but nonzero).
2021-04-03 19:29:06 +01:00
James R
04b6911e21 Merge branch 'sloped-camera' into 22-merge-again 2021-04-01 20:55:22 -07:00
Sally Coolatta
4916afdc01 Merge branch '22-merge-again' of https://git.do.srb2.org/KartKrew/Kart into 22-merge-again 2021-04-01 22:22:50 -04:00
Sally Coolatta
ced33388e3 Enable slope tilting 2021-04-01 22:13:35 -04:00
James R
c4072ff050 Don't read renderflags twice 2021-04-01 19:08:51 -07:00
Sally Coolatta
fed0e0f9e5 Issue #133 thing 2021-04-01 21:09:30 -04:00
SteelT
e9f85c0992 Merge branch '22mergaintranswork' into '22-merge-again'
(22mergain) Transparency and Blend Modes

See merge request KartKrew/Kart!408
2021-04-01 20:18:15 -04:00
Sal
07c8e803f7 Merge branch 'spindash-button' into 'master'
Spindash shortcut button

See merge request KartKrew/Kart!404
2021-04-01 20:02:50 -04:00
Sal
94ec99a935 Merge branch 'popsquared' into 'master'
Prevent hitlag from eating death events (resolves #112)

Closes #112

See merge request KartKrew/Kart!406
2021-04-01 20:02:24 -04:00
toaster
ebe38ff518 * Add a blend field to FOFs.
* Set via a fourth digit in the upper midtexture for transparent FOFs
        * For example - #2551 is additive solid, #1282 is subtractive half...
    * The original method of setting the upper midtexture to #900 or 901 still works, since I'm not out to break existing maps.
* Software: Remove the horrible `else if` ladder for FOF translucency. Algorithms, baby!
* OpenGL: Move to using `HWR_GetBlendModeFlag` in more places, for more long-term extensible support for multiple blendmodes.
2021-04-01 23:45:21 +01:00
toaster
e27506c660 * Made it possible to perform palette calculations in gamma-corrected space. Now used by:
* Blend tables generated by the game.
    * The Color Cube accessibility tool.
* Fixed another stupid typo that got in the way of FF_BLENDMASK working.
* Some minor adjustments for code cleanliness.
2021-04-01 19:28:01 +01:00
toaster
8b63908820 More precise translucency amount picking. 2021-04-01 12:41:04 +01:00