Steel Titanium
1e655fb2c1
Better fix for may be used uninitialized, maybe fixes GCC 4.x
2020-06-17 18:23:54 -04:00
Steel Titanium
3946309ece
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into sal-oglshaderport
...
# Conflicts:
# src/hardware/r_opengl/r_opengl.c
2020-06-17 18:15:07 -04:00
Steel Titanium
5708325d2b
Use SAMPLERATE for consistency with the rest of the code
2020-06-17 14:50:22 -04:00
Steel Titanium
f626b9f4d9
Fix VGZ sometimes causing SRB2 to crash by not playing the song early in I_LoadSong
2020-06-17 14:31:49 -04:00
Steel Titanium
a34be0e370
Reduce code duplication by creating get_zlib_error function
...
Reduce calls to gme_set_equalizer in I_LoadSong by moving it to I_PlaySong
Return false if it fails to decompress VGZ data in some form.
2020-06-17 14:19:19 -04:00
Steel Titanium
d3d5496a78
Fix facecolor may be used uninitialized.
2020-06-17 14:09:49 -04:00
lachwright
7d92631d97
Whoops, forgot hu_stuff.c
2020-06-17 05:27:42 +08:00
lachwright
edfd64877c
Add SF_NOSUPERSPRITES
2020-06-17 04:53:42 +08:00
lachwright
e403de7459
Merge branch 'next' into more-platform-fixes
2020-06-17 01:53:19 +08:00
lachwright
29738fcdd0
Allow Fang to bounce on solid rising floors without taking damage/losing all scorechain
2020-06-17 01:46:36 +08:00
lachwright
38e2c999c5
Platform fixes
2020-06-14 12:17:30 +08:00
Zachary McAlpin
6eccc7030d
I forgot to pop the error handler
2020-06-12 07:50:57 -05:00
Zachary McAlpin
965d42f974
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
2020-06-12 07:32:44 -05:00
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
Zachary McAlpin
0d70e16b0b
Updated LUAh_GameQuit to use new error handler
2020-06-11 15:11:01 -05:00
Zachary McAlpin
08e9efee76
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
2020-06-11 15:02:31 -05:00
lachwright
fad82265e0
Allow macOS builds to be launched through Steam
2020-06-12 01:19:06 +08:00
mazmazz
8fc414536f
CMAKE: Move launch-c into more sensible location
2020-06-10 15:08:09 -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
Zachary McAlpin
291479e3e8
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
2020-06-09 19:54:47 -05:00
mazmazz
46b383acda
CMAKE: Fix toggle fullscreen breakage due to missing define
...
This is lazy. The correct solution is to eliminate the define in the program code
2020-06-09 17:32:14 -04:00
MascaraSnake
a76c8af60c
Compiling fix
2020-06-09 22:10:02 +02:00
mazmazz
36e17006b7
CMAKE: Fix OS X ccache scripts
2020-06-09 11:12:52 -04:00
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
Steel Titanium
2abdc86537
Fix these "may be used uninitialized in this function" errors with batching
2020-06-08 20:18:32 -04:00
Steel Titanium
3dd89f67fa
Fix no previous prototype for TimeFunction
2020-06-08 19:56:24 -04:00
Steel Titanium
62d73968e2
Merge branch 'next' into sal-oglshaderport
2020-06-08 19:36:23 -04:00
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
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
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
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
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
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
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
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
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
SwitchKaze
d589e6bc95
Fix signpost shade.
2020-05-29 21:41:20 -05:00
Zachary McAlpin
7bdea21435
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
2020-05-29 15:32:59 -05:00
Louis-Antoine
1dbb755743
Add dofile() to Lua
2020-05-29 17:35:07 +02: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
SteelT
07da7f7d29
Merge branch 'scroller-tweaks' into 'next'
...
Add back side wall scrollers & allow using offsets for tagged wall scrollers.
See merge request STJr/SRB2!955
2020-05-28 11:29:39 -04:00
LJ Sonic
aab6339e66
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
1c42102ddb
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
f0b64971a0
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
67eef5a37f
Fix potential desynch when a player spawns
2020-05-28 11:03:35 +02:00
Louis-Antoine
bb1e3fdf13
Add a few missing calls to GameQuit hook
2020-05-27 14:58:10 +02:00
Monster Iestyn
40566e6926
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
mazmazz
272362a86f
Fix NOWIPE bugs with colormap fade and title card
2020-05-25 00:20:23 -04:00
mazmazz
8fee9a51ce
Add NOWIPE behavaior for colormap fades
2020-05-25 00:19:41 -04:00
Monster Iestyn
ed25fefcae
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
f508f5b881
Fix typo SKINCOLOT
2020-05-24 12:36:20 -05:00
SwitchKaze
b37c73b008
Make colors UINT16, increase color freeslots to 1024
2020-05-23 19:35:36 -05:00
Zachary McAlpin
566a5a0ab7
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
2020-05-23 15:23:43 -05:00
MascaraSnake
747d784c77
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
SwitchKaze
46191cade7
Update to 2.2.4
2020-05-22 16:47:51 -05:00
Monster Iestyn
4b7f0f49f1
added the ability to get the # of a mapthing_t in Lua
2020-05-22 18:32:34 +01:00
Monster Iestyn
c9c7327011
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
7722d41be6
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
702a7041d4
also do the fovtan multiplication thing with precip sprites
2020-05-20 19:34:18 +01:00
Louis-Antoine
bf00955786
Wait for acks before resending file fragments
2020-05-20 16:21:18 +02:00
James R
4eeae51cbb
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
06060c02d3
Add a command to list current file transfers
2020-05-20 00:24:53 +02:00
Louis-Antoine
c8948909d3
Fix I_Error when queuing multiple Lua files
2020-05-19 23:50:37 +02:00
sphere
934b28989f
Add linedef actions 507 & 508, allow using offsets for actions 502-504.
2020-05-19 23:39:35 +02:00
Monster Iestyn
c3d576058a
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
f620b52672
Fix sending Lua files in text mode
2020-05-19 21:36:21 +02:00
Louis-Antoine
34c5da39e2
Create FIL_ConvertTextFileToBinary
2020-05-19 20:00:58 +02:00
Monster Iestyn
65d6b04fd2
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
35e5d673e0
do tx checking after tz clamping, not before
2020-05-19 18:43:33 +01:00
Monster Iestyn
12e1094143
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
1a790235c6
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
c8320b6c9d
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
dd42682791
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
06d3af6716
Refactor Lua file transfer code
2020-05-19 15:16:51 +02:00
Louis-Antoine
db85c62c6f
Allow resuming the most recent file transfer
2020-05-19 11:28:24 +02:00
MascaraSnake
ff37975892
Merge branch 'next' into movement-refactor
...
# Conflicts:
# src/p_map.c
2020-05-19 09:50:23 +02:00
MascaraSnake
6f854f2de3
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
33a22331f8
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
530d0e3421
Remove redundant M_QuitResponse call
2020-05-18 14:56:10 -05:00
Zachary McAlpin
ed78d17ed3
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
2020-05-18 14:50:58 -05:00
Louis-Antoine
d40a8efce2
I forgot to test OpenGL :slight_smile:
2020-05-18 20:35:30 +02:00
GoldenTails
8b801921a4
Deprecate FixedRem.
...
It's about time!
2020-05-18 11:29:56 -05:00
Louis-Antoine
435643b958
Fix P_GetZAt for Lua
2020-05-18 16:16:45 +02:00
Louis-Antoine
d0abd6e86c
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
a06c4a8c98
Rename P_GetZAt to P_GetSlopeZAt and P_GetZAt2 to P_GetZAt
2020-05-18 15:23:56 +02:00
Louis-Antoine
37d2796b91
Increase the length of the player input buffer even more
2020-05-18 12:35:55 +02:00
Louis-Antoine
56cc5190e5
Allow input buffer to hold more than 64 tics
2020-05-18 11:34:09 +02:00
Louis-Antoine
e49d3d0bb9
Use per-node reference tics in ExpandTics
2020-05-17 20:23:07 +02:00
Louis-Antoine
fc07db26c0
Store starttic as a raw value in PT_SERVERTICS packets
...
This avoids some desynch issues and is simpler to handle.
Those packets are always big anyway, so the difference is irrelevant.
2020-05-17 20:09:11 +02:00
MascaraSnake
c05d1dd979
Merge branch 'software-missing-sprite-column' into 'next'
...
Fix missing sprite column (resolves #135 )
See merge request STJr/SRB2!944
2020-05-17 02:30:32 -04:00
MascaraSnake
a7c7f7afa9
Merge branch 'fof-cleanup' into 'next'
...
FOF cleanup
See merge request STJr/SRB2!910
2020-05-17 02:30:16 -04:00
Louis-Antoine
bf11e3a361
Add missing packet name
2020-05-16 23:22:33 +02:00
Louis-Antoine
66ecfb741a
Show total size when downloading gamestate
2020-05-16 22:49:20 +02:00
Louis-Antoine
3c7c758d17
Rewrite file transfer code
...
This code uses a custom packet acknowledgement system,
which is more suited for file transfer and does not suffer from
the small sender window used by the default acknowledgement system
2020-05-16 22:09:00 +02:00
Jaime Passos
423494381e
Fix mistake
2020-05-16 14:01:42 -03:00
Jaime Passos
c64e231b2b
Attempt to properly match Software texture blending
...
without messing with the original ASTBlendPixel function
2020-05-16 13:51:10 -03:00
Monster Iestyn
20e4d5ab9e
lib_sStopSoundByID: fixed mixed declaration and code compiler warning
2020-05-16 16:14:47 +01:00
MascaraSnake
969c48fac8
Merge branch 'udmf-next' into udmf-polyobjects
...
# Conflicts:
# src/p_polyobj.c
2020-05-16 11:18:47 +02:00
MascaraSnake
9b25ab27ca
Merge branch 'stop-sound-by-id' into 'next'
...
S_StopSoundByID Lua support
See merge request STJr/SRB2!925
2020-05-16 04:55:46 -04:00
MascaraSnake
5d7bea6400
Merge branch 'more-demo-cleanup' into 'next'
...
More Demo code cleanup
See merge request STJr/SRB2!942
2020-05-16 04:52:31 -04:00
MascaraSnake
371a1851e3
Polyobject waypoint movement: Prevent infinite loop if all waypoints are in the same location
2020-05-16 10:24:06 +02:00
MascaraSnake
536e355cdf
polywaypointdata_t: Turn reverse and continuous into flags
2020-05-16 09:49:30 +02:00
MascaraSnake
06dda9c69d
EV_DoPolyObjWaypoint: Don't discard movement if you start at the last waypoint
2020-05-16 09:09:26 +02:00
MascaraSnake
3680b246c9
T_PolyObjWaypoint: We can find waypoints in constant time now, so no need to store the waypoint mobj in the thinker anymore
2020-05-16 09:03:02 +02:00
MascaraSnake
1057c0f7c1
T_PolyObjWaypoint: If the polyobject reaches its target exactly, find next waypoint in the same tic
2020-05-16 08:49:03 +02:00
MascaraSnake
e422d1fa1d
Rewrite T_PolyObjWaypoint to move more smoothly
2020-05-16 08:45:06 +02:00
Steel Titanium
69c86c63b3
Fix A_SpinSpin not being usable in Lua or SOC due to an error
2020-05-15 23:05:29 -04:00
MascaraSnake
ed9b76e4b9
Merge branch 'opengl-character-select-mipmap-memory-leak-fix' into 'next'
...
Fix colormap mipmap memory leak on the character select in OpenGL
See merge request STJr/SRB2!943
2020-05-15 16:41:19 -04:00
MascaraSnake
8f4ed5af62
Merge branch 'nights-character-select' into 'next'
...
Character select in Nights mode.
See merge request STJr/SRB2!862
2020-05-15 16:39:38 -04:00
toaster
a5150e07fd
* Swap location of Tutorial and Marathon Run, per sphere's suggestion.
...
* Lock Marathon Run if Record Attack isn't available, to avoid confusing new players.
2020-05-15 21:32:54 +01:00
toaster
a615de3504
Correctly reset map/timer for retries where the first map in Marathon Run is LF_NORELOAD (by forcing a reload when the retry option is used).
2020-05-15 21:17:57 +01:00
James R
1ccca987cb
Jart? What's that?
2020-05-15 12:57:31 -07:00
Jaime Passos
288d7166bc
Fix ASTBlendPixel outputting empty pixels if the background pixel was empty, BUT if the foreground pixel had no alpha at all
2020-05-15 16:41:39 -03:00
Jaime Passos
00ac9deb5b
Fix missing sprite column
2020-05-15 16:17:31 -03:00
Jaime Passos
dd3c7aa0af
Fix colormap mipmap memory leak on the character select in OpenGL
2020-05-15 15:58:20 -03:00
Jaime Passos
5e28e358ad
Fix memory leak
2020-05-15 15:45:00 -03:00
MascaraSnake
0508f99419
T_PolyObjWaypoint: Move duplicated movement code into its own function
2020-05-15 17:35:07 +02:00
toaster
9686ad2d70
* In-game timer option! Doesn't tick in intermission or in lag, only when a frame is actually run. Realtime option remains default.
...
* Tweak retry behaviour to restart timer and not subtract life if you're on the first level and haven't hit a checkpoint yet.
2020-05-15 16:33:20 +01:00
toaster
1e3e9c81ac
Remove emblem hints from Marathon Run (I think Options is good just for the sake of live events, though).
2020-05-15 15:23:31 +01:00
toaster
47419ce0df
Introducing "antisplice" - a pair of small highlights on the Marathon bar that is based on the real time the executable has been open for and *isn't* restored with the Live Event Backup, making spliced runs basically intractable.
2020-05-15 15:08:45 +01:00
toaster
f06206cd5f
Fix "press any other key" sending you to HOM hell.
2020-05-15 14:24:29 +01:00
toaster
271c6d354b
Re-order Marathon bar to be drawn before FPS and captions if applicable.
2020-05-15 13:39:27 +01:00
toaster
4348ebdfa8
Make live event backup files savedata specific (new format: live%s.bkp, where %s is the time attack folder name/savegame name - so vanilla's is livesrb2sav.bkp).
2020-05-15 13:37:06 +01:00
toaster
2aa542d2bf
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into marathonmode
...
# Conflicts:
# src/doomdef.h
2020-05-15 13:23:37 +01:00
toaster
e99d38ffaf
Make a falsy useBlackRoc prevent doing Black Rock sparkle calculations and Egg Rock pulse sounds.
2020-05-15 13:19:52 +01:00
MascaraSnake
9cd9d2e0d7
Merge branch 'carry-dust-devil' into 'next'
...
Add carry types to Dust devils
See merge request STJr/SRB2!886
2020-05-15 02:50:29 -04:00
Jaime Passos
1a79f6246d
Merge remote-tracking branch 'origin/next' into pictureformats
2020-05-15 01:34:54 -03:00
James R
2ec97b87a0
This is SRB2
2020-05-14 17:29:36 -07:00
James R
57c7df74d9
Rename hms123311.c to http-mserv.c
...
HMS lives on in our hearts!
(cherry picked from commit e8a2397deaacdd7dc6f80717755bc89161247cb5)
2020-05-14 17:28:55 -07:00
James R
fec8879797
Use Unlock_state here too
...
(cherry picked from commit a6ce21b450644a79b08b9533166704c7ef093816)
2020-05-14 17:28:55 -07:00
toaster
d593e2e1bb
Introducing Marathon Run. (I was going to call it Marathon Mode, but NiGHTS Mode being right next to it on the menu looked terrible.)
...
Basically a dedicated Record Attack-like experience for speedrunning the game as a continuous chunk rather than ILs. Has several quality of life features.
Benefits include:
* An unambiguous real-time bar across the bottom of the screen, always displaying the current time, ticking up until you reach the ending.
* Disable the console (pausing is still allowed, but the timer will still increment).
* Automatically skip intermissions as if you're holding down the spin button.
* Show centiseconds on HUD automatically, like record attack.
* "Live Event Backups" - a category of run fit for major events like GDQ, where recovery from crashes or chokes makes for better entertainment. Essentially a modified SP savefile, down to using the same basic functions, but has its own filename and tweaked internal layout.
* "spmarathon_start" MainCfg block parameter and "marathonnext" mapheader parameter, allowing for a customised flow (makes this fit for purpose for an eventual SUGOI port).
* Disabling inter-level custom cutscenes by default with a menu option to toggle this (won't show up if the mod doesn't *have* any custom cutscenes), although either way ending cutscenes (vanilla or custom) remain intact since is time is called before them.
* Won't show up if you have a mod that consists of only one level (determined by spmarathon_start's nextlevel; this won't trip if you manually set its marathonnext).
* Unconditional gratitude on the evaluation screen, instead of a negging "Try again..." if you didn't get all the emeralds (which you may not have been aiming for).
* Gorgeous new menu (no new assets required, unless you wanna give it a header later).
Changes which were required for the above but affect other areas of the game include:
* "useBlackRock" MainCFG block parameter, which can be used to disable the presence of the Black Rock or Egg Rock in both the Evaluation screen and the Marathon Run menu (for total conversions with different stories).
* Disabling Continues in NiGHTS mode, to match the most common singleplayer experience post 2.2.4's release (is reverted if useContinues is set to true).
* Hiding the exitmove "powerup" outside of multiplayer. (Okay, this isn't really related, I just saw this bug in action a lot while doing test runs and got annoyed enough to fix it here.)
* The ability to use V_DrawPromptBack (in hardcode only at the moment, but) to draw in terms of pixels rather than rows of text, by providing negative instead of positive inputs).
* A refactoring of redundant game saves smattered across the ending, credits, and evaluation - in addition to saving the game slightly earlier.
* Minor m_menu.c touchups and refactorings here and there.
Built using feedback from the official server's #speedruns channel, among other places.
2020-05-14 23:10:00 +01:00
Monster Iestyn
ee520b4a0d
split significant chunks of G_CheckDemoStatus into their own smaller functions, also give writing demo checksums its own little function
2020-05-14 20:57:21 +01:00
kaysrishaq
70896f9095
clean whitespace
2020-05-14 07:42:06 -04:00
kaysrishaq
c2a54acae3
Minor reorganization
2020-05-14 07:17:58 -04:00
kaysrishaq
fd31c5cd5e
Update
...
Worked out some edge cases that had resulted in tracks restarting in the same format when they shouldn't - or tracks not switching to the other format when they should.
Removed stray }
2020-05-14 06:33:03 -04:00
kaysrishaq
53252f0d14
Merge branch 'next' into musicpref-var
2020-05-14 03:38:38 -04:00
James R
0b9c20cc70
ok
2020-05-13 17:52:49 -07:00
ZipperQR
6a9543b1c2
no message
2020-05-14 03:35:46 +03:00
James R
ae45333535
Revert "Use new two digit version number for HMS"
...
This reverts commit 7d2b3b0877
2020-05-13 17:31:51 -07:00
James R
4b19a3321b
Bind HMS connection with -bindaddr
2020-05-13 17:26:53 -07:00
James R
fb6572f080
Reset the masterserver address if the old one was set by the config
2020-05-13 17:26:34 -07:00
James R
35419cd77e
Clarify where debug prints go when using masterserver_debug
2020-05-13 17:26:34 -07:00
James R
d91d7773be
Use IPv4 for master server connections
...
Your server's address is gathered from the request, so it needs to be IPv4!
2020-05-13 17:26:34 -07:00
James R
7d2b3b0877
Use new two digit version number for HMS
2020-05-13 17:26:34 -07:00
James R
3e936a0878
Oops a debug condition snuck in there
2020-05-13 17:26:34 -07:00
James R
f9ec2a634c
Fix switching the master server
2020-05-13 17:26:34 -07:00
James R
47bc3bff13
Put some mutex on CONS_Printf etc. hahaha
2020-05-13 17:26:34 -07:00
James R
ca8b3e95af
Fucking multithreading in the server registration
...
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
2020-05-13 17:25:52 -07:00
James R
a80c7a26dd
Wait for threads before SDL_Quit (lol)
2020-05-13 17:25:52 -07:00
James R
5fff4c35fc
Create cond if it doesn't exist when signaling
2020-05-13 17:25:52 -07:00
James R
00ffb29f95
Use malloc for hms
2020-05-13 17:25:52 -07:00
Steel Titanium
ff8987f745
Support for http downloads
...
(cherry picked from commit 6fcc06bf72cf3b95c30f04919e807c7aaacec68d)
(cherry picked just the libcurl stuff)
2020-05-13 17:25:52 -07:00
James R
7ebde22b77
Make mod update, room list and server list multithreaded
...
This took fucking ages and it still fails sometimes in edge cases, but I
don't give a FUCK right now.
2020-05-13 17:24:27 -07:00
James R
886bd34be5
Multithreading in my SRB2???
2020-05-13 17:21:19 -07:00
James R
1584b7394b
WHY THE FUCK DID I DO THIS
2020-05-13 17:21:18 -07:00
James R
676865c1b9
Oops
2020-05-13 17:21:18 -07:00
James R
9216406eea
Handle NULL hms buffer
2020-05-13 17:21:18 -07:00
James R
197cffb7f5
Compiler errors: won't stop, can't stop
2020-05-13 17:21:18 -07:00
James R
4fcd24d848
masterserver_update_rate cvar determines wait between updates in minutes
...
The new default is 15 minutes as well. And if you think that's too long, I have
confirmed that the Master Server delists inactive servers after a whopping 40
minutes, at least.
2020-05-13 17:20:59 -07:00
James R
bb8b279cd4
Don't try to update right after registering
2020-05-13 17:20:59 -07:00
James R
eac7b2e060
Add a hack so the 'All' room isn't display for hosting
2020-05-13 17:20:59 -07:00
James R
4fd707984b
Kill the old mserv, long live HMS!
2020-05-13 17:20:59 -07:00
James R
1e4e5275b5
Clean up header text
2020-05-13 17:18:27 -07:00
James R
1f295b8e50
HTTP update alert
2020-05-13 17:18:27 -07:00
James R
1f04f8e0c0
Fix some goofs
2020-05-13 17:18:27 -07:00
James R
ec1d4c9a91
Bruh
2020-05-13 17:18:27 -07:00
James R
bcfbd5563b
Clean up a bunch of stuff and follow the Master Server API more closely
2020-05-13 17:18:27 -07:00
James R
b15b90f217
Windows certs do work, thanks Steel!
2020-05-13 17:18:27 -07:00
James R
a4bbc06f25
Handle more errors
2020-05-13 17:18:27 -07:00
James R
f26ad18e28
Kill masterserver_token
2020-05-13 17:18:27 -07:00
James R
273e1ff170
This will be the Master Server in 2020
2020-05-13 17:18:27 -07:00
James R
bec97faf5c
Use https because my web server redirects
2020-05-13 17:18:27 -07:00
James R
768ad80a97
strtok can return NULL
2020-05-13 17:18:27 -07:00
James R
9e0c1b3f1f
This time I fucked up
2020-05-13 17:18:27 -07:00
James R
bec233515e
Windows gaysed: the sequel
2020-05-13 17:18:27 -07:00
James R
acdced643c
Windows is weird
2020-05-13 17:18:27 -07:00
James R
2cfb04f90b
masterserver_debug to set CURLOPT_VERBOSE
2020-05-13 17:18:27 -07:00
James R
8228182823
Don't show "All" room when hosting
2020-05-13 17:18:27 -07:00
James R
06764dd88e
I don't even know my own website
2020-05-13 17:18:26 -07:00
James R
83365e6ce0
lol
2020-05-13 17:18:26 -07:00
James R
06da1425b3
The big bad HTTP master server
...
Cvars:
http_masterserver is the url to the master server's API.
masterserver_token may be an authentication token.
2020-05-13 17:18:26 -07:00
kaysrishaq
7f7ccc9911
musicpref console variable
...
Adds musicpref to console and sound options menu, which allows users to select whether to prioritize MIDI or Digital music.
Functions GameMIDIMusic_OnChange and GameDigiMusic_OnChange updated to not assume digital music priority, and to have more consistent behavior between the two.
Positive side effect of using P_RestoreMusic in these functions means that powerup music (speed shoes, invincibility) will restore in the correct position when reenabling the original MusicType they loaded in with.
2020-05-13 19:20:21 -04:00
MascaraSnake
7413da918b
Store PolyObject waypoint return behavior in an enum
2020-05-13 16:21:47 +02:00
MascaraSnake
b561ee7921
Remove diffx/y/z from polywaypoint_t, since they're always 0 anyway
2020-05-13 14:40:07 +02:00
MascaraSnake
acdb4b42ea
Merge branch 'actnum-tweaks' into 'next'
...
Act number tweaks
See merge request STJr/SRB2!905
2020-05-13 04:25:53 -04:00
MascaraSnake
9d06cb4be4
Merge branch 'fix-window-icon' into 'master'
...
Fix window icon being reset when switching renderers on non-Windows platforms
See merge request STJr/SRB2!898
2020-05-13 04:14:51 -04:00
MascaraSnake
0e2fb59650
Merge branch 'ogl-gif-fix' into 'master'
...
Fix OpenGL only recording the first frame of unoptimized GIFs
See merge request STJr/SRB2!928
2020-05-13 04:09:58 -04:00
MascaraSnake
ff3768f3e0
Merge branch 'udmf-next' into executordelay
2020-05-13 10:01:41 +02:00
MascaraSnake
1ccda0b85c
Merge branch 'next' into udmf-next
2020-05-13 10:01:12 +02:00
MascaraSnake
d3ec12c842
Merge branch 'udmf-next' into executordelay
...
# Conflicts:
# src/p_spec.c
2020-05-13 09:55:25 +02:00
MascaraSnake
aa16bd22f9
Fix accidental swap of first and last waypoint
2020-05-13 09:32:00 +02:00
MascaraSnake
36843cbfd6
Merge branch 'next' into waypoints
2020-05-12 23:51:32 +02:00
MascaraSnake
d708789c3a
Store waypoints (for zoom tubes, rope hangs, polyobjects) explicitly
2020-05-12 23:50:30 +02:00
Louis-Antoine
bf660dd35a
Rename local variables
2020-05-12 19:58:16 +02:00
Monster Iestyn
8c88c3dbb4
added missing extern keyword for ntemprecords in doomstat.h (definition is in g_game.c)
2020-05-12 18:43:49 +01:00
Monster Iestyn
064f4bcf34
added missing extern keyword for ms_RoomId in mserv.h (the definition is already in the .c file in this case)
2020-05-12 18:42:16 +01:00
Monster Iestyn
dab212dc56
turn all non-extern variables in s_sound.h into externs (and put their real definitions in the .c file)
2020-05-12 18:40:51 +01:00
Monster Iestyn
89cd756cd8
make savegamename in doomdef.h an extern, put the actual definition in d_main.c
2020-05-12 18:37:15 +01:00
Louis-Antoine
061fd4761a
Rename some file transfer functions
2020-05-12 19:06:40 +02:00
sphere
4eb5f09c6f
Restore SHORT().
2020-05-12 17:20:29 +02:00
sphere
0287c6956e
Fix some errors and add some comments. Also, actnum is not an INT32.
2020-05-12 17:20:28 +02:00
sphere
69c11a8220
Support act numbers up to 99 and draw both digits individually.
2020-05-12 17:17:24 +02:00
MascaraSnake
435e6c9812
Rename variables for Fang waypoints, in preparation for new global waypoint data structure
2020-05-12 14:53:10 +02:00
Steel Titanium
feced5ec3c
Merge branch 'master' into next
2020-05-11 18:20:09 -04:00
SteelT
78fe9af56a
Merge branch 'splitscreen-titlecards-fix' into 'master'
...
Fix splitscreen Title Card act name regression
See merge request STJr/SRB2!934
2020-05-11 18:18:22 -04:00
SteelT
432cca7556
Merge branch 'menu-soc-bullshit-mergefix' into 'master'
...
Menu soc bullshit mergefix
See merge request STJr/SRB2!933
2020-05-11 18:17:59 -04:00
James R
e80f6497d7
Merge remote-tracking branch 'origin/next' into 2.2.4-prep
2020-05-11 15:01:32 -07:00
Louis-Antoine
0c4f983eb5
Fix crash with rollout rock
2020-05-11 23:48:35 +02:00
James R
a645f3a44f
Update patch.pk3 asset hash
2020-05-11 14:41:36 -07:00
James R
c52c8e0282
Update version names, SUBVERSION, MODVERSION
2020-05-11 14:41:36 -07:00
Monster Iestyn
d508d16cef
Merge branch 'master' into next
2020-05-11 20:08:02 +01:00
Zwip-Zwap Zapony
334ad93c56
Fix splitscreen Title Card act name regression
...
This fixes act names not being shown on player 2's view
2020-05-11 19:57:20 +02:00
MascaraSnake
e288c9d4f2
Merge branch 'fix-simple-camera-and-eggstatue' into 'next'
...
Fix Simple Camera not working with the tutorial's statue challenge
See merge request STJr/SRB2!931
2020-05-11 13:31:09 -04:00
toaster
e5bc0583e5
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2.git into fickleheart/SRB2-menu-soc-bullshit
...
# Conflicts:
# src/m_menu.c
2020-05-11 15:00:31 +01:00
James R
7257fc730a
Remove instances of HAVE_BLUA that actually disable Lua now
2020-05-10 19:59:56 -07:00
James R
6b4ee94e38
Use camera angle, not mobj angle, when comparing Angle Anchor
2020-05-10 19:40:28 -07:00
sphere
61dfee7e13
Don't show the FPS counter during startup.
2020-05-11 01:33:34 +02:00
Steel Titanium
fabd76a5fe
Merge branch 'next' into 2.2.3-prep
2020-05-10 17:05:56 -04:00
Monster Iestyn
49864f646e
Merge branch '2.2.3-prep' of git@git.magicalgirl.moe:STJr/SRB2.git into 2.2.3-prep
2020-05-10 20:10:11 +01:00
Monster Iestyn
197da95a23
Last minute OpenGL fix: don't check flippedness in HWR_RotateSpritePolyToAim if the mobj is actually a precipmobj!
...
precipmobj_t does not have eflags, so P_MobjFlip checking it would actually be accessing memory addresses beyond the end of the struct
2020-05-10 20:09:08 +01:00
lachwright
215ff828f8
Merge branch 'master' into next
2020-05-11 01:29:10 +08:00
Lachlan Wright
357ad68599
Merge branch 'patch_music' into 'next'
...
patch_music.pk3
See merge request STJr/SRB2!812
2020-05-10 12:51:49 -04:00
lachwright
b7af502ed4
Update MD5 hashes for player.dta and patch.pk3
2020-05-11 00:23:32 +08:00
Monster Iestyn
3ce4c1b789
Fix logging on Mac
...
These fixes were suggested by Sveciaost on #mac-users on Discord
2020-05-10 16:47:01 +01:00
Monster Iestyn
baee6a1d57
Update version number to 2.2.3 in all the usual files, also updated MODVERSION
2020-05-10 16:02:23 +01:00
Louis-Antoine
dc55ab9ae2
Use W_CachePatchLongName in Snake minigame
2020-05-10 11:02:45 +02:00
Louis-Antoine
614f45b380
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into snake
2020-05-10 11:00:30 +02:00
LJ Sonic
280633019a
Merge branch 'gfz3laser-mkii' into 'next'
...
New Greenflower Zone 3 laser
See merge request STJr/SRB2!924
2020-05-09 16:40:40 -04:00
LJ Sonic
62d5d16f5c
Merge branch 'optimise-archiving' into 'next'
...
Optimise net-archiving of Lua strings, numbers and booleans
See merge request STJr/SRB2!904
2020-05-09 16:40:28 -04:00
Jaime Passos
38c74cecc0
Avoid a crash
2020-05-09 17:26:27 -03:00
Jaime Passos
39c5ab4e17
Merge remote-tracking branch 'origin/next' into gtr-fixes
2020-05-09 17:12:52 -03:00
Jaime Passos
ab7987d1cf
Fix OpenGL only recording the first frame of unoptimized GIFs
2020-05-09 16:59:09 -03:00
Zachary McAlpin
61562683c2
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
2020-05-09 00:05:05 -05:00
sphere
c55d6dbc9f
Make showfps save to config, and add a compact option.
2020-05-08 15:40:50 +02:00
Lachlan
426925c5fc
Play the 1-up sound when 1upsound is set to sound
2020-05-08 04:07:00 +08:00
MascaraSnake
60aa0f82f3
Merge branch 'next' of git.magicalgirl.moe:STJr/SRB2 into next
2020-05-07 22:00:02 +02:00
MascaraSnake
650f44566f
Fixed a typo
2020-05-07 21:59:39 +02:00
lachwright
9d21d790a4
Prevent laser sprites clipping into walls/off ledges
2020-05-08 02:58:56 +08:00
lachwright
36b400387e
Remove MF_NOBLOCKMAP from MT_LASER so Silver can find it
2020-05-07 23:24:33 +08:00
lachwright
3a1988fc01
Fix knockback scaling
2020-05-07 22:47:34 +08:00
lachwright
51a5ece294
Merge remote-tracking branch 'origin/next' into gfz3laser-mkii
2020-05-07 22:34:44 +08:00
Alam Ed Arias
24df9f032f
Merge branch 'master' into next
2020-05-06 18:36:20 -04:00
Alam Ed Arias
38232ce07e
fix build errors in public master
2020-05-06 18:35:54 -04:00
Monster Iestyn
30105621d4
Merge branch 'master' into next
2020-05-06 21:51:36 +01:00
Zipper
87f7100d2e
Update p_user.c
2020-05-06 09:30:15 -04:00
ZipperQR
d0376e284a
S_StopSoundByID Lua support
2020-05-06 16:22:04 +03:00
Lachlan
05ea95d0eb
Merge branch 'next' into gfz3laser-mkii
2020-05-06 09:10:27 +08:00
lachwright
63cb58a10a
Update new GFZ3 laser
2020-05-06 09:03:03 +08:00
lachwright
92c900f284
New GFZ3 laser
2020-05-06 09:01:02 +08:00
Louis-Antoine
2d6c9a94f4
Fix compiler warning
2020-05-05 14:05:19 +02:00
MascaraSnake
5282f01a53
Fix PolyObject flags not being applied when there is no parameter line
2020-05-05 08:40:59 +02:00
MascaraSnake
df3ca712d8
Move polyobject crush option to the first line args
2020-05-04 23:27:26 +02:00
MascaraSnake
8c36b9efa5
Adapt basic PolyObject setup to UDMF
2020-05-04 22:40:49 +02:00
MascaraSnake
6e7373a475
Merge branch 'next' into udmf-next
2020-05-04 20:32:56 +02:00
MascaraSnake
023c095d55
Merge branch 'polyobject-cleanup' into 'next'
...
PolyObject cleanup
See merge request STJr/SRB2!919
2020-05-04 14:18:08 -04:00
MascaraSnake
de100b076a
PolyObject: Allow translucency to be set via X offset
2020-05-04 19:47:39 +02:00
MascaraSnake
d03742b15b
Merge branch 'level-header-sector-typeskd' into 'next'
...
Allow some map-wide settings to be set via level header instead of sector types
See merge request STJr/SRB2!917
2020-05-04 05:21:49 -04:00
MascaraSnake
248df41a2f
Simplify set/fade polyobject translucency code
2020-05-04 10:29:35 +02:00
MascaraSnake
e3ddb413aa
Make PolyObject special functions return boolean instead of INT32
2020-05-04 10:07:38 +02:00
MascaraSnake
78a700f5fa
Remove non-descriptive comments
2020-05-04 10:01:44 +02:00
MascaraSnake
2be775e74c
Move parameter parsing for EV_DoPolyObjFlag into its own function
2020-05-04 09:58:27 +02:00
MascaraSnake
482adc6124
Pass parameters to EV_DoPolyObjFlag in a struct and not via the line
2020-05-04 09:54:32 +02:00
MascaraSnake
02c347ada2
Refactor Polyobj_findSegs
2020-05-04 01:28:21 +02:00
MascaraSnake
8ae635c7ba
Purge uninformative comments
2020-05-04 00:17:05 +02:00
MascaraSnake
b82c3c2089
Clean up Polyobj_GetInfo
2020-05-03 23:55:23 +02:00
MascaraSnake
5de11441a1
Remove "explicitly include line in polyobject" code which has never worked
2020-05-03 23:47:26 +02:00
MascaraSnake
a881662ca9
Implement "set linedef executor delay" linedef type
2020-05-03 21:03:15 +02:00
MascaraSnake
f26648e6f2
Adapt linedef executor delay to UDMF
2020-05-03 20:41:37 +02:00
MascaraSnake
7fec1211fd
Bugfix in XGL3 ZNODES parsing
2020-05-03 19:28:52 +02:00
MascaraSnake
700b340827
Allow map-wide gravity to be set via level header
2020-05-03 18:33:18 +02:00
MascaraSnake
4b87bee759
Add level header options for setting special stage time and spheres requirements
2020-05-03 17:56:49 +02:00
MascaraSnake
a9bd307dc0
Merge branch 'next' into egg-capsule
...
# Conflicts:
# src/p_spec.c
2020-05-03 15:29:20 +02:00
MascaraSnake
dd50990e85
Add "trigger egg capsule" linedef executor
2020-05-03 15:22:13 +02:00
ZipperQR
0d7c49e7e4
no message
2020-05-03 14:02:23 +03:00
MascaraSnake
d0d25025e1
Refactor P_CheckBouncySectors
2020-05-03 10:01:58 +02:00
Steel Titanium
887c25e047
Remove inline keyword from P_DoTwinSpin function
...
The compiler doesn't like this and will give you a "inlining failed in call to 'P_DoTwinSpin': call is unlikely and code size would grow" error
2020-05-02 17:39:55 -04:00
Hannu Hanhi
c9114867cc
Dummy I_GetTimeMicros
2020-05-02 23:24:49 +03:00
Hannu Hanhi
1b6e65b91c
Implement I_GetTimeMicros without affecting I_GetTime behaviour details
2020-05-02 23:14:20 +03:00
Hannu Hanhi
724e093ce8
Render stats cleanup
2020-05-02 23:14:08 +03:00
Hannu Hanhi
7e8543a408
More render stats for software mode, renamed and relocated some render stats variables
2020-05-02 23:13:53 +03:00
Hannu Hanhi
8dcc2fe20d
Move some render stats variables to better locations, add I_FinishUpdate timing
2020-05-02 23:13:32 +03:00
Hannu Hanhi
64a153fdee
Render stats
2020-05-02 23:13:08 +03:00
Monster Iestyn
1528f2aef8
Fix drop shadow and rotsprite code to use SHORT()
2020-05-02 17:13:16 +01:00
MascaraSnake
d9ed914e14
Merge branch 'amyswings' into 'next'
...
Restore jump-related pflags properly during twinspin
See merge request STJr/SRB2!908
2020-05-02 10:03:49 -04:00
MascaraSnake
452fd100b8
Refactor P_CheckBustableBlocks
2020-05-02 15:50:18 +02:00
MascaraSnake
122104815a
Revert some very incorrect refactoring
2020-05-02 15:33:15 +02:00
MascaraSnake
ddb4c2c97f
Refactor P_PushableCheckBustables
2020-05-02 15:30:56 +02:00
MascaraSnake
bc2d0dcea6
Some minor PTR_GlideClimbTraverse cleanup
2020-05-02 15:25:19 +02:00
MascaraSnake
929064b998
Refactor PTR_SlideTraverse
2020-05-02 15:21:53 +02:00
MascaraSnake
a67c8786ae
P_PlayerZMovement: Move PolyObject handling code into its own function
2020-05-02 13:49:16 +02:00
MascaraSnake
29192eff9a
Merge branch 'remove-polyobjects' into movement-refactor
2020-05-02 13:37:13 +02:00
MascaraSnake
afc6378868
P_PlayerZMovement: Move checks for Mario blocks into their own function
2020-05-02 13:34:24 +02:00
MascaraSnake
2605f29bd4
P_PlayerMobjThinker: Move check for floatbob platforms into its own function
2020-05-02 13:08:13 +02:00
MascaraSnake
19d77bfc53
P_PlayerMobjThinker: Move crumbling platforms check into its own function
2020-05-02 12:50:09 +02:00
MascaraSnake
485a4e5035
Remove POLYOBJECTS and POLYOBJECTS_PLANES defines
2020-05-02 12:08:31 +02:00
MascaraSnake
2a39265156
Make the laser thinker find the FOF itself instead of storing it in the thinker struct
2020-05-02 10:03:16 +02:00
MascaraSnake
c1304e019d
Clean up Thwomp spawning code
2020-05-02 09:15:34 +02:00
Zipper
dd645d88ea
Update p_user.c
2020-05-01 08:25:37 -04:00
MascaraSnake
5c8b50ca8b
Merge branch 'next' into udmf-next
...
# Conflicts:
# src/p_saveg.c
# src/p_slopes.c
# src/p_spec.c
2020-05-01 12:44:39 +02:00
MascaraSnake
2449c66b78
Merge branch 'find-sector-from-tag' into 'next'
...
Remove P_FindSectorFromLineTag and P_FindLineFromLineTag
See merge request STJr/SRB2!901
2020-05-01 05:49:52 -04:00
MascaraSnake
7922306113
Merge branch 'more-thinker-refactor' into 'next'
...
More thinker refactoring
See merge request STJr/SRB2!900
2020-05-01 05:47:14 -04:00
MascaraSnake
790affd13b
Merge branch 'next' into elevator-cleanup
...
# Conflicts:
# src/p_saveg.c
2020-05-01 11:42:05 +02:00
MascaraSnake
be0959fa90
Remove bogus comments from p_saveg.c
2020-05-01 11:25:32 +02:00
LJ Sonic
ef5f8f3bd2
Merge branch 'join-delay' into 'next'
...
Add a minimum delay between connections
See merge request STJr/SRB2!889
2020-05-01 03:29:15 -04:00
lachwright
165b6c2435
Dashmode fixes:
...
- Don't force the player's default normalspeed and jumpfactor while not in dashmode
- Properly trim the fuse for followmobj ghosts spawned during dashmode
- Add deliberate dashmode ghosts for Metal's jet fume
2020-05-01 08:26:23 +08:00
lachwright
f9b831c00b
Restore jump-related pflags properly during twinspin
2020-05-01 06:34:30 +08:00
Monster Iestyn
279ad0707e
Merge branch 'strncpy-brullshit' into 'next'
...
Fix a few strncpy bullshit
See merge request STJr/SRB2!895
2020-04-30 14:53:46 -04:00
Hannu Hanhi
be99670a39
More HWR_ProcessSeg sky code from master
2020-04-30 19:57:28 +03:00
Hannu Hanhi
ff8f48647b
HWR_ProcessSeg skywall processing from master
2020-04-30 19:57:15 +03:00
Monster Iestyn
0d3876abf3
Merge branch 'next' into netarchive-cleanup
2020-04-29 15:27:07 +01:00
Monster Iestyn
2f0bf3860f
Don't discard const, added missing &
2020-04-29 15:24:28 +01:00
Monster Iestyn
d89d2505bb
Whoops the third
2020-04-29 14:45:52 +01:00
Louis-Antoine
9b3917cd72
Revert "Replace a few instance of strncpy with strlcpy"
...
This reverts commit 2e27f32d3e
2020-04-29 10:55:49 +02:00
Zachary McAlpin
196c12549c
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
2020-04-28 18:31:15 -05:00
Louis-Antoine
ae05f11c45
Optimise number archiving
2020-04-28 23:12:02 +02:00
Louis-Antoine
3e8fb8db25
Optimise boolean archiving
2020-04-28 23:11:28 +02:00
Louis-Antoine
2e3c110534
Optimise string archiving and allow for longer strings
2020-04-28 22:19:44 +02:00
LJ Sonic
5c16e33432
Merge branch 'fix-intermission-mouse' into 'next'
...
Fix mouse being grabbed in intermission and cutscenes
See merge request STJr/SRB2!891
2020-04-28 04:25:32 -04:00
Louis-Antoine
752b48de3a
Update sound and closed captions in connection screen
2020-04-28 00:37:58 +02:00
Louis-Antoine
231a835bf6
Minor adjustements in Snake minigame
2020-04-27 23:15:18 +02:00
Louis-Antoine
dfdace22bb
Add bonuses and maluses to Snake minigame
2020-04-27 23:10:13 +02:00
Louis-Antoine
a3dcc100c0
Add pause and retry to Snake minigame
2020-04-27 22:06:32 +02:00
MascaraSnake
df692645c4
Merge branch 'raisethinker' into 'next'
...
Make P_AddRaiseThinker more configurable via function parameters (needed for UDMF)
See merge request STJr/SRB2!899
2020-04-27 15:04:37 -04:00
Louis-Antoine
647d74bad5
Add a background to Snake minigame
2020-04-27 15:31:38 +02:00
MascaraSnake
4cec927bbb
Replace P_FindLineFromLineTag with P_FindLineFromTag
2020-04-27 14:34:42 +02:00
MascaraSnake
0a0812bc57
Remove P_FindSectorFromLineTag
2020-04-27 14:31:37 +02:00
Louis-Antoine
c7cd53d5b2
Call rand() a few times after calling srand()
2020-04-27 14:22:45 +02:00
MascaraSnake
4f3d837835
Store "no bosses" setting for lasers in thinker instead of checking sourceline.
2020-04-27 13:09:57 +02:00
MascaraSnake
630af5d225
Pass thwomp settings to P_AddThwompThinker
2020-04-27 13:01:31 +02:00
Louis-Antoine
58c0383e88
Use sprites for snake and apple
2020-04-27 13:01:14 +02:00
MascaraSnake
556c2a8c18
Store tag instead of sourceline in raise thinker
2020-04-27 12:54:08 +02:00
MascaraSnake
2f9cccf287
Make P_AddRaiseThinker more configurable via function parameters (needed for UDMF)
2020-04-27 11:19:07 +02:00
Steel Titanium
e0f9b82544
Fix window icon being reset when switching renderers on non-Windows platforms
2020-04-26 18:46:43 -04:00
Louis-Antoine
380e246be3
Lower the download progress bar
2020-04-26 21:57:17 +02:00
Louis-Antoine
7c9ce1faee
Prevent edge warping in Snake minigame
2020-04-26 21:17:15 +02:00
MascaraSnake
c026b707ce
Make new thinker loading functions set floordata/ceilingdata where necessary
2020-04-26 18:54:03 +02:00
MascaraSnake
fb1746e95b
Deprecate the camera scanner effect and print a warning when it's used
2020-04-26 18:42:31 +02:00
MascaraSnake
82bf72f5e1
Remove obsolete stuff from elevator_t
2020-04-26 18:38:45 +02:00
MascaraSnake
f4282718dc
Accidentally changed the wrong SaveElevatorThinker call to SaveCrumbleThinker
2020-04-26 18:31:39 +02:00
MascaraSnake
554de0e0f5
T_StartCrumble refactoring, part 1
2020-04-26 16:51:14 +02:00
MascaraSnake
295ed303af
Make T_StartCrumble use its own thinker data structure
2020-04-26 11:55:10 +02:00
Louis-Antoine
2e27f32d3e
Replace a few instance of strncpy with strlcpy
2020-04-26 00:42:17 +02:00
Louis-Antoine
212358dbba
Restore old entry searching functions and add alternate versions for long names
2020-04-26 00:39:52 +02:00
Monster Iestyn
7034e2537a
whoops the sequel
2020-04-25 16:53:52 +01:00
Monster Iestyn
049a7db877
whoops
2020-04-25 16:52:11 +01:00
Hannu Hanhi
78c2928b8b
Optimization: also don't reset shader on models
2020-04-25 16:32:44 +03:00
Hannu Hanhi
c0c095e1d1
Optimization: only call pglUseProgram if shader actually needs changing
2020-04-25 16:32:32 +03:00
Hannu Hanhi
0758a8caec
Optimization: Don't reset shader program at end of DrawPolygon, instead reset it in UnSetShader
2020-04-25 16:32:21 +03:00
Nev3r
9ebb4071ee
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-multitag
...
# Conflicts:
# src/p_floor.c
# src/p_mobj.c
# src/p_spec.c
# src/r_segs.c
2020-04-25 10:47:45 +02:00
MascaraSnake
04c10ed41b
Merge branch 'next' into udmf-next
2020-04-25 08:19:26 +02:00
MascaraSnake
3cd8f62ae9
Remove a line I overlooked in the thinker cleanup branch
2020-04-25 08:18:48 +02:00
James R
fe9b933b97
Merge remote-tracking branch 'origin/master' into HEAD
2020-04-24 22:10:59 -07:00
Monster Iestyn
49cceda15b
Do the same with writing ARCH_FFLOOR values in Lua archiving code (reading was already dealt with years ago)
2020-04-24 22:43:23 +01:00
Monster Iestyn
7dda5f6b94
created P_GetFFloorID to get an "ID" of an FOF in its target sector (an opposite to P_GetFFloorByID you could say!), rewrote floor/ceiling rover archiving code to use both P_GetFFloorID and P_GetFFloorByID
2020-04-24 22:29:41 +01:00
Louis-Antoine
10fbaaf781
Fix compiler warnings
2020-04-24 22:19:05 +02:00
Monster Iestyn
e406a7bef5
no diff3 needed for line archiving
2020-04-24 20:58:38 +01:00
Monster Iestyn
1e61229cb7
we don't actually need put/get pointers at all (plus with everything put into functions they wouldn't work properly anyway)
2020-04-24 20:57:48 +01:00
Monster Iestyn
c1d2b8301b
split sector/lines archiving-related code into their own functions too
2020-04-24 20:40:50 +01:00
Monster Iestyn
2d45decbb0
remove statsec and statline as they appear to be entirely unused
2020-04-24 20:28:01 +01:00
Monster Iestyn
08a7fcbe8d
Split off FOF archiving-related code into their own functions
2020-04-24 20:26:57 +01:00
MascaraSnake
3170f2b8c3
Merge branch 'next' into udmf-next
...
# Conflicts:
# src/p_mobj.c
# src/r_segs.c
2020-04-24 21:15:53 +02:00
Monster Iestyn
d1d006a1a7
Merge branch 'thinker-cleanup' into 'next'
...
Plane movement thinker cleanup
See merge request STJr/SRB2!880
2020-04-24 14:30:52 -04:00
Louis-Antoine
d235d401bc
Improve controls handling in connection screen minigame
2020-04-24 19:27:42 +02:00
Louis-Antoine
9ac3fd202f
Add a Snake minigame to the downloading screen
2020-04-24 19:27:29 +02:00
Louis-Antoine
e4f2c1dc70
Fix mouse being grabbed in intermission and cutscenes
2020-04-24 18:33:35 +02:00
Monster Iestyn
9df5d6e1e0
These are flags! Serves me right for just rushing this out
2020-04-24 16:53:54 +01:00
Monster Iestyn
2419b65f79
Sync crumblestate in netgames
2020-04-24 16:40:09 +01:00
Louis-Antoine
c90cc3b58f
Add a menu option for the minimum join delay
2020-04-24 15:38:07 +02:00
Louis-Antoine
9ec4ba3824
Add a minimum delay between connections
2020-04-24 14:05:15 +02:00
Zachary McAlpin
187efb4df2
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
2020-04-23 18:39:31 -05:00
Zachary McAlpin
f6120410fb
Execute LUAh_GameQuit earlier in M_QuitResponse
...
It just feels a bit funny to execute LUAh_GameQuit if you are playing a session after the quit screen appears instead of before.
2020-04-23 17:38:08 -05:00
Monster Iestyn
bfb2467796
Merge branch 'uh-oh-spriteinfo' into 'next'
...
Fix minor issue with lua spriteinfo
See merge request STJr/SRB2!872
2020-04-23 16:12:55 -04:00
Monster Iestyn
4ef8093e92
Merge branch 'emeraldspawnfix' into 'next'
...
Fix emerald hunt not working properly, part 2
See merge request STJr/SRB2!887
2020-04-23 15:41:27 -04:00
Monster Iestyn
a71fe6445a
Merge branch 'master' into next
2020-04-23 18:49:53 +01:00
sphere
67f511a55e
Restore carelessly removed const keywords.
2020-04-22 23:38:10 +02:00
sphere
f85bfc87f5
Move variable declarations outside of for loops.
2020-04-22 23:17:18 +02:00
sphere
e26788d014
Fix variable-length array definition, just in case.
2020-04-22 23:10:43 +02:00
sphere
01a1297631
Make P_SpawnEmeraldHunt even more concise, using Fisher-Yates shuffle.
2020-04-22 22:46:12 +02:00
sphere
b254cb186b
Fix a mistake with P_SpawnEmeraldHunt and make it more concise.
2020-04-22 20:38:58 +02:00
sphere
25affe6948
Make emerald hunt shards spawn at correct heights, and add Float option.
2020-04-22 18:58:40 +02:00
Zipper
657ee8287e
Update p_user.c
2020-04-22 07:59:08 -04:00
Nev3r
ab7690346d
Merge branch 'udmf-thingargs' into udmf-multitag
...
# Conflicts:
# src/doomdata.h
# src/lua_mobjlib.c
# src/p_setup.c
2020-04-22 10:54:27 +02:00
Nev3r
de3ad9bc43
Merge branch 'udmf-next' into udmf-multitag
...
# Conflicts:
# src/doomdata.h
# src/p_setup.c
2020-04-22 09:11:17 +02:00
Nev3r
1afb0eb79f
Initialize pitch and roll on textmap mapthings too.
2020-04-22 09:00:29 +02:00
Nev3r
188ad67c58
Merge branch 'udmf-next' into udmf-thingargs
...
# Conflicts:
# src/p_setup.c
2020-04-22 08:58:40 +02:00
ZipperQR
64edd91dbd
Dust devil support
2020-04-22 00:59:12 +03:00
Nev3r
3d9d9d74f6
Merge branch 'udmf-pitch-and-roll' into 'udmf-next'
...
Add textmap pitch and roll parsing, and mobj pitch and roll variables.
See merge request STJr/SRB2!882
2020-04-21 12:27:26 -04:00
Nev3r
f4c2d70c7e
Merge branch 'udmf-mthingscale' into 'udmf-next'
...
Add mapthing scale support
See merge request STJr/SRB2!883
2020-04-21 12:26:46 -04:00
Louis-Antoine
0ddd2fea21
Let W_CheckNumForName(Pwad) find entries with long names
2020-04-21 11:08:18 +02:00
Louis-Antoine
29a94ee26a
Add a longname field to lumpinfo_t
2020-04-21 10:21:41 +02:00
Louis-Antoine
f6e2c7063f
Rename lumpinfo_t.name2 to lumpinfo_t.fullname
2020-04-20 23:40:41 +02:00
Nev3r
5c605a8a39
Merge branch 'udmf-next' into udmf-multitag
2020-04-20 09:05:55 +02:00
Nev3r
efb81fc526
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
2020-04-20 09:05:21 +02:00
James R
e79d8c7896
Merge branch 'flipfuncpointers-master' into 'master'
...
Flipfuncpointers (take two)
See merge request STJr/SRB2!864
2020-04-19 18:23:56 -04:00
Nev3r
1e4eab77a6
Use fixed_t on the mapthing scale for the sake of coherence.
2020-04-19 18:34:00 +02:00
Nev3r
aa98eb5a4c
Add mapthing pitch/roll Lua access as well.
2020-04-19 17:19:04 +02:00
Nev3r
0147320ff4
Add missed pitch and roll to precipmobj_t
2020-04-19 16:05:08 +02:00
Nev3r
beb42c9499
Move the scale setting code behind the MapthingSpawn hook.
2020-04-19 16:00:57 +02:00
Nev3r
67acb6e498
Add Lua support.
2020-04-19 15:56:06 +02:00
Nev3r
7cf08e1a08
Add mapthing scale support; fields scale, scalex and scaley set the only mapthing scale field alike.
2020-04-19 15:18:36 +02:00
Nev3r
ca10b38b9c
Add textmap pitch and roll parsing, and mobj pitch and roll variables.
2020-04-19 14:51:55 +02:00
Nev3r
9ac60a62b3
Fix cage issue with boss 4.
2020-04-19 13:13:53 +02:00
Nev3r
cde14c1d9f
Fix an outrageous typo which didn't get pushed for some reason.
2020-04-19 12:23:51 +02:00
Nev3r
6eaaa744f4
Taggroups are now sorted when a new entry is added.
2020-04-19 12:21:22 +02:00
James R
536fb1ef2a
Merge remote-tracking branch 'origin/master' into next
2020-04-18 17:20:33 -07:00
James R
cbe181c66d
Merge branch 'angle-for-spawn-object' into 'next'
...
Make the Spawn Object linedef executor able to set the object's angle.
See merge request STJr/SRB2!877
2020-04-18 20:16:07 -04:00
James R
b11845b045
Merge branch 'packetversion-revision' into 'master'
...
The rule for PACKETVERSION is too confusing, it's also too hard to unify formats
See merge request STJr/SRB2!875
2020-04-18 20:15:23 -04:00
James R
abb338d650
Merge branch 'continue_tweaks' into 'next'
...
A tangible mechanism to disable Continues
See merge request STJr/SRB2!865
2020-04-18 20:15:04 -04:00
MascaraSnake
09506112d7
Add enums to encapsulate the textmap colormap settings
2020-04-18 17:15:25 +02:00
MascaraSnake
f0c63ce76a
Merge branch 'udmf-next' into udmf-argenums
2020-04-18 16:56:21 +02:00
MascaraSnake
111da04b07
Add enums to encapsulate the textmap slope settings
2020-04-18 16:55:56 +02:00
MascaraSnake
c031008eab
Enable SF_TRIGGERSPECIAL_TOUCH for sectors with spike damage
2020-04-18 15:17:25 +02:00
Nev3r
ffc161e2aa
Merge branch 'udmf-next' into udmf-multitag
...
# Conflicts:
# src/p_spec.c
2020-04-18 14:04:15 +02:00
Nev3r
2b2a18fdf1
Merge branch 'udmf-colormaps' into 'udmf-next'
...
UDMF colormaps
See merge request STJr/SRB2!855
2020-04-18 07:42:24 -04:00
MascaraSnake
2a300bcea4
Fix NULL pointer crash involving stringargs
2020-04-18 12:23:01 +02:00
Nev3r
b7c4ed9c6b
Implement dynamic global taggroups/lists functionality.
2020-04-18 11:35:56 +02:00
MascaraSnake
54cbd66999
Eradicate levelspecthink_t
2020-04-18 11:05:58 +02:00
MascaraSnake
da594db3fc
Remove return values from a few elevator functions that don't use them
2020-04-18 10:52:58 +02:00
MascaraSnake
ab17267363
Make T_BounceCheese use its own thinker struct
2020-04-18 10:45:21 +02:00
MascaraSnake
08f1e03e79
Refactor T_ThwompSector
2020-04-18 10:26:03 +02:00
MascaraSnake
29d33f0a93
Refactor T_NoEnemiesSector
2020-04-18 09:21:04 +02:00
MascaraSnake
0038605979
Make T_MarioBlock use its own thinker data structure
2020-04-18 02:05:23 +02:00
MascaraSnake
7e2f95c3f5
Refactor T_ContinuousFalling
2020-04-18 01:42:13 +02:00
MascaraSnake
70d262653e
Refactor T_MovePlane a little bit
2020-04-18 01:08:01 +02:00
MascaraSnake
cc0f686c95
Refactor T_FloatSector
2020-04-18 00:26:49 +02:00
Nev3r
aa0d76f8fa
Delete tags.
2020-04-18 00:23:24 +02:00
Nev3r
e87ad0fb38
Delete old taglists.
2020-04-18 00:05:55 +02:00
MascaraSnake
fd598f315e
Add an enum for crumblestate
2020-04-17 23:54:37 +02:00
Nev3r
d775a42e93
Rewrote a bit of the boss 4 code, which still requires working dynamic global tag lists.
2020-04-17 23:43:26 +02:00
MascaraSnake
779b10681f
Refactoring in T_BounceCheese
2020-04-17 23:32:39 +02:00
Nev3r
38c665fa79
Remove old taglist access from Lua.
2020-04-17 23:31:08 +02:00
Nev3r
7c11091c40
Remove old tag list netgame packing/unpacking.
2020-04-17 23:30:47 +02:00
Nev3r
9eb17e4104
Remove P_ChangeSectorTag().
2020-04-17 23:30:07 +02:00
Nev3r
e2a98a1591
Double fuck.
2020-04-17 23:05:41 +02:00
MascaraSnake
9b27d004e3
Remove the spike thinker, which hasn't been necessary for a while now
2020-04-17 22:54:35 +02:00
Nev3r
0c2fb80ec9
Fuck.
2020-04-17 22:41:04 +02:00
Nev3r
6c12e6701d
Make the Lua interface return/set the first tags from the local taglists.
2020-04-17 22:30:16 +02:00
Nev3r
ae07b7c96c
Netsynch the sector local taglists.
2020-04-17 22:29:26 +02:00
Nev3r
7904856e8e
Remove presumably the remaining old tag references in the gamelogic.
2020-04-17 22:28:41 +02:00
MascaraSnake
099ad6cf20
Remove sec assignments that have become superfluous
2020-04-17 21:39:38 +02:00
MascaraSnake
5a58b2d90e
Refactor T_EachTimeThinker
2020-04-17 21:19:21 +02:00
Nev3r
b5eaad42fc
Carry over a considerable case regarding accessing the old tag vars.
2020-04-17 18:15:25 +02:00
Nev3r
e3dfdb448e
Add currently unused auxiliary function.
2020-04-17 18:14:15 +02:00
MascaraSnake
89539512f6
Make T_EachTimeThinker use its own struct
2020-04-17 14:00:48 +02:00
Nev3r
b690d35a99
Move the global taglist init functionality to the taglist files.
2020-04-17 12:52:44 +02:00
Nev3r
209b8e7678
Map loading should consider tag 0 as a valid tag and add its respective entries just like the rest of tags.
2020-04-17 11:21:40 +02:00
Nev3r
dd46b1ab44
P_ConvertBinaryMap() line conversion now uses the first tag from taglists.
2020-04-17 11:16:01 +02:00
MascaraSnake
3e0a9c8718
Forgot to clean up some stuff
2020-04-17 11:13:13 +02:00
MascaraSnake
63a901b714
-Remove superfluous variables from raise_t
...
-Cleanup signatures of P_AddRaiseThinker and P_AddAirbob
2020-04-17 11:11:36 +02:00
Nev3r
a5bc3fb507
P_SpawnSpecials() line special spawn sequence now uses the taglist, until we move on to using args[0].
2020-04-17 10:52:12 +02:00
Nev3r
61c3e12d63
Make a commented out debug code account for taglists.
2020-04-17 10:41:26 +02:00
Nev3r
e59480e4cf
Portal lines now use the taglist's first element.
2020-04-17 10:34:24 +02:00
Nev3r
b9decb2837
Polyobject spawning now use the taglist.
2020-04-17 10:30:38 +02:00
MascaraSnake
a41dbe2bae
Get rid of code duplication in T_RaiseSector
2020-04-17 10:19:02 +02:00
Nev3r
4fc07473fd
Skybox spawning now uses the taglists.
2020-04-17 10:05:50 +02:00
Nev3r
81be6b4067
Thing-based slope vertexes use taglists now.
2020-04-17 10:04:11 +02:00
MascaraSnake
d0c473c9ae
Make T_RaiseSector use its own thinker struct instead of levelspecthink_t
2020-04-17 09:58:53 +02:00
Nev3r
944716c45a
Add auxiliary functions to the taglist library.
2020-04-17 09:57:45 +02:00
Nev3r
c0b4090924
Clean up type inconsistency on tags.
2020-04-16 18:48:57 +02:00
Nev3r
1d572c5b2c
Fix fuckup in the -1 tag bailout on the global tag lists.
2020-04-16 15:10:48 +02:00
Nev3r
786e448f16
Do not add -1 to the global taglists.
2020-04-15 10:17:14 +02:00
Nev3r
95c7690a40
Remove P_FindSpecialLineFromTag()
2020-04-15 10:16:49 +02:00
Nev3r
7d3d71c418
Get rid of the last case of P_FindSpecialLineFromTag() in the main code.
2020-04-15 10:05:59 +02:00
Nev3r
f9b1acb813
reworked Tag_FindLineSpecial()
2020-04-15 09:41:21 +02:00
Nev3r
2d9b0e4906
Fix the args in Tag_FindLineSpecial() being swapped.
2020-04-15 09:32:19 +02:00
Nev3r
439fde3434
Replace most P_FindSpecialLineFromTag() cases with Tag_FindLineSpecial(), which settle with the first found result.
2020-04-14 23:59:22 +02:00
Nev3r
d518703334
Replaces P_FindSectorFromTag() occurrences with its corresponding macro and vanishes it from existence.
2020-04-14 23:33:56 +02:00
Nev3r
25102ab4af
Remove P_FindSectorFromLineTag()
2020-04-14 22:22:48 +02:00
Nev3r
35f539e398
Merge branch 'udmf-next' into udmf-multitag
2020-04-14 22:21:32 +02:00
Nev3r
d40713d08b
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
2020-04-14 22:20:54 +02:00
Nev3r
24baf5bea0
Replace P_FindSectorFromLineTag() with its corresponding macro for most cases.
2020-04-14 22:19:18 +02:00
Nev3r
5df60f8e15
Make use of functions for the tag lists iterations instead of bloated macros.
2020-04-14 21:46:02 +02:00
Nev3r
8495b59890
Added hilarious -1 tag support for the iteration macros.
2020-04-14 18:53:05 +02:00
Nev3r
464ecc01a4
Merge branch 't_moveplane-refactor' into 'next'
...
Remove faulty code from T_MovePlane()
See merge request STJr/SRB2!876
2020-04-14 05:53:59 -04:00
Nev3r
778ef86fee
Remove the bridge thinker code.
2020-04-14 10:31:07 +02:00
Nev3r
e820b9e369
Fixed a typo worthy of divine punishment.
2020-04-13 19:45:41 +02:00
sphere
01b28b66a6
Make linedef type 461 able to set object angle, using the line's angle.
2020-04-13 17:10:25 +02:00
Nev3r
01c0797ba6
Remove now unused P_MobjReadyToMove().
2020-04-13 16:00:58 +02:00
Nev3r
74bd23c275
Actually remove the entire code block in T_MovePlane(), and remove line_t.tagline as it served no other purpose.
2020-04-13 15:17:53 +02:00
Nev3r
711c35970c
Refactor an unholy piece of code.
2020-04-13 14:31:19 +02:00
Nev3r
dbf0f14dc4
Replace P_FindSectorFromLineTag() in p_floor.c
2020-04-13 13:27:45 +02:00
Nev3r
909268d175
Replace P_FindLineFromLineTag() instances with macros and remove its code.
2020-04-13 13:10:38 +02:00
Nev3r
de07c04f5c
Make the macros and their usage relatively cleaner.
2020-04-13 13:09:58 +02:00
Nev3r
0d1f898869
Added disabled test code in P_FindSectorFromTag().
2020-04-13 13:09:04 +02:00
Nev3r
5e20e9e27e
Fix typo involving the stringargs exposure.
2020-04-13 10:21:32 +02:00
James R
4214397679
Make the PACKETVERSION rule easier
2020-04-12 17:05:18 -07:00
Nev3r
499c884501
Add multitag support to FOF spawners.
2020-04-12 18:52:47 +02:00
Nev3r
cb2571b12c
Rename the macros, reshape them slightly to avoid mixed declarations, and add a finalizer.
2020-04-12 18:42:42 +02:00
Nev3r
f7f9b68bb9
Introduce tagged element iteration macros.
2020-04-12 17:50:48 +02:00
Nev3r
07b4d0ee3d
Add lookup tag tables construction.
2020-04-12 15:16:04 +02:00
Nev3r
38e92aecfd
Fix Tags_Compare() typo to Tag_Compare().
2020-04-12 15:03:14 +02:00
Nev3r
64e2e7c12f
Use Tags_Compare wrapper in the OpenGL renderer, as well.
2020-04-12 13:16:33 +02:00
Nev3r
fe4ab5d29f
Use Tags_Compare wrapper on software renderer to compare sector tags.
2020-04-12 13:14:39 +02:00
Nev3r
bfd48c4c83
add Tag_Compare()
2020-04-12 13:05:21 +02:00
Nev3r
ab2619d538
Wrap P_FindSectorFromLineTag() is now a wrapper for P_FindSectorFromTag().
2020-04-12 13:04:15 +02:00
Nev3r
a7e99ab5cf
Added static multitag read and storage on mapload.
2020-04-12 11:56:36 +02:00
Nev3r
ca694c8c43
Merge branch 'udmf-next' into udmf-thingargs
2020-04-12 10:02:12 +02:00
Nev3r
4128f826b7
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
...
# Conflicts:
# src/lua_hooklib.c
2020-04-12 09:57:19 +02:00
Nev3r
21de33bd08
Add mapthing arg support.
2020-04-11 12:54:34 +02:00
fickleheart
be07a23e52
Make a separate function instead of clogging up IdentifyVersion
2020-04-09 20:56:27 -05:00
fickleheart
6845aca6e5
Make chdir usage consistent with other source usage
2020-04-09 20:52:23 -05:00
fickleheart
614449298e
Merge remote-tracking branch 'upstream/master' into netgame-urls
2020-04-09 20:48:52 -05:00
James R
d460e1e826
Merge branch 'pk3-xtra-comm-fix' into 'next'
...
PK3: Proper ignorance for file comments/extra data
See merge request STJr/SRB2!761
2020-04-09 21:25:11 -04:00
James R
efe74cfd8f
Merge branch 'md2-rollangle' into 'master'
...
Fix MD2 rollangle in reverse gravity
See merge request STJr/SRB2!818
2020-04-09 21:25:02 -04:00
James R
0313213c59
Merge branch 'hw-horizon' into 'master'
...
OGL horizon lines
See merge request STJr/SRB2!861
2020-04-09 21:24:41 -04:00
James R
e457b71e7e
Merge branch 'execcfg-fixes' into 'master'
...
ExecCfg fixes
See merge request STJr/SRB2!821
2020-04-09 21:24:12 -04:00
Zachary McAlpin
31b19f69a2
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
2020-04-09 20:12:11 -05:00
James R
dc25177457
You don't need to push the value twice, it's only used once
2020-04-09 17:30:53 -07:00
James R
aca39d6210
Merge remote-tracking branch 'origin/master' into next
2020-04-09 17:04:04 -07:00
James R
b029ccff0d
Merge branch 'hide-useless-1p-menu-options' into 'master'
...
Hide record & NiGHTS attack options if there are no available maps for them.
See merge request STJr/SRB2!868
2020-04-09 19:57:27 -04:00
James R
40a74a6211
Merge branch 'ra-emblemhints' into 'master'
...
Allow emblem hints (and radar) in record attack.
See merge request STJr/SRB2!820
2020-04-09 19:56:17 -04:00
James R
5f7bd9a947
Merge branch 'fix-256-brightness' into 'master'
...
Florida man fixes sectors with light level 256 blacking out OpenGL objects; mappers riot.
See merge request STJr/SRB2!840
2020-04-09 19:53:40 -04:00
James R
2fda89f1c3
Merge branch 'bot-respawn-hook' into 'next'
...
BotRespawn hook
See merge request STJr/SRB2!804
2020-04-09 19:52:25 -04:00
James R
bd7d05fdf0
Merge branch 'gtr-replace' into 'next'
...
Separate PvP damage from ringslinger
See merge request STJr/SRB2!831
2020-04-09 19:51:52 -04:00
James R
2dfe276a73
Merge branch 'sdlglcontext' into 'master'
...
Only initialise OpenGL if the user intends to load it (for real this time)
See merge request STJr/SRB2!796
2020-04-09 19:51:20 -04:00
James R
b8d40a5783
Merge branch 'dye' into 'next'
...
Expose colorization to mappers and SOC
See merge request STJr/SRB2!679
2020-04-09 19:50:32 -04:00
James R
78613ec445
Merge branch 'supergoldedit' into 'next'
...
Change SKINCOLOR_SUPERGOLD1-5
See merge request STJr/SRB2!805
2020-04-09 19:50:06 -04:00
James R
4e7283c833
Merge branch 'pk3-directory-start' into 'next'
...
Don't skip the first directory entry of PK3 if it's a file
See merge request STJr/SRB2!764
2020-04-09 19:49:44 -04:00
James R
d4c08a8410
Merge branch 'lightmemedata' into 'next'
...
Cvars returned by CV_FindVar did not work with userdataType
See merge request STJr/SRB2!754
2020-04-09 19:48:39 -04:00
James R
e100f21dda
Merge branch 'loop-patch' into 'next'
...
Let MUSICDEF set loop point
See merge request STJr/SRB2!762
2020-04-09 19:47:43 -04:00
James R
aad225932d
Merge branch 'SF_NONIGHTSSUPER' into 'next'
...
Skin flag for disabling super colors in NiGHTS
See merge request STJr/SRB2!782
2020-04-09 19:47:20 -04:00
James R
673a842043
Merge remote-tracking branch 'origin/next' into SF_NONIGHTSSUPER
2020-04-09 16:47:52 -07:00
James R
1edc300d0c
Merge branch 'lua-hook-cleanup' into 'next'
...
Lua hook cleanup
See merge request STJr/SRB2!851
2020-04-09 19:40:09 -04:00
James R
a4fa4351d8
Merge branch 'fix-consbackpic' into 'master'
...
Fix console backpic
See merge request STJr/SRB2!850
2020-04-09 19:39:16 -04:00
James R
b4ab284d21
Merge branch 'fixed2float-funcs' into 'master'
...
Turn FIXED_TO_FLOAT into a function
See merge request STJr/SRB2!869
2020-04-09 19:37:22 -04:00
Zachary McAlpin
28de6b1f93
Execute LUAh_GameQuit in 2 additional places in m_menu.c
2020-04-03 17:44:57 -05:00
Zachary McAlpin
c629883afa
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
2020-04-02 16:13:20 -05:00
sphere
806884a3f4
Use M_GametypeHasLevels again (properly this time) to save memory.
2020-04-02 17:59:56 +02:00
sphere
3074880ac1
Actually check for available maps correctly. Whoops!
2020-04-02 16:07:38 +02:00
Steel Titanium
9a242818a7
Merge branch 'master' into next
2020-03-31 20:46:54 -04:00
Louis-Antoine
ad12e29fda
Fix allowjoin off affecting single player
2020-03-30 22:11:48 +02:00
Monster Iestyn
befae492fe
use ATTRINLINE rather than inline to match some of the other functions in this file, though I'm told modern compilers ignore inlining info as they actually decide themselves now
...
(though I could pretend we still support the older ones lol)
2020-03-30 20:25:56 +01:00
Monster Iestyn
2e27b3ea87
Turn the fixed-float convert macros into inline functions, like those in GZDoom. The old macros get to be just the same as calling these inline functions.
2020-03-30 19:58:46 +01:00
Louis-Antoine
8130599a4f
Fix disconnected players being kicked for high ping
2020-03-28 15:23:15 +01:00
toaster
da86c17ee1
Disable continues outside of no-save/Ultimate by default, but allow SOC to re-enable them globally.
...
Please look at the merge request description for a full explanation, since I know the vanilla team has been hashing this out and I don't want to add fuel to the fire without at least presenting a solid case.
2020-03-26 20:16:44 +00:00
toaster
ce2a1aa3b2
Minor optimisations surrounding R_DrawFlippedMaskedColumn.
...
* Replace the texheight parameter provided directly to it with a previously existing (now renamed) global used for the same purpose, so that it can be used as an interchangeable function pointer with R_DrawMaskedColumn.
* Using the above, optimise R_DrawVisSprite to call a function pointer in a tighter loop rather than check SC_VFLIP each time around.
* SHORT macro can involve repeated operations; calculate once and put in memory for both RANGECHECK and papersprite.
* Remove irrelevant range check (already covered by existing range check immediately above) from R_DrawFlippedMaskedColumn and R_DrawMaskedColumn.
* "Warning: avoiding a crash in %s %d" is a terrible error message, and it chips away at the tightness of the loop just for something most people will never see printed. Replace with a PARANOIA I_Error in case someone actively wants to go hunting for its cause.
2020-03-26 16:09:19 +00:00
MascaraSnake
92c74814cf
Standardize the behavior of FF_INVERTSIDES and FF_INVERTPLANES
2020-03-25 08:34:52 +01:00
Zachary McAlpin
decce7905b
Moved LUAh_GameQuit(void) function to the end of the lua_hooklib.c
2020-03-24 22:55:25 -05:00
Zachary McAlpin
21353f1209
Screw merge conflicts
2020-03-24 20:38:46 -05:00
Sonic Edge
60f7e35383
Character select in Nights mode.
2020-03-24 16:21:33 -04:00
sphere
99a5192872
Hide record/NiGHTS attack if there are no available maps for them.
2020-03-24 16:10:30 +01:00
fickleheart
719f29d27e
Reduce near renderdist to lessen visible texture distortion
2020-03-23 08:23:36 -05:00
Monster Iestyn
4722fbbc2a
Merge branch 'demos-refactor' into 'next'
...
Demos refactor
See merge request STJr/SRB2!853
2020-03-22 17:52:45 -04:00
Monster Iestyn
23b6679b3a
Merge branch 'buggle-trouble' into 'next'
...
P_HomingAttack related fixes
See merge request STJr/SRB2!836
2020-03-22 16:57:22 -04:00
Monster Iestyn
3b9dd31faf
Merge branch 'fix-setspriteinfo' into 'next'
...
Fix lib_setSpriteInfo indexes being off-by-one
See merge request STJr/SRB2!854
2020-03-22 16:40:34 -04:00
fickleheart
f9027ccaeb
Split horizon lines for minimal distortion
2020-03-22 12:52:17 -05:00
fickleheart
14d6a01292
Distort far edges to viewz for a flat horizon line
2020-03-22 12:28:49 -05:00
fickleheart
deff1565dc
GL horizon lines
2020-03-22 12:13:59 -05:00
Louis-Antoine
6ffbc89f42
Remove redundant conditional in P_IsClimbingValid
2020-03-22 17:45:07 +01:00
Louis-Antoine
478f0f2059
Cleanup P_IsClimbingValid
2020-03-22 17:39:51 +01:00
Louis-Antoine
ea631715a6
Remove unused define
2020-03-22 17:29:15 +01:00
Louis-Antoine
6f9422d380
Encapsulate plane height checks
2020-03-22 17:28:50 +01:00
Louis-Antoine
077543f2e9
Fix typo in camera handling code
2020-03-22 15:21:23 +01:00
MascaraSnake
2133bc89e6
Merge branch 'udmf-next' into udmf-colormaps
2020-03-22 08:05:05 +01:00
MascaraSnake
1580e14cbc
Merge branch 'next' into udmf-next
...
# Conflicts:
# extras/conf/Includes/SRB222_linedefs.cfg
# extras/conf/Includes/SRB222_misc.cfg
# src/p_spec.c
2020-03-21 20:04:31 +01:00
MascaraSnake
42445b39d7
Merge branch 'master' into next
2020-03-21 19:16:52 +01:00
LJ Sonic
fa9c2f43f7
Merge branch 'skip-empty-gametypes' into 'master'
...
Skip empty gametypes in level select menu
See merge request STJr/SRB2!819
2020-03-21 08:52:54 -04:00
fickleheart
f32ab5918e
Define SERVER_URL_PROTOCOL const for easy reconfiguration
2020-03-21 07:47:29 -05:00
fickleheart
feb18208cb
Add support for srb2:// URL handler (server links)
2020-03-21 01:36:39 -05:00
Louis-Antoine
892a8dd6e7
Make SRB2 flat like Earth
2020-03-20 18:55:29 +01:00
Monster Iestyn
7a585e2498
Merge branch 'next' into demos-refactor
...
# Conflicts:
# src/g_game.c
(also update g_demo.c)
2020-03-20 17:48:31 +00:00
MascaraSnake
0ecf8616ba
Add sector flag that protects the colormap from being changed
2020-03-20 12:19:02 +01:00
MascaraSnake
7cf9ad2f2b
Adapt setup of colormap linedefs
2020-03-20 11:19:30 +01:00
fickleheart
78ec210896
hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh
2020-03-19 18:55:10 -05:00
Jaime Passos
5eaa73b6ac
Fix lib_setSpriteInfo indexes being off-by-one
2020-03-19 19:09:34 -03:00
Monster Iestyn
4236ae7c08
We don't need m_cheat.h either in g_demo.c
2020-03-19 21:10:23 +00:00
Monster Iestyn
6610150bfe
We definitely don't need these files to compile!
2020-03-19 20:43:56 +00:00
Monster Iestyn
dd76be16cb
Create G_FreeGhosts, for the benefit of G_DeferedInitNew (assuming it actually needs to do ghosts = NULL; at all)
2020-03-19 20:42:51 +00:00
Monster Iestyn
1a14234088
update Makefile, CMakeLists.txt and MSVC project files
2020-03-19 20:13:39 +00:00
Monster Iestyn
dcb4ce8cb9
Created g_demo.c/.h, for the demo recording and playback code that formerly lived in g_game.c
2020-03-19 20:09:55 +00:00
Louis-Antoine
e3cbdf8fab
Use HAVE_BLUA as fuel for my fireplace
2020-03-19 18:36:14 +01:00
Louis-Antoine
c1b50397ce
Fix compiler warning
2020-03-19 14:40:35 +01:00
Louis-Antoine
1d5d6ead65
Fix misleading naming
2020-03-19 14:40:12 +01:00
Louis-Antoine
58c42eec29
Simplify hook code
2020-03-19 14:38:42 +01:00
fickleheart
725826a64b
Avoid infinite loops if no maps are selectable (y tho)
2020-03-18 22:56:20 -05:00
fickleheart
05b2570ae7
Merge remote-tracking branch 'upstream/next' into lua-music
2020-03-18 22:43:07 -05:00
fickleheart
9c86cd0bc2
More union types for the union type god
2020-03-18 22:42:31 -05:00
fickleheart
520e3c5dc3
Are these casts unnecessary...??
2020-03-18 22:40:11 -05:00
fickleheart
647f73c8f2
Clean up after myself
2020-03-18 22:38:51 -05:00
fickleheart
dd0d86120b
> building SRB2 without Lua in 2020
2020-03-18 22:38:18 -05:00
fickleheart
e0badd1e5b
Rename hook to ShouldJingleContinue
2020-03-18 22:35:21 -05:00
Steel Titanium
5dac9c6875
Merge branch 'master' into next
2020-03-18 15:42:02 -04:00
SteelT
04131d3268
Merge branch 'fix-nights-mode-menu-wrong-return' into 'master'
...
NiGHTS Mode menu fixes
See merge request STJr/SRB2!841
2020-03-18 15:41:17 -04:00
SteelT
e3a5164ddf
Merge branch 'deadzone-sigfpe-fix' into 'master'
...
Fix division-by-0 crash from 100% gamepad deadzones, and lack of input from 0% deadzones
See merge request STJr/SRB2!838
2020-03-18 15:39:04 -04:00
SteelT
bd058ecc4b
Merge branch 'viewpointswitch-fix' into 'next'
...
Fix incorrect newdisplayplayer in forced ViewpointSwitch
See merge request STJr/SRB2!814
2020-03-18 15:34:18 -04:00
LJ Sonic
38bcfe4997
Merge branch 'screenshot-menu-header' into 'master'
...
Actually use the "SCREENSHOT OPTIONS" header for its menu.
See merge request STJr/SRB2!832
2020-03-18 10:56:35 -04:00
LJ Sonic
c43ca31dc2
Merge branch 'increase-input-buffer' into 'next'
...
Increase the length of the player input buffer
See merge request STJr/SRB2!835
2020-03-18 09:49:14 -04:00
Jaime Passos
1904e3b5e9
Fix OpenGL
2020-03-17 15:23:13 -03:00
Jaime Passos
c2cd9a71fa
Fix con_backpic
2020-03-17 13:05:54 -03:00
Monster Iestyn
31b1188a3e
Merge branch 'master' into next
2020-03-15 20:32:43 +00:00
LJ Sonic
0a54c40ff4
Merge branch 'fix-playernode-crash' into 'next'
...
Fix buffer overrun with players with no associated node
See merge request STJr/SRB2!810
2020-03-15 15:36:45 -04:00
Monster Iestyn
3f43dd22f9
Merge branch 'skins-refactor' into 'master'
...
Skins refactor
See merge request STJr/SRB2!843
2020-03-15 15:31:49 -04:00
Zachary McAlpin
569034d3a9
Call LUAh_GameQuit in I_GetEvent in if the event is SDL_Quit and if you are in a playing session
...
Time for the ultimate testing to see if I get any undefined reference compiling errors
2020-03-15 10:47:55 -05:00
Zachary McAlpin
2052ee1144
Check if you are playing a game then execute `LUAh_GameQuit` if you are in Command_quit_f and Command_ExitGame_f
2020-03-15 10:34:43 -05:00
Zachary McAlpin
8b7f93d50a
Revert "Let's just call LUAh_GameQuit in I_Quit anyways"
...
This reverts commit 7c65577336
2020-03-15 10:33:24 -05:00
MascaraSnake
c2443b8e8c
Merge branch 'udmf-formatcheck' into udmf-colormaps
2020-03-15 16:26:00 +01:00
MascaraSnake
f689bc88aa
Add boolean variable that indicates if current map is in UDMF format
2020-03-15 16:23:15 +01:00
MascaraSnake
bc8a1350e4
Merge branch 'udmf-next' into udmf-colormaps
2020-03-15 09:58:39 +01:00
MascaraSnake
3c294b5e3d
Merge branch 'next' into udmf-next
2020-03-15 09:57:42 +01:00
MascaraSnake
e545e5f9ba
Add UDMF colormap fields
2020-03-15 09:55:57 +01:00
Zachary McAlpin
766ca2f5a5
Since exitgame shuts down the server if you are running a dedicated server I may as well allow the hook to run for the dedicated server as well
2020-03-15 00:54:06 -05:00
Zachary McAlpin
7c65577336
Let's just call LUAh_GameQuit in I_Quit anyways
2020-03-15 00:39:46 -05:00
Zachary McAlpin
0e56202d63
Let's just call LUAh_GameQuit in Command_ExitGame_f during its execution if you are in game and are not a dedicated server
2020-03-15 00:28:41 -05:00
Zachary McAlpin
b067d1e134
Revert "Call `LUAh_GameQuit` in 2 places."
...
This reverts commit a329ca43ba
2020-03-15 00:08:57 -05:00
Zachary McAlpin
a329ca43ba
Call `LUAh_GameQuit` in 2 places.
2020-03-15 00:53:05 -04:00
Zachary McAlpin
de9dc43b21
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
2020-03-14 22:55:40 -05:00
Steel Titanium
efab0f479c
Merge branch 'master' into next
2020-03-14 22:21:12 -04:00
SteelT
49001b207e
Merge branch 'nadraw-fix' into 'master'
...
Fix NiGHTS Attack crash after render mode change
See merge request STJr/SRB2!837
2020-03-14 22:19:35 -04:00
SteelT
88fff119ea
Merge branch 'hwrflipcolchromakey' into 'master'
...
Fix HWR_DrawFlippedColumnInCache ignoring chroma key TF
See merge request STJr/SRB2!826
2020-03-14 22:13:19 -04:00
SteelT
e80a09a651
Merge branch 'tex' into 'master'
...
Replace NextTexAvail with glGenTextures
See merge request STJr/SRB2!828
2020-03-14 22:12:02 -04:00
SteelT
2d16281d86
Merge branch 'acz-fence' into 'master'
...
Fix ASTBlendPixel blending with nothing
See merge request STJr/SRB2!827
2020-03-14 22:11:23 -04:00
fickleheart
e3b17cd82b
Use po2 patches to fix mipmaps
2020-03-14 15:52:25 -05:00
fickleheart
b9d7b3e5c5
Merge remote-tracking branch 'upstream/master' into shaders-222
...
# Conflicts:
# src/hardware/r_opengl/r_opengl.c
# src/i_video.h
# src/r_main.c
# src/r_main.h
# src/screen.c
# src/sdl/i_video.c
# src/sdl/ogl_sdl.c
# src/w_wad.c
2020-03-14 12:52:15 -05:00
sphere
bdab78152c
Check if emblem hints are actually unlocked.
2020-03-13 10:46:57 -04:00
Zachary McAlpin
f97187f59b
Revert "Call LUAh_GameQuit in Command_ExitGame_f"
...
This reverts commit 2b16971137
2020-03-12 22:31:48 -05:00
Zachary McAlpin
7ec241c59e
Revert "Don't execute LUAh_GameQuit in Command_ExitGame_f if you are in a multiplayer game"
...
This reverts commit bef49f5660
2020-03-12 22:31:39 -05:00
Zachary McAlpin
bef49f5660
Don't execute LUAh_GameQuit in Command_ExitGame_f if you are in a multiplayer game
2020-03-12 20:51:16 -05:00
Zachary McAlpin
2b16971137
Call LUAh_GameQuit in Command_ExitGame_f
2020-03-12 20:15:21 -05:00
Zachary McAlpin
4d144f2e40
No longer call LUAh_GameQuit in D_QuitNetGame
2020-03-12 19:59:50 -05:00
Zachary McAlpin
4d7f64a53d
Let's call LUAh_GameQuit in D_QuitNetGame since that function is still called outside of netgames
...
However, the D_QuitNetGame function returns early if you are not in a netgame.
2020-03-12 12:45:41 -05:00
Zachary McAlpin
bb08b55b43
Created GameQuit hook, but I need to decide where to execute it
2020-03-12 12:22:04 -05:00
Nev3r
68f60f3c29
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
2020-03-11 09:31:31 +01:00
Monster Iestyn
ddc0762ecc
Merge branch 'master' into next
2020-03-09 19:53:08 +00:00
Monster Iestyn
db6a3bbd1f
Merge branch 'archive-sprite2-hotfix' into 'master'
...
Archive sprite2 Hotfix
See merge request STJr/SRB2!845
2020-03-09 15:50:55 -04:00
Monster Iestyn
40e728fdb5
One line fix: don't assume 0 (aka SPR2_STND) is the default value for sprite2, but rather what the state sets for it
...
This fixes some issues with a custom character tested during netplay, which did not have SPR2_WAIT sprites and therefore fell back to SPR2_STND sprites. Unfortunately, the fact they used SPR2_STND instead meant the sprite2 was not synced at all!
2020-03-09 15:04:22 +00:00
Monster Iestyn
f4cb6e1f5e
Include r_skins.h instead of r_things.h in many files where all they wanted from it was skins stuff
...
(oddly enough, this actually revealed some secret file dependencies previously included via r_things.h! I also needed to include d_player.h in r_skins.h itself it seems)
2020-03-09 13:54:56 +00:00
Monster Iestyn
1dd4ed4afa
Reorganise r_things.h
2020-03-08 21:17:30 +00:00
Monster Iestyn
e81ef824d6
Set the "spritename" variable within R_AddSingleSpriteDef rather than externally to it, since R_InstallSpriteLump is the only place it gets used anyway
...
This way we don't have to make it some extern in order for r_skins.c to use it
2020-03-08 19:51:18 +00:00
Monster Iestyn
37ecb47436
update Makefile, CMakeLists.txt and MSVC project files
2020-03-08 19:48:23 +00:00
Monster Iestyn
b2d9697e07
remove r_skins.c include in r_things.c, on second thoughts
2020-03-08 19:36:56 +00:00
Monster Iestyn
a67dbfff54
Create r_skins.c/.h, to contain skins code formerly in r_things.c/h
2020-03-08 19:32:07 +00:00
Louis-Antoine
b85ac65378
Fix missing break
2020-03-08 20:04:29 +01:00
colette
ce29129f3a
Fix resyncs never recovering if node and player mismatch
2020-03-08 13:09:39 -04:00
Tatsuru
be338da3f6
I guess
2020-03-08 14:06:18 -03:00
Steel Titanium
e5270ad9c7
Fix guest data being deleted regardless of choice
2020-03-08 00:34:15 -05:00
Steel Titanium
a3f3dd649f
Fix guest deletion confirmation returning to Record Attack menu from Nights Mode menu
2020-03-08 00:02:43 -05:00
GoldenTails
cdba9ba033
Fix spaces before someone yells at me for it
2020-03-07 21:48:40 -06:00
GoldenTails
0d92bf3dd0
Florida man fixes sectors with light level 256 blacking out OpenGL objects; mappers riot.
...
Disclaimer: I'm not actually from Florida.
2020-03-07 21:41:52 -06:00
Jaime Passos
26e367eb9b
Merge remote-tracking branch 'origin/next' into pictureformats
2020-03-07 20:43:16 -03:00
Zipper
4b28e19d16
Update p_inter.c
2020-03-05 18:48:20 -05:00
Zipper
4d8a523da9
Update p_inter.c
2020-03-05 18:30:27 -05:00
ZipperQR
da9bf34175
fix source player being nil
2020-03-05 12:26:27 +03:00
Zwip-Zwap Zapony
bce6349b1d
More gamepad deadzone tweakage
2020-03-04 21:44:57 +01:00
Zwip-Zwap Zapony
df220aa2c2
Hotfix for 100% deadzone returning 0 input
...
It makes more sense for 100% deadzone to just make it so that
you have to push the axis all the way to trigger it,
rather than 100% deadzone resulting in no axis input
ever happening... So, let's make it be the former way instead
2020-03-04 21:11:55 +01:00
Zwip-Zwap Zapony
27e084a827
Fix division-by-0 crash with gamepad deadzones
...
Fix division-by-0 crash with gamepad deadzones
The problem was that it checked if A was more than B,
then lowered A to a max value, then subtracted B from A,
then divided something by that, without checking if A minus B was 0,
allowing division by 0 if B was the same as that max value
This fixes that by making sure that A is less than the max value
2020-03-04 17:31:52 +01:00
Jaime Passos
b8db3e2216
Fix NiGHTS Attack crash after render mode change
2020-03-04 09:42:34 -03:00
Tatsuru
761ec3b6a4
Separate PvP damage from non-friendly gametypes
2020-03-03 11:56:57 -03:00
Tatsuru
776951c6a8
Never forget who your enemy is
2020-03-03 11:40:35 -03:00
SteelT
039aeed633
Merge branch 'tolflag-fix' into 'next'
...
Fix G_TOLFlag returning the wrong type
See merge request STJr/SRB2!834
2020-03-02 21:27:45 -05:00
Steel Titanium
10d08fc8bb
Merge branch 'master' into next
2020-03-02 15:26:01 -05:00
SteelT
7d14796954
Merge branch 'fix-ogllib' into 'master'
...
Fix -OGLlib
See merge request STJr/SRB2!794
2020-03-02 15:21:50 -05:00
Jaime Passos
67b8a7eb67
Merge remote-tracking branch 'origin/next' into tolflag-fix
2020-03-02 13:14:12 -03:00
Louis-Antoine
04a1f479be
Increase the length of the player input buffer
2020-03-02 15:36:28 +01:00
Louis-Antoine
7ba93c184f
Fix warning and formatting
2020-03-02 13:33:12 +01:00
sphere
c671097c04
Actually use the "SCREENSHOT OPTIONS" header for its menu.
2020-03-02 13:23:54 +01:00
Jaime Passos
70a103b9af
Fix G_TOLFlag returning the wrong type
2020-03-02 00:20:53 -03:00
LJ Sonic
60cd6fe986
Merge branch 'next' into 'resend-gamestate'
...
# Conflicts:
# src/d_clisrv.c
2020-03-01 12:35:53 -05:00
Jaime Passos
76bda716cd
Merge branch 'tol-moment' into 'next'
...
Fix TYPEOFLEVEL options not having enough bits for TOL_ flags
See merge request STJr/SRB2!825
2020-03-01 11:14:29 -05:00
LJ Sonic
2cace6e147
Merge branch 'lua-io' into 'next'
...
Support for Lua's I/O library
See merge request STJr/SRB2!727
2020-03-01 11:12:45 -05:00
SwitchKaze
fd4666b481
Bruh.
2020-02-29 23:44:56 -05:00
SwitchKaze
21b28b6295
Merge branch 'next' of https://github.com/STJr/SRB2 into next-luacolors
2020-02-29 23:41:16 -05:00
SwitchKaze
3106a92e8b
Prohibit modification of built-in colors
...
In addition, fixes a bug where loading a custom color using command line params exhibits strange behavior.
2020-02-29 23:14:49 -05:00
Louis-Antoine
46d8546f49
Update packet names
2020-03-01 03:26:15 +01:00
Louis-Antoine
846560910d
Obliterate resynch
...
Okay, more precisely this substitutes the old resynch with
the newly added gamestate resend code.
2020-03-01 03:22:47 +01:00
Jaime Passos
94107a5320
Set pixel RGBA to nothing instead of the alpha only
2020-02-29 19:36:50 -03:00
Monster Iestyn
cf95837a76
Merge branch 'follow-is-mobj' into 'next'
...
Turn FollowMobj into a mobj hook
See merge request STJr/SRB2!803
2020-02-29 12:48:39 -05:00
Louis-Antoine
29d8389461
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into resend-gamestate
2020-02-29 13:43:47 +01:00
Louis-Antoine
4f7591a044
Rename packet
2020-02-29 13:40:15 +01:00
Jaime Passos
7d77600e71
Make exitmove friendly, don't start empty intermission screens
2020-02-29 01:51:45 -03:00
Jaime Passos
4e7b47440f
G_CoopGametype, for all the GT_COOP cases
2020-02-29 00:57:22 -03:00
Jaime Passos
6fb5a6efb6
Consider hide-and-seek as GTR_HIDEFROZEN
2020-02-28 23:52:33 -03:00
Jaime Passos
d3ed5ad44f
Race is Competition without the lives
2020-02-28 23:47:38 -03:00
Jaime Passos
fd062308fe
Score adding and stealing should check the gametype's rules.
2020-02-28 23:41:10 -03:00
Jaime Passos
3ce4ddf854
Fix incorrect team gametype rule being used in A_OldRingExplode
2020-02-28 23:25:25 -03:00
Jaime Passos
51c593e633
Fix homing ring using the wrong team gametype rule
2020-02-28 23:21:27 -03:00
Jaime Passos
4a489c4d95
Fix NOTEXTURE_NUM
2020-02-28 18:57:34 -03:00
Jaime Passos
9b88edc458
Same deal for screen textures
2020-02-28 18:57:15 -03:00
Jaime Passos
48b352049f
Stop using NextTexAvail
2020-02-28 18:56:41 -03:00
Jaime Passos
4446b0d563
Fix ACZ fence texture
2020-02-28 17:33:58 -03:00
Jaime Passos
7f32a53233
Fix HWR_DrawFlippedColumnInCache ignoring chroma key TF
2020-02-28 17:31:41 -03:00
Louis-Antoine
a927d67259
Fix warning
2020-02-28 18:17:37 +01:00
Jaime Passos
4abe112af8
Merge remote-tracking branch 'origin/master' into next
2020-02-25 22:43:15 -03:00
Jaime Passos
8350a8c58a
Merge branch 'new-color-chat-fix' into 'master'
...
Fix new skin colors using default chat color
See merge request STJr/SRB2!822
2020-02-25 20:38:36 -05:00
Jaime Passos
25cf369f22
Fix (technically functional) string comparison counting an extra character in the comparison length
2020-02-25 22:34:19 -03:00
Jaime Passos
3d7cd29eda
Fix TYPEOFLEVEL options not having enough bits for TOL_ flags
2020-02-25 22:30:34 -03:00
LJ Sonic
8dd4e47a35
Merge branch 'realmo' into 'next'
...
Let Lua access spectator mobjs
See merge request STJr/SRB2!756
2020-02-25 15:06:29 -05:00
fickleheart
de789add8a
Fix menu enterwipes being overridden?
2020-02-24 18:00:52 -06:00
fickleheart
141df606c2
Use a named macro for menu hierarchy
...
This _really_ needs to be a UINT8 array instead of
all this bit-shifting nonsense that saves no space,
but at least this way reading the menu structs doesn't
make me want to die.
2020-02-24 18:00:17 -06:00
fickleheart
da122ca2fd
Fix missing menuname entries
2020-02-24 17:56:00 -06:00
Jaime Passos
fe93155578
Fix Amy cameo's love hearts crashing the Software renderer due to invalid translucency tables
2020-02-24 20:03:08 -03:00
Steel Titanium
ce801e1076
Fix new skin colors using default chat color
2020-02-24 16:58:19 -05:00
fickleheart
b66be478d9
Increase COM_BUF_SIZE
...
The config file is starting to get close to the old max,
so this should be enough headroom for a while...
2020-02-24 11:45:22 -06:00
fickleheart
f8408f3c99
Fix ExecCfg not working on files added via command line
2020-02-24 11:44:45 -06:00
fickleheart
1f8dbd1b8c
Allow using lump names in ExecCfg
2020-02-24 11:44:27 -06:00
sphere
0df094021e
Allow emblem hints (and radar) in record attack.
2020-02-24 17:31:30 +01:00
fickleheart
1848ce4b97
Skip empty gametypes in level select menu
2020-02-24 10:02:48 -06:00
Jaime Passos
952bce362e
Remove unused SOC menu types
2020-02-23 22:31:17 -03:00
fickleheart
d1dcdf88c7
Fix MD2 rollangle in reverse gravity
2020-02-23 18:44:22 -06:00
fickleheart
352029fd76
Add music position functions to Lua
2020-02-23 17:58:32 -06:00
fickleheart
f2c968dea8
Add JingleStatus hook for carrying custom jingle tunes
...
The extra argument is the music name, as passed into
P_PlayJingleMusic(player, musname), to run the hook for, optional.
Arguments are (player, musname) - the latter to allow global hooks
that still differentiate between different tracks.
2020-02-23 17:20:44 -06:00
fickleheart
c5f3868819
Expose P_PlayJingle/Music() to Lua
2020-02-23 17:19:18 -06:00
James R
711c8ed6b4
Merge branch 'console-in-menus-mk-ii' into 'master'
...
Console in menus again!
See merge request STJr/SRB2!797
2020-02-23 18:15:43 -05:00
James R
95b8f950b4
Merge branch 'nomd5-crash' into 'master'
...
Fix crash under NOMD5
See merge request STJr/SRB2!807
2020-02-23 18:15:04 -05:00
Jaime Passos
94738bfd2d
Don't get chosen as the tagger if you're a spectator
2020-02-23 19:28:16 -03:00
Jaime Passos
b103a792c0
Let spectators decide where they spawn
...
Also fixes some issues with tag gametypes
2020-02-23 19:23:00 -03:00
fickleheart
40488096c0
Make P_PlayLivesJingle player optional in Lua
2020-02-23 15:40:59 -06:00
Jaime Passos
678935f26a
Turn players IT if they join the game after the hide time in tag gametypes
...
Except in gametypes with hide time stasis, because they can't change team.
2020-02-23 17:02:50 -03:00
Jaime Passos
7439ab5296
Allow countdown time-up in any campaign gametype
2020-02-23 16:50:36 -03:00
Jaime Passos
290cd9d08e
Same here
2020-02-23 16:46:45 -03:00
Jaime Passos
1b8e172af3
Consider Co-Op here as any campaign gametype
2020-02-23 16:45:01 -03:00
Jaime Passos
a334542f34
Scan for emeralds in gametypes with Emerald Hunt
2020-02-23 16:41:39 -03:00
Jaime Passos
b622f539ff
Always allow skin switching in friendly gametypes
2020-02-23 16:40:52 -03:00
Jaime Passos
f313a0386f
Don't reset player between maps in campaign gametypes
2020-02-23 16:40:16 -03:00
Jaime Passos
572bffcd83
Award pink shields in friendly gametypes
2020-02-23 16:38:32 -03:00
fickleheart
283bb52e7d
Disable NOHUD/INLEVEL checks on Lua sound functions
...
None of these are implicitly sync-safe anyway, and most have
no need to be walled off from HUD code or intermission thinkers.
2020-02-23 12:50:45 -06:00
Snu
2dc72219e7
Merge branch 'master' into supergoldedit
2020-02-23 17:57:39 +00:00
SwitchKaze
58d435484c
Fix userdataType typo
2020-02-23 12:17:52 -05:00
SwitchKaze
6415e10216
Merge branch 'next' of https://github.com/STJr/SRB2 into next-luacolors
2020-02-23 11:50:13 -05:00
Jaime Passos
0362f53e9b
Fix incorrect newdisplayplayer in forced ViewpointSwitch
2020-02-23 12:14:52 -03:00
lachwright
4517377552
Start CA_GLIDEANDCLIMB swimming functionality
2020-02-23 15:38:11 +08:00
Tatsuru
ff8a62819b
Oopsie 2
2020-02-22 22:36:44 -03:00
Tatsuru
4c00e33096
Oopsie
2020-02-22 21:14:05 -03:00
James R
4244480d63
Add patch_music.pk3
2020-02-22 14:43:41 -08:00
Steel Titanium
03e38e9486
Enable use of the patch file
2020-02-22 16:42:24 -05:00
Steel Titanium
1c1163bd0f
Update version number to 2.2.2
2020-02-22 16:37:13 -05:00
Louis-Antoine
d19fe295e0
Fix buffer overrun with nodeless players
2020-02-22 15:08:17 +01:00
James R
af12f26f37
Merge remote-tracking branch 'origin/master' into next
2020-02-21 21:06:27 -08:00
James R
f6df71ba54
Fix NOMD5 compiling
2020-02-21 21:06:04 -08:00
James R
0f2b8b8b2c
Register servername etc. under NOMD5
...
This fixes crashes in the menus.
2020-02-21 20:04:28 -08:00
James Hale
56b67a3b4f
Custom skincolors
2020-02-21 21:56:39 -05:00
Steel Titanium
76f26cda24
Merge branch 'master' into next
2020-02-21 21:01:29 -05:00
SteelT
cfd190c453
Merge branch 'warp-gamedata-corruption-fix' into 'next'
...
Warp gamedata corruption fix
See merge request STJr/SRB2!802
2020-02-21 21:00:29 -05:00
SteelT
a1cf58cf7f
Merge branch 'update-copyright-year' into 'master'
...
Update copyright year
See merge request STJr/SRB2!801
2020-02-21 20:59:56 -05:00
Louis-Antoine
778715f611
Cleanup code a little
2020-02-22 02:21:27 +01:00
Louis-Antoine
af9164f336
Improve join refusal handling
2020-02-22 02:17:21 +01:00
Louis-Antoine
472befd183
Replace MAX_WADPATH with plain numbers
...
This is not ideal either, but I would rather
not use a constant for something unrelated.
2020-02-21 17:31:32 +01:00
Louis-Antoine
ec5b88e79f
Fix weird comment style
2020-02-21 17:17:39 +01:00
lachwright
365e63894f
Merge branch 'next' into knuxtweaks
2020-02-21 16:28:17 +08:00
James R
93046c5e59
Merge remote-tracking branch 'origin/master' into next
2020-02-20 17:30:50 -08:00
James R
08627752b2
Fix NOPNG compiling
2020-02-20 17:30:32 -08:00
James R
2df4717f18
Fix NO_LUA compiling
2020-02-20 17:20:50 -08:00
James R
cce5308108
Fix compiler warnings
2020-02-20 17:18:26 -08:00
James R
fb0bedf02c
Merge branch 'ogl-colorbug' into 'master'
...
Fix OpenGL "color bug"
See merge request STJr/SRB2!795
2020-02-20 19:32:34 -05:00
James R
62d943b609
Merge branch 'thin-fixed' into 'next'
...
Add more strings (and respective functions) for v.drawString().
See merge request STJr/SRB2!770
2020-02-20 19:27:01 -05:00
Snu
2a93ddc2dd
Change SKINCOLOR_SUPERGOLD1-5
2020-02-20 21:53:21 +00:00
Sally Cochenour
400366802c
Make hook_FollowMobj a mobj hook instead of a player hook
...
Makes more logical sense, as if you have a custom follow item for a custom skin, you probably want your new thinker to only run for your new MT_ and not the vanilla ones.
2020-02-20 16:40:39 -05:00
Monster Iestyn
5c33ff0458
clarify the situation a bit more in the comments
2020-02-20 20:38:01 +00:00
Monster Iestyn
903cc311a7
move -warp code to a later part of D_SRB2Main so G_LoadGameData isn't upset by G_SetGameModified
2020-02-20 20:31:11 +00:00
Louis-Antoine
3502278f8a
SpaceSpaceSpaceSpace
2020-02-20 01:15:54 +01:00
James R
54794f325d
:)
2020-02-19 14:44:22 -08:00
James R
61470201f9
Regex bruh moment
2020-02-19 14:37:42 -08:00
James R
7060083db5
Update copyright year to 2020
2020-02-19 14:08:45 -08:00
Louis-Antoine
12959ff4a9
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into lua-io
2020-02-19 22:40:54 +01:00
Louis-Antoine
20d054a679
Minor code cleanup
2020-02-19 22:37:30 +01:00
Louis-Antoine
ebc1809da9
Fix bad tabulation
2020-02-19 22:01:33 +01:00
Tatsuru
380b2f87bb
Merge branch 'coloredtitlecard' into Tatsuru/SRB2-dye
2020-02-19 17:47:13 -03:00
Tatsuru
3022e38d15
Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into Tatsuru/SRB2-dye
...
# Conflicts:
# src/d_player.h
# src/dehacked.c
2020-02-19 17:46:18 -03:00
Tatsuru
80edefa56e
Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into dye
2020-02-19 17:32:43 -03:00
Jaime Passos
2893803c68
Merge remote-tracking branch 'origin/next' into pictureformats
2020-02-19 02:25:36 -03:00
Jaime Passos
adee6c3910
I forgot to save :]
2020-02-19 00:56:14 -03:00
Jaime Passos
8bd5193ee0
Merge remote-tracking branch 'origin/master' into sal-oglshaderport
2020-02-19 00:55:46 -03:00
Steel Titanium
281d40d6d2
Merge branch 'master' into next
2020-02-18 22:03:08 -05:00
James R
d3d8f85602
Merge branch 'the-colors-feel-so-right' into 'next'
...
New skin colors, add support for preferred opposite color to save cards, new lua features.
See merge request STJr/SRB2!787
2020-02-18 22:02:01 -05:00
James R
92f65fd822
Merge branch 'exitmove-tweaks' into 'next'
...
Exitmove tweaks
See merge request STJr/SRB2!709
2020-02-18 21:58:18 -05:00
James R
a447a3d8a9
Merge branch 'rscache' into 'master'
...
Fix R_CacheRotSprite not working with PNG lumps
See merge request STJr/SRB2!800
2020-02-18 21:54:45 -05:00
James R
b92d66a54c
Merge branch 'seenames-fix' into 'master'
...
Fix seenames not working without a SeenPlayer hook
See merge request STJr/SRB2!799
2020-02-18 21:53:28 -05:00
James R
c1a91cdc2e
Merge branch 'setrenderneeded-fix' into 'master'
...
Clear setrenderneeded after calling VID_CheckRenderer
See merge request STJr/SRB2!793
2020-02-18 21:53:14 -05:00
James R
26825a2b4c
Merge branch 'pw-justlaunched' into 'next'
...
Add pw_justlaunched to tell modders when a player launches from a slope
See merge request STJr/SRB2!792
2020-02-18 21:53:05 -05:00
James R
2d8522b9ec
Merge branch 'titlecard-options' into 'next'
...
Allow more options for when the titlecard shows up
See merge request STJr/SRB2!765
2020-02-18 21:52:03 -05:00
James R
8054f341a1
Merge branch 'startup-file-not-found' into 'master'
...
Fix the issue !678 did, but just don't exit if the file was added twice
See merge request STJr/SRB2!753
2020-02-18 21:50:11 -05:00
James R
3fc9c7d298
Merge remote-tracking branch 'origin/next' into SF_NONIGHTSSUPER
2020-02-18 18:23:20 -08:00
Tatsuru
4a8de7cb55
Enough
2020-02-18 22:55:40 -03:00
Tatsuru
b1ad7787f4
Standards 3
2020-02-18 22:54:11 -03:00
Tatsuru
ec67e776dc
Standards 2
2020-02-18 22:50:22 -03:00
Tatsuru
c76a8e8a58
Standards
2020-02-18 22:46:16 -03:00
Steel Titanium
da15c92568
Merge branch 'master' into next
2020-02-18 17:41:13 -05:00
Jaime Passos
1dc080e8cd
Merge remote-tracking branch 'origin/master' into rscache
2020-02-18 19:38:19 -03:00
Jaime Passos
72edf514c2
Merge remote-tracking branch 'origin/master' into seenames-fix
2020-02-18 19:37:55 -03:00
Steel Titanium
f0e2ba9e6a
Merge branch 'next' into the-colors-feel-so-right
2020-02-18 14:29:50 -05:00
MascaraSnake
cae99654be
Merge branch 'next' into udmf-next
2020-02-18 18:39:11 +01:00
Monster Iestyn
2b3034a7af
Merge branch 'master' into next
2020-02-18 17:38:05 +00:00
James R
e3ba369ae4
Fix M_Ftrim
...
- Use '%f' instead of '%g' to avoid going scientific. Should also fix some
compiler warnings.
- The trailing zero trimming code is now useful. It started on the terminating
byte before and wouldn't have done anything with '%g' anyway.
- Use the absolute fractional value to avoid a sign.
2020-02-17 19:38:14 -08:00
Jaime Passos
369fd8e35f
Fix LUAh_SeenPlayer not working
2020-02-17 23:06:38 -03:00
Jaime Passos
b3933c7842
Fix R_CacheRotSprite not working with PNG lumps
2020-02-17 22:59:36 -03:00
Jaime Passos
bd7b2fcb93
setrenderneeded is already cleared earlier
2020-02-17 22:33:36 -03:00
Jaime Passos
d3abf5dcfa
Set the palette :)
2020-02-17 22:31:34 -03:00
James R
b78fc670d0
Don't let console open with menu keys while the menu is open
2020-02-17 17:10:29 -08:00
Jaime Passos
bef6cb532b
Fix what !785 tried to fix, but correctly
2020-02-17 21:58:32 -03:00
James R
b2733eba73
Draw console in the Record/NiGHTS Attack menus
...
(cherry picked from commit 4efd915d28
2020-02-17 16:37:29 -08:00
James R
a9a0601c84
Revert "Revert "Let the console open in menus""
...
This reverts commit 705cf9fd40
2020-02-17 16:37:13 -08:00
Jaime Passos
e53a17bb52
Rename stuff around
2020-02-17 21:11:56 -03:00
Jaime Passos
d0ee4ad440
Change the default setting of cv_grshearing to Off
2020-02-17 12:30:02 -03:00
Jaime Passos
00bdb41640
Merge remote-tracking branch 'origin/master' into sal-oglshaderport
2020-02-17 12:28:16 -03:00
Jaime Passos
cac5f9d171
add -nogl parm
2020-02-17 12:14:51 -03:00
James R
d0b9027d0a
Merge branch 'viewroll' into 'next'
...
Rolling
See merge request STJr/SRB2!690
2020-02-17 00:10:57 -05:00
James R
9bd9e667c5
Merge branch 'push-special-params' into 'master'
...
"+" command line parameters make sense
See merge request STJr/SRB2!707
2020-02-17 00:05:49 -05:00
James R
3ea51c943a
Merge branch 'trim-floats' into 'master'
...
Trim the trailing zeros off floats for cvars
See merge request STJr/SRB2!716
2020-02-17 00:04:15 -05:00
James R
8e4cb953c8
Merge branch 'extra-emblem-display' into 'next'
...
Extra emblem hint display
See merge request STJr/SRB2!721
2020-02-17 00:00:36 -05:00
James R
132e8f82d5
Merge branch 'local-color-table' into 'master'
...
Local Color Table for GIF movie mode
See merge request STJr/SRB2!742
2020-02-16 23:58:11 -05:00
James R
af14166730
Merge branch 'stoppedclock-exposed' into 'next'
...
Expose stoppedclock to Lua
See merge request STJr/SRB2!771
2020-02-16 23:55:33 -05:00
James R
7ed7e53c81
Merge branch 'tolfix' into 'master'
...
Don't freeslot TOL_ twice
See merge request STJr/SRB2!779
2020-02-16 23:52:45 -05:00
James R
11a1ce6df9
Merge branch 'lua-hud-get-rotsprites' into 'next'
...
Get rotated sprites with v.getSprite(2)Patch
See merge request STJr/SRB2!773
2020-02-16 23:51:49 -05:00
James R
f4c2a4551b
How many bruh moments can we have?
2020-02-16 20:45:09 -08:00
James R
fb66691991
Merge branch 'colormap_flags_refactor' into 'next'
...
Clean up the mess that is extracolormap_t::fog
See merge request STJr/SRB2!790
2020-02-16 23:28:26 -05:00
James R
94aec0101f
Merge branch 'grfang' into 'master'
...
Allow models for skin/sprites with same name
See merge request STJr/SRB2!767
2020-02-16 23:21:07 -05:00
Jaime Passos
067a2667e3
move hw texture used to be always below.
2020-02-17 01:20:00 -03:00
Sally Cochenour
07d71778dc
FIX COLOR BUG
2020-02-17 01:19:28 -03:00
Jaime Passos
f90b6d241f
Merge branch 'setrenderneeded-fix' into fix-ogllib
2020-02-17 01:17:54 -03:00
Jaime Passos
8da832986c
Don't center the window when changing renderers
2020-02-17 01:15:18 -03:00
Jaime Passos
04ee6ca12c
Don't call HWR_Switch twice
2020-02-17 01:15:11 -03:00
Jaime Passos
7ddad9c9ec
Remove redundant check
2020-02-17 01:15:04 -03:00
Jaime Passos
9d9de3aff6
Only set OpenGL as the target renderer if it loaded successfully
2020-02-17 01:14:48 -03:00
Jaime Passos
3fa4db891f
Always load the GL library!
2020-02-17 01:13:13 -03:00
Jaime Passos
07afd7520f
Only initialise OpenGL if you actually intend to use it.
2020-02-17 01:12:53 -03:00
Jaime Passos
6c5db5f462
Missing comment
2020-02-17 01:08:55 -03:00
Jaime Passos
cca3665525
Fallback to Software if the renderer version doesn't match
2020-02-17 01:08:41 -03:00
Jaime Passos
b6089ccdaf
Fix -OGLlib
2020-02-17 01:08:15 -03:00
Steel Titanium
0299f21dc7
Merge branch 'next' into the-colors-feel-so-right
2020-02-16 22:56:27 -05:00
Jaime Passos
ae013108ab
Merge remote-tracking branch 'origin/next' into fix-overtime
2020-02-17 00:48:42 -03:00
Jaime Passos
9e83e2751d
Clear setrenderneeded after calling VID_CheckRenderer
2020-02-17 00:36:10 -03:00
fickleheart
0fbff66e25
Let scripters see if player just launched from slope
2020-02-16 21:34:07 -06:00
fickleheart
c4b390bc76
Merge remote-tracking branch 'upstream/master' into viewroll
2020-02-16 21:32:57 -06:00
fickleheart
ae53c146e6
Allow SHOWTITLECARDFOR = NONE
2020-02-16 21:32:40 -06:00
fickleheart
187bd9ab23
Merge remote-tracking branch 'upstream/master' into titlecard-options
2020-02-16 21:32:27 -06:00
Steel Titanium
847b2bde13
Merge remote-tracking branch 'public/next' into public_next
2020-02-16 20:41:17 -05:00
James R
e245354c80
Merge remote-tracking branch 'origin/master' into next
2020-02-16 17:35:59 -08:00
James R
705cf9fd40
Revert "Let the console open in menus"
...
This reverts commit ef3d462eb7
2020-02-16 17:14:54 -08:00
Steel Titanium
773ed0a056
Update credit at Rob's request
2020-02-16 20:10:30 -05:00
Steel Titanium
728e01e60d
Merge branch 'public_next' into mobj-shadowscale-send
2020-02-16 18:55:44 -05:00
Steel Titanium
b44358df63
Update file hash yet again
2020-02-16 18:54:51 -05:00
Steel Titanium
cb97aafd05
Fix object shadow not appearing for mid-joiners
2020-02-16 18:45:49 -05:00
MascaraSnake
512c6f24a9
Clean up the mess that is extracolormap_t::fog
2020-02-16 20:19:24 +01:00
Steel Titanium
3a82864ce9
Update comment
2020-02-16 11:34:02 -05:00
Steel Titanium
13a521d808
Merge remote-tracking branch 'public/next' into public_next
2020-02-16 11:32:43 -05:00
Steel Titanium
45ab4244fc
Restore this that got shifted.
2020-02-15 17:55:25 -05:00
Louis-Antoine
7b13f0a2de
Fix dedicated servers not running gamelogic
...
Note to future testers:
Remember to test dedicated servers before merging.
And splitscreen also.
2020-02-15 23:47:11 +01:00
Steel Titanium
2b678aaef0
New Lua functions: R_GetColorByName and R_GetNameByColor
2020-02-15 17:35:00 -05:00
Steel Titanium
2b615aa09c
Add prefoppoistecolor support to save cards
2020-02-15 17:34:21 -05:00
Jaime Passos
5dc0f0649e
Fix overtime not working
2020-02-15 13:07:53 -03:00
Jaime Passos
a98e84faa0
change prefix to "PLAYER"
2020-02-15 12:40:41 -03:00
MascaraSnake
e7a0fc65bd
Update hashes (again)
2020-02-15 12:44:03 +01:00
MascaraSnake
9dd788a90c
Merge remote-tracking branch 'Public/next' into public_next
2020-02-15 12:32:39 +01:00
MascaraSnake
31bce6c857
Merge branch 'master' into next
2020-02-15 12:32:09 +01:00
MascaraSnake
63ffe561ae
Merge branch 'dropshadows-refactor' into 'next'
...
Use exact object types when setting shadowscale
See merge request STJr/SRB2!755
2020-02-15 06:31:25 -05:00
MascaraSnake
7bb7cb61ea
Merge branch 'leftover-tokens' into 'next'
...
Don't carry extra tokens into the next level if you got all 7 emeralds already
See merge request STJr/SRB2!778
2020-02-15 06:31:17 -05:00
MascaraSnake
869748dfbf
Merge remote-tracking branch 'Public/next' into public_next
2020-02-15 12:25:29 +01:00
MascaraSnake
9bf0cfda5c
Merge branch 'po-slide-fixes' into 'next'
...
Improvements to polyobjects carrying things
See merge request STJr/SRB2!772
2020-02-15 06:24:45 -05:00
MascaraSnake
fff638f46a
Merge branch 'S_SKIN-missing-flag' into 'next'
...
Missing flag in S_SKIN
See merge request STJr/SRB2!781
2020-02-15 02:07:56 -05:00
Steel Titanium
d9e2256a3c
Add six new skin colors
2020-02-14 22:30:37 -05:00
James R
ba92db412a
Merge branch 'patch-valid' into 'next'
...
Don't error when checking patch.valid on invalid patches
See merge request STJr/SRB2!780
2020-02-12 21:19:19 -05:00
James R
71319dce6b
Revert "Update file hashes"
...
This reverts commit 4281de3b89
2020-02-12 18:15:15 -08:00
James R
64b7a5e4d6
SF_NONIGHTSSUPER for disabling super colors in NiGHTS
2020-02-12 18:03:39 -08:00
James R
841094976b
Add flag name variant of SF_NONIGHTSROTATION to S_SKIN
2020-02-12 18:02:36 -08:00
Sally Cochenour
934808ef62
BotRespawn hook
...
Lets you force when and when not to respawn the bot
2020-02-12 14:16:23 -05:00
Jaime Passos
2fc7e56951
Cast Moment
2020-02-12 13:59:08 -03:00
Jaime Passos
7bc58c4c0e
Add MAXTOL
2020-02-12 13:41:30 -03:00
Jaime Passos
c827a72aab
Merge remote-tracking branch 'origin/next' into tolfix
2020-02-12 13:03:16 -03:00
colette
d3e5cbffba
comment
2020-02-12 08:54:20 -05:00
fickleheart
b7a6773ff5
Don't error when checking patch.valid on invalid patches
2020-02-11 23:25:01 -06:00
Jaime Passos
d8793ce579
Merge branch 'gtr-shift' into 'next'
...
1 left shifted by zero is still 1
See merge request STJr/SRB2!766
2020-02-11 23:33:43 -05:00
James R
ae2041d686
Remove extra tokens if we got all 7 emeroods
2020-02-11 19:36:09 -08:00
Jaime Passos
6b8195dbc1
player model prefix
2020-02-11 23:54:39 -03:00
Steel Titanium
c44442ef7c
Merge remote-tracking branch 'public/next' into public_next
2020-02-11 20:43:26 -05:00
James R
0993b71355
Merge branch 'patch-1' into 'next'
...
Fix title/card hud hooks grabbing the wrong functions
See merge request STJr/SRB2!758
2020-02-11 20:17:50 -05:00
GoldenTails
9f7bfd901b
I broke SHIFT in the Connect IP Textbox.. whoops.
...
It's okay, I literally had to remove one line lmao.
2020-02-11 19:07:48 -06:00
MascaraSnake
8c932e4a6d
Merge branch '2.2.1-prep' into 'next'
...
2.2.1 preparation
See merge request STJr/SRB2!759
2020-02-11 17:37:23 -05:00
MascaraSnake
4d5e14a847
Merge remote-tracking branch 'Public/next' into public_next
2020-02-11 22:27:50 +01:00
MascaraSnake
9498c5ba8e
Merge branch 'signpostfixes' into 'next'
...
Fix CLEAR! signpost showing up in unmodded games (& add proper support for SPR2 animated signpost)
See merge request STJr/SRB2!775
2020-02-11 16:23:06 -05:00
MascaraSnake
7b627abf31
R_GetLinedefTransTable: Calculate the transtable arithmetically instead of doing an if-else cascade
2020-02-11 19:18:31 +01:00
lachwright
aeab33ee03
Defuse minecarts
2020-02-12 01:41:11 +08:00
lachwright
248a80cac4
Cast to statenum_t for 32-bit compatibility
2020-02-11 20:36:48 +08:00
lachwright
c417ffae4c
Add proper support for animated signpost
2020-02-11 15:53:25 +08:00
MascaraSnake
be67719a2a
Merge remote-tracking branch 'Public/2.2.1-prep' into public_next
2020-02-10 22:47:22 +01:00
MascaraSnake
8618589acc
Merge remote-tracking branch 'Public/next' into public_next
2020-02-10 22:44:15 +01:00
MascaraSnake
24de2968a3
Some fixes for the linedef alpha field
2020-02-10 20:26:29 +01:00
fickleheart
76b397bece
Get rotated sprites with v.getSprite(2)Patch
...
NOTE: since rotated sprites are offset upward by 4px from non-rotated
sprites, these functions will now return a third boolean (true) if a
rotated sprite was returned, so that scripters can offset accordingly.
2020-02-10 01:02:06 -06:00
fickleheart
a63e9fe002
Improvements to polyobjects carrying things:
...
- Fixed loss of precision in rotate carry causing objects to slide off
- Adjusted player carrying logic to make platforms less slippery
- Finally obsoleted the player-specific rotate hack now that I found the
actual problem :]
2020-02-10 00:07:25 -06:00
fickleheart
021ca92019
Expose stoppedclock to Lua
2020-02-10 00:07:01 -06:00
Steel Titanium
4281de3b89
Update file hashes
2020-02-09 21:29:46 -05:00
Steel Titanium
13e5911de7
Merge branch 'next' into 2.2.1-prep
2020-02-09 20:30:48 -05:00
fickleheart
19cdb002ab
More fixes for titlecard option stuff
2020-02-09 17:53:50 -06:00
Monster Iestyn
e5a325994e
Use the provided Regex strings to properly turn the entire info.h states/mobjtypes lists into strings for dehacked.c
...
...it's surprising what we actually missed in the states list, apart from just the missing state (yes this makes the states fix branch redundant)
2020-02-09 19:15:04 +00:00
Jaime Passos
d0d7fd1589
Don't add a TOL_ twice.
2020-02-09 16:11:52 -03:00
Alam Ed Arias
1d2f6c9581
Merge branch 'master' into next
2020-02-09 10:37:10 -05:00
Alam Ed Arias
15c263e9c7
Z_Zone: fixup Valgrind support
2020-02-09 10:35:23 -05:00
Jaime Passos
2162cbd794
Merge branch 'customgametypeswtf' into 'next'
...
Fix broken GT_ constants with custom gametypes
See merge request STJr/SRB2!769
2020-02-08 23:17:35 -05:00
Jaime Passos
2d0e72d756
Fix broken GT_ constants with custom gametypes
2020-02-08 21:40:30 -03:00
Jaime Passos
598daac093
allow models for skin/sprites with same name
2020-02-08 20:44:43 -03:00
Jaime Passos
81a2a9e912
fix crash
2020-02-08 20:38:37 -03:00
Jaime Passos
7cfc8d022e
allow models for skin/sprites with same name
2020-02-08 20:29:28 -03:00
Jaime Passos
5e516eb98d
1 left shifted by zero is still 1
2020-02-08 18:50:05 -03:00
Jaime Passos
384f5af1f8
move hw texture used to be always below.
2020-02-08 18:27:44 -03:00
Jaime Passos
9bc0592e56
don't free pu_cache.
2020-02-08 18:23:37 -03:00
Jaime Passos
b38f336dc5
why does this still exist?
2020-02-08 18:19:27 -03:00
Jaime Passos
d633435cd6
i'm not paying too much attention, am i.
2020-02-08 18:08:56 -03:00
Jaime Passos
e157391387
split r_isviewpointfirstperson
2020-02-08 17:49:27 -03:00
Jaime Passos
11e6cf0ade
add "third person only" option to gr_shearing.
2020-02-08 17:42:26 -03:00
fickleheart
fed8167a81
Allow more options for when the titlecard shows up
2020-02-08 11:13:40 -06:00
James R
0a53f91820
Don't skip the first directory entry of PK3 if it's a file
...
Also puts the marker skipping in the WAD API.
2020-02-07 19:41:45 -08:00
fickleheart
fb7c4ab812
zentries is unnecessary
2020-02-07 18:47:56 -06:00
fickleheart
ee9aa86ecd
Use the proper numbers to adjust lump's offset position
2020-02-07 18:46:46 -06:00
fickleheart
f7cf8e50f8
Oops
2020-02-07 18:43:20 -06:00
James R
3d00596c6a
Don't override loop point if unset in MUSICDEF
2020-02-07 12:51:54 -08:00
James R
c4ee113c71
Let MUSICDEF set loop point
2020-02-07 12:47:41 -08:00
fickleheart
8cb9d6f670
Uhhh do VerifyPk3 too
2020-02-07 00:04:02 -06:00
fickleheart
57a4545fdf
PK3: Proper ignorance for file comments/extra data
2020-02-07 00:01:20 -06:00
lachwright
7a5d7afb30
Add Rob as the game's producer
2020-02-06 23:06:15 +08:00
Steel Titanium
d03d09f397
Update credits again
2020-02-05 15:20:35 -05:00
Monster Iestyn
f1bdaa2fda
Updated version number to 2.2.1, increment MODVERSION.
...
Also updated CMakeLists.txt, appveyor.yml and this one Xcode project file as usual
2020-02-05 19:55:40 +00:00
James R
7805828c4a
Merge remote-tracking branch 'origin/master' into next
2020-02-04 14:31:21 -08:00
colette
01433c3648
Fix title/card hud hooks grabbing the wrong functions
2020-02-03 23:09:18 -05:00
Louis-Antoine
2eaf02d234
Let Lua access spectators mobjs
2020-02-03 19:42:37 +01:00
James R
700d9426d4
Merge branch 'name-stuck' into 'master'
...
Fix game hanging on server creation/splitscreen if your name is whack
See merge request STJr/SRB2!752
2020-02-03 03:49:13 -05:00
Jaime Passos
d1e8744583
What
2020-02-03 02:24:22 -03:00
Jaime Passos
af66a2e5fa
Restore some functionality that went missing
2020-02-03 02:12:55 -03:00
Jaime Passos
520e2148fe
Merge remote-tracking branch 'origin/master' into local-color-table
2020-02-03 01:52:43 -03:00
Jaime Passos
90eb6a6011
Merge remote-tracking branch 'tehrealsalt/oglshaderport' into sal-oglshaderport
2020-02-03 01:17:26 -03:00
James R
bd90c20366
Turn the shadow scale if-else into a switch statement, for sake of editing and in case object types ever change 💦
2020-02-02 18:00:02 -08:00
James R
35f1a4b76c
lua_pushvalue is unneeded
2020-02-02 17:22:28 -08:00
Steel Titanium
1794949696
Add empty entry
2020-02-02 18:52:41 -05:00
James R
deaf5cfa28
LUA_PushLightUserdata takes the fun out of lib_cvFindVar
2020-02-02 15:19:19 -08:00
James R
0218f58f48
userdataType can check light userdata too!
2020-02-02 15:08:22 -08:00
lachwright
305559b3f4
Move climbing checks to a separate function
2020-02-02 23:07:45 +08:00
Sally Cochenour
33a75fcd30
Remove blend to black
2020-02-02 07:28:31 -05:00
Sally Cochenour
8305d65768
Drop shadows closer to software
2020-02-02 07:28:31 -05:00
Sally Cochenour
07b2a5aca8
FIX COLOR BUG
2020-02-02 07:28:31 -05:00
James R
57492347ed
Don't I_Error on startup files only if a file was added twice
2020-02-01 19:32:08 -08:00
James R
5a524f21da
Merge branch 'starpost-config-additions' into 'next'
...
Starpost config additions
See merge request STJr/SRB2!680
2020-02-01 21:42:43 -05:00
James R
ce3a79e51a
Merge branch 'bruh2' into 'master'
...
Fix fuckup 2
See merge request STJr/SRB2!744
2020-02-01 21:42:21 -05:00
James R
ec995d620f
Merge branch 'rotsprite-memory-leak' into 'next'
...
Fix memory leak when caching rotsprite
See merge request STJr/SRB2!745
2020-02-01 21:42:12 -05:00
James R
c069cf94bc
Merge branch 'tnt-is-laggy' into 'next'
...
Make flying TNTs' explosions not so laggy the first time
See merge request STJr/SRB2!746
2020-02-01 21:41:59 -05:00
James R
52c1e73035
Merge branch 'platform-fixes' into 'next'
...
Reset pmomz after applying it to momz
See merge request STJr/SRB2!747
2020-02-01 21:41:49 -05:00
James R
5c8406f6d7
Merge branch 'protect-wrists' into 'next'
...
Remove flight cutoff property
See merge request STJr/SRB2!748
2020-02-01 21:41:33 -05:00
James R
c46d9a1b87
Merge branch 'file-param-error' into 'master'
...
Don't I_Error if non base files fail to load with -file
See merge request STJr/SRB2!678
2020-02-01 21:41:22 -05:00
James R
d5ced42f06
Remove Player 0
2020-02-01 18:22:03 -08:00
James R
bf3b7fc5b0
Clean player name before joining!!!
2020-02-01 18:20:35 -08:00
James R
ab8eed6efb
Add missing conditions to CleanupPlayerName
2020-02-01 18:11:41 -08:00
Jaime Passos
68f4d415fe
Merge remote-tracking branch 'origin/next' into sal-oglshaderport
2020-02-01 23:02:15 -03:00
Jaime Passos
828961264e
Update w_wad.c
2020-02-01 22:50:52 -03:00
Jaime Passos
59cc097d94
Merge branch 'sal-oglshaderport' of https://git.magicalgirl.moe/STJr/SRB2 into sal-oglshaderport
2020-02-01 22:26:40 -03:00
Jaime Passos
65da251a2f
Fix ACZ fence texture
2020-02-01 22:25:48 -03:00
Louis-Antoine
7dd0f2b808
Fix splitscreen player being unable to move
2020-02-01 20:19:39 +01:00
GoldenTails
fe17933156
Make V_DrawCenteredSmallThinString() a less precise wrapper for V_DrawCenteredSmallThinStringAtFixed() for new "small-thin-center" option in v.drawString()
2020-02-01 11:01:39 -06:00
GoldenTails
7d9f138160
Make V_DrawRightAlignedSmallThinString() a less precise wrapper for V_DrawRightAlignedSmallThinStringAtFixed() for new "small-thin-right" option in v.drawString()
2020-02-01 11:01:22 -06:00
GoldenTails
b2b4c4c79e
Create V_DrawCenteredSmallThinStringAtFixed() for new "small-thin-fixed-center" option in v.drawString()
...
Thankfully "center" is just "right" but with the X offset divided by 2.
2020-02-01 11:01:03 -06:00
GoldenTails
4cbcb68795
Create V_DrawRightAlignedSmallThinStringAtFixed() for new "small-thin-fixed-right" option in v.drawString()
...
You guys have no idea how long this took to code.
2020-02-01 11:00:45 -06:00
GoldenTails
c858d9fd4d
Make V_DrawSmallThinString() a less precise wrapper for V_DrawSmallThinStringAtFixed() to fix rounding errors.
2020-02-01 11:00:24 -06:00
GoldenTails
75d94c6c1a
Create V_DrawSmallThinStringAtFixed() for new "small-thin-fixed" option in v.drawString()
...
I removed the limitation present in "small-thin" by converting all relevant variables to fixed_t's and using FixedMul() and FixedDiv() when necessary. Who'da thunk it would actually work?
2020-02-01 11:00:02 -06:00
GoldenTails
a216736ef4
Create V_DrawCenteredSmallStringAtFixed() for new "small-fixed-center" option in v.drawString()
2020-02-01 10:59:38 -06:00
GoldenTails
5f56d19a43
Create V_DrawRightAlignedSmallStringAtFixed() for new "small-fixed-right" option in v.drawString()
2020-02-01 10:59:21 -06:00
GoldenTails
f7085fc171
Create V_DrawCenteredThinStringAtFixed() for new "thin-fixed-center" option in v.drawString()
2020-02-01 10:58:55 -06:00
GoldenTails
f1655d32f5
Fixed V_DrawRightAlignedThinStringAtFixed declaration to use fixed_t for positioning.
2020-02-01 10:58:19 -06:00
GoldenTails
cb5c90fc40
Create V_DrawRightAlignedThinStringAtFixed() for new "thin-fixed-right" option in v.drawString()
...
These function names are starting to become rediculous...
2020-02-01 10:55:54 -06:00
GoldenTails
d147a50e9b
remove large commented broken version of V_DrawSmallThinString() lol
2020-02-01 10:54:10 -06:00
GoldenTails
6527b5d16b
Create V_DrawSmallThinString() for new "small-thin" option in v.drawString()
...
Note this has some major limitations to prevent squished text. It defaults to using V_MONOSPACE|V_OLDSPACING and you cannot change the size of characters. V_6WIDTHSPACE seems to act exactly the same as V_OLDSPACING too.
2020-02-01 10:53:06 -06:00
GoldenTails
9f50b6ef73
Create V_DrawCenteredStringAtFixed() for new "fixed-center" option in v.drawString()
2020-02-01 10:51:43 -06:00
GoldenTails
b0e66874d3
Fixed v_video.h declaration for V_DrawRightAlignedStringAtFixed()
2020-02-01 10:51:31 -06:00
GoldenTails
dc1871a74f
Create V_DrawRightAlignedStringAtFixed() for new "fixed-right" option in v.drawString()
2020-02-01 10:50:57 -06:00
GoldenTails
426ccc9203
Create V_DrawCenteredThinString() for new "thin-center" option in v.drawString()
2020-02-01 10:50:50 -06:00
GoldenTails
df15ad82d2
Create V_DrawCenteredSmallString() for new "small-center" option in v.drawString()
2020-02-01 10:50:46 -06:00
GoldenTails
37cef69c95
Add V_COLORMAP support for small-fixed and thin-fixed text.
2020-02-01 10:46:26 -06:00
GoldenTails
63721b99cf
Create V_DrawSmallStringAtFixed() for new "small-fixed" option in v.drawString()
2020-02-01 10:43:04 -06:00
GoldenTails
93b64a8d7d
Create V_DrawThinStringAtFixed() for new "thin-fixed" option in v.drawString()
2020-02-01 10:42:15 -06:00
lachwright
af7366058d
Merge branch 'next' into knuxtweaks
2020-02-01 18:00:55 +08:00
lachwright
d2bfc673a9
Distance orbital camera appropriately when gr_shearing is enabled
2020-02-01 17:01:27 +08:00
Jaime Passos
77f373c903
Merge branch 'am-line' into 'master'
...
Automap fixes
See merge request STJr/SRB2!735
2020-02-01 03:22:53 -05:00
Jaime Passos
decc381698
Merge branch 'colorlutfix' into 'master'
...
Fix color LUT using the wrong palette
See merge request STJr/SRB2!739
2020-02-01 03:22:26 -05:00
lachwright
f5e49ace00
Have spin set fly1 to 2 instead of 0, akin to the previous cutoff behavior
2020-02-01 14:49:48 +08:00
lachwright
ec02a90ebc
Make flight controls less bullshit
2020-02-01 14:29:49 +08:00
lachwright
d67388ece0
Merge branch 'next' into platform-fixes
2020-02-01 13:34:04 +08:00
Steel Titanium
a2c15c5cb2
Only check if the directory is not empty, use strncasecmp for case insensitive comparing, and remove debug print
2020-01-31 20:21:09 -05:00
James R
a46b397659
Remove code that does effectively nothing
2020-01-31 14:35:19 -08:00
James R
71707e6dca
Reset rollangle on TNT explosion
...
This is the where the extreme lag when TNT Barrels explode came from. Probably
because the sprites are big and there's four of 'em! It shouldn't matter that
these aren't rotated--they're pretty round.
2020-01-31 14:32:47 -08:00
Steel Titanium
7c83e5e420
Implement folder blacklisting
2020-01-31 16:37:55 -05:00
Louis-Antoine
d02c4c0cc7
Add "resendgamestate" command
2020-01-31 15:57:04 +01:00
Louis-Antoine
014b93406e
Store most data in gamestate instead of server config packet
2020-01-31 15:29:22 +01:00
James R
3afc766f5e
Oops
2020-01-30 23:58:35 -08:00
James R
4238003887
Merge remote-tracking branch 'origin/master' into next
2020-01-30 23:54:56 -08:00
James R
aad4b6f8a1
Merge branch 'i-can-see-myself' into 'master'
...
Don't draw yourself in first person!
See merge request STJr/SRB2!697
2020-01-31 02:34:11 -05:00
James R
6528b4a0f8
Merge branch 'opengl-skipintro-sigabrt' into 'master'
...
Fix crash when using -skipintro and the renderer is set to OpenGL from config
See merge request STJr/SRB2!714
2020-01-31 02:34:08 -05:00
James R
d7fcd3384a
Merge branch 'cybrak_flamedmg' into 'next'
...
Fix damagetype for Cybrak flamethrower.
See merge request STJr/SRB2!731
2020-01-31 02:34:05 -05:00
James R
d1e954ec9c
Merge branch 'angle-clamp' into 'master'
...
Fix the minecart angle thing in netgames
Closes #69
See merge request STJr/SRB2!732
2020-01-31 02:33:59 -05:00
James R
56839f428d
Merge branch 'ttfixes2' into 'next'
...
Fix title card not showing up at all if focus lost
See merge request STJr/SRB2!736
2020-01-31 02:33:57 -05:00
James R
8297dbd373
Merge branch 'ntsatkbgfix' into 'master'
...
Fix M_DrawNightsAttackMountains integer overflow
See merge request STJr/SRB2!737
2020-01-31 02:33:53 -05:00
James R
4e9fb2de7d
Merge branch 'startcontinue' into 'master'
...
Fix F_StartContinue fading out incorrectly in OpenGL
See merge request STJr/SRB2!738
2020-01-31 02:33:51 -05:00
Steel Titanium
f4de193809
Fix memory leak while chat is on screen
2020-01-30 22:11:50 -05:00
lachwright
2e48539251
Merge branch 'next' into platform-fixes
2020-01-30 21:39:01 +08:00
Jaime Passos
85211dcc09
Only write a Local Color Table if the frame's palette differs from the header's palette
2020-01-29 17:31:27 -03:00
Jaime Passos
999e72ab32
Uh
2020-01-29 13:56:39 -03:00
Jaime Passos
99c755c186
Update the Screenshot Options menu
2020-01-29 13:52:02 -03:00
Jaime Passos
5a330803ec
Local Color Table for GIF movie mode
2020-01-29 13:47:55 -03:00
SteelT
3a6c7e9577
Merge branch 'dehacked-hud-fix' into 'next'
...
Fix missing "RINGSNUMTICS" in dehacked.c's HUD items
See merge request STJr/SRB2!733
2020-01-28 20:25:07 -05:00
Louis-Antoine
31ce076411
Only call P_CheckSurvivors() in tag gametypes
2020-01-28 14:02:36 +01:00
Jaime Passos
a321ec9135
no more 3dfx
2020-01-28 00:56:22 -03:00
Jaime Passos
b0ba9d22a8
i want to die
2020-01-28 00:41:41 -03:00
Jaime Passos
b6b875f934
so is the accumulation buffer (deprecated)
2020-01-28 00:33:45 -03:00
Jaime Passos
93fe6a50ac
glFog is unused
2020-01-28 00:26:09 -03:00
Jaime Passos
35983c7ae5
load_shaders -> Shader_Load + Shader_SetUniforms
2020-01-28 00:20:10 -03:00
Jaime Passos
82492f353b
DoScreenWipe is void
2020-01-28 00:17:07 -03:00
Jaime Passos
af7b4795b7
port pfnUpdateTexture
2020-01-28 00:16:38 -03:00
Jaime Passos
636093a59d
Fix color LUT using the wrong palette
2020-01-27 13:55:13 -03:00
Jaime Passos
28fd2380df
Fix F_StartContinue fading out incorrectly in OpenGL
2020-01-27 13:28:07 -03:00
Jaime Passos
c87119f18f
Fix shader reading yet again
2020-01-27 02:15:34 -03:00
Jaime Passos
bdd43efb25
Fix -OGLlib
2020-01-27 01:57:55 -03:00
Jaime Passos
1548a22ea9
Fix M_DrawNightsAttackMountains being broken for obvious reasons
2020-01-27 00:44:10 -03:00
Jaime Passos
1774ba22b6
Fix title card not showing up at all if focus lost
2020-01-26 23:50:36 -03:00
Jaime Passos
cf7b4d826a
Remove redundancy
2020-01-26 23:46:07 -03:00
Jaime Passos
7f57327ff7
"changes" not "changed"
2020-01-26 23:41:34 -03:00
Jaime Passos
46cbe63b43
Fix going big
2020-01-26 23:39:31 -03:00
Jaime Passos
2cfeaa63d2
Fix movement to accomodate to window scale changes
2020-01-26 23:34:04 -03:00
Jaime Passos
8f3855d09f
Don't stop the automap (just restart it instead.)
2020-01-26 23:12:28 -03:00
Jaime Passos
dd8166ca5f
Doesn't matter.
2020-01-26 22:57:14 -03:00
Jaime Passos
ba6018aea4
Optimise pixel drawing
2020-01-26 22:52:15 -03:00
Jaime Passos
d08929b3d7
Move line drawer setting to AM_Drawer
2020-01-26 22:46:57 -03:00
fickleheart
bea7ad2185
Merge remote-tracking branch 'upstream/next' into viewroll
2020-01-26 18:01:58 -06:00
Monster Iestyn
ef53672deb
Merge branch 'master' into next
...
# Conflicts:
# src/g_game.c
2020-01-26 19:23:05 +00:00
MascaraSnake
cedfc02f19
Implement linedef alpha field (replaces specials 900-908)
2020-01-26 12:24:52 +01:00
Zwip-Zwap Zapony
ea28304d8c
Fix missing "RINGSNUMTICS" in dehacked.c
...
This fixes 16/20 of the HUD items in dehacked.c being off by one
(Same case as the MFE_ flags thing)
Also fixes dehacked.c mentioning "LAPS", which doesn't exist
2020-01-26 10:53:37 +01:00
Jaime Passos
9e79b337b1
Fix NOTEXTURE_NUM
2020-01-25 22:20:27 -03:00
Jaime Passos
e576c1ada1
make up for the lack of ogllog.txt
2020-01-25 22:17:39 -03:00
fickleheart
e57589b106
Fix the minecart angle thing
2020-01-25 19:03:15 -06:00
Jaime Passos
8bcdd105ce
I'll put this back in here, I guess.
2020-01-25 21:57:05 -03:00
Jaime Passos
647107a220
Same deal for screen textures
2020-01-25 21:46:52 -03:00
Jaime Passos
c219a170da
Stop using NextTexAvail you dunce
2020-01-25 21:37:33 -03:00
Jaime Passos
b9b1958886
make NOTEXTURE_NUM 1
2020-01-25 21:22:24 -03:00
Jaime Passos
8401e09787
remove includes
2020-01-25 21:21:44 -03:00
lachwright
65e84978fa
Don't cancel Knuckles' landing animation on rising surfaces
2020-01-26 04:51:00 +08:00
lachwright
cddc4e1500
Merge branch 'next' into platform-fixes
2020-01-26 04:34:57 +08:00
lachwright
b6106ca8c5
Don't spawn glide dust for SF_NOSKID characters
2020-01-26 04:33:41 +08:00
lachwright
652a1984fe
Fix P_SpawnSkidDust description
2020-01-26 03:44:10 +08:00
toaster
f90c70ebe2
Make the DMG actually *applied*. Consequence: flame will continue flying through player instead of dying in midair and dropping a flame, but this is actually desirable given the current behaviour looks kind of shitty.
2020-01-25 11:34:30 -05:00
toaster
2dd13bb2a4
Fix damagetype for Cybrak flamethrower.
2020-01-25 11:31:06 -05:00
MascaraSnake
3775e6447e
Skyboxes: Remove obsolete modulo operation
2020-01-25 15:37:23 +01:00
Nev3r
842099b74d
Merge branch 'credits-again' into 'next'
...
Credit Tatsuru
See merge request STJr/SRB2!728
2020-01-25 08:54:41 -05:00
Louis-Antoine
d30b48cfd1
Fix lava removing fire shield
2020-01-25 14:04:16 +01:00
MascaraSnake
d947558576
Use tag instead of angle for skyboxes
2020-01-25 10:26:38 +01:00
MascaraSnake
5656d77c82
Use tag instead of angle for polyobject spawn points and anchors
2020-01-25 10:15:20 +01:00
MascaraSnake
37375972e2
Use tag field to setup vertex slopes
2020-01-25 10:01:01 +01:00
MascaraSnake
261f049f6c
Add mapthing tag field (not used yet)
2020-01-25 09:52:13 +01:00
fickleheart
332b22a87a
Move spawnsnap to Special/ignore on sector trigger
...
Also includes splitting the starpost logic into its own function.
2020-01-24 23:54:54 -06:00
SteelT
6c4c122925
Merge branch 'opengl-garbage-fade' into 'master'
...
Fix garbage fade on Sonic's ass in OpenGL
See merge request STJr/SRB2!715
2020-01-25 00:51:07 -05:00
James R
c9bc3837f9
Signed is unsigned, cool
2020-01-24 16:44:53 -08:00
James R
59ed381fc0
Credit Tatsuru, he's done a bit
2020-01-24 16:38:46 -08:00
Louis-Antoine
2d142f734f
Remove all potentially dangerous functions
...
Basically any function that calls fopen() is gone,
except the ones created by me.
And no access to stdin/stdout/stderr
through io.read()/io.write().
Not really harmful but why would you want that in SRB2.
2020-01-25 01:37:50 +01:00
LJ Sonic
53e2cfbde2
Merge branch 'keep-body' into 'next'
...
Let clients rejoin the server without losing their status
See merge request STJr/SRB2!722
2020-01-24 18:50:03 -05:00
SteelT
4b1a402731
Merge branch 'key-out-of-range' into 'master'
...
Don't set controls to keys of array bounds
See merge request STJr/SRB2!723
2020-01-24 18:45:19 -05:00
Louis-Antoine
16c7981bb8
Fix the compiler warning fix
2020-01-24 23:34:39 +01:00
Louis-Antoine
51947319ee
Fix two compiler warnings
2020-01-24 23:24:54 +01:00
LJ Sonic
d654bbc7de
Merge branch 'point-in-subsector-or-null' into 'next'
...
Rename R_IsPointInSubsector to R_PointInSubsectorOrNull/Nil
See merge request STJr/SRB2!719
2020-01-24 17:08:30 -05:00
SteelT
c7b4054a7a
Merge branch 'musicdef-versioning' into 'next'
...
MUSICDEF cleanup, fixes, and VERSION directive to opt into new format
See merge request STJr/SRB2!708
2020-01-24 17:06:58 -05:00
SteelT
9677c9f084
Merge branch 'player2-turn-fix-next' into 'next'
...
Fix "cam2_turnmultiplier" being unused in "next"
See merge request STJr/SRB2!713
2020-01-24 17:04:20 -05:00
SteelT
7d740efc78
Merge branch 'player2-turn-fix' into 'master'
...
Fix "cam2_turnmultiplier"
See merge request STJr/SRB2!711
2020-01-24 17:04:06 -05:00
MascaraSnake
60cde39042
Rename some UDMF fields whose names have different meanings in other UDMF implementations
2020-01-24 23:02:42 +01:00
SteelT
72996a50bf
Merge branch 'ploadflat-bruh-bruh' into 'master'
...
Fix P_AddLevelFlatRuntime again
See merge request STJr/SRB2!717
2020-01-24 17:00:09 -05:00
SteelT
9a414ff5ab
Merge branch 'fix-mouse-controls-setup' into 'master'
...
Fix mouse in controls setup menu
See merge request STJr/SRB2!706
2020-01-24 16:58:06 -05:00
MascaraSnake
97c58957ee
Merge branch 'next' into udmf-next
2020-01-24 22:38:26 +01:00
MascaraSnake
7ac1b9298f
Merge branch 'master' into next
2020-01-24 22:37:25 +01:00
Jaime Passos
bdc1594b07
Redundant define?
2020-01-24 17:05:40 -03:00
Jaime Passos
075ae996fa
GL_DBG_Printf instead of CONS_Alert
2020-01-24 17:04:38 -03:00
Jaime Passos
1c7b584dee
I_Error is too extreme I think, just CONS_Alert instead
2020-01-24 17:03:00 -03:00
Jaime Passos
7c4c04ca6a
Fix custom shader loading
2020-01-24 16:57:21 -03:00
Jaime Passos
b18c0cfcab
Un-HWRENDER shader lump names
2020-01-24 16:42:55 -03:00
Louis-Antoine
8bd897a269
Be silent when "kicking" a disconnected player
...
This lets the host manually remove a body if they want,
without polluting the chat with redundant messages.
2020-01-24 19:56:57 +01:00
Louis-Antoine
9658ef2c5b
Add .dat and .csv to whitelisted file extensions
2020-01-24 17:51:20 +01:00
Louis-Antoine
e0f0984fcc
Rename "luafiles/shared/" to "luafiles/client/"
2020-01-24 17:11:00 +01:00
Tatsuru
295f052f2d
I don't know how these even come up
2020-01-24 01:03:38 -03:00
Jaime Passos
0246026ade
I don't know why this happened
2020-01-24 00:35:51 -03:00
Jaime Passos
686d8e418e
st_translucency went missing in here for... reasons...
2020-01-23 23:52:11 -03:00
Jaime Passos
afa9b58cee
fix corona compiling lol
2020-01-23 23:41:09 -03:00
Jaime Passos
922ac73594
Menu organisation
2020-01-23 23:15:27 -03:00
Jaime Passos
a521e40c0e
bye
2020-01-23 23:09:53 -03:00
Louis-Antoine
3b22a84296
Split open() into open() and openlocal()
...
open() for normal, consistency-friendly reading,
openlocal() for writing and local reading.
2020-01-24 02:47:51 +01:00
Jaime Passos
d019080327
I LOVE MENU CODE!
2020-01-23 22:38:54 -03:00
Jaime Passos
11c3721db4
Fix warnings around load_shaders
2020-01-23 22:30:36 -03:00
Jaime Passos
d24060bb94
Wait.
2020-01-23 22:24:35 -03:00
James R
968fea0383
Fix implicit operand because GLSL is a goof or such
2020-01-23 17:22:02 -08:00
Jaime Passos
770135451f
Restore some model lighting code that went gone in the shaders code
2020-01-23 22:02:18 -03:00
Jaime Passos
1755c240bf
Fix the gl_leveltime problem, I guess.
...
This is probably superfluous.
2020-01-23 21:25:54 -03:00
Jaime Passos
544d6acc51
Delete USE_PALETTED_TEXTURE again
2020-01-23 20:21:13 -03:00
Jaime Passos
1601f0c66f
Update copyright text
2020-01-23 20:12:15 -03:00
Jaime Passos
014638ead7
Fix view aiming / shearing
2020-01-23 19:44:46 -03:00
Jaime Passos
7266e0876a
towards
2020-01-23 19:17:05 -03:00
James R
3d9466e5f5
Semantics
2020-01-23 13:57:39 -08:00
Louis-Antoine
ba127008cf
Do not spam player quit net commands
2020-01-23 19:59:41 +01:00
Louis-Antoine
b0b22b53d6
Ignore disconnected players in tag gametypes
...
Disconnected players do not become IT at round start.
If all non-ITs are disconnected, the round ends.
If all ITs are disconnected, one of the non-ITs
becomes IT, or the round ends if in Hide & Seek.
2020-01-23 19:58:13 +01:00
Louis-Antoine
ce20642fa7
Do not protect non-IT players in tag gametypes
2020-01-23 18:52:16 +01:00
James R
f0daea39d4
Don't set controls to keys out of array bounds
...
Shout-out to TAG's config that somehow had
`setcontrol2 "custom3" "KEY931926528"`, cuasing the game to crash only in
Splitscreen.
2020-01-22 22:19:00 -08:00
Louis-Antoine
e8760fe5dd
Update Lua I/O support to 2.2
2020-01-22 23:08:57 +01:00
Bartu Ä°nce
875774a45f
no message
2020-01-22 22:08:08 +01:00
Bartu Ä°nce
c72e0efee4
"page x of y"
2020-01-22 21:57:28 +01:00
Bartu Ä°nce
912734ffe6
Extra emblems display, take 2.
2020-01-22 21:52:15 +01:00
Bartu Ä°nce
aa05581de2
Added support for 10+ emblem hints
2020-01-22 18:53:17 +01:00
lachwright
32607d6195
Reduce severity of glide landing & move skid dust to separate function
2020-01-23 01:02:44 +08:00
Louis-Antoine
fb28ede660
Rename R_IsPointInSubsector to R_PointInSubsectorOrNull/Nil
...
The old name made it really easy to accidentally read
R_IsPointInSubsector as R_PointInSubsector, and anyway it
didn't even make sense...
2020-01-22 16:58:57 +01:00
Louis-Antoine
cfec8609f9
Fix missing declaration
2020-01-22 04:01:06 +01:00
Louis-Antoine
f209721ded
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into keep-body
...
# Conflicts:
# src/g_game.c
# src/p_setup.c
2020-01-22 03:57:22 +01:00
Louis-Antoine
2527b6c389
Teleport disconnected players to starpost if they fall in a pit
2020-01-22 03:20:27 +01:00
Louis-Antoine
412ba38a81
Refactor player spawning code a little
2020-01-22 03:19:15 +01:00
Louis-Antoine
d03c928baa
Give flashing tics to disconnected players and prevent drowning
2020-01-22 03:14:44 +01:00
Louis-Antoine
73d0549fa4
Ignore players towards exit count 30 seconds after their disconnection
2020-01-22 03:11:05 +01:00
Louis-Antoine
d374bf4f9b
Let clients rejoin the server without losing their status
...
This is accomplished by simply preserving
the player's body after disconnecting.
Bodies will despawn after the number of minutes
specified by the "rejointimeout" console variable (float).
A value of 0 disables the feature completely.
Clients rejoining are identified by their IP address,
and may rejoin even if the server is full or joins are disabled,
for as long as their body remains.
From a technical standpoint, when the user disconnects,
the player they were controlling does not leave,
the underlying player_t just keeps working normally,
except it does not receive any input anymore.
When the user reconnects, they are simply "relinked"
to their player_t.
Those "soulless" players can be identified through
their "quittime" field, which is the number of tics
elapsed since the user disconnected, or zero
if still connected. "quittime" is exposed to Lua.
2020-01-22 03:05:08 +01:00
James R
2373a0aa83
Actually actually match the old behavior and check existing levelflats in P_AddLevelFlatRuntime BRUH
2020-01-21 16:47:47 -08:00
James R
d90c0b8fbd
Don't check "Too many flats in level" with P_AddLevelFlatRuntime
...
Also moved the debug down in case anyone uses that.
2020-01-21 15:35:07 -08:00
James R
9cd101c68d
Revert "Fix Ploadflat closing the game with "Too many flats in level" error message"
...
This reverts commit ea129f701c
2020-01-21 15:35:07 -08:00
James R
f297f4ff56
Sonic is dead again
2020-01-21 12:24:24 -08:00
James R
c347254e80
Reorder Sonic's ass so the OpenGL wipe doesn't see garbage
2020-01-21 12:23:34 -08:00
James R
dfcd058c80
(BRUH MOMENT) activettscale was -1, so do recache after it's set
2020-01-21 12:21:18 -08:00
Zwip-Zwap Zapony
49a4c7d5f3
Separate "turnmultiplier"s for splitscreen players
...
This fixes player 2 using player 1's "cam_turnmultiplier"
instead of player 2's "cam2_turnmultiplier"
2020-01-21 14:53:05 +01:00
James R
5b08e1802d
Trim the trailing zeros off floats for cvars
2020-01-20 23:14:26 -08:00
James R
2d8ea7125c
Remove unnecessary optimization
2020-01-20 15:36:27 -08:00
James R
0d460aed1d
Merge branch 'gl-dropshadows' into 'next'
...
OpenGL drop shadows
See merge request STJr/SRB2!703
2020-01-20 16:52:40 -05:00
Jaime Passos
720695a6c4
Remove W_FlushCachedPatches
2020-01-20 17:03:38 -03:00
Jaime Passos
f4a976f3be
Merge remote-tracking branch 'origin/next' into pictureformats
2020-01-20 16:53:41 -03:00
Zwip-Zwap Zapony
c1097813f4
Fix "cam2_turnmultiplier"
...
In splitscreen stuff, player 2's "cam2_turnmultiplier" implementation
was wrong compared to player 1's "cam_turnmultiplier"
This commit makes player 2's multiplier work just like player 1's does
2020-01-20 16:14:20 +01:00
Tatsuru
431206ebee
Die
2020-01-20 10:04:44 -03:00
Tatsuru
fed000b724
Remove Tails pick-up lock
2020-01-19 23:18:49 -03:00
Tatsuru
697dbd58e7
Turn cv_exitmove on by default
2020-01-19 21:56:53 -03:00
Tatsuru
db22d503a4
HUD visual indicator + property fix
2020-01-19 21:55:08 -03:00
Tatsuru
9e4c519cad
In-map visual indicator
2020-01-19 19:02:03 -03:00
Tatsuru
e9a8c2d21a
No more losing lives when finished
2020-01-19 14:30:05 -03:00
Confusion
ad505a6fe7
Fix title screen broken when leaving during resynch
2020-01-19 17:55:22 +03:00
James R
a7770c3e97
Merge branch 'add-exitmove-to-menu' into 'next'
...
Put cv_exitmove in the server options menu
See merge request STJr/SRB2!704
2020-01-19 02:18:49 -05:00
James R
9dbc54284e
Opt into new MUSICDEF format (2.2.0 compatibility)
...
The "VERSION" directive enables features available in a certain version of
SRB2. It may be used as "VERSION 2.2.0".
2020-01-18 23:12:30 -08:00
James R
1317dba3e4
Refactor MUSICDEF parsing, actually count lines
...
If you use strtok for (CR)LF, it'll skip the empty lines bruh.
2020-01-18 22:17:47 -08:00
James R
b7b24eb5d7
Buold.
2020-01-18 15:56:03 -08:00
Louis-Antoine
512435c59f
Fix mouse in controls setup menu
2020-01-18 20:18:20 +01:00
fickleheart
ec89015662
Fix loss of aimingtody precision at high FOV
2020-01-18 11:19:59 -06:00
fickleheart
f6efe19fca
Use generally higher zooms and fix fuzzy edges
2020-01-18 11:15:36 -06:00
fickleheart
5757f24342
Reduce the number of distinct roll angles
2020-01-18 10:53:45 -06:00
fickleheart
8679606ebb
Remove a couple adds from each pixel of morph mapping
2020-01-18 10:53:23 -06:00
fickleheart
af4479924a
Fully clip drawing to roll-used screen bounds
2020-01-18 10:53:00 -06:00
Tatsuru
8348123a70
Goal posts
2020-01-18 13:15:24 -03:00
Jaime Passos
cdc3386d48
Fix missing constant
2020-01-18 12:10:48 -03:00
Tatsuru
0c7c5742a8
Put cv_exitmove in the menus
2020-01-18 12:06:04 -03:00
Sally Cochenour
7e333c6331
input is reserved apparently
2020-01-18 09:25:09 -05:00
James R
ffc274643c
Let "+" command line parameters specify more than one argument
...
Previously each parameter after the first would be quoted into one argument to
pass to the command buffer.
2020-01-18 00:23:47 -08:00
fickleheart
8868fc4d8a
Fix lighting discrepancies between different FOVs
2020-01-18 00:16:18 -06:00
James R
e82d19572d
Merge branch 'intangable' into 'next'
...
Add FF_INTANGABLEFLATS as an alternative spelling for FF_INTANGIBLEFLATS
See merge request STJr/SRB2!702
2020-01-18 00:49:08 -05:00
fickleheart
1d221a453a
Avoid rendering unused left/right edges of screen while rolling
2020-01-17 23:21:11 -06:00
James R
94a2f0bb4f
Don't draw Tails' tails in first person (MF2_LINKDRAW)
2020-01-17 20:56:32 -08:00
James R
762223db7c
Duplicated code is gone, so sad
2020-01-17 20:53:36 -08:00
fickleheart
21ccefe4eb
Fix sky texture scaling wrong with fov changes
2020-01-17 22:03:16 -06:00
fickleheart
7bd9344dd0
I think this fixes the compile errors
2020-01-17 21:55:16 -06:00
Sally Cochenour
a12d6885a3
Merge branch 'gl-dropshadows' into oglshaderport
2020-01-17 22:29:31 -05:00
Sally Cochenour
43828f265c
Use shadow cvar
2020-01-17 22:20:04 -05:00
Sally Cochenour
ba51f83aaf
Merge branch 'next' into gl-dropshadows
2020-01-17 22:19:51 -05:00
fickleheart
64c4a4c02c
Fisheye lens experiments
2020-01-17 20:39:38 -06:00
fickleheart
2b7d75126e
Add DBG_VIEWMORPH to view pre-transformed view
2020-01-17 20:39:15 -06:00
fickleheart
84329fcd26
OGL can have little a viewroll
2020-01-17 19:01:45 -06:00
fickleheart
7cf563eadd
Un/archive viewrollangle in netsaves
2020-01-17 18:32:13 -06:00
fickleheart
d63aa1031e
Merge remote-tracking branch 'upstream/next' into viewroll
2020-01-17 18:27:15 -06:00
James R
9a1cb0e30e
Merge branch 'software-dropshadows' into 'next'
...
Software dropshadows
See merge request STJr/SRB2!660
2020-01-17 18:56:13 -05:00
James R
96c91ce716
Merge branch 'r_ispointinsubsector' into 'next'
...
Add R_IsPointInSubsector to lua baselib
See merge request STJr/SRB2!700
2020-01-17 18:24:04 -05:00
Jaime Passos
999094f2f6
backwards compat
2020-01-17 16:11:17 -03:00
Alam Ed Arias
b09341383f
Merge branch 'master' into next
2020-01-17 11:12:10 -05:00
Alam Ed Arias
b38921ff53
Merge branch 'mserv-is-dumb-and-what-else-is-new' into 'master'
...
Fuck NONET
See merge request STJr/SRB2!699
2020-01-17 11:11:02 -05:00
fickleheart
f59ed6b2f4
DOUBLE DAMNIT
2020-01-17 00:34:57 -06:00
fickleheart
d39d8506ca
Let nerds turn off shadows
2020-01-17 00:20:10 -06:00
fickleheart
919661ff8f
Give me a break
2020-01-17 00:18:00 -06:00
fickleheart
4ca44f2d57
Bosses need dropshadows too
2020-01-17 00:16:15 -06:00
fickleheart
9a4ad20947
DAMNIT
2020-01-17 00:13:13 -06:00
fickleheart
f0843cba13
Let vissprites have shadows too
...
fuck it, hopefully it works
2020-01-17 00:13:05 -06:00
Jaime Passos
8bfdb52231
add R_IsPointInSubsector to lua baselib
2020-01-17 00:49:43 -03:00
Jaime Passos
7adc108a2a
typoe
2020-01-17 00:34:31 -03:00
James R
e4f0fa46f5
Dumbass NONET stuff...
2020-01-16 18:07:28 -08:00
James R
b6f68be52c
Merge branch 'credits-woopises' into 'next'
...
Add missing name to the credits
See merge request STJr/SRB2!696
2020-01-16 20:33:35 -05:00
James R
098e41e518
Merge branch 'larger-chat' into 'master'
...
Larger chat
See merge request STJr/SRB2!691
2020-01-16 20:33:09 -05:00
James R
d4e0bfe87f
Merge branch 'snac-bruh' into 'master'
...
Try to set a 21 character name and SIGABRT
See merge request STJr/SRB2!689
2020-01-16 20:32:58 -05:00
James R
d7b6a3dd61
Merge branch 'mserv-is-dumb-and-what-else-is-new' into 'master'
...
-bindaddr for mserv
See merge request STJr/SRB2!688
2020-01-16 20:32:49 -05:00
Alam Ed Arias
b97b9ac7a8
Merge branch 'master' into next
2020-01-16 20:18:54 -05:00
Alam Ed Arias
d9742afb45
Merge remote-tracking branch 'origin/next' into next
2020-01-16 20:17:58 -05:00
Alam Ed Arias
daab7a0d21
Merge remote-tracking branch 'origin/master'
2020-01-16 20:17:05 -05:00
James R
f93ddc3f37
Merge branch 'keywords-back-again' into 'next'
...
Level header keywords
See merge request STJr/SRB2!656
2020-01-16 20:05:24 -05:00
James R
f8666d6cee
Merge branch 'word' into 'master'
...
Word jumping
See merge request STJr/SRB2!653
2020-01-16 20:05:12 -05:00
James R
601d4aec34
Merge branch 'FALLTHRU' into 'next'
...
FALLTHRU versus fallthru, which will win?
See merge request STJr/SRB2!692
2020-01-16 19:59:00 -05:00
James R
1be648578f
Merge branch 'clear-sign-sprite' into 'next'
...
Add generic signpost sprite for skins that don't have one
See merge request STJr/SRB2!626
2020-01-16 19:57:54 -05:00
James R
1f36bde25f
Merge branch 'musicdef' into 'next'
...
MUSICDEF parser changes.
See merge request STJr/SRB2!599
2020-01-16 19:35:38 -05:00
Steel Titanium
54ec64062c
Revert "Move to the end of the list"
...
This reverts commit 32c65ae844
2020-01-16 19:20:05 -05:00
Steel Titanium
32c65ae844
Move to the end of the list
2020-01-16 18:59:39 -05:00
Sally Cochenour
56f96674b0
Slope contrast
...
Off by default
2020-01-16 16:45:49 -05:00
Sally Cochenour
ef81bf810b
??
...
did not commit??
2020-01-16 14:56:11 -05:00
Sally Cochenour
e5215e929c
Merge branch 'gl-dropshadows' into oglshaderport
2020-01-16 14:55:55 -05:00
Steel Titanium
4c6edd87df
Restore this that got removed shomehow
2020-01-16 14:31:36 -05:00
Steel Titanium
36511afda9
Add missing name to the credits
2020-01-16 14:28:47 -05:00
Sally Cochenour
4e481340ce
OpenGL shadows
2020-01-16 12:37:32 -05:00
Alam Ed Arias
709489cab8
Merge branch 'master' into next
2020-01-16 12:08:36 -05:00
Alam Ed Arias
0134be8b78
please stop breaking clang
2020-01-16 12:05:21 -05:00
lachwright
28c466a0a5
Reset pmomz after transfer to momz
2020-01-16 22:56:01 +08:00
Sally Cochenour
28cd5b2f03
Merge remote-tracking branch 'fickle/software-dropshadows' into gl-dropshadows
2020-01-16 09:38:12 -05:00
James R
542e38e717
Don't draw player mobj in first person
...
This solves that annoying albeit slightly amusing bug
where your sprite clips into your view during a quake.
For OpenGL, this also solves the player's model
rendering while in first person. So you'll no
longer be looking through Sonic's body!
2020-01-16 03:18:05 -08:00
James R
bbbe76d2ca
Expose viewmobj as r_viewmobj
2020-01-16 03:09:02 -08:00
James R
36b9549b23
Merge branch 'locale-liberation' into 'master'
...
Locale liberation
Closes #113
See merge request STJr/SRB2!677
2020-01-15 23:38:40 -05:00
James R
55cc978f40
Merge branch 'extra-life-jingle' into 'master'
...
Optionally use a sound for 1-Up
See merge request STJr/SRB2!668
2020-01-15 23:38:21 -05:00
James R
1e3fd79601
Expose G_FindMapByNameOrCode to Lua
2020-01-15 20:32:40 -08:00
James R
50b18acd3f
Expose G_BuildMapTitle to Lua
2020-01-15 20:04:50 -08:00
James R
7d5a8ac14b
Allow G_BuildMapName outside of levels
2020-01-15 19:25:48 -08:00
James R
bcd90b96d4
Add comment to lib_gFindMap so I know what the fuck I did
2020-01-15 19:01:28 -08:00
James R
a4149cfe37
Expose G_FindMap to Lua
2020-01-15 18:49:22 -08:00
Louis-Antoine
0197a83db7
bruh
2020-01-15 15:57:38 +01:00
Louis-Antoine
ec5db89e55
Cleanup chat code a little
2020-01-15 15:48:03 +01:00
Louis-Antoine
9504ba96da
Increase maximum and default chat width
2020-01-15 15:36:11 +01:00
James R
1489b4bcdd
It's FALLTHRU not fallthru
...
It took a week and me staying up until 2AM to look at the damn manpage and
figure out THIS is why I was getting an error about 'if (tutorialmode)' falling
through. But I still don't know why it didn't trigger on the MT_TNTBARREL case.
Oh well.
2020-01-15 02:14:20 -08:00
fickleheart
e23f632cdb
Clean up fisheye and fix crashes
2020-01-14 23:44:21 -06:00
James R
708ab6ff90
Update buffer for SendNameAndColor
2020-01-14 21:40:58 -08:00
fickleheart
cdbea0be26
Revert "LMAO fisheye"
...
This reverts commit cd957d84f7
2020-01-14 23:30:39 -06:00
fickleheart
cd957d84f7
LMAO fisheye
2020-01-14 23:30:19 -06:00
fickleheart
c25e969676
wip viewroll stuff
2020-01-14 23:29:56 -06:00
James R
619efb3d4e
And free addrinfo
...
(cherry picked from commit 986c80fb13e7ae6900792de5b4b43327af7ca76c)
2020-01-14 19:33:52 -08:00
James R
af2d3cfd16
Let MS_Connect use -bindaddr
...
And so now you really can host from multiple IP addresses.
(cherry picked from commit e56bf12537700af7b7fcd0d3b0e8586e41edddd1)
2020-01-14 19:33:52 -08:00
Tatsuru
fb19d25de1
What
2020-01-14 00:52:54 -03:00
James R
68b78f44d8
Load flats first so textures with the same name are prefered on walls
2020-01-13 15:21:35 -08:00
James R
0d6b6efe0f
Refactor R_LoadTextures into something manageable (no goto!!)
2020-01-13 15:20:50 -08:00
Tatsuru
0fa638eaf5
Logistical problems
2020-01-13 19:12:02 -03:00
James R
223edd8ee0
Merge branch 'disable-titlemap-in-netgames' into 'master'
...
Disable title map when entering a netgame
See merge request STJr/SRB2!683
2020-01-13 16:47:17 -05:00
James R
339ceafdf0
Remove adminplayer from SERVERINFO (PACKETVERSION 2)
2020-01-12 20:21:35 -08:00
James R
84ac743d73
Kill Lua adminplayer
2020-01-12 20:04:05 -08:00
Alam Ed Arias
a2b1b6289c
use a byte, not a ptr2int with memset
2020-01-12 18:59:35 -05:00
James R
bff6875b95
Merge branch 'fangpogo' into 'next'
...
Make Fangboss' player pogo a little less bullshit.
See merge request STJr/SRB2!676
2020-01-12 17:54:02 -05:00
James R
2b95ea0135
Merge remote-tracking branch 'origin/master' into next
2020-01-12 14:17:52 -08:00
James R
2bb8b85754
Merge branch 'split-emblem-hints' into 'next'
...
"Symmetrical"-ish Emblem Hint pages
See merge request STJr/SRB2!670
2020-01-12 17:16:03 -05:00
Zwip-Zwap Zapony
66c9e8e3aa
Fix "symmetrical"-ish emblem hints for ERRORMODE
...
"left_hints" is always 3, 4, or 5, so the signedness is irrelevant.
But with ERRORMODE set to 1 when compiling,
the compile would previously stop due to comparing INT32 to UINT32.
2020-01-12 23:09:27 +01:00
LJ Sonic
6eba68bc3b
Merge branch 'fix-node-player-mixups' into 'master'
...
Fix node player mixups
See merge request STJr/SRB2!684
2020-01-12 15:57:20 -05:00
James R
70bd7132c5
Merge branch 'egg2pogo' into 'next'
...
Egg Slimer Pogo Bruh Moment (resolves #112 )
See merge request STJr/SRB2!674
2020-01-12 15:43:24 -05:00
James R
34b42507d1
Merge branch 'targetproblem' into 'next'
...
Homing Targetting Issues
See merge request STJr/SRB2!671
2020-01-12 15:43:08 -05:00
LJ Sonic
34f73ec083
Merge branch 'fix-node-player-mixups' into 'master'
...
Fix node numbers being used in place of player numbers
See merge request STJr/SRB2!681
2020-01-12 15:40:25 -05:00
James R
50d1226224
Merge branch 'you-cant-escape-console' into 'master'
...
Open the console in menus and draw backpic correctly
See merge request STJr/SRB2!665
2020-01-12 15:38:51 -05:00
James R
5d6d6a7d4d
Merge branch 'escape-console' into 'master'
...
Let Escape close the console
See merge request STJr/SRB2!664
2020-01-12 15:38:35 -05:00
Louis-Antoine
f6244ec9a4
Disable title map when entering a netgame
2020-01-12 20:08:41 +01:00
Louis-Antoine
e9108de365
Replace all instances of XD_KICK with a SendKick function
2020-01-12 19:43:04 +01:00
Louis-Antoine
5b34923352
Fix node numbers being used in place of player numbers
2020-01-12 18:34:08 +01:00
fickleheart
8a6173a3f2
Declare checkbase for both sides of the if statement
2020-01-12 09:11:57 -06:00
fickleheart
9e101fc2bb
Limit shadow Y scale to prevent graphical bugs
2020-01-12 09:10:09 -06:00
fickleheart
e60ba92a92
Checkpoint players at star post exact location with Ambush flag
2020-01-11 22:30:07 -06:00
fickleheart
1e2a4c2cce
Allow starpost Parameter to dictate order
2020-01-11 22:26:20 -06:00
Tatsuru
7b3cc02ddc
Range check
2020-01-11 21:38:10 -03:00
Tatsuru
4221f08a7c
toaster guidance
2020-01-11 21:35:19 -03:00
fickleheart
cfb9b3c234
Expose mobj->shadowscale to Lua
2020-01-11 18:28:15 -06:00
fickleheart
ba8ff3d502
Add mobj shadowscale property
2020-01-11 18:24:08 -06:00
