lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
10,202 Commits 1 Branch 29 Tags 122 MiB
Commit Graph

10202 Commits

Author SHA1 Message Date
Nev3r 2322644488 Merge branch 'dofile' into 'next' 
Add dofile() to Lua

See merge request STJr/SRB2!969
 2020-06-12 02:32:16 -04:00
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
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
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
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 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
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
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
LJ Sonic 715cb857f5 Merge branch 'next' into 'better-download' 
# Conflicts:
#   src/sdl/i_system.c
#   src/win32/win_sys.c
 2020-06-01 08:16:53 -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 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
Louis-Antoine 3c3a60d189 Fix "downloads" command reporting incorrect progress 2020-06-01 10:37:05 +02: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
SwitchKaze 5a18bdf20b Fix SOC color name reading 2020-05-30 16:52:44 -05:00