Commit graph

2745 commits

Author SHA1 Message Date
TehRealSalt
dfaa7aaad4 missed something 2018-03-14 16:37:42 -04:00
TehRealSalt
eb1b84ce5c 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
1e76cb8a88 Merge branch 'master' into next 2018-03-14 14:29:42 -04:00
Alam Ed Arias
93e143e26f Merge remote-tracking branch 'public/master' 2018-03-14 14:26:07 -04:00
colette
1151f4bba3 Merge branch 'credits_update' into 'master'
Credits update

See merge request STJr/SRB2!231
2018-03-14 12:56:27 -04:00
toasterbabe
5f4fa843c2 i suck at the alphabet! 2018-03-14 16:55:33 +00:00
toasterbabe
cb0511a912 oh yeah this guy's name needs changing too 2018-03-14 16:49:10 +00:00
toasterbabe
429a293a1b down with cis 2018-03-14 16:47:19 +00:00
Sryder
b8cb80255e Merge branch 'debug-fix' 2018-03-14 10:11:10 +00:00
TehRealSalt
036029bbd7 Rename fake item to eggman monitor 2018-03-13 21:07:08 -04:00
Sryder
80230e4429 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
eb909dabb3 Shadow optimisation
Done like Overlays, goes through a list of shadows ONLY
2018-03-13 05:58:57 +00:00
Sryder
78e2021f4b Make sure it's a waypoint before doing distance calculations 2018-03-13 05:25:04 +00:00
Sryder
201392d34b 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
68a9454fa3 Use the constant, not a magic number 2018-03-13 02:54:49 +00:00
Sryder
3617a4320e Stop touching a random item box crashing debug builds 2018-03-13 02:51:14 +00:00
TehRealSalt
638d2fce41 whoops 2018-03-12 01:23:42 -04:00
TehRealSalt
b12872af02 what is this bullshit?!
r_local.h just got completely overwritten by a copy of r_draw.h.....
2018-03-12 01:21:35 -04:00
TehRealSalt
79ba08ac7d Merge remote-tracking branch 'refs/remotes/origin/master' into sonicitems
# Conflicts:
#	src/d_netcmd.c
#	src/g_game.c
#	src/k_kart.c
#	src/p_enemy.c
#	src/p_inter.c
#	src/p_map.c
#	src/p_user.c
#	src/sounds.c
#	src/sounds.h
#	src/y_inter.c
2018-03-12 00:58:13 -04:00
TehRealSalt
6a1e542277 Merge remote-tracking branch 'refs/remotes/origin/sal-misc' 2018-03-12 00:13:33 -04:00
Sryder
dee6c2b97d Comment out calls to CV_SetValue for cv_analog 2018-03-12 03:18:45 +00:00
Sryder
ac53757e8d Update dehacked lists
Why were all of these states and objects missing
2018-03-12 00:21:14 +00:00
TehRealSalt
fc329d893b Better gamepad axis support 2018-03-11 18:07:28 -04:00
TehRealSalt
1797e3d09e Fixed mouse turning
Only works with spectating, and is affected by mirror
2018-03-11 13:12:09 -04:00
TehRealSalt
0ed9232758 Remove unused mousemove snippet 2018-03-11 12:58:33 -04:00
TehRealSalt
84c7241a70 Merge remote-tracking branch 'refs/remotes/origin/master' into sal-misc 2018-03-11 12:49:15 -04:00
TehRealSalt
798f87907e Merge remote-tracking branch 'refs/remotes/srb2public/fof-slope-skew-backport' 2018-03-11 12:47:44 -04:00
Sryder
9b753c2e95 Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git 2018-03-11 06:38:43 +00:00
Sryder
a807ac7bde Lower kart engine sound distance 2018-03-11 06:38:22 +00:00
TehRealSalt
5378cd8184 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
MonsterIestyn
632c7dd5ce Merge pull request #239 from LJSonik/net-archive-fix
Fix Lua panic when archiving a table element with an userdata key
2018-03-09 16:13:12 +00:00
Louis-Antoine
dc02ef886f Fix Lua panic when archiving a table element with an userdata key 2018-03-09 16:40:34 +01:00
Sryder
4114464930 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
83d4f29367 Fix screenshot functionality in fullscreen in SDL2 2018-03-08 22:28:38 +00:00
Monster Iestyn
651e773c7e Merge branch 'master' into next 2018-03-08 19:35:51 +00:00
Monster Iestyn
9a1a29508e Merge branch 'download-filename-trunc-fix' into 'master'
Download filename trunc fix

See merge request STJr/SRB2!230
2018-03-08 14:33:57 -05:00
Sryder
e6dff75aab 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
954850b221 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
3f61a1608d 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
b060d98c28 replace the 3 strncpys with a snprintf 2018-03-06 20:20:27 +00:00
Sryder
254c53cb3d Merge branch 'master' of git@git.magicalgirl.moe:STJr/SRB2.git into openglquickfixes 2018-03-06 16:11:05 +00:00
TehRealSalt
20f0cdc0f6 Restored bounce pad strafe 2018-03-06 01:31:49 -05:00
TehRealSalt
ae4377f6b0 Merge remote-tracking branch 'refs/remotes/origin/master' into sal-misc 2018-03-06 01:00:12 -05:00
TehRealSalt
0a382702c0 Adjusted Sonic's stats
(also made new characters default to 5-5 instead of using Sonic's stats)
2018-03-05 20:14:50 -05:00
TehRealSalt
5aa4856d27 Maybe fixed dedicated? 2018-03-05 19:55:39 -05:00
Monster Iestyn
426983ff11 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
ac645decfa Fix movies not recording the "extension" to special stage intro fades 2018-03-05 19:08:53 +00:00
TehRealSalt
5e76a21875 Merge remote-tracking branch 'refs/remotes/origin/sal-misc' 2018-03-04 18:58:34 -05:00
TehRealSalt
e7a04e6d7a whoop, minor thing 2018-03-04 18:57:34 -05:00
TehRealSalt
76e317c111 Unlock all cheat no longer sets game modified if it can't find anything to unlock
Sound test is also in the Options menu now.
2018-03-04 18:42:06 -05:00