lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
9269 commits 1 branch 29 tags 122 MiB
Commit graph

8109 commits

Author SHA1 Message Date
fickleheart f8a3e3b898 Merge remote-tracking branch 'origin/next' into next-newcontrols 2020-01-04 09:57:09 -06:00
fickleheart f0e6a56b6b Merge branch 'newcontrols' into next-newcontrols 2020-01-04 09:56:24 -06:00
fickleheart 34fe284416 Fix camera stuff in splitscreen 2020-01-04 09:54:56 -06:00
fickleheart 794d74c4d7 Merge remote-tracking branch 'origin/master' into newcontrols 2020-01-04 09:35:12 -06:00
Nev3r f207048ab2 Add Lua support for vertex heights. 2020-01-04 11:40:21 +01:00
Nev3r 49667689c1 Provide a fix for "non-sloped" slopes launch/land behavior by checking the normal's components. 2020-01-04 11:27:31 +01:00
Nev3r 60999c7b84 Revert "Provide a fix for "non-sloped" slopes launch/land behavior by checking the normal's components." 
This reverts commit c9294d1e32.
 2020-01-04 11:25:46 +01:00
Nev3r c9294d1e32 Provide a fix for "non-sloped" slopes launch/land behavior by checking the normal's components. 2020-01-04 11:17:54 +01:00
MascaraSnake 1e42dc7ee5 Move P_ProcessLinedefsAfterSidedefs into P_LoadMapData, but move map data copying after everything else 2020-01-04 11:08:05 +01:00
Nev3r faf127ff88 Add vertex slope spawning function. 
Rename P_ResetDynamicSlopes() to P_SpawnSlopes().
 2020-01-04 10:39:45 +01:00
Nev3r 0b21a34ddd Add vertex height vars into the vertex struct, and their textmap parsing. 2020-01-04 10:24:42 +01:00
lachwright 5ce1695047 Merge branch 'next' into clear-sign-sprite 2020-01-04 14:50:17 +08:00
lachwright 6f5833f8b3 Randomize skin during signpost roulette 2020-01-04 14:49:44 +08:00
fickleheart eac8732bc8 Make holding both turn keys freeze camera direction (broke in merge) 2020-01-03 23:26:31 -06:00
MascaraSnake a6926e339f Merge branch 'no-compress' into 'next' 
Compressing sidedefs can break both special effects and netgame syncing, so let's get rid of it

See merge request STJr/SRB2!628
 2020-01-03 16:38:42 -05:00
MascaraSnake 26bb0b3c67 Compressing sidedefs can break both special effects and netgame syncing, so let's get rid of it 2020-01-03 21:50:27 +01:00
Alam Ed Arias a26c5f5428 Merge branch 'master' into next 2020-01-03 14:56:37 -05:00
MascaraSnake 7b5f2f09c0 Merge branch 'textmap-parser' into 'next' 
Textmap parser

See merge request STJr/SRB2!604
 2020-01-03 04:14:38 -05:00
lachwright da226139f1 Add generic signpost sprite for skins that don't have one 2020-01-03 13:12:18 +08:00
Louis-Antoine b45ee059e3 Fix major issue 2020-01-03 02:58:23 +01:00
James R 12e87d58b4 Merge branch 'findvar' into 'next' 
CV_FindVar for Lua

See merge request STJr/SRB2!583
 2020-01-02 20:54:16 -05:00
LJ Sonic ff8cb3ddb0 Merge branch 'do-not-save-netvars' into 'master' 
Do not save netgame-synced console variables

See merge request STJr/SRB2!623
 2020-01-02 20:50:00 -05:00
LJ Sonic c6aec51d99 Merge branch 'ungrab-mouse-in-menus' into 'master' 
Let the mouse move freely when a menu is open or game is paused

See merge request STJr/SRB2!617
 2020-01-02 18:48:38 -05:00
Louis-Antoine 1845266bc8 Do not save netgame-synced console variables 
This is a bad thing to do, because if you join a server,
your game will save the host's settings.
 2020-01-03 00:40:49 +01:00
Louis-Antoine 49934007d7 Add a "alwaysgrabmouse" console variable 2020-01-03 00:25:58 +01:00
MascaraSnake dc0c17dbb8 P_LoadExtendedSubsectorsAndSegs: Print size_t with %s 2020-01-02 22:28:32 +01:00
Louis-Antoine e0e5e83869 Revert "Ungrab mouse when watching a record" 
This reverts commit 17636ccc01.
 2020-01-02 20:29:51 +01:00
