Commit graph

10650 commits

Author SHA1 Message Date
Steel Titanium
b056bf1d6c Merge branch 'master' into next 2020-06-11 20:11:26 -04:00
SteelT
c810ea3945 Merge branch 'next-lc-uint16' into 'next'
Custom skincolor bugfixes

See merge request STJr/SRB2!971
2020-06-11 20:08:50 -04:00
Zachary McAlpin
0d70e16b0b Updated LUAh_GameQuit to use new error handler 2020-06-11 15:11:01 -05:00
Zachary McAlpin
08e9efee76 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook 2020-06-11 15:02:31 -05:00
lachwright
fad82265e0 Allow macOS builds to be launched through Steam 2020-06-12 01:19:06 +08:00
LJ Sonic
38a8fe2baa Merge branch 'better-download' into 'next'
Improvements to the in-game file downloader

See merge request STJr/SRB2!976
2020-06-11 13:02:13 -04:00
mazmazz
8fc414536f CMAKE: Move launch-c into more sensible location 2020-06-10 15:08:09 -04:00
LJ Sonic
7ffee074d8 Merge branch 'next' into 'better-download'
# Conflicts:
#   src/d_clisrv.c
2020-06-10 07:57:49 -04:00
LJ Sonic
bc2edb2ae4 Merge branch 'snake' into 'next'
Add a Snake minigame to the file transfer screen

See merge request STJr/SRB2!903
2020-06-10 07:38:37 -04:00
Zachary McAlpin
291479e3e8 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook 2020-06-09 19:54:47 -05:00
mazmazz
46b383acda CMAKE: Fix toggle fullscreen breakage due to missing define
This is lazy. The correct solution is to eliminate the define in the program code
2020-06-09 17:32:14 -04:00
mazmazz
36e17006b7 CMAKE: Fix OS X ccache scripts 2020-06-09 11:12:52 -04:00
Steel Titanium
2abdc86537 Fix these "may be used uninitialized in this function" errors with batching 2020-06-08 20:18:32 -04:00
Steel Titanium
3dd89f67fa Fix no previous prototype for TimeFunction 2020-06-08 19:56:24 -04:00
Steel Titanium
62d73968e2 Merge branch 'next' into sal-oglshaderport 2020-06-08 19:36:23 -04:00
SteelT
ce17cc4855 Merge branch 'ogl-batching' into 'sal-oglshaderport'
OpenGL draw call batching

See merge request STJr/SRB2!986
2020-06-08 18:10:18 -04:00
SteelT
405f1550a5 Merge branch 'shaders-224-next-merge' into 'sal-oglshaderport'
Shaders next merge

See merge request STJr/SRB2!985
2020-06-08 18:07:53 -04:00
mazmazz
01ff46326f Merge remote-tracking branch 'stjr-gl/master' into cmake-adjustments 2020-06-08 11:57:57 -04:00
Digiku
70eb5ba634 Merge branch 'buffer-offset-fix' into 'master'
Strike null-pointer-arithmetic error in BUFFER_OFFSET

See merge request STJr/SRB2!989
2020-06-08 11:56:48 -04:00
Digiku
a41e68362e Merge branch 'openmpt-deprecated-fix' into 'master'
Fix OPENMPT deprecation error, openmpt_module_ctl_set

See merge request STJr/SRB2!990
2020-06-08 10:37:46 -04:00
Lachlan Wright
191e2e094d Merge branch 'fix-spawn-desynch' into 'next'
Fix desynch when a player spawns

See merge request STJr/SRB2!977
2020-06-08 05:25:41 -04:00
Lachlan Wright
614a98bd9d Merge branch 'dashmode-fixes' into 'next'
Dashmode fixes

See merge request STJr/SRB2!909
2020-06-08 05:25:30 -04:00
Lachlan Wright
590dfca582 Merge branch 'fix-continuing-mouse' into 'next'
Fix mouse being grabbed in continue screen

