Zachary McAlpin
|
1b831c0bbe
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
|
2020-06-11 15:02:31 -05:00 |
|
LJ Sonic
|
4eb8b25d1f
|
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
|
3203d4a62e
|
Merge branch 'next' into 'better-download'
# Conflicts:
# src/d_clisrv.c
|
2020-06-10 07:57:49 -04:00 |
|
LJ Sonic
|
5e7ffb055f
|
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
|
3a8e053d9d
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
|
2020-06-09 19:54:47 -05:00 |
|
Lachlan Wright
|
5263b8cf63
|
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
|
f9c3a93cf3
|
Merge branch 'dashmode-fixes' into 'next'
Dashmode fixes
See merge request STJr/SRB2!909
|
2020-06-08 05:25:30 -04:00 |
|
Lachlan Wright
|
d7e7d977e6
|
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 |
|
Zachary McAlpin
|
5495fef76c
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
|
2020-06-07 22:42:43 -05:00 |
|
MascaraSnake
|
31bdf38f89
|
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
|
de73af46e2
|
Fix mouse being grabbed in the continue screen.
|
2020-06-07 00:40:33 +02:00 |
|
Monster Iestyn
|
4aa626eeda
|
Merge branch 'master' into next
|
2020-06-06 20:50:12 +01:00 |
|
Monster Iestyn
|
0dd462c17c
|
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
|
3a7417c8fe
|
Merge branch 'master' into next
|
2020-06-06 20:35:48 +01:00 |
|
Monster Iestyn
|
b493010b5e
|
Merge branch 'cppcheck-fixes' into 'master'
Cppcheck fixes
See merge request STJr/SRB2!967
|
2020-06-06 15:28:48 -04:00 |
|
lachwright
|
207c6d71a9
|
Merge branch 'next' into nospinmovecut
|
2020-06-07 02:45:26 +08:00 |
|
Monster Iestyn
|
fedbac6f64
|
Merge branch 'master' into next
|
2020-06-06 17:39:43 +01:00 |
|
Monster Iestyn
|
7dd0ba0f45
|
added liolib.c to the VC10 project files, since it was missing from them
|
2020-06-06 17:38:35 +01:00 |
|
MascaraSnake
|
5d99f42a2a
|
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
|
d7228562e3
|
Updated LUAh_GameQuit
|
2020-06-05 13:18:22 -05:00 |
|
Zachary McAlpin
|
c7e64d635c
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
|
2020-06-05 12:59:41 -05:00 |
|
Monster Iestyn
|
7302fde015
|
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
|
cc491d0a1e
|
Sync turnobjs for polyrotate_t thinkers in netgames
|
2020-06-04 21:31:26 +01:00 |
|
Monster Iestyn
|
d6ef2625f5
|
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
|
8f776b9318
|
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
|
1636c90388
|
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
|
c90b8c583b
|
sdl/i_main.c: fix wrong placement of #endif for LOGMESSAGES code
|
2020-06-03 20:47:49 +01:00 |
|
Monster Iestyn
|
e2e65d7fae
|
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
|
d0d6f76f8e
|
P_XYMovement: initialise slopemom to all zeros
|
2020-06-03 20:47:49 +01:00 |
|
Monster Iestyn
|
b9d116afb4
|
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
|
e52e139793
|
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
|
ef4cb40ed7
|
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
|
f713487f3c
|
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
|
764f966ffe
|
Minor edit
|
2020-06-02 10:31:56 +02:00 |
|
Louis-Antoine
|
293c8ad75b
|
Fix food occasionally spawning inside the snake
|
2020-06-01 15:21:16 +02:00 |
|
LJ Sonic
|
24ff9d05e5
|
Merge branch 'deprecate-fixedrem' into 'next'
Deprecate FixedRem.
See merge request STJr/SRB2!952
|
2020-06-01 08:30:44 -04:00 |
|
LJ Sonic
|
05e8d12427
|
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
|
aeeb6e1b02
|
Merge branch 'next' into 'fix-spawn-desynch'
# Conflicts:
# src/p_map.c
|
2020-06-01 08:15:02 -04:00 |
|
MascaraSnake
|
0d6b0919bb
|
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
|
69a7ac6b4e
|
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
|
04ae70179c
|
Fix "downloads" command reporting incorrect progress
|
2020-06-01 10:37:05 +02:00 |
|
LJ Sonic
|
5da7082418
|
Merge branch 'traceback' into 'next'
Traceback
See merge request STJr/SRB2!974
|
2020-06-01 04:17:30 -04:00 |
|
LJ Sonic
|
cccc1be070
|
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
|
636201fa1b
|
Use 0 instead of 0xffff as dummy mobjnum
|
2020-05-31 22:58:14 +02:00 |
|
MascaraSnake
|
2b92d82b89
|
Netsync waypoint sequences
|
2020-05-31 22:44:25 +02:00 |
|
Louis-Antoine
|
25cb181b8e
|
Refactor hook library a little
|
2020-05-30 20:28:45 +02:00 |
|
Louis-Antoine
|
a71f690241
|
Show the traceback when a Lua script error happens
|
2020-05-30 20:24:33 +02:00 |
|
lachwright
|
92cae7aef9
|
Oops, forgot to #undef
|
2020-05-31 01:26:23 +08:00 |
|
lachwright
|
3b4df4657a
|
Move drop shadows to the ceiling for objects in reverse gravity
|
2020-05-31 01:21:26 +08:00 |
|
lachwright
|
534aea9f62
|
Don't cut momentum if landing in a roll
|
2020-05-30 19:07:16 +08:00 |
|