Commit graph

2117 commits

Author SHA1 Message Date
Tasos Sahanidis 001e4e11ca
Correct C FixedMul() off-by-one errors
The FixedMul() C implementation would produce off by one results,
causing constant desyncs on 64 bit builds and builds without an
ASM implementation of the function.

This is fixed by shifting instead of dividing, possibly avoiding
rounding errors.
2018-05-20 22:55:21 +03:00
Sryder 092e709235 OpenGL Map Specific palettes working
This makes OpenGL stop using a specific function that doesn't really do anything for it anymore. It looks like it was used for a hack that would change the colour of polygons for the flashpal equivalent in DOOM.
I made it so ST_DoPaletteStuff doesn't set the flashpal in OpenGL as it already does its own hacky overlay and doing that would cause all the textures to be flushed more mid-level, it could be enabled for more correct flashpals, but they still wouldn't effect fog or lighting.
This means the palette will be set when going to the title screen, and twice when starting a map, (causing the OpenGL cached textures to also be flushed at those times)
2018-05-17 22:17:20 +01:00
Steel Titanium 0bef99f566 Fix console typo 2018-05-17 13:57:19 -04:00
Sryder badbb4324e Fix FF_FULLBRIGHT not working in sectors with multiple light levels in OpenGL 2018-05-16 21:04:57 +01:00
Monster Iestyn 4f75ae3a68 Fix both Bouncy FOF and Space Countdown sector specials working on FOFs without the FF_EXISTS flag
Also move the Bouncy FOF sector special check above the FOF heights checking in P_CheckBouncySectors, because it means not having to waste time calculating FOF heights only for it not to be bouncy anyway :P
2018-05-11 20:35:46 +01:00
Alam Ed Arias 6be0f90fbe Merge branch 'master' into next 2018-05-08 21:26:26 -04:00
Steel Titanium a1d696b38e Fix small typo 2018-05-08 18:38:28 -04:00
Steel Titanium 9ff491dd78 Add indentation 2018-05-08 18:36:47 -04:00
Steel Titanium 29e80c5300 Don't increment totalplaytime if a demo is playing. 2018-05-08 18:16:01 -04:00
Monster Iestyn 8e5ac64d7c Merge branch 'dedicated-nosoundinit' into 'master'
Don't init the sound system on dedicated servers

See merge request STJr/SRB2!225
2018-04-21 17:40:45 -04:00
Monster Iestyn 452aef4981 Merge branch 'connect-empty-address-fix' into 'master'
Fixed "invalid pointer" error when passing "" to Command_connect().

See merge request STJr/SRB2!234
2018-04-21 17:32:50 -04:00
Monster Iestyn 83a84d5a81 Merge branch 'connect-server-fix' into 'master'
Removed contradictory `-connect` check

See merge request STJr/SRB2!236
2018-04-21 16:25:28 -04:00
Monster Iestyn eb0f9681d7 Merge branch 'findfile-rewrite' into 'master'
Rewrite of d_netfil.c's findfile

See merge request STJr/SRB2!240
2018-04-21 16:22:21 -04:00
Monster Iestyn 48a85512a0 Merge branch 'dedicated-debug-hotfix' into 'master'
Dedicated debug hotfix

See merge request STJr/SRB2!239
2018-04-21 16:13:38 -04:00
Monster Iestyn 6c7acdbd9e Merge branch 'movie-spec-stage-fade-fix' into 'master'
Movie mode: special stage intro fade recording fix

See merge request STJr/SRB2!229
2018-04-21 16:12:46 -04:00
Monster Iestyn 9cdf87404e Rewrote findfile to store whether any of the three paths searched had a bad MD5 rather than just simply being not there.
This means that, if the three paths are not the same, you should be able to tell if at least one of them has a file that just had a bad MD5. Most relevant for Linux peeps I expect.

