Commit graph

17791 commits

Author SHA1 Message Date
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
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
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
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
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
Sally Coolatta
885b7673eb Makes it to kart files 2021-03-01 01:02:23 -05:00
Sally Coolatta
4139e67ddb Renderer compile errors 2021-02-28 23:31:56 -05:00
Sally Coolatta
f540156bbf Fully fix taglist for james scroller 2021-02-28 23:11:51 -05:00
Sally Coolatta
7dca95da14 Fix scroller merge 2021-02-28 23:01:46 -05:00
Sally Coolatta
caa5314866 Get past some taglist stuff 2021-02-28 22:58:30 -05:00
Sally Coolatta
420a6ccccb Fix Dehacked loading 2021-02-28 22:39:47 -05:00
Sally Coolatta
7f912e1558 Remove unused cv_freedemocamera
Not relevant to kart
2021-02-28 21:28:18 -05:00
Sally Coolatta
20e2c78331 Delete seenames code
We had SEENAMES disabled before, and vanilla removed the define, so I went ahead and removed it. Repurposed the old seenames console variable for our nametags.
2021-02-28 21:27:23 -05:00
Sally Coolatta
4c9aceded1 Merge remote-tracking branch 'srb2/next' into 22-merge-again 2021-02-28 21:03:09 -05:00
Sally Coolatta
23ed607d11 Handle angleturn conflict
Since Sryder mentioned it, the main difference is:

- player->angleturn is the absolute angle, like vanilla, but it's now an angle_t, so it doesn't need shifted.
- cmd->turning modifies player->angleturn relatively, instead of absolute angles being stored in the cmd (makes the system less cheatable for kart)
- Because the absolute angle is no longer stored in the cmd, all of the pre/post angleturn values that vanilla has basically just need to be flat-out removed.
2021-02-28 21:02:14 -05:00
sphere
943b7b5aab Merge branch 'fix-implicit-tablecheck' into 'next'
Fix "implicit declaration of function 'DEH_TableCheck'" warning

See merge request STJr/SRB2!1419
2021-02-28 12:14:28 -05:00
Sryder
a25d721a6a Fix some d_clisrv compile errors. Left some in regarding angleturn because I know we have it different but I can't remember exactly how.
Made issue #133 regarding some changes we should mirror.
2021-02-27 15:19:51 +00:00
Jaime Ita Passos
a8909190ff Fix "implicit declaration of function 'DEH_TableCheck'" warning 2021-02-27 12:04:48 -03:00
James R
98bcfc7cac Conflicts e9bbdb8cc3 ef1ca357de 2021-02-27 03:35:38 -08:00
James R
9df5a4b25f Conflicts a59c03fef 08d087c6b 2021-02-27 03:32:19 -08:00
James R
6cb0e9667d Conflicts da7e79ac83 d5688f53a0 2021-02-27 03:29:01 -08:00
James R
1ce3a7dd56 Conflicts cb3660331a 031665cdf 2021-02-27 03:26:17 -08: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
Sally Coolatta
1f082f15e6 Merge SRB2 master 2021-02-27 02:25:14 -05:00
Sally Coolatta
d63b428565 Merge Kart-Public next 2021-02-27 02:16:21 -05:00
Sally Coolatta
176900c7e2 Merge branch 'master' into next 2021-02-27 00:38:43 -05:00