Lachlan Wright
e24ed9bd75
Merge branch 'nogmever' into 'next'
...
Check if GME_VERSION is defined.
See merge request STJr/SRB2!1372
2021-03-01 17:50:48 -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
Steel Titanium
024d92eb2a
Check if GME_VERSION is defined.
...
I made the assumption it would always be defined, which won't always be the case.
2021-01-06 19:40:30 -05:00
James R
57155643b1
Merge branch 'gme-spc-fix' into 'next'
...
Fix SPC looping on libgme versions >= 0.6.3
See merge request STJr/SRB2!1302
2020-12-15 20:40:10 -05:00
James R
477ae9d1af
Merge branch 'gamequit-argument' into 'next'
...
Send a `quitting` argument to the GameQuit Lua hook.
See merge request STJr/SRB2!1276
2020-12-10 15:25:52 -05:00
James R
2e649de64f
Merge branch 'high-resolution-timer-2' into next
2020-12-10 02:55:02 -08:00
Steel Titanium
95efd5e7e0
Tab fix
2020-12-06 22:58:17 -05:00
Steel Titanium
215631bd03
Let's check for looping first
2020-12-06 22:30:50 -05:00
Steel Titanium
0c4ce37b61
Fix SPC looping on libgme versions >= 0.6.3
2020-12-06 22:20:06 -05:00
GoldenTails
d8ab3a75ed
Remove the rest of the Playing() checks for GameQuit hook
2020-11-29 16:53:29 -06:00
GoldenTails
ded87cb54c
Send a quitting argument to the GameQuit Lua hook
2020-11-29 08:30:50 -06:00
Nev3r
17955311b9
Merge branch 'dehacked-hell' into 'next'
...
Split dehacked.c into multiple files.
See merge request STJr/SRB2!1222
2020-11-29 05:18:45 -05:00
GoldenTails
d673604b48
Split dehacked.c into multiple files.
2020-11-23 21:42:26 -06:00
Jaime Ita Passos
82b11c224a
Improve GPU texture management.
2020-11-22 18:18:26 -03:00
Jaime Ita Passos
2170ca3a50
Some interface fixes
2020-11-22 17:22:18 -03:00
Jaime Ita Passos
b8a13e6006
Change how texture deletion works in OpenGL
2020-11-22 17:03:04 -03:00
Jaime Ita Passos
be274a4fa9
Merge branch 'next' into spritestuff2
2020-11-19 00:52:43 -03:00
James R
1d107b268c
Merge branch 'unfuck-icon-mac' into 'next'
...
Use SDL version of executable icon at runtime on macOS
See merge request STJr/SRB2!1250
2020-11-17 20:24:42 -05:00
lachwright
dd4065795a
Add parentheses
2020-11-15 15:52:55 +11:00
lachwright
3840303b02
Use SDL version of executable icon at runtime on macOS
2020-11-15 01:13:41 +11: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
c2e242d27c
Fix floating point math
2020-11-07 13:48:37 -08:00
James R
91a89d5d5e
Let's try an experiment: move the epoch forward as I_GetTime is called
...
This will make it even longer until time wraps around. Have you ever run a
srb2 server for 4 years straight?
2020-11-07 01:57:09 -08:00
James R
f07c6067e4
Use high precision timer, replace I_GetTimeMicros with I_GetPreciseTime and I_PreciseToMicros
2020-11-07 01:31:24 -08:00
James R
15b2d52c69
Remove win32 specific timer
2020-11-06 14:14:12 -08:00
James R
99a0a9a9eb
Merge remote-tracking branch 'origin/master' into next
2020-11-01 20:01:22 -08:00
Steel Titanium
f9b1f873a4
CMake: Fix fullscreen toggle not working
...
All because of a typo
2020-10-31 00:59:51 -04:00
James R
f21b2c66b5
Merge remote-tracking branch 'origin/master' into next
2020-10-23 14:57:13 -07:00
GoldenTails
e7b3e2598d
Add i_threads.h too
2020-10-20 15:58:34 -05:00
GoldenTails
0fb69e75e1
Add multithreading option for CMake
2020-10-20 15:44:01 -05:00
James R
f34a761d48
Merge branch 'perfstats' into 'next'
...
Performance stats
See merge request STJr/SRB2!1186
2020-10-18 15:33:20 -04:00
James R
66a6374dbe
Merge branch 'lua-polyobjects' into 'next'
...
Lua polyobjects
Closes #19
See merge request STJr/SRB2!1140
2020-10-15 19:08:54 -04:00
Jaime Passos
0bf5237e0d
Merge branch 'next' into allowshaders
2020-10-15 01:25:11 -03:00
James R
c04d08460a
Merge branch 'slight-shader-cleanup' into 'next'
...
Shader code cleanup
See merge request STJr/SRB2!1103
2020-10-12 18:22:08 -04:00
Jaime Passos
e23929a899
Refactor patch rotation
2020-10-10 18:43:26 -03:00
Jaime Passos
b44837324f
Merge branch 'next' into patch-stuff-again-2
2020-10-10 17:01:10 -03:00
Hannu Hanhi
24ff748c58
Performance stats
2020-10-10 22:12:34 +03:00
Jaime Passos
f133726df0
Let the server or an admin toggle clients' custom shaders
2020-10-09 02:06:13 -03:00
James R
6363162826
Merge branch 'sanity-meter-empty' into 'next'
...
Replace cvar initializers with a macro
See merge request STJr/SRB2!1178
2020-10-08 22:02:25 -04:00
James R
eaec5126a6
Merge branch 'ogl-driver-error' into 'next'
...
Add error message when the GDI Generic OpenGL renderer is encountered in Windows
See merge request STJr/SRB2!1172
2020-10-08 22:00:43 -04:00
Jaime Passos
70cd48c9a2
Merge remote-tracking branch 'origin' into slight-shader-cleanup
2020-10-08 22:45:39 -03:00
James R
b7c4a82a0f
Replace C90's junk with a modest macro
2020-10-06 23:04:23 -07:00
Hannu Hanhi
e234eb8f87
Add error message when the GDI Generic OpenGL renderer is encountered in Windows
2020-10-03 18:45:56 +03:00
James R
94415facfe
Merge branch 'windows-console-go-brrr' into 'next'
...
Fix #178
Closes #178
See merge request STJr/SRB2!1112
2020-10-02 20:23:20 -04:00
James R
e42eb9aba8
Revert "Warn when going to OpenGL from the menu"
...
This reverts commit 3883d44bb5 .
And one line from 5c1b3baf18 .
2020-10-02 15:37:23 -07:00
lachwright
6fa06c4523
Update ICNS icon for macOS
...
Replaced some of the lower resolution variants with some smoother downscales. The 16x16 one is even Sonic's 1-up icon from the game!
2020-10-01 02:47:24 +10: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
Monster Iestyn
d5030f8a02
Begin work on adding access to polyobjects in Lua:
...
* create new file lua_polyobjlib.c
* made a stub LUA_PolyObjLib function
* added META_POLYOBJ to lua_libs.h
* updated makefile, CMake and MSVC project files for lua_polyobjlib.c
2020-09-08 18:08:08 +01:00
James R
d78befc713
Merge branch 'master' into next
2020-08-31 16:10:05 -07:00
James R
e4b7257ec9
Fix NOHW compiling
2020-08-31 16:09:41 -07:00