Note: Untested as of writing
2018-04-15 22:00:31 +01:00
Monster Iestyn 3fb12cf337 Don't use CV_StealthSetValue on cv_itemfinder if running the game in dedicated mode 2018-04-15 19:59:57 +01:00
TehRealSalt 36b52e1c67 Merge remote-tracking branch 'refs/remotes/srb2public/next'
# Conflicts:
#	src/f_finale.c
#	src/hardware/hw_draw.c
#	src/hardware/hw_main.c
#	src/m_misc.c
2018-04-07 18:43:59 -04: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 cf6a30a8ef Merge branch 'master' into next 2018-04-03 15:48:06 -04:00
TehRealSalt 15f0e16344 Race lap linedef executor
Set up similar to NiGHTS Mare linedef executors. Give a sector the "Race
Lap" sector type, tag it, then set the frontside x-offset on the trigger
line to the lap it should activate on minus 1. There are a few flags you
can check on the trigger line to modify its behavior.
- Normally the executor will only trigger if its exactly on the lap
specified. Check Not Climbable to make it execute on laps equal to or
greater than, or check Block Enemies to make it execute on laps equal to
or less than.
- By default, the executor will check current lap with the person in
last's lap. Check E4 to instead find the current lap from the player who
triggered it. This flag is better for triggering events ahead of the
players, while the default effect is better for triggering events behind
the players.
2018-03-31 14:48:49 -04:00
TehRealSalt 0f6c79d983 I'm a huge idiot 2018-03-31 00:12:26 -04:00
TehRealSalt 8f69d14716 reset randmapbuffer in G_DeferedInitNew 2018-03-31 00:11:03 -04: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
TehRealSalt 1c0e9eb12c I just realized that SRB2's credits are listed in alphabetical order of last name
(I had to research the Polish alphabet to figure out where Fooruman's
name should've been, hah)
2018-03-30 14:14:08 -04:00
Sryder 0aaae501d3 Warnings must die 2018-03-30 18:53:23 +01:00
TehRealSalt 88b278e7bb oop 2018-03-30 13:33:01 -04: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
TehRealSalt fe645f8a53 Actually, I messed this up 2018-03-30 12:17:48 -04:00
TehRealSalt 7516a1dc0c Doing one more step to totally ensure that matchesplayed is unlocking stuff 2018-03-30 12:16:15 -04:00
TehRealSalt a10a068f15 zzzzz 2018-03-30 00:53:32 -04:00
TehRealSalt e974b6e4b7 MK rules for Battle scoring
and quick fix for karma items
2018-03-30 00:53:25 -04:00
TehRealSalt 3d8441fe54 Unsuck start boosts 2018-03-29 21:43:02 -04: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
TehRealSalt e86aa94f74 Zigs & better scroll 2018-03-29 18:11:06 -04:00
TehRealSalt 2cc2b68e38 Oh boy another real name 2018-03-29 14:48:45 -04:00
TehRealSalt 0fe06a0089 Add the accent 2018-03-29 13:35:40 -04:00
TehRealSalt 6fa54576f6 Real naaaames 2018-03-29 12:57:41 -04:00
TehRealSalt e9c2b09c24 Forgot to remove some debug stuff 2018-03-29 12:01:04 -04:00
TehRealSalt cde733f850 Finished checklist 2018-03-29 11:43:56 -04:00
TehRealSalt 713fba7111 More full names, and more names 2018-03-29 01:34:31 -04:00
TehRealSalt d4fba3be49 :( 2018-03-29 01:14:47 -04:00
TehRealSalt 84a5fac5e9 Start of a better unlockable checklist
Still WIP, doesn't display properly
2018-03-29 01:14:29 -04:00
TehRealSalt f2bc7d16c9 Allow skipping (for real this time) 2018-03-28 22:12:45 -04:00
TehRealSalt d07419b6ac Allow skipping 2018-03-28 21:52:35 -04:00
TehRealSalt ad42a9f63c Some more credit adjustments 2018-03-28 20:32:53 -04:00
TehRealSalt 9dd14531ee More credit stuff 2018-03-28 19:27:26 -04:00
TehRealSalt 38b59aaaf1 Actually, ehhh, let's remove full names for everyone who hasn't went "yes, I want my full name on Kart's credits 2018-03-28 16:25:43 -04:00
TehRealSalt caa000d5d6 A quick credits draft
Please give me corrections and people to add. I've not been here as long
as some people, so there is 100% probably people I missed
2018-03-28 16:17:04 -04:00
TehRealSalt 8e9d09121e Actually, this makes more sense :U 2018-03-28 15:28:50 -04:00
TehRealSalt d7bb7734d3 Merge remote-tracking branch 'refs/remotes/origin/master' into sal-misc 2018-03-28 15:25:12 -04:00
TehRealSalt 84944f1a52 Idea: Make Boo make you invisible instead of flash in splitscreen
There's no way atm to make you flash on your screen but not on everyone else's, so I think just making you invisible on all of them keeps the original SMK intent of "you have to pay extra close attention to their screen to know where they are at all" better
2018-03-27 18:30:02 -04:00
TehRealSalt ac6a996c0d HUD improvements
Most notably, Karma & Boo no longer appear on the minimap
2018-03-27 18:22:33 -04:00
TehRealSalt acc9abca55 Items respawn in Battle properly again
and in a slightly less wasteful way.
2018-03-27 17:53:47 -04:00
TehRealSalt e16bf1cf75 WIP karma item stuff 2018-03-26 20:36:16 -04:00
TehRealSalt 8bc2fa7b6c Fix errors 2018-03-24 08:13:33 -04:00
TehRealSalt 61f929168e Splitscreen sound improvements
- Fixed a simple oversight that prevented P3 and P4's sounds from ever
playing
- Changed how sound priority works, now compares distances between

(Untested as of commit since my computer wants a quick restart before it
compiles :V)
2018-03-23 22:50:42 -04: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
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
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
Sryder 4caff9c8e7 Merge branch 'debug-fix' 2018-03-14 10:11:10 +00:00
Sryder 2a4a0f24d4 Fix Bombs
Use reactiontime instead of health so chain reactions can occur when multiple bombs are layered.
Make the check for nearby players happen BEFORE the spawning of explosion objects.
Remove MF_NOCLIPTHING and MF_MISSILE from bombs so they don't try and die when they hit the floor sometimes.
2018-03-13 11:07:08 +00:00
Sryder 0483c882cd Shadow optimisation
Done like Overlays, goes through a list of shadows ONLY
2018-03-13 05:58:57 +00:00
Sryder f26c96175d Make sure it's a waypoint before doing distance calculations 2018-03-13 05:25:04 +00:00
Sryder 07c7bc05c5 Fix the item box related crashes
Removed Magnet item box pulling code. It's a mess, hacky, doesn't really help in races, and breaks things. We will implement something new for it soon.
2018-03-13 05:20:47 +00:00
Sryder 71c1a5b7e2 Use the constant, not a magic number 2018-03-13 02:54:49 +00:00
Sryder e3de8ae75f Stop touching a random item box crashing debug builds 2018-03-13 02:51:14 +00:00
Sryder be0e5fe627 Comment out calls to CV_SetValue for cv_analog 2018-03-12 03:18:45 +00:00
Sryder 419b83ee27 Update dehacked lists
Why were all of these states and objects missing
2018-03-12 00:21:14 +00:00
TehRealSalt 517fcd4366 Better gamepad axis support 2018-03-11 18:07:28 -04:00
TehRealSalt 8cb73c8d25 Fixed mouse turning
Only works with spectating, and is affected by mirror
2018-03-11 13:12:09 -04:00
TehRealSalt 0d0e856619 Remove unused mousemove snippet 2018-03-11 12:58:33 -04:00
TehRealSalt 1b4f893385 Merge remote-tracking branch 'refs/remotes/srb2public/fof-slope-skew-backport' 2018-03-11 12:47:44 -04:00
Sryder 4edcb49c0e Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git 2018-03-11 06:38:43 +00:00
Sryder 367b037c4a Lower kart engine sound distance 2018-03-11 06:38:22 +00:00
TehRealSalt 10f04aea52 Disable "Play Credits" if you're in a game
I have no clue if it'd break or not if you used this in a netgame (my
gut feeling is "it would break"), but even if it worked it'd be stupid
:V
2018-03-09 20:57:13 -05: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