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

3385 commits

Author SHA1 Message Date
toasterbabe 4f3c9b5fad Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into pretty_stuff 
# Conflicts:
#	src/hardware/hw_draw.c
 2018-04-06 19:38:19 +01:00
Monster Iestyn a3b86a737e Merge branch 'public_next' 
# Conflicts:
#	src/f_finale.c
#	src/hardware/hw_draw.c
#	src/hardware/hw_main.c
#	src/hardware/r_opengl/r_opengl.c
#	src/sdl12/hwsym_sdl.c
#	src/sdl12/i_video.c
 2018-04-06 18:42:07 +01:00
toasterbabe 3f427d0161 * Improve devmode text. 
* Make sure showfps never covers anything relevant to the base game.
* Tweak spectator text for raising/lowering.
* Minor code-smell squishes.
 2018-04-06 18:40:08 +01:00
toasterbabe 15903c6271 * Correct V_PERPLAYER's screen-centered (no snapto flags on a given axis) behaviour. 
* Fix that one comment Digiku mentioned. ;P
* Make extra lives/100 ring rewards consistent between lives being relevant and lives being infinite/not present, which was a problem this branch made evident when Race ended up getting the infinite lives symbol!
 2018-04-06 14:42:49 +01:00
toasterbabe 3c74952522 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into pretty_stuff 2018-04-06 12:54:39 +01:00
Monster Iestyn 740e0cf8c1 Merge branch 'master' into hardcoding-time-again 2018-04-05 19:03:49 +01:00
Wolfy ca8e14d5e9 Revert "THZ Hardcoding" 
This reverts commit 8bd91bd2f2.

Note to self: read through the fucking merge requests
 2018-04-05 12:49:39 -05:00
Wolfy 1d63f53aeb Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal 2018-04-05 03:55:03 -05:00
Wolfy 8bd91bd2f2 THZ Hardcoding 
Feel free to reorganize as necessary.
 2018-04-05 03:23:27 -05:00
Steel Titanium d446f3420e Merge remote-tracking branch 'upstream/master' into dedicated-nosoundinit 2018-04-03 16:16:20 -04:00
Steel Titanium 759ea8cb42 Indentation fixup 2018-04-03 16:11:07 -04:00
Alam Ed Arias 59f5b46ad3 Merge branch 'public_next' into master 2018-04-03 16:09:11 -04:00
Alam Ed Arias cf6a30a8ef Merge branch 'master' into next 2018-04-03 15:48:06 -04:00
toasterbabe 4f3f647f5b A minor assortment of changes. 2018-04-03 01:46:42 +01:00
toasterbabe 156cc031ea * Optimise them even further... AGAIN! Using an offset-based system rather than a multiplication-based one... 
* Again, tweak the spawning code to take maximum advantage of these gains.
* Fix potential crashes with MT_NULL mace/chain types supplied.
* #ifdef out the height-clipping code. It needs more TLC than I can give it right now, and the existing behaviour is less obviously broken (sadly enough).
* Fix chainmace points, which were apparently broken without anyone realising.
 2018-04-03 01:10:10 +01:00
toasterbabe 4051ae8915 * Revamp mace creation again to potentially serve as the foundation for further optimisation (and also not rely on a while (1) loop, which easily went wrong several times whilst I was making changes to it). 
* Fix minor typoes and other small tweaks in the P_MaceRotate function, which I'm probably about to rewrite again anyways...
 2018-04-02 21:36:12 +01:00
toasterbabe 0102da824e Make the h-chain repairing safer. 2018-04-02 01:20:32 +01:00
toasterbabe 5ac70bbb7e * Fix multispoke mace/chainbars having problems. 
* Completely rework how mace/chainbars are spawned to reduce the number of matrix multiplications required EVEN FURTHER!
* Reimplement the maceretry solidity stuff (effect 4).
* Flip the mminlength stuff so that existing dev maps don't break badly.
* Fix hacky chainbar grabbing.
* Tweak height of tinychain a smidge.
 2018-04-02 01:08:31 +01:00
toasterbabe 97ddb8881d * Remove ability to change speed of chains. 
* Fix ability to turn chains (still disabled by default, just at least want the option...)
* Replace max speed setting with a "minimum chainlink distance" setting - if greater than zero, that many chains will not be spawned from the center outwards. Doesn't affect the head of the chain at all, since otherwise what's the point? :V
 2018-04-01 22:05:59 +01:00
toasterbabe 6d59551afd Mace optimisation! 
* Handle all chain objects as a hnext/hprev chain.
* When removing mobjs with hnext/hprev, "repair the chain" (make the h links meet).
* Fix hidden slings, which I accidentially broke when I revamped maces the first time.
* Kill MF2_MACEROTATE. Not needed for anything anymore.
* P_MaceRotate now available to Lua to make up for it.
* Related: Made modifying hnext/hprev using Lua safer, so it keeps the reference counts in play.
 2018-04-01 20:54:19 +01:00
Sryder 6f2de824fb Uncomment HWR_CorrectSWTricks but set gr_correcttricks to be off by default 
I wasn't aware of the cvar, this should do for now since I don't believe any maps use these software tricks, probably an old leftover from DOOM.
 2018-03-30 23:12:44 +01:00
toasterbabe 0fbebcaa08 Make special stage tallies do the token noise if you cash in a token! 2018-03-30 22:03:14 +01:00
toasterbabe d9b5155e6e * Make Tokens appear in competition. 
* Tweak thrown ring colours.
* Make Armageddon shield loop properly.
* Tweak drowning numbers to be consistent between third and first person.
 2018-03-30 21:49:15 +01:00
Sryder 0aaae501d3 Warnings must die 2018-03-30 18:53:23 +01:00
Sryder f3aa02e26d Start with lightnum on sector lightlevel 2018-03-30 18:13:52 +01:00
Sryder 66f220d6ad Merge branch 'master' into openglquickfixes 2018-03-30 18:09:41 +01:00
toasterbabe de8f1fa407 * Incorporate (almost) all of Mystic's feedback. 
* Prevent ANY input when blindfolded.
* Make CECHOs always perplayer'd. (A little hacky; quads will need work here.)
* Make NiGHTS link timer bounces not a mess, and only when the colour changes.
 2018-03-30 16:39:59 +01:00
