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 |
|
Sally Coolatta
|
e6a9e5a68e
|
Merge branch 'master' into new-menus
|
2020-11-08 02:49:28 -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 |
|
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 |
|
James R
|
737ea51ace
|
Merge remote-tracking branch 'origin/the-scary-22-merge' into sloped-camera
|
2020-10-04 16:32:19 -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 |
|
James R
|
70eec29992
|
Mute music instead of pausing if lose focus
|
2020-09-28 11:58:24 -07:00 |
|
Sally Coolatta
|
b5fcd74ef9
|
Merge master
Slopes in a few maps are really broken ... think it's anchors, I'm gonna leave that to jart :V
|
2020-09-25 12:00:50 -04:00 |
|
James R
|
c9e3281b99
|
Merge remote-tracking branch 'origin/master' into tinnitus
|
2020-09-25 01:57:08 -07:00 |
|
James R
|
68bd632bac
|
You have entered the comedy area
|
2020-09-24 16:49:34 -07:00 |
|
James R
|
ef108cbb36
|
Merge remote-tracking branch 'pub/next'
|
2020-09-20 14:07:54 -07:00 |
|