Commit graph

2734 commits

Author SHA1 Message Date
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
9fccf62124 Merge remote-tracking branch 'refs/remotes/origin/master' into sal-misc 2018-03-28 23:28:10 -04:00
TehRealSalt
9aa19e3c39 Merge remote-tracking branch 'refs/remotes/origin/sal-misc' 2018-03-28 23:09:48 -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
a980e8b0d9 Merge remote-tracking branch 'refs/remotes/origin/sal-misc' 2018-03-24 08:03:55 -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
TehRealSalt
c1a32c609f Merge remote-tracking branch 'refs/remotes/origin/master' into sal-misc 2018-03-23 22:24:01 -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
TehRealSalt
ee977ca8db missed something 2018-03-14 16:37:42 -04:00
TehRealSalt
d99339ecd0 Merge remote-tracking branch 'refs/remotes/origin/master' into sonicitems
# Conflicts:
#	src/info.c
#	src/k_kart.c
#	src/p_enemy.c
#	src/p_inter.c
#	src/p_mobj.c
2018-03-14 16:12:15 -04: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
colette
18b4ab9770 Merge branch 'credits_update' into 'master'
Credits update

See merge request STJr/SRB2!231
2018-03-14 12:56:27 -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
TehRealSalt
e5798f7490 Rename fake item to eggman monitor 2018-03-13 21:07:08 -04: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