MascaraSnake 5ba179ad7c Fix two bugs in extended segs loading, and add some error checking while I'm at it 2020-01-02 09:51:07 +01:00
Nami ad610ba4aa Move MobjLineCollide up a bit to where we first know for sure that we hit a line 2020-01-01 19:38:48 -08:00
James R 9931f0d58f Merge branch 'thiccnames' into 'next' 
Allow 6-letter character names to be drawn with the thick font

See merge request STJr/SRB2!618
 2020-01-01 21:49:13 -05:00
James R 69dd8acf7f Merge branch 'sstailscarry-fix' into 'next' 
Fix MP Special Stages crashing if a player is being carried when it ends

See merge request STJr/SRB2!615
 2020-01-01 21:49:01 -05:00
James R 99f020adb6 Merge branch 'sound-slots' into 'next' 
Add slots for unused sounds and remove unused sound slots

See merge request STJr/SRB2!603
 2020-01-01 21:48:46 -05:00
Zachary McAlpin 93e9bb661e Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playerthink-hook 2020-01-01 17:54:47 -06:00
James R a358702700 Merge remote-tracking branch 'origin/master' into next 2020-01-01 15:53:18 -08:00
James R b9cecea25c Hahahahahahahahahahahahaha 2020-01-01 15:52:23 -08:00
Louis-Antoine 3af00ac93e Minor code refactoring 2020-01-02 00:47:20 +01:00
Louis-Antoine 17636ccc01 Ungrab mouse when watching a record 2020-01-02 00:46:50 +01:00
Louis-Antoine 5bde4df439 Grab mouse again when closing menu, unpausing, etc 2020-01-02 00:45:28 +01:00
Zachary McAlpin d62cd2ac06 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playerthink-hook 2020-01-01 17:39:13 -06:00
James R 0c40a466d8 Merge remote-tracking branch 'origin/master' into next 2020-01-01 15:39:05 -08:00
Louis-Antoine 62397a36ec Grab mouse on game startup 2020-01-02 00:38:43 +01:00
MascaraSnake 02acf6222b P_LoadExtendedSubsectorsAndSegs: Slightly simplify the seg vertex reading code 2020-01-02 00:32:29 +01:00
Zachary McAlpin dc51ba6b64 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playerthink-hook 2020-01-01 17:11:19 -06:00
James R 85fbf4f571 Merge branch 'custom-gametype-serverinfo' into 'next' 
Gametype name in SERVERINFO

See merge request STJr/SRB2!610
 2020-01-01 17:52:46 -05:00
James R e9843590da Merge branch 'nohw-renderswitch' into 'master' 
NOHW V.S. Renderer Switching

See merge request STJr/SRB2!609
 2020-01-01 17:52:35 -05:00
MascaraSnake 2da9c3cf81 P_LoadTextmap: Bail out if certain mandatory fields are not set 2020-01-01 23:52:30 +01:00
James R 35fe2e7281 Merge branch 'quote-shenanigans' into 'master' 
Stuff I Broke: Commands

See merge request STJr/SRB2!607
 2020-01-01 17:52:21 -05:00
James R 01be810aee Merge branch 'warp-by-name' into 'master' 
Properly fix the issue that !528 tried to; let the -warp parameter work with map name

See merge request STJr/SRB2!596
 2020-01-01 17:51:21 -05:00
James R 48c83be89e Merge branch 'respawndelaygametyperule' into 'next' 
Gametype ruleset changes

See merge request STJr/SRB2!585
 2020-01-01 17:49:53 -05:00
Jaime Passos 874d4d01ee Don't Y-billboard papersprite models (?!?!??!??!?!?) 2020-01-01 18:00:01 -03:00
Jaime Passos 03d4082f21 Rename functions 2020-01-01 17:46:26 -03:00
Jaime Passos c7794d4ce0 Remove unused parameter 2020-01-01 17:36:55 -03:00
Jaime Passos 6d2f2e0865 Update copyrights 2020-01-01 17:30:07 -03:00
Jaime Passos 401c35b407 Fix transparent PNG conversion 2020-01-01 17:28:22 -03:00
Zachary McAlpin 7123abd493 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playerthink-hook 2020-01-01 13:31:07 -06:00
Alam Ed Arias af57468e68 Merge branch 'master' into next 2020-01-01 14:29:30 -05:00
Jaime Passos 98b7d8aaca Fix broken model light lists in ACZ3 2020-01-01 15:55:18 -03:00
Jaime Passos 35ff383a4a Rename `seenplayer to seenfriend` 2020-01-01 15:17:29 -03:00
lachwright dc7f10e17d Allow 6-letter character names to be drawn with the thick font 2020-01-01 23:49:29 +08:00
MascaraSnake 4f26a8e73a Move MAXFLATSIZE define to p_spec.h so p_spec.c doesn't have to redefine it 2020-01-01 16:01:07 +01:00
MascaraSnake 9cda82d896 Rework textmap parser to always read a parameter's value, even if it doesn't recognize the parameter 2020-01-01 15:52:59 +01:00
MascaraSnake 6724b11c36 Whoops 2020-01-01 15:11:39 +01:00
MascaraSnake a41c640559 Move shared parts of sidedef initialization into P_InitializeSidedef 2020-01-01 15:10:41 +01:00
MascaraSnake fe198b8a32 Check if certain mandatory linedef and sidedef fields are set, and use fallback values if not 2020-01-01 14:27:01 +01:00
MascaraSnake b59532bcca Setup repeatcnt in P_LoadSidedefs instead of P_ProcessLinedefsWithSidedefs, since UDMF can set it directly 2020-01-01 14:13:24 +01:00
MascaraSnake 24d68ba07e P_LoadTextmap: Set defaults for all linedef and sidedef fields that UDMF is allowed to set 2020-01-01 13:40:17 +01:00
Louis-Antoine caadf6aa61 Let the mouse move freely when a menu is open or game is paused 
That means you can now easily move your mouse out of SRB2's window
and switch between several windows easily by just pressing escape!

