Commit graph

17837 commits

Author SHA1 Message Date
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
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
toaster
cf59809852 Fixed some of the worst of it, but still has inconsistencies with the lookup tables we generated for main.kart - will provide evidence on Discord.
(side note, it's weird as hell that code we inherited from vanilla next - and i checked, it wasn't mangled in the merge - has bugs that straight up prevent it from functioning properly...)
2021-04-01 00:05:05 +01:00
toaster
40cbc30bff Mammoth commit, sorry.
All my work thus far on solving the drawflag/renderflag/additive/subtractive conundrum.

Outstandng problems:
* Bad additive/subtractive tables means that they appear opaque except under certain conditions.
* No support for FOFs, Polyobjects, or linedefs in OpenGL yet.
* All OpenGL support mostly done blind, may or may not function in practice.

If nothing else, the hard engineering problems are solved and it's just bug hammering...
2021-03-31 22:46:23 +01:00
Sal
553d708525 Merge branch 'loadbar_plus' into '22-merge-again'
(22mergeagain) Loadbar plus

See merge request KartKrew/Kart!407
2021-03-31 10:47:24 -04:00
Sal
2b4f213c9f Merge branch 'fuck-gamma' into 'master'
Fuck the gamma shortcut, replace it with a fullscreen toggle

See merge request KartKrew/Kart!405
2021-03-31 10:46:33 -04:00
toaster
6f8033ab76 Some preparation for engineering a solution to the rendermode flag/V_*TRANS flag conflict.
* None of the following things (grouped by the fact they fade/slide in) use hardcoded static numbers; they'e now attached to the titlecard ticker.
    * Minimap.
    * All V_HUDTRANS items. (Not add/sub) - this was previously broken entirely
    * FREE PLAY
    * Record Attack Input (no longer slides in at all - needs to be visible from start of play.)
* Fixed a rare case where V_SLIDEIN HUD elements would occasionally jump a step too far.
2021-03-30 22:55:09 +01:00
toaster
a4cf9932f0 Fixed flashingtics being set on subsequent maploads. 2021-03-29 18:40:18 +01:00
toaster
017b472d14 Fix error for fresh compiles (LOADED_MINIT was renamed into LOADED_CONFIG during dev. of previous commit) 2021-03-29 17:22:48 +01:00
toaster
72defa325f * Add a seperate step for I_STARTUPSKINS - "Load characters" - since it takes a similar length to loading all other types of sprites.
* Adjust several loading strings, and left-align their rendering.
* Don't call HU_LoadGraphics() again (startup cached ALL FONTS twice).
* Adjust when some functions are called during loading to more effectively compartmentalise sections of loading that depend on each other.
    * LOADED_ISTARTUPGRAPHICS now comes after SCR_Startup, as we can explicitly guarantee the palette has been loaded after that function.
    * Make sure everything closely related to configurations (gamedata, console stuff, etc) which is not directly dependent on anything else is loaded under LOADED_CONFIG - "Load settings" (formerly LOADED_MINIT).
    * The `-warp` command line parameter is now checked alongside LOADED_DCHECKNETGAME.
* Don't attempt to draw the loading bar before LOADED_ISTARTUPGRAPHICS, as the palette is not loaded, which means you're wasting cycles on a white screen.
2021-03-29 17:02:08 +01:00
toaster
c3c5096ca2 Merge branch '22-merge-again' into loadbar_plus 2021-03-29 15:04:34 +01:00
toaster
45c0e48e16 Resolve #147 by making players not have flashingtics if they spawn before the end of the intro. 2021-03-29 00:03:33 +01:00
toaster
71cceaaf3c Readded Kartstuff and Karthud access to Lua, resolving both #143 and #138. 2021-03-28 23:10:30 +01:00
toaster
4e3b4a82f9 Resolve #136 - mapobjectscale is working again. 2021-03-28 22:33:43 +01:00
toaster
f7f1202a37 woops 2021-03-28 20:20:06 +01:00
toaster
99a764dbc0 Loadbar plus.
* Resolves #145.
* Increased granularity, to seperate out texture loading and sprite loading from other render structure initialisation.
* Shows small loading string in DEVELOP builds, to show where we can optimise loading times when we're polishing.
* Clean up con_refresh/startup, which got split into two variables in the merge by mistake.
2021-03-28 20:16:47 +01:00
toaster
5e70789cda Prevent hitlag from eating death events (resolves #112).
I could've used the existing `boolean force` here to skip over the check, but I think the MF_SHOOTABLE check is appropriate, and the DMG_CANTHURTSELF flag will be respected this way too.

Also, clean up a ridiculously long statement.
* `k_spinouttype` will never have the value of 2. This might've been a check for KSPIN_IFRAMES, but
    * that already controls `pw_flashing` earlier in the check
    * completely unlabeled, so it's nonsense that needs to be stripped
* `k_squishedtimer` wa mou shinderu.
2021-03-17 18:39:19 +00:00
Sally Coolatta
8ebfb656cc Fuck the gamma shortcut, replace it with a fullscreen toggle 2021-03-11 15:03:30 -05:00
Sally Coolatta
0a10396c84 Spindash shortcut button 2021-03-09 17:28:20 -05:00
Sal
3ebedeaa08 Merge branch 'udmf-scale-by-mobjscale' into 'master'
Multiply thing scale by mobjscale

See merge request KartKrew/Kart!402
2021-03-09 16:51:23 -05:00
Sal
731f0af25f Merge branch 'bot-alt-turning' into 'master'
New bot swerving system

See merge request KartKrew/Kart!400
2021-03-09 16:12:30 -05:00
Sal
e0da1d7a7d Merge branch 'no-turn-easing' into 'master'
Remove turn easing code

See merge request KartKrew/Kart!401
2021-03-09 16:12:11 -05:00
Sryder
8344ac3489 Actually just get rid of seenplayer and NAMECHECK altogether. 2021-03-03 18:03:41 +00:00
Sryder
48d46c19e0 MT_NAMECHECK was missing from Lua MOBJTYPE_LIST array. 2021-03-03 17:51:10 +00:00
James R
e18a3a1be0 Multiply thing scale by mobjscale 2021-03-01 22:04:13 -08:00
James R
017c5a363f Fix casing 2021-03-01 19:49:44 -08:00
Sally Coolatta
0be122189f Remove turn easing code
Vanilla holdover lots of people complain about & tbh just doesn't need to exist
2021-03-01 12:39:42 -05:00
Sally Coolatta
d165e723be Make it through Lua 2021-03-01 01:49:05 -05:00
Sally Coolatta
a93acd1958 Make it through OGL 2021-03-01 01:48:31 -05:00
Sally Coolatta
1619efec82 Make it past kart & mixer files 2021-03-01 01:13:03 -05:00