Sryder 65c893da86 static tempsec for R_FakeFlat 
I don't fully understand this, but it's what software does and it fixes the issue of the lighting in DSZ3. Also don't need the extra call to R_Prep3DFloors.
 2018-03-29 23:28:54 +01:00
Nevur fc3e863fd3 asdf 
Signed-off-by: Nevur <apophycens@gmail.com>
 2018-03-29 20:12:19 +02:00
toasterbabe 98601dc757 A lot! 
* cv_powerupdisplay. Never, First-person only (default), Always.
* New monitor stuff.
* Fixed hitmessages.
* Some CTF stuff.
* Aaaaugh it's a lot I hate myself I need to work on my coursework.
* I'll figure out what I did here in the merge request when that's done.
 2018-03-26 23:53:09 +01:00
mazmazz ce215195f8 NiGHTS drone loop: Change flyangle comparison to fix detection from vertical angles 
Use > 90 && < 270 instead of >= 90 && <= 270. Fixes a bug where if you fly directly up (flyangle 90) or directly down (flyangle 270), that registers as a backwards direction, so you trigger the loop detection by flying BACKWARDS, not FORWARDS. This edge case (only possible via JUMPTOAXIS) should default to FORWARDS looping.
 2018-03-26 01:04:02 -04:00
mazmazz 67e4381284 Fix NiGHTS drone loop detection by using pl->flyangle 2018-03-26 00:33:17 -04:00
mazmazz d85f108997 P_SpawnMapThing: Ignore MTF_ flags if MT_NIGHTSBUMPER 2018-03-25 19:42:46 -04:00
mazmazz dc9fd6f02e MT_NIGHTSBUMPER Spawn: Don't reset mthing->options 2018-03-25 19:07:21 -04:00
toasterbabe 33afd94252 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into pretty_stuff 
# Conflicts:
#	src/d_main.c
#	src/st_stuff.c
 2018-03-24 17:17:01 +00:00
jameds 876d0fa58b Removed contradictory -connect check 2018-03-23 18:09:07 -07:00
Sryder f62cb3a30a I've commented out the call to HWR_CorrectSWTricks. 
I don't think it does anything for us anymore, and might even break things with slopes.
Someone let me know if I'm wrong and am breaking things horribly here.
 2018-03-23 22:27:29 +00:00
jameds a431197921 Fixed "invalid pointer" error when passing "" to Command_connect(). 2018-03-22 21:21:26 -07:00
Sryder fab4b7f5ea Stop squashing the screen vertically in non-green resolutions 2018-03-22 01:10:53 +00:00
Sryder 839ee0ab85 OpenGL Sprite Splitting 2018-03-22 00:52:14 +00:00
Sryder 0885d27171 Transform sprites in world space rather than screen space 
Transformation based on screen space would make sense if we didn't want anything in the world to effect the sprites.
This should allow sprite splitting and sorting of sprites with level geometry easier.
stransform is no longer needed.
 2018-03-21 19:45:37 +00:00
toasterbabe 24c017564e Mammoth commit! 
* Make TIME part of HUD count down in a bunch of circumstances where it was otherwise some other seperate thing.
* Make race countdown happen in a bunch of appropriate circumstances.
* Refactor race countdown.
* Remove a lot of useless stuff from H&S/Tag UI.
* Make co-op/competition/race end-of-act countdown use the race countdown and bigger HUD font.
* Remove useless PLAYING/SPECTATE text from lives element.
* Merge lap counter into lives element.
* Move some other text around.
 2018-03-21 18:18:45 +00:00
toasterbabe 05bf3674d3 * M_Random function access to v! (so v.RandomFixed(), etc...) 
* Remove deprecated P_Random() from Lua.
 2018-03-20 15:00:27 +00:00
Sryder 4e95066f5a Some fixes and updates for HWR_SplitWall 
Solid walls *can* be cut
Fix issues with water and fog FOFs not cutting each other out correctly
Fix Fog colourmap and lighting setting that is done here.
Remove HWR_SplitFog

There is currently a bug with FF_DOUBLESHADOW (that also exists in software) but has a larger impact here. When 2 FF_DOUBLESHADOW lights are directly stacked on each other the bottom one has its height set incorrectly. This causes all the Fog in the timed gravity flipping section of ERZ2 to be drawn and it looks really bad.
 2018-03-20 14:20:08 +00:00
toasterbabe ae033a9409 * Clean up a lot of NiGHTS stuff still using the old, shitty NOSCALESTART offsetting in nonstandard resolutions. 
* Clean up the ST_ drawing macro list.
 2018-03-20 00:19:20 +00:00
toasterbabe 7885ae57e2 * Allow for V_ flag control for hudinfo SOC/Lua stuff through hudinfo[n].f (for flags). 
* Fix Old Special Stage offsets.
* Fix drowning number offsets.
* Remove useless "WS" macros.
 2018-03-19 23:08:51 +00:00
toasterbabe 4798f85382 Fix issues with the level platter in nonstandard resolutions. 2018-03-19 17:41:53 +00:00
toasterbabe c0cc1471e5 Make some tweaks to devmode offsets. 2018-03-19 16:39:37 +00:00
toasterbabe 7d1885917a Some minor intro tweaks. 2018-03-19 16:36:14 +00:00
Sryder f3d63b82ce Revert "Fix screenshot functionality in fullscreen in SDL2" 
This reverts commit 121fcd8369.

The reason I am reverting this is because the last commit actually fixes the *old* screenshot functionality, as the screen is being drawn back onto the buffer after they're swapped in the "real" size. Meaning the old function actually works perfectly fine now.
 2018-03-18 18:33:53 +00:00
