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

8771 commits

Author SHA1 Message Date
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
MascaraSnake 3cd8f62ae9 Remove a line I overlooked in the thinker cleanup branch 2020-04-25 08:18:48 +02: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
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 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
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
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
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
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
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
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
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
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
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
sphere bdab78152c Check if emblem hints are actually unlocked. 2020-03-13 10:46:57 -04: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