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
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
Hannu Hanhi
24ff748c58
Performance stats
2020-10-10 22:12:34 +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
James R
7cbc9add07
Kill NOHS
...
(cherry picked from commit a79316b375 )
2020-08-31 16:06:40 -07:00
James R
1818693d71
Fix NOGME compiling
...
(cherry picked from commit d52a35e5b6 )
2020-08-31 16:04:09 -07:00
James R
288a6c1431
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
2a27628232
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
James R
4acc3e6d0c
Strip a few more instances of SONIC ROBO BLAST 2 KART
2020-08-14 22:18:51 -07:00
James R
7be58ca3ee
Use AsciiChar to get the input from windows console window
2020-08-13 21:57:36 -07:00
James R
b771ff2426
Add http-mserv to fuck
...
(cherry picked from commit 8e493bddc3 )
2020-08-09 23:34:16 -07:00
James R
fa18f819b0
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
f9e74e8ba2
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
2e3b0ae4c8
Merge remote-tracking branch 'origin/next' into http-mserv
2020-08-08 15:05:03 -07:00
Jaime Passos
ed068a7664
Fix buffer overrun in I_ClipboardPaste
2020-08-08 15:36:01 -03:00
Jaime Passos
368e550ab1
Shader code cleanup
2020-08-07 18:17:05 -03:00
Steel Titanium
913c07959e
Kill CD support
2020-08-07 17:06:19 -04:00
Jaime Passos
10189ecdc0
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into pictureformats
2020-07-21 22:25:00 -03:00
James R
95a6e194e1
Merge remote-tracking branch 'origin/master' into next
2020-07-16 19:00:21 -07:00
James R
47719474ef
Merge remote-tracking branch 'origin/next' into http-mserv
2020-07-13 08:58:43 -07:00
James R
6efedfc756
Merge remote-tracking branch 'origin/master' into cmake-adjustments
2020-07-12 16:24:24 -07:00
James R
e09a430804
Merge remote-tracking branch 'origin/next' into remove-glide-2
2020-07-12 16:05:15 -07:00
James R
84d9aa93c7
Merge remote-tracking branch 'origin/next' into http-mserv
2020-07-11 17:41:46 -07:00
Steel Titanium
b53e6e834d
Update version number
2020-07-10 17:29:03 -04:00
SteelT
5242d77c12
Merge branch '225-prep' into 'next'
...
2.2.5 preparation
See merge request STJr/SRB2!1039
2020-07-07 14:55:06 -04:00
Lachlan Wright
a050f04cd0
Merge branch 'remove-tricks' into 'next'
...
Remove Software tricks
See merge request STJr/SRB2!1036
2020-07-07 13:47:33 -04:00
Steel Titanium
d53d65b798
Update the version number
2020-07-06 21:29:02 -04:00
Jaime Passos
c385eca5d2
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into pictureformats
2020-07-06 19:29:14 -03:00
Steel Titanium
29d6b5c758
Merge branch 'master' into next
2020-07-06 12:13:00 -04:00
Jaime Passos
9788afa820
Remove Software tricks
2020-07-06 01:26:56 -03:00
Jaime Passos
abc4f22a3e
Delete hw_glide.h
2020-07-06 00:27:34 -03:00
Zachary McAlpin
bad02950e8
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
2020-06-24 20:55:08 -05:00
James R
0dcba91c4f
Merge branch 'gme-cleanup-fixes' into 'next'
...
GME cleanup and fixes
See merge request STJr/SRB2!1001
2020-06-24 21:41:49 -04:00
Zachary McAlpin
feb56fc3b6
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
2020-06-24 19:47:52 -05:00
SteelT
dbd5198ac2
Merge branch 'marathonmode' into 'next'
...
MARATHON RUN
See merge request STJr/SRB2!941
2020-06-17 19:36:10 -04:00