Sryder a984d979d1 Fix wipes in low resolutions 2018-03-18 17:12:12 +00:00
Sryder 31d1ef8db0 Draw the final screen texture in the centre with black bars 
Only applies when the monitor aspect ratio is different to the game's aspect ratio.
 2018-03-17 19:22:14 +00:00
Sryder 527df5c248 Fix OpenGL Title Screen Sky 
My IDE doesn't seem to like Vada's name.
 2018-03-17 15:11:32 +00:00
Sryder 6de0cc6bcc Remove the OpenGL only code from V_DrawPatchFill 
That's all of the HUD drawing functions that are currently used updated in GL.
 2018-03-17 14:47:06 +00:00
Sryder a9214ebd37 Match HWR_DrawCroppedPatch to V_DrawCroppedPatch 2018-03-17 13:58:44 +00:00
Sryder 801f7547d3 Add the full-screen drawfill functionality to HWR_DrawFixedPatch 2018-03-17 13:26:43 +00:00
Sryder 7830c031f7 Make HWR_DrawFill match V_DrawFill 2018-03-16 19:46:45 +00:00
Sryder 7764a1bb5d Match HWR_DrawFixedPatch to V_DrawFixedPatch 2018-03-16 18:08:24 +00:00
Sryder 1b3e1f78af Translucent floors shouldn't write into the depth buffer 2018-03-15 23:59:01 +00:00
Sryder 5a4ea9fab3 Better fog block colouring 
They still aren't perfect, but now they are at least not quite so obviously just translucent polygons over the level. A mixture between partially modulating the background colours and adding the fog colour. Notably white fog blocks look like they're brightening what's behind them.
Additive was also setting noalphatest before, can probably decide that depending on what it needs anyway. I don't think it's currently used anyway.
 2018-03-15 23:58:37 +00:00
Alam Ed Arias 5a04145e43 Merge branch 'master' into next 2018-03-14 14:29:42 -04:00
Alam Ed Arias 1619b392f6 Merge remote-tracking branch 'public/master' 2018-03-14 14:26:07 -04:00
toasterbabe fee8714109 i suck at the alphabet! 2018-03-14 16:55:33 +00:00
toasterbabe a5ab9f01bb oh yeah this guy's name needs changing too 2018-03-14 16:49:10 +00:00
toasterbabe 68cb919205 down with cis 2018-03-14 16:47:19 +00:00
LJSonik 0ff5b851cd
Merge branch 'master' into minor-net-command-fixes 2018-03-09 17:15:37 +01:00
Louis-Antoine aefe06e2ef Fix Lua panic when archiving a table element with an userdata key 2018-03-09 16:40:34 +01:00
Sryder e4ed3a793b Small hacky fix for MD2s and sprites until sorting for walls, floors, and sprites is done 
Sorts all translucent sprites and MD2s so they're drawn after all the opaque ones. Fixes most of the observable issues between translucent MD2s and opaque sprites/MD2s.
 2018-03-09 09:58:10 +00:00
