LJ Sonic
|
8c5149f180
|
Merge branch 'possibly-fix-dedi-crash' into 'next'
Possible fix for dedicated server crashes (aka the msvcrt.dll!_mbscat crash)
See merge request STJr/SRB2!963
|
2020-05-28 11:29:00 -04:00 |
|
SteelT
|
2739f989dc
|
Merge branch 'fix-input-buffer' into 'next'
Allow input buffer to hold more than 64 tics
See merge request STJr/SRB2!950
|
2020-05-28 11:27:39 -04:00 |
|
SteelT
|
4b77741f37
|
Merge branch 'next-lc-uint16' into 'next'
Custom skincolors
See merge request STJr/SRB2!960
|
2020-05-28 11:23:05 -04:00 |
|
Louis-Antoine
|
d886e35576
|
Fix potential desynch when a player spawns
|
2020-05-28 11:03:35 +02:00 |
|
Louis-Antoine
|
3483ddf573
|
Add a few missing calls to GameQuit hook
|
2020-05-27 14:58:10 +02:00 |
|
Monster Iestyn
|
9a122fd9c4
|
Got_AddPlayer: check that I_GetNodeAddress(node) is non-NULL before using strcpy to copy it to the playeraddress array
|
2020-05-25 21:27:48 +01:00 |
|
Monster Iestyn
|
5c6004f213
|
Merge branch 'crumblebob-fixes' into 'next'
Fix crumbling floatbob FOFs in MP SS5 rising up into space for no reason
See merge request STJr/SRB2!961
|
2020-05-25 07:58:21 -04:00 |
|
mazmazz
|
0294f8d26a
|
Fix NOWIPE bugs with colormap fade and title card
|
2020-05-25 00:20:23 -04:00 |
|
mazmazz
|
505fb1761d
|
Add NOWIPE behavaior for colormap fades
|
2020-05-25 00:19:41 -04:00 |
|
Monster Iestyn
|
dbe7b57c74
|
T_BounceCheese: Fix FOF height desync occurring if the FOF fell down too fast (resulting in a bizarre bouncing back up effect in MP SS5 due to P_FloorzAtPos messing up as a result)
|
2020-05-24 21:15:31 +01:00 |
|
SwitchKaze
|
77a501ecae
|
Fix typo SKINCOLOT
|
2020-05-24 12:36:20 -05:00 |
|
SwitchKaze
|
58cac1fd73
|
Make colors UINT16, increase color freeslots to 1024
|
2020-05-23 19:35:36 -05:00 |
|
Zachary McAlpin
|
712485cad7
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
|
2020-05-23 15:23:43 -05:00 |
|
sphere
|
8e068e94b0
|
Rename the rest of the wall scrollers in the ZB config.
|
2020-05-23 16:41:38 +02:00 |
|
MascaraSnake
|
4fcbb59116
|
Merge branch 'splitshot-notarget-fix' into 'next'
A_SplitShot no target fix
See merge request STJr/SRB2!956
|
2020-05-23 07:52:36 -04:00 |
|
MascaraSnake
|
8c38d4e261
|
Merge branch 'lua-mapthing-len' into 'next'
Lua mapthing len
See merge request STJr/SRB2!957
|
2020-05-23 07:51:58 -04:00 |
|
SwitchKaze
|
afe56667b8
|
Update to 2.2.4
|
2020-05-22 16:47:51 -05:00 |
|
Monster Iestyn
|
11b115083e
|
added the ability to get the # of a mapthing_t in Lua
|
2020-05-22 18:32:34 +01:00 |
|
Monster Iestyn
|
55dd8739ab
|
A_SplitShot fix: don't even attempt to A_FaceTarget (or anything beyond) if there is no target to face to begin with
|
2020-05-21 19:42:48 +01:00 |
|
Monster Iestyn
|
b232530695
|
Merge branch 'sprite-projection-fixes' into 'next'
Sprite projection fixes
See merge request STJr/SRB2!954
|
2020-05-20 15:33:30 -04:00 |
|
Monster Iestyn
|
58d62f9881
|
also do the fovtan multiplication thing with precip sprites
|
2020-05-20 19:34:18 +01:00 |
|
Louis-Antoine
|
2ae00f1edf
|
Wait for acks before resending file fragments
|
2020-05-20 16:21:18 +02:00 |
|
James R
|
0e25e9a074
|
Merge branch 'more-lua-map-names' into 'next'
G_BuildMapTitle for Lua, G_BuildMapName outside of levels
See merge request STJr/SRB2!694
|
2020-05-19 23:13:35 -04:00 |
|
Louis-Antoine
|
15d6a254e1
|
Add a command to list current file transfers
|
2020-05-20 00:24:53 +02:00 |
|
Louis-Antoine
|
6e073efbb7
|
Fix I_Error when queuing multiple Lua files
|
2020-05-19 23:50:37 +02:00 |
|
sphere
|
ff6b9a9cf0
|
Add linedef actions 507 & 508, allow using offsets for actions 502-504.
|
2020-05-19 23:39:35 +02:00 |
|
Monster Iestyn
|
8ad59bbb51
|
on second thought maybe we don't need extra tx clamping, it turns out to be more effort than it's worth (at least for now)
meanwhile, let's move x/yscale calculations down since we don't actually need them until later on
|
2020-05-19 22:00:34 +01:00 |
|
Louis-Antoine
|
ccc51df93b
|
Fix sending Lua files in text mode
|
2020-05-19 21:36:21 +02:00 |
|
Louis-Antoine
|
fbfb9dc95c
|
Create FIL_ConvertTextFileToBinary
|
2020-05-19 20:00:58 +02:00 |
|
Monster Iestyn
|
4ad02cae93
|
change limits for tx based on fov, by multiplying by fovtan
this makes it so that higher fov values can actually let you see all the sprites that should be in the view
|
2020-05-19 18:54:39 +01:00 |
|
Monster Iestyn
|
a2a6208548
|
do tx checking after tz clamping, not before
|
2020-05-19 18:43:33 +01:00 |
|
Monster Iestyn
|
b1f804871f
|
We don't actually need x1 or x2 until these points in the function, at least for papersprites
|
2020-05-19 17:23:22 +01:00 |
|
Monster Iestyn
|
c9d2a79ecc
|
added basic culling of papersprites if tx for either is too large, proper clamping to be added later
also removed some commented out old code
|
2020-05-19 17:19:44 +01:00 |
|
Monster Iestyn
|
f496001c8b
|
split "rot" into two variables: frame and rot, for frame number and rotation angle
it always bothered me that "rot" was used for both of the above, since it confused me as to what it was for every time I look at this function
|
2020-05-19 16:58:53 +01:00 |
|
Monster Iestyn
|
a361437f77
|
remove gxt and gyt, as they are unnecessary
also add a few comments to explain what tx/tz are
|
2020-05-19 16:48:50 +01:00 |
|
Louis-Antoine
|
1b62785cfa
|
Refactor Lua file transfer code
|
2020-05-19 15:16:51 +02:00 |
|
Louis-Antoine
|
362adf4576
|
Allow resuming the most recent file transfer
|
2020-05-19 11:28:24 +02:00 |
|
MascaraSnake
|
ccd2371d42
|
Merge branch 'next' into movement-refactor
# Conflicts:
# src/p_map.c
|
2020-05-19 09:50:23 +02:00 |
|
MascaraSnake
|
a928eb3cf7
|
Merge branch 'more-polyobject-cleanup' into 'next'
Smooth polyobject movement and other cleanup
See merge request STJr/SRB2!947
|
2020-05-18 16:00:55 -04:00 |
|
MascaraSnake
|
f1744efbd5
|
Merge branch 'waypoints' into 'next'
Store waypoints at map load instead of iterating through the thinker list to find them
See merge request STJr/SRB2!938
|
2020-05-18 16:00:46 -04:00 |
|
Zachary McAlpin
|
d45a120786
|
Remove redundant M_QuitResponse call
|
2020-05-18 14:56:10 -05:00 |
|
Zachary McAlpin
|
5470a03e11
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
|
2020-05-18 14:50:58 -05:00 |
|
LJ Sonic
|
8f864fd52b
|
Merge branch 'slope-cleanup' into 'next'
I forgot to test OpenGL :slight_smile:
See merge request STJr/SRB2!953
|
2020-05-18 14:37:18 -04:00 |
|
Louis-Antoine
|
cce2ade8a5
|
I forgot to test OpenGL :slight_smile:
|
2020-05-18 20:35:30 +02:00 |
|
GoldenTails
|
40e93e1977
|
Deprecate FixedRem.
It's about time!
|
2020-05-18 11:29:56 -05:00 |
|
LJ Sonic
|
7ffe368501
|
Merge branch 'slope-cleanup' into 'next'
Encapsulate plane height checks
See merge request STJr/SRB2!860
|
2020-05-18 10:17:25 -04:00 |
|
Louis-Antoine
|
4c37c18385
|
Fix P_GetZAt for Lua
|
2020-05-18 16:16:45 +02:00 |
|
Louis-Antoine
|
74fa35221d
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into slope-cleanup
# Conflicts:
# src/hardware/hw_main.c
# src/p_spec.c
|
2020-05-18 16:14:05 +02:00 |
|
Louis-Antoine
|
6af2871fa5
|
Rename P_GetZAt to P_GetSlopeZAt and P_GetZAt2 to P_GetZAt
|
2020-05-18 15:23:56 +02:00 |
|
Louis-Antoine
|
3fd2bb4548
|
Increase the length of the player input buffer even more
|
2020-05-18 12:35:55 +02:00 |
|