Commit graph

4408 commits

Author SHA1 Message Date
TehRealSalt
7e15e8b55d "if !splitscreen" instances that SHOULD be "if netgame" 2018-10-27 21:45:04 -04:00
TehRealSalt
89cd20bd70 Higher default scale, WANTED indicator scales properly 2018-10-27 20:56:11 -04:00
TehRealSalt
02c425696f Reduce camspeed in splitscreen 2018-10-27 20:44:05 -04:00
toaster
3516b11b33 toaster: not good at stuff (signpost z offset fix) 2018-10-27 22:23:44 +01:00
toaster
18c649caca Fix and then subsequently disable the zoom tube angle setting stuff. 2018-10-27 22:05:15 +01:00
toaster
92b6f8bb50 Fix the issue with sliding I identified this morning.
Also, apply it to being in a zoom tube, too! For extra forwards compatibility with all the terrible SRB2 Riders ports that are almost an inevitability.
2018-10-27 21:41:45 +01:00
toaster
503985d48d Minor correction - Jeck initially got it wrong, but informed me after lots of testin's. 2018-10-27 21:30:41 +01:00
toaster
e92d03ee94 As requested by Jeck:
* gr_md2 on the menu.
* Disable interpolerated model option completely for now.

Also, tweaked the GL menus a bit to suck less, since I was ferreting around in that area.
2018-10-27 21:16:19 +01:00
toaster
558ca6cfec Make it so hitting enter on the ipv4 option doesn't close all menus with the warning, only if you start trying to connect. 2018-10-27 20:44:18 +01:00
toaster
88b13212d9 Minor things that annoyed me to NO GOOD END.
* Tweak the demo info layout (holding tab while demoplayback) to better match the Viewpoint text in MP.
* Make the tab rankings view support widescreen better, including the spectator ticker (but not the player name layout).
* Make the tab rankings view always have a darkened background, to get around the fact we can't darken it based on player state for battle.
* Remove FREE PLAY from tab rankings.
2018-10-27 20:43:33 +01:00
toaster
f35374defc Fade stuff!
* Make the white intro fade always drawn, rather than potentially disable-able through tab or HUD disable.
* Slightly increase the darkness of the intermission fade, since its current value had a negative effect on SKINCOLOR_SAPPHIRE.
2018-10-27 20:39:41 +01:00
Monster Iestyn
eebdbc21f2 Removed all remaining traces of VID_X11 code in hw_drv.h and hw_data.h, the macro is no longer used by Linux etc versions of SRB2.
Unlike the rest of the commits in this branch (as of writing), I didn't make this commit between 1 and 2 years ago, I made it right now ;)
2018-10-27 19:58:51 +01:00
Monster Iestyn
ee590fb9ae Remove pointless drawtextured variable and redundant fake planes checks (R_FakeFlat would already have made gr_frontsector/backsector something else if they were) 2018-10-27 19:32:55 +01:00
Monster Iestyn
e32d4ead6a Added missing checks in HWR_AddLine from the software version, move v** vars to the top since R_PointToAngle calls use the same values anyway 2018-10-27 19:31:24 +01:00
Monster Iestyn
a6bd2dddaf Hack to make sure even (extra)subsectors without planepolys have segs adjusted
this fixes a crash in (old) GFZ2 at the ramp as a result of creating pv1/pv2. This probably means before pv1/pv2 there could have been some silly typecasting from vertex_t to polyvertex_t to get fixed vertex coords and such...
2018-10-27 19:29:45 +01:00
Monster Iestyn
ef2b789bfe Make new pv1/pv2 seg pointers, so AdjustSeg doesn't modify the v1/v2 pointers directly anymore
Yes I know they're void * in r_defs.h's seg_t definition, it's quicker than trying to figure out if including hardware/hw_glob.h is a good idea or not
2018-10-27 19:29:31 +01:00
Monster Iestyn
b749d97bf2 More optimising and otherwise fixing bizarre formatting in hw_trick.c 2018-10-27 18:58:05 +01:00
Monster Iestyn
9b60200cc4 Moved my added slope checks in hw_trick.c to isCeilingFloating/isFloorFloating
I also optimised those two functions while I was there (why keep a "floating" variable when setting it to false guarantees the functions return false?)
2018-10-27 18:57:28 +01:00
Monster Iestyn
b07d8283e6 gr_correcttricks fix: don't check if top/bottom textures are missing for sloped sectors, just ignore and cancel the hack
This fixes GFZ2's mysterious flying flats at the ramp to the big room
2018-10-27 18:56:38 +01:00
Monster Iestyn
ef230df2c6 Ensure file is closed whenever MD2 reading errors happen 2018-10-27 18:53:38 +01:00
Monster Iestyn
2eb531cf20 Add MD2_INDENT and MD2_VERSION so we can cleanly check that it's a valid MD2 from magic number/version 2018-10-27 18:53:18 +01:00
Monster Iestyn
7a43272e13 Call V_DoPostProcessor only in software mode (it cancels itself in OGL anyway) 2018-10-27 18:52:34 +01:00
Monster Iestyn
993f6b1725 don't bother with inlining the function, on second thoughts 2018-10-27 16:47:56 +01:00
Monster Iestyn
c965964f9a static the buffer, forgot to do this earlier 2018-10-27 16:27:00 +01:00
toaster
889064527a dumbass who forgot to stage most of the actual changes because she actually deleted all the changes and then remade them by accident 2018-10-27 16:25:25 +01:00
Monster Iestyn
69b7699b2f Use temporary buffer with a max size of 255 bytes instead of having Microsoft's FormatMessageA alloc one for us. Also, provide a fallback message in case no message was available for some reason 2018-10-27 16:09:14 +01:00
Monster Iestyn
ec708dcf13 Save the result of errno (aka WSAGetLastError() for WinSock) as soon as possible, to prevent anything in SOCK_GetNodeAddress resetting the value to 0 while trying to print the message for the error itself! 2018-10-27 15:49:04 +01:00
toaster
90f904241b Felt like cleaning up the character frame list. Definitely won't merge conflict with anything else.
Requires charscleanup.kart. Ezo, if you want me to, I can fix up bonuschars for this tweaked system.
2018-10-27 15:43:33 +01:00
Monster Iestyn
1d40033de6 Creating a quick get_WSAErrorStr function to act as a wrapper for FormatMessageA so we can string-ify Winsock errors properly
Untested!
2018-10-27 15:36:15 +01:00
TehRealSalt
32ada811b2 Merge branch 'master' into div-sounds 2018-10-26 01:15:10 -04:00
TehRealSalt
bb7ef3798c Combine spinout & wipeout timers
Turns out they were only 1 tic apart originally, sooo
2018-10-26 01:07:54 -04:00
TehRealSalt
46164a7f46 More consistent face-forward
Needs it to still land in a close ballpark, so the timer changes are still needed, but  this makes it less prone to error
2018-10-26 01:07:14 -04:00
TehRealSalt
2096b56da2 CRITICAL BUGFIX
Make sure flashing tics don't go down WHILE you're in a hit animation (wipeout, squished)
2018-10-26 00:56:02 -04:00
TehRealSalt
0492ddc3ad Adjust spinout times to face your forward about 90% of the time 2018-10-26 00:55:20 -04:00
TehRealSalt
bd79aaf847 Speed up spinout based on timer left 2018-10-26 00:51:58 -04:00
TehRealSalt
95875289b8 - Reduce volume reduction
- Don't apply to sounds without an origin mobj
2018-10-25 22:53:58 -04:00
toaster
0adfc93327 Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into toast_hardcode 2018-10-25 19:09:22 +01:00
Sal
f5a9ae016a Merge branch 'karma-touchups' into 'master'
Karma touchups

