stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-02 09:12:54 +00:00
Code Issues Projects Releases Packages Wiki Activity
11067 commits 177 branches 41 tags 188 MiB
Commit graph

11067 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Monster Iestyn
71d4eb015a Merge branch 'polyrotate-turnobjs-sync' into 'next' 
Sync turnobjs for polyrotate_t thinkers in netgames

See merge request STJr/SRB2!979
 2020-06-04 17:20:08 -04:00
Monster Iestyn
9e4ed738b7 Sync turnobjs for polyrotate_t thinkers in netgames 2020-06-04 21:31:26 +01:00
Monster Iestyn
cb7423b97e sdl/i_main.c: while we're here, split all the logging initialisation code into a separate function, to make main function more clean 2020-06-03 20:47:49 +01:00
Monster Iestyn
b11d58aef5 clean up BUGTRAP code in win32/win_main.c to avoid unmatched } 
(though that said we don't officially care about the win32 folder files anymore)
 2020-06-03 20:47:49 +01:00
Monster Iestyn
5349a0bf62 V_Init: count to NUMSCREENS, not NUMSCREENS+1 (though I can't help thinking this one might have been deliberate somehow?) 2020-06-03 20:47:49 +01:00
Monster Iestyn
bb1a2dbba7 sdl/i_main.c: fix wrong placement of #endif for LOGMESSAGES code 2020-06-03 20:47:49 +01:00
Monster Iestyn
8092d30376 Polyobj_rotate and related: change "origin" to vector2_t since all it needs is x/y and not any of the new stuff for vertex_t 2020-06-03 20:47:49 +01:00
Monster Iestyn
7340442839 P_XYMovement: initialise slopemom to all zeros 2020-06-03 20:47:49 +01:00
Monster Iestyn
adb11eec1b dehacked.c: use actual size of descriptions buffers rather than MAXLINELEN, which is way too large 2020-06-03 20:47:49 +01:00
Monster Iestyn
d11ba67288 G_ReadMetalTic: Make sure all three values for GZT_XYZ are read in the right order 2020-06-03 20:47:49 +01:00
Monster Iestyn
879a2bd20a G_GhostTicker/G_ReadMetalTic: type should default to MT_NULL, not -1 
This way, if for some reason the ghost has no skin, nothing should spawn at all
 2020-06-03 20:47:49 +01:00
MascaraSnake
33ed36cf4b Effect 6 flag allows cutting of cyan pixels on FOF and PolyObject planes (even if they're translucent) 2020-06-03 19:41:47 +02:00
Louis-Antoine
9be188ff02 Minor edit 2020-06-02 10:31:56 +02:00
Louis-Antoine
286b316cf9 Fix dofile() return incorrect values 2020-06-01 15:43:14 +02:00
LJ Sonic
6895d7df92 Merge branch 'next' into 'dofile' 
# Conflicts:
#   src/lua_script.c
#   src/lua_script.h
 2020-06-01 09:28:56 -04:00
Louis-Antoine
e6ffedbce8 Fix food occasionally spawning inside the snake 2020-06-01 15:21:16 +02:00
LJ Sonic
04c7eeb6ae Merge branch 'deprecate-fixedrem' into 'next' 
Deprecate FixedRem.

See merge request STJr/SRB2!952
 2020-06-01 08:30:44 -04:00