stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-11 13:21:56 +00:00
Code Issues Projects Releases Packages Wiki Activity
10571 commits 172 branches 41 tags 242 MiB
Commit graph

9300 commits

Author SHA1 Message Date
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
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
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
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
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
ZipperQR
6a9543b1c2 no message 2020-05-14 03:35:46 +03: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
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
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
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
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
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
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
ZipperQR
64edd91dbd Dust devil support 2020-04-22 00:59:12 +03: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
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
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
c031008eab Enable SF_TRIGGERSPECIAL_TOUCH for sectors with spike damage 2020-04-18 15:17:25 +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
MascaraSnake
fd598f315e Add an enum for crumblestate 2020-04-17 23:54:37 +02:00
MascaraSnake
779b10681f Refactoring in T_BounceCheese 2020-04-17 23:32:39 +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
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
MascaraSnake
89539512f6 Make T_EachTimeThinker use its own struct 2020-04-17 14:00:48 +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
MascaraSnake
a41dbe2bae Get rid of code duplication in T_RaiseSector 2020-04-17 10:19:02 +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
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
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
James R
4214397679 Make the PACKETVERSION rule easier 2020-04-12 17:05:18 -07: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