Monster Iestyn
ff944f5f94
split sector/lines archiving-related code into their own functions too
2020-04-24 20:40:50 +01:00
Monster Iestyn
d255d29942
remove statsec and statline as they appear to be entirely unused
2020-04-24 20:28:01 +01:00
Monster Iestyn
0916ca3642
Split off FOF archiving-related code into their own functions
2020-04-24 20:26:57 +01:00
MascaraSnake
d2e21afaf1
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
f26e8f3df7
Merge branch 'thinker-cleanup' into 'next'
...
Plane movement thinker cleanup
See merge request STJr/SRB2!880
2020-04-24 14:30:52 -04:00
Monster Iestyn
db9c14702d
These are flags! Serves me right for just rushing this out
2020-04-24 16:53:54 +01:00
Monster Iestyn
d1e49fa926
Sync crumblestate in netgames
2020-04-24 16:40:09 +01:00
Nev3r
da165d2d22
Add textmap pitch and roll parsing, and mobj pitch and roll variables.
2020-04-19 14:51:55 +02:00
MascaraSnake
059fded08c
Fix NULL pointer crash involving stringargs
2020-04-18 12:23:01 +02:00
MascaraSnake
0d21e4ad87
Eradicate levelspecthink_t
2020-04-18 11:05:58 +02:00
MascaraSnake
1d35442e16
Make T_BounceCheese use its own thinker struct
2020-04-18 10:45:21 +02:00
MascaraSnake
54de7584d1
Refactor T_ThwompSector
2020-04-18 10:26:03 +02:00
MascaraSnake
71f9fe167b
Refactor T_NoEnemiesSector
2020-04-18 09:21:04 +02:00
MascaraSnake
a90735fdf0
Make T_MarioBlock use its own thinker data structure
2020-04-18 02:05:23 +02:00
MascaraSnake
e6193297d8
Refactor T_ContinuousFalling
2020-04-18 01:42:13 +02:00
MascaraSnake
272a8e532b
Refactor T_FloatSector
2020-04-18 00:26:49 +02:00
MascaraSnake
3add9943a8
Remove the spike thinker, which hasn't been necessary for a while now
2020-04-17 22:54:35 +02:00
MascaraSnake
21b92b63e9
Make T_EachTimeThinker use its own struct
2020-04-17 14:00:48 +02:00
MascaraSnake
1f038e827a
-Remove superfluous variables from raise_t
...
-Cleanup signatures of P_AddRaiseThinker and P_AddAirbob
2020-04-17 11:11:36 +02:00
MascaraSnake
cd036b57fd
Make T_RaiseSector use its own thinker struct instead of levelspecthink_t
2020-04-17 09:58:53 +02:00
Nev3r
750cafbcbc
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
2020-04-14 22:20:54 +02:00
Nev3r
d05ad892be
Remove the bridge thinker code.
2020-04-14 10:31:07 +02:00
MascaraSnake
9b76d3af6f
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
Louis-Antoine
4e7605f0e2
Make SRB2 flat like Earth
2020-03-20 18:55:29 +01:00
Louis-Antoine
46df2b9551
Use HAVE_BLUA as fuel for my fireplace
2020-03-19 18:36:14 +01:00
Monster Iestyn
c0b85396e0
Merge branch 'skins-refactor' into 'master'
...
Skins refactor
See merge request STJr/SRB2!843
2020-03-15 15:31:49 -04:00
Nev3r
63fb8f846b
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
2020-03-11 09:31:31 +01:00
Monster Iestyn
5defb33266
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
f186def0bf
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
Jaime Passos
81a57d5fac
Merge remote-tracking branch 'origin/next' into pictureformats
2020-03-07 20:43:16 -03:00
Steel Titanium
fc042e90f0
Merge branch 'master' into next
2020-02-21 21:01:29 -05:00
James R
2274129f57
Update copyright year to 2020
2020-02-19 14:08:45 -08:00
Jaime Passos
b0ce2e088f
Merge remote-tracking branch 'origin/next' into pictureformats
2020-02-19 02:25:36 -03:00
MascaraSnake
c2311dca45
Merge branch 'next' into udmf-next
2020-02-18 18:39:11 +01:00
James R
d6251a763b
Merge branch 'viewroll' into 'next'
...
Rolling
See merge request STJr/SRB2!690
2020-02-17 00:10:57 -05:00
James R
b758e7b75b
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
fickleheart
51ef6b3684
Merge remote-tracking branch 'upstream/master' into viewroll
2020-02-16 21:32:57 -06:00
Steel Titanium
8019a18e04
Fix object shadow not appearing for mid-joiners
2020-02-16 18:45:49 -05:00
MascaraSnake
4c4596a45f
Clean up the mess that is extracolormap_t::fog
2020-02-16 20:19:24 +01:00
fickleheart
62c75c0c81
Merge remote-tracking branch 'upstream/next' into viewroll
2020-01-26 18:01:58 -06:00
Louis-Antoine
a997683d1c
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
c2682ac1b6
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
fickleheart
459602f4b2
Un/archive viewrollangle in netsaves
2020-01-17 18:32:13 -06:00
MascaraSnake
16b515ba06
Implement linedef string arguments
2020-01-08 08:42:35 +01:00
Jaime Passos
3b29ec3fbc
Merge remote-tracking branch 'origin/next' into pictureformats
2020-01-07 16:10:25 -03:00
Jaime Passos
96340ac80c
Move texture stuff to its own file
2020-01-07 12:35:10 -03:00
MascaraSnake
6f3354f24f
Merge branch 'next' into linedef-args
2020-01-04 23:10:39 +01:00
MascaraSnake
85a94e1a58
Implement linedef args (unused and untested so far)
2020-01-02 12:23:14 +01:00
James R
0f3b77de8c
Merge branch 'polyobj-waypoint-thinker-optimise' into 'next'
...
Polyobj waypoint thinker optimise
See merge request STJr/SRB2!586
2019-12-31 01:33:01 -05:00
MascaraSnake
f67ff6d97e
Rename P_SetupLevel to the more accurate P_LoadLevel and separate out some of its content into subfunctions
2019-12-28 11:30:39 +01:00