Any phase of the game that isn't actual gameplay counts as a menu,
which means you can also move the mouse in cutscenes,
at the title screen, server connection screen,
and even when the chat or console are open.
 2020-01-01 13:29:07 +01:00
Jaime Passos b41cd59e51 Revert "Merge branch 'software-clownery' into 'master'" 
This reverts merge request !578
 2019-12-31 23:40:17 +00:00
Tatsuru caf47019ce Or is it better like this? 2019-12-31 20:20:30 -03:00
Nami ef4840555e Add MobjLineCollide hook 2019-12-31 15:17:02 -08:00
Tatsuru 83467a7b3d The dumbass forgot NiGHTS mode is also a carry power 2019-12-31 20:13:16 -03:00
Tatsuru 6e330348bc Fix MP Special Stages crashing if a player is being carried when it ends 2019-12-31 19:38:11 -03:00
James R 2a9a3b9760 Merge branch 'fix-flight-indicator' into 'next' 
Remove flight indicator when AI Tails is taken over by second player

See merge request STJr/SRB2!611
 2019-12-31 17:17:21 -05:00
James R f77188ef0f Merge branch 'metal-fume-opacity' into 'next' 
Make Metal Sonic's jet fume opaque when re-emerging from water

See merge request STJr/SRB2!612
 2019-12-31 17:16:14 -05:00
James R 0cb76f63b7 Merge branch 'firefuck3' into 'next' 
Make elemental crop circle flames obey player gravity

See merge request STJr/SRB2!613
 2019-12-31 17:15:45 -05:00
James R bd0deea11c Merge branch 'minecartspawner-fix' into 'next' 
Disable minecart spawners for players already riding a minecart

See merge request STJr/SRB2!608
 2019-12-31 17:15:18 -05:00
Jaime Passos c460775cd7 Merge branch 'fixcoronalist' into 'master' 
Fix broken corona list

See merge request STJr/SRB2!605
 2019-12-31 14:25:49 -05:00
fickleheart b22de48c03 Merge branch 'next' into next-newcontrols 
# Conflicts:
#	src/g_game.c
#	src/p_setup.c
 2019-12-31 12:58:36 -06:00
Nev3r 0979887600 Merge branch 'software-clownery' into 'master' 
Software clownery

See merge request STJr/SRB2!578
 2019-12-31 12:49:44 -05:00
Jaime Passos 1c048275da **NEW!** hook_SeenPlayer 2019-12-31 14:37:45 -03:00
fickleheart 8bc58807aa Software FOV ported from kart 
also fixes high software FOVs having buggy walls
 2019-12-31 11:22:05 -06:00
Jaime Passos cd1cc9a222 Fix desynch 2019-12-31 14:00:25 -03:00
Tatsuru 79f18a3c19 Got rid of the uhh 2019-12-31 11:19:54 -03:00
lachwright e5e96cb271 Make elemental crop circle flames obey player gravity 2019-12-31 18:06:40 +08:00
lachwright 10b71d40b8 Make Metal Sonic's jet fume opaque when re-emerging from water 2019-12-31 17:26:35 +08:00
lachwright 342d80198c Add missed semicolon, oops 2019-12-31 16:55:36 +08:00
lachwright 1a78b3548c Remove flight indicator on death as well 2019-12-31 16:54:52 +08:00
lachwright d3c56cd807 Remove flight indicator when AI Tails is taken over by second player 2019-12-31 16:48:29 +08:00
James R 939814d479 Merge remote-tracking branch 'origin/master' into next 2019-12-30 22:37:24 -08:00
James R 3112dff345 Merge branch 'oops' into 'next' 
Fix unknown gametype for map command crashing the game

