Eidolon
12c2ddb115
Merge branch 'uncappedrevengeance' into next
...
Uncapped
See merge request STJr/SRB2!1856
# Conflicts:
# src/dummy/i_system.c
# src/win32/win_sys.c
2022-11-08 21:13:50 -06:00
spherallic
ef35084d95
Merge remote-tracking branch 'public/master' into next
2022-09-08 16:52:54 +02:00
sphere
5d7d19d2bf
Merge branch 'more-whitelisting' into 'next'
...
Add more menu graphics to the whitelist.
Closes #765
See merge request STJr/SRB2!1731
2022-09-06 07:40:56 +00:00
Jaime Ita Passos
c27d7f916f
Stop -Wuse-after-free warnings
2022-08-11 04:30:03 -03:00
Eidolon
e79654a33a
Completely refactor timing system
...
Time is now tracked internally in the game using I_GetPreciseTime
and I_UpdateTime. I_Time now pulls from this internal timer. The
system code no longer needs to keep track of time itself.
This significantly improves frame and tic timing in interp mode,
resulting in a much smoother image with essentially no judder at
any framerate.
2022-04-30 16:33:23 -05:00
spherallic
50330c746b
Merge branch 'next' into fast-r-load-textures
2022-03-08 22:11:16 +01:00
spherallic
14295ac7de
2022
2022-03-03 20:24:46 +01:00
spherallic
52f3e00497
Whitelist CHARFG, CHARFG, and level select graphics.
2022-02-03 14:38:45 +01:00
spherallic
61661dc900
Whitelist SPECTILE, NGRTIMER, and emblem/emerald hunt radar graphics.
2022-02-03 11:34:05 +01:00
spherallic
18361f5ed7
Whitelist record attack, NiGHTS mode and SRB2BACK graphics.
2022-02-02 23:40:10 +01:00
James R
2aec4501eb
Hash name lookup for textures and lumps
2022-01-27 00:03:37 -08:00
LJ Sonic
b7dbb7782e
Only load map lumps that are WADs or have no extension
2022-01-12 23:06:26 +01:00
LZA
a3353be0dc
Raise addon limit
2021-12-02 22:50:44 +00:00
LZA
aaf4653f1e
Fix minor issues with folder addons
2021-09-12 21:08:06 +00:00
LJ Sonic
4af3b860fd
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2.git into folder-next
2021-06-25 00:30:30 +02:00
LJ Sonic
d325c7e6d3
The year is 2021
2021-05-07 17:45:56 +02:00
James R
a01a420aa0
Brackets
2021-04-05 18:10:34 -07:00
Jaime Ita Passos
dca158096d
Experimental implementation
2021-03-22 23:56:55 -03:00
sphere
95eff8cbc5
Avoid savemoddata being set in W_InitFile to fix addons with gamedata.
2021-03-15 18:11:02 +01:00
Jaime Ita Passos
5501d495c7
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
440f46144a
Fix intro crash
2020-12-10 22:01:53 -03:00
James R
445d040795
Don't print W_VerifyFile errors more than once
2020-11-28 20:51:21 -08:00
James R
6b4d422664
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
5e890ee6f8
Merge branch 'next' into spritestuff2
2020-11-19 00:52:43 -03:00
James R
876aeb6a31
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
9e6f64ea22
Merge branch 'x' into 'next'
...
Whitelist missing graphics
See merge request STJr/SRB2!1189
2020-11-08 20:48:25 -05:00
Zolton Auburn
d1f16e0f77
Continue
2020-10-20 15:56:41 -04:00
Zippy_Zolton
f602944efd
titlecard
2020-10-17 15:51:22 -05:00
Zippy_Zolton
6fd226eb29
Crosshair fix, no GAMEQUIT
2020-10-13 16:41:39 -05:00
Zippy_Zolton
5d699591c7
more!!!!! :3
2020-10-13 14:23:56 -05:00
Zippy_Zolton
45b52e3729
good night
2020-10-13 02:19:20 -05:00
Zippy_Zolton
2ba1017dab
More whitelists :D
2020-10-13 02:13:35 -05:00
Zippy_Zolton
da27f720da
Whitelist the "X" shown in the HUD
2020-10-11 23:22:16 -05:00
Jaime Passos
b15bbd505c
Merge branch 'next' into patch-stuff-again-2
2020-10-10 17:01:10 -03:00
Jaime Passos
0811f60b2a
Let the server or an admin toggle clients' custom shaders
2020-10-09 02:06:13 -03:00
Jaime Passos
63d4c1dffc
Merge remote-tracking branch 'origin' into slight-shader-cleanup
2020-10-08 22:45:39 -03:00
Jaime Passos
aaa9cff6ac
Fix PNG issue in OpenGL + optimize PNG sprite loading
2020-10-02 19:48:13 -03:00
James R
1cfb1f673b
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
650635e780
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
SteelT
a033f482be
Merge branch 'pictureformats' into 'next'
...
PNG conversion refactoring
See merge request STJr/SRB2!675
2020-09-10 15:58:18 -04:00
GoldenTails
d15be1696a
Forgot to check if the file was important, whoops!
2020-08-21 04:00:54 -05:00
GoldenTails
2c5f23bacb
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
92c4993d67
Introduce Doom patch format into picture formats
...
Fixes sprite rotation
2020-08-15 21:52:01 -03:00
Jaime Passos
9b426b474c
Merge branch 'pictureformats' into patch-stuff-again-2
2020-08-15 20:48:28 -03:00
Jaime Passos
78cc4a78d0
Refactor renderer switching
2020-08-14 22:27:16 -03:00
James R
5153338bf5
Merge branch 'kill-dos' into 'next'
...
Remove support for DOS
See merge request STJr/SRB2!1090
2020-08-08 21:26:18 -04:00
Jaime Passos
91ed56ef40
Refactor patch loading
2020-08-08 05:16:47 -03:00
Jaime Passos
74dfa9f700
Shader code cleanup
2020-08-07 18:17:05 -03:00
James R
40dc532ea2
Merge branch 'clarify-md5-mismatch' into 'next'
...
Include "is old" in the list of possible causes for a MD5 mismatch.
See merge request STJr/SRB2!1095
2020-07-29 21:19:23 -04:00
GoldenTails
55d137215f
Include "is old" in the list of possible causes for a MD5 mismatch.
2020-07-28 03:53:25 -05:00