Sryder 121fcd8369 Fix screenshot functionality in fullscreen in SDL2 2018-03-08 22:28:38 +00:00
Monster Iestyn 145616b152 Merge branch 'master' into next 2018-03-08 19:35:51 +00:00
Sryder 77af3a8f95 Optimise the screen texture setup for SDL2, Post-processor, and wipes. 
Only use glCopyTexImage2D when first creating the screen texture, use glCopyTexSubImage2D anytime after that as it does not define a new texture each time.
Flushing of the screen textures has been implemented for when the screen size changes (so that the screen textures don't stay at a wrong size) and the game is closed, I believe they would leave a memory leak before.
 2018-03-07 22:55:21 +00:00
Sryder 67ee1637c9 Decrease far clipping plane 
The Far clipping plane did not need to be nearly as high as it was, the new value is 32768, which I suspect is about how far software can render before it completely falls apart.
It is desirable to increase the near clipping plane to between 6-10, but it can introduce more issues with close geometry not being drawn when the player or camera is scaled or viewheight is set to MIN in first person view. It would also stop sprites from being drawn ever so slightly too early, but this isn't too much of an issue and isn't too noticeable with those values. Might look into scaling near clipping plane in accordance to camera scale in the future.
The reason for wanting to increase the near clipping plane is because the small value can cause very noticeable Z-fighting where there shouldn't be on older GPU's, usually Intel ones, that don't support 24-bits for the depth buffer.
 2018-03-07 00:39:33 +00:00
Monster Iestyn aba4adfabc shrunk buffer from 32 to 28 so that all of "Downloading "extremely...longname.wad"" can fit on screen at once. 2018-03-06 20:52:55 +00:00
Monster Iestyn a66824d63f replace the 3 strncpys with a snprintf 2018-03-06 20:20:27 +00:00
Sryder 538d0de949 Merge branch 'master' of git@git.magicalgirl.moe:STJr/SRB2.git into openglquickfixes 2018-03-06 16:11:05 +00:00
Monster Iestyn e3151f26dc rewrite download file screen code: 
* fix screen to properly truncate the filename to just the real name only
* if the real name itself is too long, use ellipsis and paste in parts of the start and end of the actual name

note: I haven't actually tested if this works or compiles yet, I haven't the time right now
 2018-03-05 22:24:03 +00:00
Monster Iestyn 1fe79a0d71 Fix movies not recording the "extension" to special stage intro fades 2018-03-05 19:08:53 +00:00
Monster Iestyn bfbe69c627 Merge branch 'master' into hardcoding-time-again 2018-03-04 19:22:08 +00:00
Monster Iestyn b254acaa0d Merge branch 'master' into texture-fixes 2018-03-04 19:20:54 +00:00
Monster Iestyn 01f1e7fc33 Merge branch 'zoning-out' into 'master' 
Zoning out

See merge request STJr/SRB2Internal!133
 2018-03-04 14:19:25 -05:00
Monster Iestyn 61923f3b1f Merge branch 'public_next' 
# Conflicts:
#	src/sdl/i_system.c
 2018-03-04 19:18:13 +00:00
Monster Iestyn ad1801e7f1 Merge branch 'master' into next 2018-03-04 19:10:01 +00:00
Monster Iestyn 16e60aada9 Merge branch 'linux-limbo' into 'master' 
Linux limbo

See merge request STJr/SRB2!228
 2018-03-04 14:08:21 -05:00
Monster Iestyn 4fdb82c942 Merge branch 'soc-sanitizing' into 'next' 
SOC sanitizing

See merge request STJr/SRB2!227
 2018-03-04 14:07:30 -05:00
toasterbabe 33d5baa2aa * Add new console text colours - sky, purple, aqua, peridot, azure, brown, rosy, and invert. 
* Remove redundant check from V_DrawFadeScreen().
* Clean up potential endless sound source in Race HUD.
 2018-03-02 13:32:55 +00:00
Monster Iestyn 4a0305eec8 more I_GetFreeMem fixes: don't attempt to set *total to 0L if total itself is NULL 2018-02-23 20:40:19 +00:00
Monster Iestyn 1216c9da18 Use __linux__ instead of LINUX/LINUX64 
Turns out compiling for Linux 32-bit using the Makefiles never actually defines LINUX! Apart from that, most of the existing Linux-specific code in SRB2's source code (except for tmap.s) actually uses __linux__ instead anyway
 2018-02-23 20:21:16 +00:00
Monster Iestyn 6e21059713 Eat unprintable keys too, since there's no reason to feed them to G_Responder anyway when the console is open 2018-02-23 20:08:02 +00:00
Monster Iestyn 80e18ecb7e Cache all the act number graphicss at game startup rather than at every start/end of a level 
I also added a few helpful functions for drawing the act numbers themselves
 2018-02-22 21:49:36 +00:00
Monster Iestyn ad8c51ab8f removing stupid dumb useless code fish 2018-02-21 22:45:51 +00:00
Monster Iestyn fb3e78c020 Make CON_Responder eat Ctrl+key combos that have no effect, instead of passing the key on to G_Responder 2018-02-20 17:06:03 +00:00
Steel Titanium 36d1259ceb Removed some redundant checks 2018-02-17 00:37:17 -05:00
Steel Titanium d921f26e54 Don't init the sound system on dedicated servers 2018-02-17 00:01:42 -05:00
Monster Iestyn 1bc98da70b Added Z_TotalUsage as a shortcut for Z_TagsUsage(0, INT32_MAX) 2018-02-16 20:32:43 +00:00
Monster Iestyn 81a9b7b070 Total reorganisation of z_zone.c/h, added doxygen-compatible comments to all functions and additional regular comments where appropriate, changed purge tag macros to an enum list 2018-02-15 22:09:24 +00:00
Monster Iestyn 4782cc89fa updating comment for Z_TagsUsage in the .c file 2018-02-15 16:53:58 +00:00
Monster Iestyn 013d185d9e Z_FreeTag and Z_TagUsage are now both macros of their respective two arg variants 2018-02-15 16:31:05 +00:00
Monster Iestyn 8f834d6784 added a quick Z_FreeTag function as a shortcut to Z_FreeTags(tag, tag) where both tags are the same 2018-02-14 23:16:16 +00:00
Monster Iestyn 836bf5e12f Clean up z_zone.h's function protos to look more readable like m_random.h, don't name functions with "2" if not using PARANOIA or ZDEBUG 
also, Z_Malloc/Calloc/Realloc are now macros of the "Align" versions, regardless of ZDEBUG or not
 2018-02-14 22:52:25 +00:00
LJSonik d1e3275c78
Merge branch 'master' into minor-net-command-fixes 2018-02-14 21:07:10 +01:00
Louis-Antoine bd2334dd93 Fix SV_StopServer not calling D_Clearticcmd correctly 2018-02-14 21:00:55 +01:00
Monster Iestyn bd7ced9363 Merge branch 'master' into hardcoding-time-again 2018-02-14 16:24:05 +00:00
Alam Ed Arias 306cbc43e2 Merge branch 'public_next' into private 2018-02-14 10:34:36 -05:00
Alam Ed Arias 99552c2ba2 Merge branch 'master' into next 2018-02-14 10:29:24 -05:00
Louis-Antoine c7320f9f82 Don't allocate memory for net commands already executed, as it would cause them to be never freed 2018-02-14 15:09:52 +01:00
Monster Iestyn df95e2175f Merge branch 'master' into hardcoding-time-again 2018-02-13 21:21:30 +00:00
Monster Iestyn 49b8fd6d67 Don't attempt to load the "Lua/" or "SOCs/" folder lumps themselves as Lua/SOC lumps 2018-02-13 21:12:42 +00:00
Louis-Antoine 490f5beb89 Do not prevent all net commands for the current tic from being executed because of an unkown net command ID 2018-02-13 17:53:18 +01:00
toasterbabe 7018ce925b Fixed the strengths going in the wrong direction of transparency in GL! 2018-02-12 21:31:03 +00:00
toasterbabe b69cbd85b9 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into pretty_stuff 2018-02-12 18:59:01 +00:00
toasterbabe da3f8ceb8d * Move the non-mapping drawFill out of the source code function and into the Lua interface. 
* Add a drawFill fallback for COLORMAP too.
* Correct a few index mishaps.
 2018-02-12 18:23:57 +00:00
toasterbabe c1b48ea79f * Total overhaul of V_DrawFadeScreen(color, strength! 
- controllable strengths between 0-31 for COLORMAP lump like before
   - arbitrary colour indices in the palette via TRANSMAP lumps, with strengths 0-9
   - exposed to Lua as v.fadeScreen(color, strength)!
* Remove last vestiges of V_STATICPATCH.
 2018-02-12 17:47:31 +00:00
Monster Iestyn 8556a05668 Fix SOC/Lua loading messages to display full names or even display at all (for PK3s at least), and otherwise some cleanup of existing code for the messages. 
Also, I moved lua_lumploading on/offing to LUA_LoadFile.
 2018-02-09 22:43:08 +00:00
Monster Iestyn bf88407d00 Make sure both software and OpenGL ignore patches that are completely out of a multi-patch texture's bounds. 
This fixes OpenGL in particular crashing because of such a weird situation.
 2018-02-09 17:23:35 +00:00
Monster Iestyn f12530a39f Merge branch 'master' into hardcoding-time-again 2018-02-08 20:33:17 +00:00
Monster Iestyn b533d36143 Merge branch 'master' into file-loading-cleanup 2018-02-08 20:32:59 +00:00
Monster Iestyn b1695de124 Merge branch 'public_next' 2018-02-08 20:31:53 +00:00
Monster Iestyn c42c70cb34 Merge branch 'playdemo-custom-home-fix' into 'next' 
Fix for "playdemo" not working with custom home paths

See merge request STJr/SRB2!221
 2018-02-08 15:29:39 -05:00
Monster Iestyn fbd4ce1d47 optimised R_ExpandPlane too 2018-02-07 18:11:32 +00:00
Monster Iestyn efe9204f78 Fixed sky-sky thok barriers showing HOM (turns out the floor and ceiling share the same plane, so I've modified the code to account for this) 
Additionally, place some optimisations in both software and OpenGL; in particular one has been added for when all of back and front sector (floor and ceiling) is sky: since everything is "open" anyway, we can simply the usual checks involved.
 2018-02-07 17:46:01 +00:00
Steel Titanium 0cc4b8d6db Smoother MD2 interpolation 2018-02-06 14:50:08 -05:00
Monster Iestyn 493af49a00 Correct backwards skies for OpenGL too 2018-02-03 21:39:36 +00:00
Monster Iestyn 33a538383f Added proper support for upside-down thok barriers, in both renderers 
Thankfully it was really just a copy+paste of the code I already tinkered with for the normal ceiling sky based thok barriers, but tweaked for floors instead
 2018-02-03 19:48:18 +00:00
Monster Iestyn 0dc867c05e Cleanup of the code I've tweaked for skies, added SLOPEPARAMS macro to R_StoreWallRange for use in getting seg end z positions 2018-02-03 18:30:49 +00:00
Monster Iestyn ecf2eed37f Pushing all my work to make OpenGL consistent with my changes to software's sky so far 2018-02-01 22:04:04 +00:00
toasterbabe 5adfdf9516 cv_playername already has a valid default value of "Sonic". We do NOT need to expose things like this. 2018-01-30 22:48:53 +00:00
toasterbabe 8090ea4ed0 Stop leaking names. 2018-01-30 21:25:28 +00:00
Monster Iestyn 9e4c985d70 some cleanup of software's seg rendering code, moved Red's polyobject plane hack to R_StoreWallRange since it doesn't actually need to be done every column draw 
(I suspect polyobject planes don't actually need the minx/maxx hacks anymore, but I haven't the time to test that tonight nor is this branch really suited for it anyway)
 2018-01-29 22:05:04 +00:00
Monster Iestyn 7d150485c9 More sky fixes for software: 
* Thok barriers with slopes now render fine in software
* The solid "sky walls" between different-height thok barriers adjacent to each other are gone. Forever.
 2018-01-28 22:08:58 +00:00
Monster Iestyn 5c70d6e6ca Fix skies in software being displayed backwards 
(I'll get round to OpenGL later)
 2018-01-27 19:29:41 +00:00
Monster Iestyn f6c740840a Move sky plane-drawing code from R_DrawPlanes to a new function called by R_DrawSinglePlane 
This potentially allows FOFs and polyobjects to display sky flats on them properly, unless skyboxes are involved in which case they'd fail either way

I also updated or added comments to some places of the sky drawing code and related where useful
 2018-01-27 19:18:17 +00:00
toasterbabe eba0978a00 RIP smiles 2018-01-24 02:07:30 +00:00
toasterbabe ab0296d1c1 Added a failure animation if you don't get the emerald. https://cdn.discordapp.com/attachments/402861856219463681/405477752972509185/srb20004.gif 2018-01-23 23:13:56 +00:00
toasterbabe dd3b39089f * Improve the rendering of emerald coinboxes. 
* Make emeralds fall onto the end tally. https://cdn.discordapp.com/attachments/400761370800422922/405122775272128512/srb20003.gif
 2018-01-22 23:29:57 +00:00
Monster Iestyn c0bb511c1f Hardcoded LUA_THZT from THZ1.wad, giving us the funny-looking steam whistle tree 
This concludes hardcoding of scenery items for THZ
 2018-01-22 18:41:14 +00:00
toasterbabe dca107f630 * Update V_DrawCroppedPatch and V_DrawFill to support V_PERPLAYER. 
* Fix some mistakes in the comments for v_video.h.
 2018-01-21 12:56:38 +00:00
toasterbabe 373bb329a2 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into pretty_stuff 2018-01-20 22:18:16 +00:00
toasterbabe 2141754e54 V_PERPLAYER. (Hooh boy.) 
* Completely redid how splitscreen works, with eventual support for quads. Squish per-player stuff automatically into the right places! Works in GL, associated flag kills V_SPLITSCREEN.
* Seriously update the lives-drawing function for all gametypes, with strings that replace the lives number whenever it's missing (deprecates SKINNAMEPADDING).
* Improved how the nosshack works, alongside many other refactorings.
 2018-01-20 22:14:24 +00:00
Monster Iestyn 0f99fdadd1 Merge branch 'next' into lua-archive-crash-hotfixes 2018-01-20 21:33:03 +00:00
Monster Iestyn fa3998e942 Some fixes to prevent bad table key types causing Lua panic errors for joining players in netgames: 
* ArchiveTables: print an error if invalid key, to alert script author potentially
* UnArchiveTables: if the key is found to be nil after reading key and value, print an error and don't set them in the table
 2018-01-20 21:18:16 +00:00
Monster Iestyn 82ac8b6a1c Hardcoded SOC_FWR6 from THZ1.wad, also tweaked MT_THZFLOWERB's hitbox 2018-01-19 17:56:18 +00:00
Monster Iestyn 0ef7aff5c0 Prevent SV_SpawnPlayer from being able to freeze the game if gametic is 0. Additionally add a sanity check to prevent the loop going on more than necessary anyway 
This commit fixes -playdemo and -timedemo params for command line, allowing them to actually work again
 2018-01-16 15:21:49 +00:00
Monster Iestyn 87aa9175a1 Merge branch 'master' into hardcoding-time-again 2018-01-13 17:49:44 +00:00
Monster Iestyn f1b8e122a2 Fix missing semicolon 2018-01-12 20:05:09 +00:00
Monster Iestyn 602701d6dd G_DoPlayDemo: prepend srb2home to the demo name (if an external file) so that demos in custom home paths can be loaded 2018-01-11 16:55:42 +00:00
Monster Iestyn ddf82949bf W_IsLumpWad: check if the file is a PK3, so it can bail out if it isn't 2018-01-10 19:13:29 +00:00
Monster Iestyn 0c89853425 created W_IsLumpWad as a shortcut for the "is the lump a WAD" checking in the code getting map data lumps 2018-01-10 16:51:23 +00:00
Monster Iestyn 19e08584a3 add support for maps-in-WADs-in-pk3s to P_NetArchiveWorld as well 2018-01-10 15:24:24 +00:00
Monster Iestyn 9c13cee9f0 Hack up support for pk3s in Custom FOF setup, fix stray ! preventing blockmap from loading 2018-01-09 22:22:10 +00:00
Monster Iestyn db23cfc916 Same has been done for REJECT now 2018-01-09 21:33:10 +00:00
Monster Iestyn 2d98da3bcb Added support for loading BLOCKMAP lumps from MAPXX.wad maps in /Maps/ in PK3s 2018-01-09 19:43:59 +00:00
Monster Iestyn 0e8db59f4b P_AddWadFile: for both WADs and pk3s, if a sound is found to replace an existing sound, don't go on looking for more with the same name (since there shouldn't be any) 2018-01-04 21:06:26 +00:00
Monster Iestyn 03020036d4 Merge branch 'master' into file-loading-cleanup 2018-01-04 20:17:19 +00:00
Monster Iestyn b0d0738fb6 P_AddWadFile: Remove useless firstmapname param, clean up map searching code 2018-01-04 20:15:44 +00:00
Alam Ed Arias f9a0ef517d Use playersprite_t 2018-01-04 14:49:26 -05:00
Alam Ed Arias 5cce6101cc Merge branch 'public_next' into private 2018-01-04 14:32:27 -05:00
Alam Ed Arias 82f2f2f2f9 SDL: disable check for noreturn 2018-01-04 14:29:29 -05:00
Alam Ed Arias 30549addf3 Undo signed mess 2018-01-04 14:26:16 -05:00
Monster Iestyn 29d605a104 clarify this comment a little better 2018-01-04 15:17:32 +00:00
Monster Iestyn 6590d97338 clean up CM_LZF code in W_ReadLumpHeaderPwad 2018-01-04 15:14:53 +00:00
Monster Iestyn 8d07e2f8be Merge branch 'master' into file-loading-cleanup 2018-01-02 18:46:02 +00:00
Monster Iestyn 2e3eade637 Merge branch 'master' into hardcoding-time-again 2018-01-02 18:36:42 +00:00
Alam Ed Arias 75abd428fc MSVC2015: fixup 2018-01-02 13:22:10 -05:00
Monster Iestyn 61176ee736 Merge branch 'public_next' 
# Conflicts:
#	src/doomdef.h
#	src/sdl12/macosx/Srb2mac.xcodeproj/project.pbxproj
#	src/win32/win_vid.c
 2018-01-02 17:32:24 +00:00
Alam Ed Arias 1ab5273400 Merge branch 'master' into next 2017-12-27 19:34:28 -05:00
Alam Ed Arias f647989433 MSVC: set SubSystem on DLLs to Windows 2017-12-27 19:32:38 -05:00
Monster Iestyn d937f6fc8b Merge branch '2.1.20-preparation' into 'next' 
2.1.20 preparation

See merge request STJr/SRB2!215
 2017-12-27 16:53:43 -05:00
Monster Iestyn 5400beb2e3 Merge branch 'master' into next 2017-12-27 21:51:11 +00:00
Monster Iestyn afcdb5cd1e Merge branch 'restartaudio' into 'master' 
Add command to restart the audio system

Closes #27

See merge request STJr/SRB2!214
 2017-12-27 16:47:50 -05:00
Steel Titanium 875446295b Remove redundant !dedicated check 2017-12-27 16:36:57 -05:00
Alam Ed Arias f9388eab1b Merge branch 'master' into next 2017-12-27 15:50:31 -05:00
Monster Iestyn fa507ee939 Merge branch 'respawnspecials-mobjtype-hotfix' into 'next' 
P_RespawnSpecials mobj type hotfix

See merge request STJr/SRB2!217
 2017-12-27 15:47:44 -05:00
Monster Iestyn a87eec89ff Merge branch 'airbob-fix-backport' into 'next' 
Airbob fix backport

See merge request STJr/SRB2!219
 2017-12-27 15:46:39 -05:00
Steel Titanium 3856165623 Indentation cleanup 2017-12-27 13:18:20 -05:00
Alam Ed Arias f397b5fc3f Makefile: disable win_dbg for DirectDraw 2017-12-26 20:42:37 -05:00
Alam Ed Arias a29203acd8 Disable win_dbg 2017-12-26 20:24:08 -05:00
Alam Ed Arias e2b604fdfd TCP: remove BADSOCKET 2017-12-26 19:56:50 -05:00
Monster Iestyn 6886a29e99 Merge branch 'master' into next 2017-12-24 20:06:33 +00:00
toasterbabe a1620b709e Fix airbob sectors fucking up when below 0 z-height. 2017-12-20 21:13:24 +00:00
toasterone ff745531b0
Merge branch 'master' into addfile-netgame-fixes 2017-12-20 20:58:45 +00:00
Monster Iestyn d576453b56 Command_Addfile: add "too many files" and already-loaded checks and respective error messages 
No more shall the server be kicked from their own servers for re-adding a wad by accident!
 2017-12-18 21:17:37 +00:00
LJSonik 36ce6579b7
Merge branch 'master' into download-freeze-fix 2017-12-18 21:39:16 +01:00
Louis-Antoine 47481804da Merge branch 'download-freeze-fix' of https://github.com/LJSonik/SRB2 into download-freeze-fix 2017-12-18 21:38:10 +01:00
Louis-Antoine c8e9e779e7 Add a short comment to explain the newplayernum hack 2017-12-18 21:35:02 +01:00
Alam Ed Arias 57a7a3bed8 Merge branch 'master' into next 2017-12-17 22:22:57 -05:00
LJSonik 084a534f6a
Merge branch 'master' into download-freeze-fix 2017-12-17 22:48:13 +01:00
LJSonik 9c7ff6e0c3
Merge branch 'master' into resynch-fixes 2017-12-17 22:47:23 +01:00
Monster Iestyn c7cd64583d Added a bunch of I_Asserts to lua_hooklib.c relating to mobj types just in case 2017-12-17 20:59:24 +00:00
Monster Iestyn ec10367856 Bail out of P_RespawnSpecials if no mobjinfo entry has a doomednum that matches, and print a warning to the console. 
This prevents a mobj of NUMMOBJTYPES from being created and potentially crashing the game. Really, this happens only if you start messing with the mapthings of respawning items like rings/weapons/etc in the first place via Lua.
 2017-12-17 20:57:45 +00:00
Alam Ed Arias baf227175b Merge branch 'master' into next 2017-12-16 18:16:15 -05:00
Alam Arias 703c5322d4
Merge pull request #212 from SteelTitanium/window_center_fix 
Fix for window being offcenter
 2017-12-16 18:15:00 -05:00
Alam Ed Arias bd86f98822 Merge branch 'master' into next 2017-12-16 16:07:31 -05:00
Louis-Antoine 4ea5d2df01 Merge branch 'net-archive-fix' of https://github.com/LJSonik/SRB2 into net-archive-fix 2017-12-15 22:06:03 +01:00
Louis-Antoine beb9b0f103 Return for both players and mobjs if they've got an empty table, instead of just mobjs 2017-12-15 22:02:34 +01:00
LJSonik b994180927
Merge branch 'master' into net-archive-fix 2017-12-15 20:07:44 +01:00
Louis-Antoine 0b836a9841 Fix missing lua_pop in ArchiveExtVars 2017-12-15 16:31:27 +01:00
Monster Iestyn ac3fef15eb Rob is now in charge of Mod IDs, change MODID comment in doomdef.h to reflect this 2017-12-13 19:07:02 +00:00
Louis-Antoine 4e89c03b0f Node and player isn't the same thing !#^&*%^:'\[[^!#^$4&@(é@*(&$*@#à$%@ 2017-12-12 23:08:18 +01:00
Louis-Antoine 16b8265c6e F stands for Fun. You want more Fun, don't you? 2017-12-12 22:48:08 +01:00
toasterbabe 336a26602d Not strictly pretty, but fixes a bug I discovered whilst working on this. 2017-12-10 14:35:55 +00:00
toasterbabe ce724a6138 * Make lives pic appear in all gametypes. 
* Lives position now more consistent between players in splitscreen.
* Ringslinger weapon bar is now at the same height as the lives pic, and also more centered horizontally.
* Begin tweaking emerald icon locations for ringslinger gametypes.
* Remove in-game team names from team gametypes, since this information is (mostly) conveyed by the lives pic.
 2017-12-09 23:08:12 +00:00
toasterbabe 3d4adaac09 my mistake 2017-12-09 18:48:25 +00:00
Monster Iestyn a79d064d15 The contents of DSZ-f16.wad's LUA_A000 Lua script are in now 
Thing type numbers may be changed later
 2017-12-08 18:26:32 +00:00
Monster Iestyn 75bc76e9b4 Remove all traces of "srb2.wad" support, since it is no longer needed now that srb2.pk3 is the IWAD (...IPK3?). srb2.wad cannot exactly be a pk3 file after all. 
Additionally, rename any remaining "srb2.srb" to "srb2.pk3" in the main source code files. Not sure whether to bother dealing with srb2.srb/srb2.wad mentions in project files for now.
 2017-12-07 18:26:12 +00:00
toasterbabe e63c1d15d8 * Show an emerald token box on the tally screen. 
* Change the horizontal spacing of the emeralds on the special stage tally screen.
* (unrelated) Fix a reference to srb2.srb instead of the now-correct srb2.pk3.
 2017-11-17 23:02:34 +00:00
Monster Iestyn 91097fb48e added RET_SOC and RET_LUA, so we can load SOC/LUA files differently to WADs 
this also means we can remove a few ancient hacks relating to using the same code used to load SOC/Lua in WADs for loading standalone Lua/SOC files, though I haven't fully done this yet
 2017-11-10 22:36:37 +00:00
Steel Titanium e61549d81f Opps, forgot to change this. 2017-11-08 14:50:27 -05:00
Steel Titanium 55c86f3e15 Successful attempt at restarting the music 2017-11-08 14:48:05 -05:00
Monster Iestyn 7cb0138293 Change version number to 2.1.20 2017-11-08 15:06:42 +00:00
Steel dbbbc1cc06
Merge branch 'master' into window_center_fix 2017-11-08 00:32:23 -05:00
Steel Titanium c1405137ec Extra tab space to make the compiler happy 2017-11-07 23:48:03 -05:00
Steel Titanium 4f8b91c770 Attempt to restart music 2017-11-07 16:26:45 -05:00
Louis-Antoine 67aba2648c Fix download freezes (well, most of them) 2017-11-03 22:58:47 +01:00
Alam Ed Arias 7f4424b4a0 whitespace cleanup 2017-11-02 23:13:34 -04:00
Alam Ed Arias 3e3065f67c Move FindFolder 2017-11-02 23:09:52 -04:00
toasterbabe c89b1ec234 Always allow the first singleplayer level in the MP level platter. 2017-11-02 21:20:55 +00:00
toaster 7d15afe6fb Merge branch 'md2_interpfix' into 'master' 
(re-)fix MD2 interpoleration.

See merge request STJr/SRB2Internal!128
 2017-11-02 16:47:24 -04:00
toaster 82a868ec8f Merge branch 'lua-sector-find-funcs' into 'master' 
Lua sector find funcs

See merge request STJr/SRB2Internal!127
 2017-11-02 16:46:16 -04:00
toaster b302607c2e Merge branch 'nights_colours_again' into 'master' 
More NiGHTS tweaks

See merge request STJr/SRB2Internal!125
 2017-11-02 16:45:09 -04:00
toaster 29c3ff1c0e Merge branch 'demo_shit' into 'master' 
Demo shit

See merge request STJr/SRB2Internal!123
 2017-11-02 16:44:13 -04:00
toaster c84d4261d1 Merge branch 'unca_scrooge' into 'master' 
The hardcoded part of ACZ3 so far

See merge request STJr/SRB2Internal!124
 2017-11-02 16:43:11 -04:00
toasterbabe 2a42291b30 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into demo_shit 
# Conflicts:
#	src/d_netcmd.c
 2017-11-02 20:39:07 +00:00
toaster 49a1266ccc Merge branch 'sal-misc-stuff' into 'master' 
Sal misc stuff (state overwriting, gamepad tweaks)

See merge request STJr/SRB2Internal!116
 2017-11-02 16:35:12 -04:00
toaster 605e51f6f3 Merge branch 'more_about_menus' into 'master' 
More about menus

Closes #72

See merge request STJr/SRB2Internal!122
 2017-11-02 16:31:51 -04:00
toaster 927e74e406 Merge branch 'FileManagement' into 'master' 
File management - PK3 support.

See merge request STJr/SRB2Internal!121
 2017-11-02 16:27:54 -04:00
toasterbabe 05832e66a3 Fix unmatched readfixed (by replacing). 2017-11-02 19:38:21 +00:00
toasterbabe b2d43cc56b (re-)fix MD2 interpoleration. 2017-11-02 14:33:56 +00:00
Monster Iestyn 2cccb81d7f Merge branch 'master' into lua-sector-find-funcs 2017-11-01 19:14:44 +00:00
Monster Iestyn 5faf263f1f Merge branch 'gametype-strings' into 'master' 
Gametype strings

See merge request STJr/SRB2Internal!113
 2017-11-01 14:47:45 -04:00
Monster Iestyn 477ee6e073 Merge branch 'lua-action-userdata' into 'master' 
Lua action userdata

See merge request STJr/SRB2Internal!112
 2017-11-01 14:45:03 -04:00
Monster Iestyn b52c843139 Merge branch 'public_next' 2017-11-01 18:39:25 +00:00
Monster Iestyn d61105fcce Merge branch 'master' into next 2017-11-01 18:36:48 +00:00
Monster Iestyn fbe5654477 add quick error messages to make toaster happy 2017-11-01 17:11:10 +00:00
Monster Iestyn a244948f21 fix action_call index numbers for the args, add missing breaks after LUA_TUSERDATA code in infolib (I am dumb dumb dumb dumb dumb dumb) 2017-11-01 16:52:12 +00:00
Monster Iestyn 42b955f4ca getActionName: added support for custom actions (A_ prefix functions only) 2017-10-31 16:47:24 +00:00
toasterbabe 811fd5f9bc * Change the NiGHTS link text colour list. Again. 
* Make the NiGHTS link text pulse, like in the original game!
* Fix going from NiGHTS special stage as Smiles to a normal level losing your followitem.
 2017-10-31 15:47:58 +00:00
toasterbabe ead8fd6bf7 Update some strings that say "joystick". 2017-10-30 23:23:52 +00:00
toasterbabe 2458c06f5b Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into sal-misc-stuff 
# Conflicts:
#	src/g_game.c
 2017-10-30 21:42:38 +00:00
Monster Iestyn bfca420f47 Merge branch 'master' into gametype-strings 2017-10-30 21:34:16 +00:00
Monster Iestyn 440ada120d Merge branch 'master' into lua-action-userdata 2017-10-30 21:33:40 +00:00
toasterbabe 4d82a76e5b Move R_AddSpriteDefs back into place. 2017-10-30 21:07:17 +00:00
toasterbabe d4e08551bf * Make P_LoadVertexes a wrapper for P_LoadRawVertexes. 
* Remove extraenous R_ClearTextureNumCache from P_LoadSidedefs2.
* Remove regressions in comments/#includes.
 2017-10-30 20:54:14 +00:00
Monster Iestyn 1d11797b47 Added six new functions from p_spec.c/h to Lua 2017-10-30 20:09:41 +00:00
Monster Iestyn 2b1fb67a5f DrawMD2i: change duration and tics to INT32, fix up any related code 2017-10-30 19:12:51 +00:00
toasterbabe 3994697fbd Fix all NiGHTS demo desyncs! (More specifically: compare with d_netcmd.c's order of operations - it's skin change, then g_initnew, then demo start, NOT g_initnew then skin change then demo start!!!!! 2017-10-30 14:20:36 +00:00
toasterbabe 548c120534 Since they give points now, make tokens spawn in record attack (and not add end-of-act tokens/continues). 2017-10-29 13:41:02 +00:00
Steel Titanium 97445f941a Add command to restart the audio system 2017-10-29 01:09:34 -04:00
Steel Titanium 799a819ee9 Merge remote-tracking branch 'upstream/master' into window_center_fix 2017-10-29 00:00:11 -04:00
Alam Ed Arias 6a639dd717 Merge branch 'master' into md2-interpolation-fix 2017-10-28 18:47:20 -04:00
Alam Ed Arias d2f922a981 Merge branch 'master' into next 2017-10-28 18:46:10 -04:00