Commit graph

329 commits

Author SHA1 Message Date
toaster
884064049e * Allocate the "MISSING" patch only once, statically, at first boot via missingpat, and prevent it from being freed.
* Rework HU_UpdatePatch to HU_UpdateOrBlankPatch with a "required" boolean.
    * If desired graphic is not present in resources:
        * If required is true, return `missingpat`.
        * If false, return NULL as before (font compatibility).
    * Add an alias with the previous function signature, so you don't need to add a million `true`s everywhere.
* Remove a ton of irrelevant graphics the game attempts to cache only because of code inherited from vanilla SRB2.
* Remove the unused hudinfo system, also inherited from vanilla SRB2.
2022-05-14 14:56:02 +01:00
James R
7579cf1b10 Fix misc warnings for GCC 12 2022-05-11 12:21:18 -07:00
toaster
5783c5aace Only load map lumps that are WADs or have no extension
# Conflicts:
#	src/w_wad.c
2022-03-18 20:31:17 +00:00
James R
b30ffea49a Hash name lookup for textures and lumps 2022-01-22 03:18:06 -08:00
Sally Coolatta
0cd3efc76d Merge branch 'master' into terrain-lump 2021-12-18 18:36:05 -05:00
James R
de2eab5e7a Inflate only size out bytes
Saves time uncompressing an entire lump when only part of
it is needed.
2021-12-15 14:10:20 -08:00
Sally Coolatta
a8615cac5b TERRAIN lump reading
Does not impact gameplay but hey pretty cool
2021-12-08 19:16:12 -05: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
a5d7bc3fd2 Brackets 2021-04-05 18:10:34 -07:00
James R
08348fcd43 Merge remote-tracking branch 'srb2/next' 2021-04-05 01:26:17 -07:00
James R
0522355135 Make important wads important again 2021-04-04 23:06:52 -07:00
sphere
3a0be379d3 Avoid savemoddata being set in W_InitFile to fix addons with gamedata. 2021-03-15 18:11:02 +01:00
Sally Coolatta
885b7673eb Makes it to kart files 2021-03-01 01:02:23 -05:00
James R
6cb0e9667d Conflicts da7e79ac83 d5688f53a0 2021-02-27 03:29:01 -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
Jaime Ita Passos
7e28b7d3e9 OpenGL backend: Manage uploaded GPU textures with an internal list
Indirectly fixes the game doing whatever after freeing a patch.
This commit implements a FTextureInfo struct type, instead of it being a typedef to the GLMipmap_s struct type.
2021-01-27 17:48:57 -03:00
Jaime Ita Passos
d69430dd04 Fix intro crash 2020-12-10 22:01:53 -03:00
James R
d5688f53a0 Don't print W_VerifyFile errors more than once 2020-11-28 20:51:21 -08:00
James R
0587b89b93 Don't add pk3 if there are holes
ZIP tools often read the final central directory, but SRB2 may not if there are
multiple central directories. It's just easier to not allow "holes", or
unaccounted for bytes in the file.
2020-11-28 20:00:01 -08:00
Jaime Ita Passos
be274a4fa9 Merge branch 'next' into spritestuff2 2020-11-19 00:52:43 -03:00
James R
e0a799c1ed Merge branch 'allowshaders' into 'next'
Let the server or an admin toggle clients' custom shaders

See merge request STJr/SRB2!1181
2020-11-08 21:09:56 -05:00
James R
2edf884fbf Merge branch 'x' into 'next'
Whitelist missing graphics