See merge request KartKrew/Kart!59
2018-10-25 14:06:22 -04:00
Latapostrophe
ef08560bf4 Reimplemented the splitscreen chat fix 2018-10-25 20:02:43 +02:00
Latapostrophe
bd1c7e2bc6 Fixed the menu highlight thing 2018-10-25 19:41:14 +02:00
Latapostrophe
35f576c166 Spectate / enter game in chat + New console colours + Highlight chat scroll arrow + small cleanup for consolefill 2018-10-25 13:21:44 +02:00
toaster
a7940d068b Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into toast_hardcode
# Conflicts:
#	src/dehacked.c
#	src/info.c
#	src/info.h
#	src/p_enemy.c
#	src/p_mobj.c
2018-10-25 10:46:18 +01:00
Latapostrophe
612ff4059c Merge branch 'master' into chat-changes 2018-10-25 11:14:49 +02:00
TehRealSalt
6f76b2b827 Fix merges
(Don't bother me hastily to merge something in again, please)
2018-10-24 21:51:43 -04:00
TehRealSalt
a57c6af1f0 Merge branch 'master' into fz-time-over 2018-10-24 21:39:02 -04:00
Sal
862f2389dc Merge branch 'lat-hardcode' into 'master'
Midnight Channel + Mementos hardcode

See merge request KartKrew/Kart!61
2018-10-24 21:26:02 -04:00
TehRealSalt
268fa6337e Fullbright explosion and fire 2018-10-24 21:25:22 -04:00
TehRealSalt
b6f10baa00 Merge branch 'master' into fz-time-over 2018-10-24 21:20:51 -04:00
TehRealSalt
db6e1f9b94 Extra safety
The turn action happens on (k_timeovercam > 2*TICRATE). This ensures it happens immediately, although it was probably fine as is
2018-10-24 21:18:15 -04:00
TehRealSalt
67de207278 Turn cam on wall hit 2018-10-24 21:05:02 -04:00