stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-22 04:21:23 +00:00
Code Issues Projects Releases Packages Wiki Activity
10259 commits 171 branches 41 tags 312 MiB
Commit graph

10259 commits

This branch
This branch
All branches
Author SHA1 Message Date
MascaraSnake
d07c376f6d Adapt POF_SPLAT to UDMF setup 2020-06-09 09:44:49 +02:00
MascaraSnake
4a0206b38d Merge branch 'next' into udmf-next 
# Conflicts:
#	src/p_mobj.c
#	src/p_polyobj.c
 2020-06-09 09:38:01 +02: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
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
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
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
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
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
LJ Sonic
e2b860dc28 Merge branch 'next' into 'fix-spawn-desynch' 
# Conflicts:
#   src/p_map.c
 2020-06-01 08:15:02 -04:00
MascaraSnake
11493e61d2 Merge branch 'executordelay' into 'udmf-next' 
UDMF linedef executor delay

See merge request STJr/SRB2!918
 2020-06-01 07:57:23 -04:00
MascaraSnake
ea3266e3f8 Merge branch 'udmf-polyobjects' into 'udmf-next' 
UDMF polyobject setup

See merge request STJr/SRB2!921
 2020-06-01 07:57:06 -04:00
MascaraSnake
b13f29852f Merge branch 'gravflip-shadows' into 'next' 
Move drop shadows to the ceiling for objects in reverse gravity

See merge request STJr/SRB2!973
 2020-06-01 07:23:29 -04:00
MascaraSnake
8d7f4e3265 Merge branch 'movement-refactor' into 'next' 
Clean up some movement code

See merge request STJr/SRB2!912
 2020-06-01 07:21:41 -04:00
LJ Sonic
dd18915570 Merge branch 'traceback' into 'next' 
Traceback

See merge request STJr/SRB2!974
 2020-06-01 04:17:30 -04:00
LJ Sonic
82af11d0df Merge branch 'waypoint-bruh' into 'next' 
Fix waypoint sequence desyncs

See merge request STJr/SRB2!975
 2020-05-31 17:58:38 -04:00
MascaraSnake
508160ed42 Use 0 instead of 0xffff as dummy mobjnum 2020-05-31 22:58:14 +02:00
MascaraSnake
3a4502fa87 Netsync waypoint sequences 2020-05-31 22:44:25 +02:00
Louis-Antoine
d31346822d Refactor hook library a little 2020-05-30 20:28:45 +02:00
Louis-Antoine
1bacaedde2 Show the traceback when a Lua script error happens 2020-05-30 20:24:33 +02:00
lachwright
f32d29f700 Oops, forgot to #undef 2020-05-31 01:26:23 +08:00
lachwright
a7f73bfa85 Move drop shadows to the ceiling for objects in reverse gravity 2020-05-31 01:21:26 +08:00
lachwright
5136a4d41d Don't cut momentum if landing in a roll 2020-05-30 19:07:16 +08:00
lachwright
b874da5229 Ensure followmobj ghost exists before applying fuse 2020-05-30 18:26:11 +08:00
lachwright
51b640ad5a Feedback so far indicates the old booster effect is preferred 2020-05-30 18:21:39 +08:00
lachwright
ae5d5b9546 Merge branch 'next' into dashmode-fixes 2020-05-30 18:13:21 +08:00
LJ Sonic
b7c5163419 Merge branch 'luacolors-gcc10-fix' into 'next' 
Fix the "Custom skincolors" branch not compiling with GCC 10.

See merge request STJr/SRB2!966
 2020-05-29 11:23:54 -04:00
sphere
71cf31fcaf Fix the "Custom skincolors" branch not compiling with GCC 10. 2020-05-28 18:43:04 +02:00
Louis-Antoine
c6e13d0e30 Fix crash when setting a mobj's angle from a Lua script 2020-05-28 18:34:56 +02:00
Monster Iestyn
755e9d659d Merge branch 'master' into next 2020-05-28 16:34:06 +01:00