Jaime Ita Passos
5e890ee6f8
Merge branch 'next' into spritestuff2
2020-11-19 00:52:43 -03:00
James R
85c5fa9527
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
26b6b33220
Add parentheses
2020-11-15 15:52:55 +11:00
lachwright
8f570eaa97
Use SDL version of executable icon at runtime on macOS
2020-11-15 01:13:41 +11: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
998a10e8ad
Merge remote-tracking branch 'origin/master' into next
2020-11-01 20:01:22 -08:00
Steel Titanium
62b5b86ed4
CMake: Fix fullscreen toggle not working
...
All because of a typo
2020-10-31 00:59:51 -04:00
James R
e9fce20071
Merge remote-tracking branch 'origin/master' into next
2020-10-23 14:57:13 -07:00
GoldenTails
1e0beab254
Add i_threads.h too
2020-10-20 15:58:34 -05:00
GoldenTails
31c410656c
Add multithreading option for CMake
2020-10-20 15:44:01 -05:00
James R
d279489753
Merge branch 'perfstats' into 'next'
...
Performance stats
See merge request STJr/SRB2!1186
2020-10-18 15:33:20 -04:00
James R
bd9fda8ceb
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
8294479a5f
Merge branch 'next' into allowshaders
2020-10-15 01:25:11 -03:00
James R
d73fbd8616
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
6e5f71dd45
Refactor patch rotation
2020-10-10 18:43:26 -03:00
Jaime Passos
b15bbd505c
Merge branch 'next' into patch-stuff-again-2
2020-10-10 17:01:10 -03:00
Hannu Hanhi
4f20a20165
Performance stats
2020-10-10 22:12:34 +03:00
Jaime Passos
0811f60b2a
Let the server or an admin toggle clients' custom shaders
2020-10-09 02:06:13 -03:00
James R
15008f31a7
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
45b9e23895
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
63d4c1dffc
Merge remote-tracking branch 'origin' into slight-shader-cleanup
2020-10-08 22:45:39 -03:00
James R
dbd79a29a4
Replace C90's junk with a modest macro
2020-10-06 23:04:23 -07:00
Hannu Hanhi
684b868524
Add error message when the GDI Generic OpenGL renderer is encountered in Windows
2020-10-03 18:45:56 +03:00
James R
8beee3761e
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
be4c5751f8
Revert "Warn when going to OpenGL from the menu"
...
This reverts commit 569453ee93b6089ccdaf
2020-10-02 15:37:23 -07:00
lachwright
e715b2f01a
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
a033f482be
Merge branch 'pictureformats' into 'next'
...
PNG conversion refactoring
See merge request STJr/SRB2!675
2020-09-10 15:58:18 -04:00
Monster Iestyn
d5beae9738
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
b2226e95d6
Merge branch 'master' into next
2020-08-31 16:10:05 -07:00
James R
e593610862
Fix NOHW compiling
2020-08-31 16:09:41 -07:00
James R
6c2370f894
Kill NOHS
...
(cherry picked from commit 3437b0690a3f4278e3ecc657102a126a3e2f3d13)
2020-08-31 16:06:40 -07:00
James R
2aab765b36
Fix NOGME compiling
...
(cherry picked from commit 0d57ba1d02c5bde2ab22a71d21a95849b21e9539)
2020-08-31 16:04:09 -07:00
James R
38d094d3f6
Merge branch 'fix-file-downloading' into 'next'
...
Fix bug where SRB2 would check size of disk from current directory instead of srb2home
See merge request STJr/SRB2!1121
2020-08-19 18:16:22 -04:00
GoldenTails
0a9c061fea
Fix bug where SRB2 would check size of current directory instead of srb2home
...
Hopefully that fixes that one bug with weird filesize issues too
2020-08-18 17:34:32 -05:00
Jaime Passos
9b426b474c
Merge branch 'pictureformats' into patch-stuff-again-2
2020-08-15 20:48:28 -03:00
James R
0944b5ad6f
Strip a few more instances of SONIC ROBO BLAST 2 KART
2020-08-14 22:18:51 -07:00
Jaime Passos
78cc4a78d0
Refactor renderer switching
2020-08-14 22:27:16 -03:00
James R
f0a79df2b8
Use AsciiChar to get the input from windows console window
2020-08-13 21:57:36 -07:00
James R
3e02f5d0cb
Add http-mserv to fuck
...
(cherry picked from commit 1a1c215a9110491a3c7324045dc96c18b604d9e7)
2020-08-09 23:34:16 -07:00
James R
e9748e5317
Merge branch 'clipboard-crash-fix-2' into 'next'
...
Fix buffer overrun in I_ClipboardPaste (resolves #205 )
Closes #205
See merge request STJr/SRB2!1105
2020-08-09 21:06:18 -04:00
James R
a808294c0c
Merge branch 'kill-cd-support' into 'next'
...
Kill CD support
See merge request STJr/SRB2!1102
2020-08-09 20:48:25 -04:00
James R
54e446199d
Merge remote-tracking branch 'origin/next' into http-mserv
2020-08-08 15:05:03 -07:00
Jaime Passos
9772bbeda1
Fix buffer overrun in I_ClipboardPaste
2020-08-08 15:36:01 -03: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
Steel Titanium
dff0e87e03
Kill CD support
2020-08-07 17:06:19 -04:00
Jaime Passos
ca060a4372
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into pictureformats
2020-07-21 22:25:00 -03:00
James R
fa90ff6bae
Merge remote-tracking branch 'origin/master' into next
2020-07-16 19:00:21 -07:00
James R
93615b07be
Merge remote-tracking branch 'origin/next' into http-mserv
2020-07-13 08:58:43 -07:00
James R
4985d94386
Merge remote-tracking branch 'origin/master' into cmake-adjustments
2020-07-12 16:24:24 -07:00
