Commit graph

1145 commits

Author SHA1 Message Date
James R
08348fcd43 Merge remote-tracking branch 'srb2/next' 2021-04-05 01:26:17 -07:00
James R
04b6911e21 Merge branch 'sloped-camera' into 22-merge-again 2021-04-01 20:55:22 -07:00
lachablock
f0e5b721ad Disallow write_backtrace on Windows entirely 2021-03-15 15:17:55 +11:00
LJ Sonic
46103ff375 Merge branch 'print-backtrace' into 'next'
Print a backtrace when SRB2 crashes in a Unix-like environment.

See merge request STJr/SRB2!1288
2021-03-07 08:26:44 -05:00
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
GoldenTails
4a0c907d34 Make it more async-signal-safe 2021-02-27 18:07:47 -06:00
GoldenTails
9a2e330af2 Print the backtrace before showing the signal handler popup. 2021-02-27 18:07:47 -06:00
GoldenTails
0c71a73513 Use file descriptors and ditch file streams, for now. 2021-02-27 18:07:47 -06:00
GoldenTails
9bc3050c49 Crash backtrace logging for NEWSIGNALHANDLER. 2021-02-27 18:07:47 -06: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
Jaime Ita Passos
c1beb1f384 Revert accidental push 2021-02-25 20:17:27 -03:00
Jaime Ita Passos
6d17b48838 [Meta] Change branding 2021-02-25 19:49:34 -03: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
bd61f216c8 Always unmute music on refocus
If the game is paused, music will be resumed when unpause anyway.
2020-11-13 17:30:23 -08:00
Sally Coolatta
fc934b38e1 Merge public next 2020-11-10 15:32:48 -05: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
b21a0a8cf2 Fix module and chip music being SRB2 LOUD 2020-10-26 04:19:41 -07: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
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
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