See merge request STJr/SRB2!1189
2020-11-08 20:48:25 -05: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
ddf466d61f Fix compile errors 2020-10-24 19:52:09 -04:00
Sally Coolatta
9b6aa946ea Merge remote-tracking branch 'srb2/master' into the-scary-22-merge 2020-10-24 19:28:06 -04:00
Sally Coolatta
fda698a290 Merge master 2020-10-24 18:34:07 -04:00
Zolton Auburn
6748795a51 Continue 2020-10-20 15:56:41 -04:00
Zippy_Zolton
442878020d titlecard 2020-10-17 15:51:22 -05:00
Zippy_Zolton
76d2343aa7 Crosshair fix, no GAMEQUIT 2020-10-13 16:41:39 -05:00
Zippy_Zolton
6c636b6130 more!!!!! :3 2020-10-13 14:23:56 -05:00
Zippy_Zolton
cef2aab8df good night 2020-10-13 02:19:20 -05:00
Zippy_Zolton
72efff4c7c More whitelists :D 2020-10-13 02:13:35 -05:00
Zippy_Zolton
aa38fe3f20 Whitelist the "X" shown in the HUD 2020-10-11 23:22:16 -05:00
Jaime Passos
b44837324f Merge branch 'next' into patch-stuff-again-2 2020-10-10 17:01:10 -03:00
Jaime Passos
f133726df0 Let the server or an admin toggle clients' custom shaders 2020-10-09 02:06:13 -03:00
Jaime Passos
70cd48c9a2 Merge remote-tracking branch 'origin' into slight-shader-cleanup 2020-10-08 22:45:39 -03:00
Jaime Passos
9ad15fd556 Fix PNG issue in OpenGL + optimize PNG sprite loading 2020-10-02 19:48:13 -03:00
James R
d612fb5c99 Add wads from the -file parameter after netvars are registered
This is so netvars registered by any lua scripts will load in the correct order.
2020-10-01 16:50:31 -07:00
Lachlan Wright
6faa84eaee Merge branch 'w-initfile-bruh' into 'next'
Fix a bug where adding the same mod multiple times counted towards the mod limit

See merge request STJr/SRB2!1124
2020-09-25 08:52:22 -04:00
James R
c9e3281b99 Merge remote-tracking branch 'origin/master' into tinnitus 2020-09-25 01:57:08 -07:00
toaster
23faef24d7 * Introduce SPR2_XTRA for face graphics, since the current system is prone to plenty of conflicts with modders if you're not careful.
* Fixed a bug where you'd see :nick: on the current character selection screen if you didn't have many skins loaded.
* Fixed a bug where character skins loaded in PK3s would attempt to load every single lump of the PK3, even if it wasn't in the same subfolder as the original S_SKIN, as a sprite into the player struct. Could stand to be ported to vanilla.

Requires new chars.kart, which was created using the help of the indev 2.2-based Kartmaker update which will be available shortly.
2020-09-23 23:46:54 +01:00
SteelT
6a168ac5e9 Merge branch 'pictureformats' into 'next'
PNG conversion refactoring

See merge request STJr/SRB2!675
2020-09-10 15:58:18 -04:00
James R
594600e5ae Fix NOPNG compiling 2020-08-24 17:52:55 -07:00
GoldenTails
8b6450fa4d Forgot to check if the file was important, whoops! 2020-08-21 04:00:54 -05:00
GoldenTails
972c8da4bb Fix a bug where adding the same mod multiple times counted to the mod limit
A one line fix. Seriously.
2020-08-21 03:30:22 -05:00
Jaime Passos
d18d12fdea Introduce Doom patch format into picture formats
Fixes sprite rotation
2020-08-15 21:52:01 -03:00
Sally Coolatta
30144d5d06 Things to get it to run
Build is still MASSIVELY broken, you can't even get into a level, still investigating
2020-08-15 20:09:36 -04:00
Jaime Passos
7bc4af41ab Merge branch 'pictureformats' into patch-stuff-again-2 2020-08-15 20:48:28 -03:00
Kimberly Wilber
4548662536 [OSX] Fix "SIGILL: illegal instruction" on macOS Catalina
on OSX, strncpy may copy to overlapping (protected) memory. this
sometimes happens when loading WAD files.

This patch eliminates these problems for me
2020-08-15 12:16:05 -04:00
Sally Coolatta
fd5fe916bc Get past w_wad.o 2020-08-15 03:31:23 -04:00