Commit graph

2742 commits

Author SHA1 Message Date
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
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
TehRealSalt
f25b2f0256 whoops 2018-03-12 01:23:42 -04:00
TehRealSalt
34d6d91577 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
375f9a9291 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
4a392f6f43 Merge remote-tracking branch 'refs/remotes/origin/sal-misc' 2018-03-12 00:13:33 -04: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
11b59348eb Merge remote-tracking branch 'refs/remotes/origin/master' into sal-misc 2018-03-11 12:49:15 -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
MonsterIestyn
af46a076f2
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
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
Monster Iestyn
87b1246b58 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
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
TehRealSalt
7e007c2832 Restored bounce pad strafe 2018-03-06 01:31:49 -05:00
TehRealSalt
79b6f3f482 Merge remote-tracking branch 'refs/remotes/origin/master' into sal-misc 2018-03-06 01:00:12 -05:00
TehRealSalt
53ef60584b 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
6650e6c49c Maybe fixed dedicated? 2018-03-05 19:55:39 -05: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
TehRealSalt
ccc6a03d17 Merge remote-tracking branch 'refs/remotes/origin/sal-misc' 2018-03-04 18:58:34 -05:00
TehRealSalt
23d19e39da whoop, minor thing 2018-03-04 18:57:34 -05:00
TehRealSalt
4d62fbf509 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
TehRealSalt
b29ad1e804 mobjscale: MT_FIREDITEM fix 2018-03-04 15:59:51 -05:00
TehRealSalt
f97ec30493 Made a lot of gametype checks use either G_RaceGametype or G_BattleGametype
Should make it a lot easier to add more gametypes later.
Also some minor fixes:
- Changed up how shell speed scales in mobjscale juuuust slightly, so
it's less messy
- Fixed CHECK showing spectators
2018-03-04 15:27:52 -05:00
TehRealSalt
1e1867fe42 General fixes
- Flame trails don't spawn if you're not on the ground
- Mobjscale: Shells are now the correct speed
- Mobjscale: Explosion's wipeout hit height scales
2018-03-04 14:28:29 -05:00