See merge request STJr/SRB2!606
 2019-12-31 01:34:39 -05:00
James R 34687e85d7 Merge branch 'emeraldhunt-fix' into 'next' 
Fix emerald hunt not working properly

See merge request STJr/SRB2!593
 2019-12-31 01:34:17 -05:00
James R b5df2d5c3f 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
James R 4b91e49bf4 Merge branch 'fix-lua-scorechains' into 'next' 
Fix scoreadd not doing anything in certain cases when modified by Lua

See merge request STJr/SRB2!579
 2019-12-31 01:32:22 -05:00
James R 077c453e33 Merge branch 'dashmode-ctf-monitors' into 'next' 
Don't let Metal pop the enemy team's monitors (closes #94)

See merge request STJr/SRB2!584
 2019-12-31 01:31:55 -05:00
James R 8e61b1003a Merge branch 'dashspeed-fix' into 'next' 
Cap dashspeed between mindash and maxdash before revving.

See merge request STJr/SRB2!565
 2019-12-31 01:31:43 -05:00
James R b4ebb01e2d Truncate gametype name in server list if it's too long 2019-12-30 22:23:19 -08:00
James R 281f30c4fd Replace gametype with gametypename in SERVERINFO 
PACKETVERSION 1
 2019-12-30 22:18:55 -08:00
fickleheart 0eb65d0fa7 Fix tailsbot behavior that broke with Simple mode 2019-12-30 23:58:58 -06:00
James R 7af2533d23 Make the menu option for renderer switching transparent under NOHW 2019-12-30 21:45:19 -08:00
James R 38492073fa IT_PAIR for when you want to define both sides of a menu item 2019-12-30 21:40:13 -08:00
Tatsuru b68a629a71 Small 2019-12-31 01:48:50 -03:00
James R e8db39229c Don't let the user switch to OpenGL if NOHW 2019-12-30 20:29:41 -08:00
Tatsuru 2d0cdbe34f Appease the C90 entity 2019-12-31 01:20:11 -03:00
James R 36c5bb7b0d Fix NOHW compiling 2019-12-30 20:18:08 -08:00
James R 782bf8d31e Fix NOMIXER compiling 2019-12-30 20:08:29 -08:00
Tatsuru 47b096a357 Disable Minecart Spawners for players already riding a minecart 2019-12-31 00:38:09 -03:00
Nami 60928db0e0 I removed a hook I left behind and forgot to save the change before committing :upside_down: 2019-12-30 19:22:12 -08:00
James R 4bf3597116 Fix NOOPENMPT compiling 2019-12-30 19:19:17 -08:00
Nami 41c902b819 Move PreThinkFrame hook back a bit, now runs before PlayerThink 2019-12-30 19:11:49 -08:00
Nami a36920808b Revert changes to searchBlockmap because on reflection, the benefits didn't outweigh breaking every current usage of it 
Readd ThinkFrame in its original position
PostThinkFrame now runs at the end of P_Ticker, only MapEnd runs after it
 2019-12-30 19:04:27 -08:00
James R ff47f911dc Fix command not running if it was split by COM_BufAddText 
(Looks at 4865a190578b900b48571e74e0bd97bef88ea71b...)
 2019-12-30 18:47:21 -08:00
James R ab410652ae Fix unclosed quotes leaving the escape character in 2019-12-30 18:44:13 -08:00
Jaime Passos 7b54846a02 Merge remote-tracking branch 'origin/master' into software-clownery 2019-12-30 23:21:42 -03:00
James R 5e94ca07bc Use gametypecount in G_GetGametypeByName 2019-12-30 17:57:38 -08:00
James R e3fcd860de Merge remote-tracking branch 'origin/next' into local-lua-commands 2019-12-30 15:08:34 -08:00
Zachary McAlpin ed5bf1ad9d
Merge branch 'next' into playerthink-hook 2019-12-30 16:35:50 -06:00
fickleheart 85e2e92ee0 Fix spying on simple mode players having dumb camera angles 2019-12-30 15:44:52 -06:00
Jaime Passos 181a366d4a Merge remote-tracking branch 'origin/next' into respawndelaygametyperule 2019-12-30 18:39:31 -03:00
fickleheart 2c45ecbaa5 Fix camera reset button 2019-12-30 15:34:43 -06:00
James R fc8c0f8a9a Merge remote-tracking branch 'origin/master' into next 2019-12-30 13:16:53 -08:00
fickleheart a51f2500e0 Update playstyle menu handling to use analog/directionchar combo 2019-12-30 15:15:37 -06:00
fickleheart c3d14064e2 Convert simple movement to directionchar+analog 
Analog + no directionchar is old analog (now known as
CS_LMAOGALOG because lmao if you still use it).
 2019-12-30 15:05:24 -06:00
James R 80bb6fe7a0 Merge branch 'modid' into 'next' 
Put a mod name in SERVERINFO

See merge request STJr/SRB2!577
 2019-12-30 15:41:08 -05:00
James R 5e5f3c4fa7 Merge branch 'renderswitch' into 'master' 
Renderer switching

See merge request STJr/SRB2!550
 2019-12-30 15:36:17 -05:00
James R d670139404 Revert revert revert 
This reverts commit 6546e3c3bc.
This reverts commit 8a15e9abc4.
 2019-12-30 12:31:53 -08:00
MascaraSnake 013f1f70d9 -Set defaults for vertex and mapthing fields in textmap 
-Fix P_InitializeSector being called too early (band-aid fix for now, will reorganize this properly later)
 2019-12-30 21:23:00 +01:00
fickleheart e0f35d207f Convert analog/directionchar cvars into 2-long arrays 2019-12-30 14:01:14 -06:00
fickleheart 631b5ff883 Disable lock-on in Ringslinger 2019-12-30 12:13:41 -06:00
fickleheart 085c39128f Save separate camera settings for standard/simple modes 2019-12-30 12:10:38 -06:00
fickleheart b46cbe76d6 Somehow miss committing the ACTUAL stickyhold part 2019-12-30 11:36:59 -06:00
fickleheart d980d526c8 Change defaults to match my personal settings 2019-12-30 11:36:40 -06:00
fickleheart 7fa9eed573 Fix camera reset snap in simple controls 2019-12-30 11:22:54 -06:00
fickleheart ebbe5938a8 Fix tailsbot flying weird with P1=standard P2=simple controls 2019-12-30 11:07:29 -06:00
fickleheart f4e7227e11 Fix compilation errors 2019-12-30 11:01:56 -06:00
fickleheart a9b80bf1f0 Merge branch 'master' into newcontrols 
# Conflicts:
#	src/d_netcmd.c
#	src/g_game.c
#	src/g_game.h
#	src/m_menu.c
 2019-12-30 10:47:09 -06:00
MascaraSnake 05a97530c1 Add support for flat offset and rotation fields in UDMF 2019-12-30 17:28:10 +01:00
MascaraSnake 72bb673209 Some minor refactoring of textmap loading code 2019-12-30 16:28:22 +01:00
Jaime Passos 7676f11112 Merge remote-tracking branch 'origin/next' into respawndelaygametyperule 2019-12-30 12:09:45 -03:00
Jaime Passos a04834d1aa Fix alignment in R_ThickStepping 2019-12-30 12:02:09 -03:00
Jaime Passos 590d6729e6 Merge remote-tracking branch 'origin/master' into software-clownery 2019-12-30 11:49:12 -03:00
Nev3r 99aace19f5 Merge branch 'textmap-parser' of https://git.magicalgirl.moe/STJr/SRB2/ into textmap-parser 2019-12-30 14:48:10 +01:00
Nev3r 4a5498473c Make P_LoadMapData() a return a boolean as well as P_LoadMapFromFile(); if they fail to load, they return false, and thus P_SetupLevel() will also return false. 
TextmapCount() also now returns false if brackets are left open inside a textmap.
 2019-12-30 14:47:48 +01:00
Nev3r f9d6e26558 Replace INT16_MAX with LUMPERROR in lump check. 2019-12-30 14:45:39 +01:00
Nev3r 7ae2143c91 Add a disclaimer when loading textmaps/UDMF. 2019-12-30 14:42:41 +01:00
MascaraSnake ea87af0076 Refactor TextmapParse 2019-12-30 14:33:41 +01:00
Nev3r c6c00aa7d5 Tweak TextmapCount()'s bracket detection to account for multiple levels, if that ever happens. 2019-12-30 13:46:37 +01:00
MascaraSnake 4aee4e3684 Refactor TextmapCount 2019-12-30 13:27:05 +01:00
Monster Iestyn 7c9b1ee2cb Fix P_SetTarget crash by setting th->target to NULL first 2019-12-30 11:49:01 +00:00
Nev3r e43df2993f Move TextmapFixFlatOffsets() above P_LoadTextmap() so that it can compile. 2019-12-30 12:33:24 +01:00
Nev3r f9aabe753e Refactor TextmapFixFlatOffsets(). 2019-12-30 12:31:55 +01:00
Nev3r 493c6c8ae2 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA 2019-12-30 12:23:31 +01:00
Nev3r f49b8de5fd Adapt P_MakeMapMD5() for textmaps. 2019-12-30 12:07:54 +01:00
Nev3r ed114f655b Fixed missing M_GetToken(NULL); 2019-12-30 12:07:02 +01:00
lachwright 0839287609 Add unused sounds and remove unused sound slots 2019-12-30 19:00:45 +08:00
Nev3r aaef412823 Add basic textmap support; currently crashes when trying to free the virtres, at vres_free(). 2019-12-30 11:33:22 +01:00
James R c46bfa2be9 Merge branch 'saloondoor-fix' into 'next' 
Fix saloon doors not letting players through when marked with the Ambush flag

See merge request STJr/SRB2!600
 2019-12-30 00:25:37 -05:00
James R 65921c1702 Improve COM_AddCommand boolean deprecated warning 2019-12-29 21:09:07 -08:00
Jaime Passos 757480f219 Some cleanup in general. 2019-12-30 02:07:39 -03:00
James R 802ef0aba1 COM_LOCAL makes your commands NetXCmd free, FUCK NetXCmd 2019-12-29 21:07:28 -08:00
James R 6546e3c3bc No. 2019-12-29 21:02:42 -08:00
James R dc757f3086 Fuck magic numbers; COM_ flags for Lua commands! 2019-12-29 21:00:38 -08:00
James R 8a15e9abc4 Bro player 2 can't use the console 2019-12-29 21:00:38 -08:00
Jaime Passos c303b1a435 Use strspn here. 2019-12-30 01:39:34 -03:00
Nami 58dd578b09 Let's try this again! 2019-12-29 20:36:24 -08:00
Tatsuru 3d724f302d Fix saloon doors not letting players through when marked with the Ambush flag 2019-12-30 01:16:50 -03:00
Jaime Passos 773d564d6a MUSICDEF parser changes. 2019-12-30 00:22:27 -03:00
James R 7886a4bbee Don't warn if we start in OpenGL 2019-12-29 18:37:44 -08:00
James R 569453ee93 Warn when going to OpenGL from the menu 2019-12-29 18:37:22 -08:00
Zachary McAlpin 458f3cb14b Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playerthink-hook 2019-12-29 20:37:11 -06:00
GoldenTails bc88def225 Slap in some Ctrl+Insert (copy) support too while I'm at it. 
Also added a comment but you didn't see that.
 2019-12-29 20:22:58 -06:00
GoldenTails 9d701d722e Reverted to better, less complex system, and added support for Shift+Insert and Shift+Delete. 
Major thanks to James for helping me.
Turns out that strncpy thwarts the memory leaks for me. Silly, me!
 2019-12-29 20:15:18 -06:00
James R 97c5e63dc3 Initialize 'supported' array 2019-12-29 16:52:39 -08:00
GoldenTails ae9adce873 Replace magic numbers with less magic and more readable chars. 2019-12-29 18:26:56 -06:00
Jaime Passos 2f4c270a7b Update r_segs.c 2019-12-29 19:43:38 -03:00
Zachary McAlpin fdd1823ee2 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playerthink-hook 2019-12-29 16:19:53 -06:00
MascaraSnake 136c656cc0 Properly pass nodes data along to functions that need it without breaking the original data pointer 2019-12-29 22:11:15 +01:00
MascaraSnake 81422c4e6d Revert "Pass along virtnodes to extended nodes loading functions to make sure virtnodes->data is moved correctly" 
This reverts commit cfc6428569.
 2019-12-29 21:57:47 +01:00
MascaraSnake cfc6428569 Pass along virtnodes to extended nodes loading functions to make sure virtnodes->data is moved correctly 2019-12-29 21:42:16 +01:00
MascaraSnake e88556efe1 P_GetNodetype: The virtnodes pointer is supposed to be the output parameter, so we have to pass a pointer to that pointer 2019-12-29 21:00:20 +01:00
MascaraSnake dd02fe0d78 P_GetNodetype: Set virtnodes for traditional Doom format 2019-12-29 20:43:41 +01:00
MascaraSnake 882e8ef7b8 Separate shared parts of seg initialization into P_InitializeSeg 2019-12-29 20:24:14 +01:00
MascaraSnake 36f86077da Move loading of extended subsectors and segs into its own function 2019-12-29 19:54:04 +01:00
MascaraSnake c287b86fab Get rid of duplicated code in the extended seg parsing 2019-12-29 19:04:50 +01:00
MascaraSnake 3839e95d63 Move reading of extra vertices into separate function 2019-12-29 18:07:44 +01:00
MascaraSnake 45ca959f97 -Move reading of actual extended nodes into separate function, cutting down on code duplication in the process 
-Fix a typo in the segs reading
 2019-12-29 17:52:49 +01:00
MascaraSnake e5cb7a7833 Merge branch 'next' into newnodeformats 2019-12-29 16:05:55 +01:00
MascaraSnake bf25128986 Merge branch 'mapload-refactor' into 'next' 
Refactor map loading functions

See merge request STJr/SRB2!594
 2019-12-29 10:04:27 -05:00
MascaraSnake 9d009edfc8 Move copying of the nodes signature out of the else case 2019-12-29 15:59:15 +01:00
MascaraSnake 0aed60f4de Separate retrieval of nodetype and nodes lump into its own function (Function. Not file. Sorry.) 2019-12-29 15:50:53 +01:00
MascaraSnake 8032054a47 Separate loading of extended nodes into its own file 2019-12-29 15:15:32 +01:00
MascaraSnake bb9093ff57 Merge branch 'kill-zshift' into 'next' 
Eliminate all unnecessary uses of ZSHIFT

See merge request STJr/SRB2!580
 2019-12-29 08:35:52 -05:00
Nev3r 389b9e35c4 Add XNOD, XGLN and XGL3 BSP formats recognition and support. 2019-12-29 14:17:51 +01:00
MascaraSnake c43a83dc04 Remove virtres_t pointer in P_SpawnSpecials that's no longer needed 2019-12-29 12:26:02 +01:00
MascaraSnake abdfe60aa7 Store custom FOF flags directly in back toptexture field at map load instead of re-reading the sidedefs data later on 2019-12-29 12:01:41 +01:00
James R 566b4a1626 Don't let us warp to a map that doesn't exist (really!) 
Okay so 6464df9876, I WAS mistaken! Except that's
not how you check for a map's existence, at least not how the old map command
did it.
 2019-12-29 02:44:27 -08:00
James R 404f3c13e4 If we move the -warp code down, map searching can be used 2019-12-29 02:31:48 -08:00
James R 0a014755b9 I'm still an idiot 2019-12-29 02:16:37 -08:00
James R 2ffff56b39 Who cares? 2019-12-29 02:15:48 -08:00
James R 19aafbfd0b Split map code checking from Command_Map_f 2019-12-29 02:14:02 -08:00
James R e04e1ac1b4 Merge branch 'mfe-lua' into 'next' 
Add missing MFE_ flags to Lua (resolves #103)

See merge request STJr/SRB2!592
 2019-12-29 04:44:29 -05:00
MascaraSnake b333770a3b Merge branch 'next' into mapload-refactor 2019-12-29 09:40:19 +01:00
MascaraSnake cfadbb0f36 -Add linedef pointer to side_t, so sidedefs are able to tell if they're a front or back sidedef during setup 
-Fix a broken condition during setup of texture fields for the change music linedef
 2019-12-29 09:39:50 +01:00
Zachary McAlpin ef9a7b01f5 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playerthink-hook 2019-12-28 22:29:10 -06:00
Steel Titanium 0d15f27026 Fix emerald hunt not working properly 2019-12-28 21:57:29 -05:00
Alam Ed Arias d588e3ca9c Merge branch 'master' into next 2019-12-28 21:43:16 -05:00
Jaime Passos f997866b4d Fix broken dynlight list because of a SPR_NON2 that doesn't exist 2019-12-28 22:57:37 -03:00
James R 0237dc8ca2 Add MFE_TOUCHLAVA and MFE_TRACERANGLE to Lua and SOC 2019-12-28 17:52:22 -08:00
Jaime Passos 244f0b228f Fix M_PathParts instead 2019-12-28 22:18:41 -03:00
Jaime Passos 3bb7fd4cbf Fix logfiles crashing Windoze 2019-12-28 22:14:23 -03:00
Jaime Passos e63f77ea1a Merge remote-tracking branch 'origin/next' into respawndelaygametyperule 2019-12-28 21:39:38 -03:00
James R 90e56bcdf9 Merge branch 'levelload-refactor' into 'next' 
Hack P_SetupLevel into little pie- actually just clean it up a bit

See merge request STJr/SRB2!587
 2019-12-28 19:37:06 -05:00
Jaime Passos dede51fc4c Disallow few more characters. 2019-12-28 21:05:42 -03:00
Jaime Passos 5b1b556946 Remove characters that will not be allowed in the constant string. 2019-12-28 20:54:22 -03:00
Zachary McAlpin 745cced08e Execute LUAh_PlayerThink(player) at the end if the player has a valid mobj_t object 2019-12-28 17:40:47 -06:00
Jaime Passos 2166571920 Add GTR_CUTSCENES. And I ran out of rule slots. Cool. 2019-12-28 20:33:28 -03:00
Zachary McAlpin 5a9b80b5d5 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playerthink-hook 2019-12-28 17:32:27 -06:00
Jaime Passos ae0acfba0f Organise gametype ruleset again. 2019-12-28 20:18:21 -03:00
Jaime Passos 7a00b3a331 Add GTR_FRIENDLY. 2019-12-28 19:56:18 -03:00
Jaime Passos 093a1baf1d Remove debugging stuff. 2019-12-28 19:50:14 -03:00
Jaime Passos 45af6d8899 Rename GTR_MATCHEMERALDS to GTR_POWERSTONES. 2019-12-28 19:49:34 -03:00
Jaime Passos 4b604328d5 Rename GTR_HIDETIME to GTR_STARTCOUNTDOWN. 2019-12-28 19:47:03 -03:00
lachwright 5ed1dc5410 Remove MF_NOTHINK from join-breaking referenced objects 2019-12-29 03:01:09 +08:00
MascaraSnake bd7765227e Rename P_GroupLines to the more apt P_LinkMapData 2019-12-28 17:40:08 +01:00
MascaraSnake 7e5b87ce42 Fix debug prints 2019-12-28 17:37:32 +01:00
MascaraSnake d38ee51d49 Separate setting of sector field defaults into P_InitializeSector 2019-12-28 17:29:58 +01:00
MascaraSnake 54fe91b1cc Refactor P_SetupLines into P_InitializeLinedef 2019-12-28 17:21:31 +01:00
MascaraSnake 1ca25224c2 Fix P_SetupLines printing the wrong line number 2019-12-28 17:05:04 +01:00
MascaraSnake 85de3614cb Standardize P_LoadVertices and P_LoadSidedefs 2019-12-28 16:58:48 +01:00
MascaraSnake 86d1fb73f4 Split P_LoadLineDefs2 into P_ProcessLinedefsWithSidedefs and P_CompressSidedefs 2019-12-28 16:49:56 +01:00
MascaraSnake 21b7507aee Reorganize and partially rename map loading functions 2019-12-28 16:40:35 +01:00
MascaraSnake b1854b5c96 Remove stray #endif 2019-12-28 14:50:00 +01:00
MascaraSnake 5590343043 Rename P_LoadThingsOnly to P_RespawnThings to make it clearer that it doesn't actually reload the things from the file, it just respawns them. 2019-12-28 14:13:26 +01:00
MascaraSnake 3971067cf3 Remove some old #if 0'd code 2019-12-28 14:03:48 +01:00
MascaraSnake 303e6cee4a Merge branch 'next' into mapload-refactor 2019-12-28 13:59:24 +01:00
MascaraSnake ceca99e3c5 Fix accidental removal of sector_t's spawn_lightlevel initialization 2019-12-28 13:58:23 +01:00
MascaraSnake e9376a8353 Cleaned up some more stuff in P_LoadLevel() 2019-12-28 12:48:32 +01:00
MascaraSnake c059146937 Move more P_LoadLevel parts into subfunctions 2019-12-28 11:37:56 +01:00
MascaraSnake 319ed09c00 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
GoldenTails f62579811b Fixed messed up comparison. 2019-12-27 23:51:13 -06:00
James R afc78fb56a Only return if we damaged the monitor 2019-12-27 14:48:55 -08:00
Alam Ed Arias 94bb6655a5 Merge branch 'master' into next 2019-12-27 17:08:16 -05:00
James R 152a63b682 Merge branch 'rotsprite3' into 'next' 
More rollangle changes

See merge request STJr/SRB2!582
 2019-12-27 16:49:21 -05:00
James R 69ad41e58e Merge branch 'skinusable-fix' into 'next' 
Fix edge case with R_SkinUsable

See merge request STJr/SRB2!573
 2019-12-27 16:49:06 -05:00
Jaime Passos 1fb244d87f GTR_HIDETIME, not GTR_TAG 2019-12-27 18:24:08 -03:00
Jaime Passos e03eaa554b In P_KillPlayer, check for the gametype's rules, instead of the gametype itself, before bursting rings. 2019-12-27 17:22:55 -03:00
Jaime Passos 4b2c88fab8 Fix CoopLives_OnChange. 2019-12-27 17:15:23 -03:00
Jaime Passos 3b341245f1 Same deal, but for starposts. 2019-12-27 17:14:56 -03:00
Jaime Passos 1f96f70173 Preparing for the inevitable gametype rule that will handle cooplives... 2019-12-27 17:08:20 -03:00
Jaime Passos ed29efd9eb ST_drawLivesArea stuff. 2019-12-27 16:58:55 -03:00
Monster Iestyn 1d04001fdf use P_SetTarget to assign a value to th->target 2019-12-27 19:24:00 +00:00