See merge request STJr/SRB2!983
2020-06-08 05:25:24 -04:00
mazmazz
f3c1db0650 CMAKE: Fix OSX CCache error 2020-06-08 03:08:58 -04:00
mazmazz
efba50c83c CMAKE: Add SRB2_DEBUG_INSTALL to toggle *.debug in install/package 2020-06-08 00:38:13 -04:00
mazmazz
aef9a1b522 CMAKE: Add CCACHE support 2020-06-08 00:35:31 -04:00
mazmazz
a5f7f9a534 Fix OPENMPT deprecation error, openmpt_module_ctl_set 2020-06-08 00:09:29 -04:00
mazmazz
2cefe82950 Fix OSX null-pointer-arithmetic error 2020-06-08 00:08:07 -04:00
mazmazz
c63ead5abb CMAKE: Configurable CPACK generator 2020-06-08 00:01:15 -04:00
mazmazz
ded6285249 CMAKE improvements: optional asset install; exe.debug for RelWithDebInfo 2020-06-08 00:01:15 -04:00
mazmazz
a449fa4a1d Added SDL Mixer X to CMAKE (Windows only) 2020-06-08 00:01:15 -04:00
Zachary McAlpin
78014cfd4c Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook 2020-06-07 22:42:43 -05:00
Hannu Hanhi
0e521922c6 Change some unsigned ints to UINT32 2020-06-07 21:32:52 +03:00
Hannu Hanhi
abe13651d0 OpenGL draw call batching system 2020-06-07 21:20:52 +03:00
MascaraSnake
de7a806ec3 Merge branch 'nospinmovecut' into 'next'
Don't cut momentum if landing in a roll

See merge request STJr/SRB2!972
2020-06-07 13:24:19 -04:00
Hannu Hanhi
da98ea242e Merge remote-tracking branch 'upstream/next' into shaders-224-next-merge 2020-06-07 20:01:05 +03:00
SteelT
db32b01222 Merge branch 'renderstats' into 'sal-oglshaderport'
Render stats

See merge request STJr/SRB2!914
2020-06-07 12:29:58 -04:00
SteelT
176361de1e Merge branch 'shader-skywalls' into 'sal-oglshaderport'
Fix outdated sky wall code in shader branch

See merge request STJr/SRB2!906
2020-06-07 12:28:07 -04:00
sphere
82200d80a9 Fix mouse being grabbed in the continue screen. 2020-06-07 00:40:33 +02:00
Monster Iestyn
28550b221a Merge branch 'master' into next 2020-06-06 20:50:12 +01:00
Monster Iestyn
d2fefb6b9a use void rather than VOID, because the logging init code isn't exclusively Win32, whoops 2020-06-06 20:49:12 +01:00
Monster Iestyn
7e562a3ca5 Merge branch 'master' into next 2020-06-06 20:35:48 +01:00
Monster Iestyn
982d1db5d8 Merge branch 'cppcheck-fixes' into 'master'
Cppcheck fixes

See merge request STJr/SRB2!967
2020-06-06 15:28:48 -04:00
lachwright
f68a95016e Merge branch 'next' into nospinmovecut 2020-06-07 02:45:26 +08:00
Monster Iestyn
a4d7ff3c6d Merge branch 'master' into next 2020-06-06 17:39:43 +01:00
Monster Iestyn
56b8ea3587 added liolib.c to the VC10 project files, since it was missing from them 2020-06-06 17:38:35 +01:00
GoldenTails
9aa68f524e Adds the branch name into the version command printout when outside of DEVELOP mode.
Really just so I don't accidentally join netgames or record replays for vanilla SRB2 in the `next` branch...
2020-06-06 04:12:27 -05:00
MascaraSnake
50b47a1b25 Merge branch 'translucent-splat-planes' into 'next'
Allow transparent parts in translucent FOF and PolyObject planes

See merge request STJr/SRB2!978
2020-06-06 04:35:06 -04:00
Zachary McAlpin
ca66c5e7ee Updated LUAh_GameQuit 2020-06-05 13:18:22 -05:00
Zachary McAlpin
7b779fa89b Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook 2020-06-05 12:59:41 -05:00