Steel Titanium
0f9611df76
Merge remote-tracking branch 'upstream/master' into cmake-use-internal-libs
2018-10-30 21:06:06 -04:00
Steel Titanium
2f62a03f6c
Fix up 64-bit gme
2018-10-30 20:50:36 -04:00
Latapostrophe
6841458546
got rid of the settop as well
2018-10-30 22:51:05 +01:00
Latapostrophe
799d8d2749
remove gL check
2018-10-30 22:29:28 +01:00
Latapostrophe
a0495142df
Small hud library additions
2018-10-30 19:40:59 +01:00
Monster Iestyn
22e8dd1f9d
now that V_FLIP's effects are always supported in V_DrawFixedPatch, there's no need for the "flip" variable anymore
2018-10-30 14:22:21 +00:00
Monster Iestyn
2fa0896fd0
Fix an error I made in HWR_DrawFixedPatch
2018-10-30 13:44:01 +00:00
LJSonik
b52158eb48
Merge branch 'master' into analog-flipcam-synch-fix
2018-10-29 19:52:08 +01:00
Monster Iestyn
b022ff02a5
add missing SHORTs in HWR_DrawPatch and HWR_DrawCroppedPatch as well
2018-10-29 13:34:54 +00:00
Monster Iestyn
f8fd8f8ec5
HWR_DrawFixedPatch: Add V_OFFSET support for V_FLIP in hardware code as well, also add missing SHORTs for gpatch fields
2018-10-29 13:29:16 +00:00
Monster Iestyn
df9c3ef3cd
Make V_OFFSET no thing without V_NOSCALESTART, to remove any potential glitches with using it on its own
2018-10-29 12:36:09 +00:00
Monster Iestyn
834a5e6b35
V_DrawFixedPatch: Tinker with the left/top offsets code so that V_OFFSET can support V_FLIP
2018-10-29 12:06:22 +00:00
Louis-Antoine
3d0daf2202
Fix desynch when toggling analog mode or flipcam
...
Special thanks to Lat' for asking weird questions
2018-10-29 00:49:23 +01:00
Monster Iestyn
32077897b6
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
aebcf3520b
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
3d88ee9d55
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
09eecd36b4
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
90cfa5ef16
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
1cf2ce63c0
More optimising and otherwise fixing bizarre formatting in hw_trick.c
2018-10-27 18:58:05 +01:00
Monster Iestyn
2107aab666
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
787d5b598d
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
67a2922558
Ensure file is closed whenever MD2 reading errors happen
2018-10-27 18:53:38 +01:00
Monster Iestyn
b150e842fc
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
29d8e34d03
Call V_DoPostProcessor only in software mode (it cancels itself in OGL anyway)
2018-10-27 18:52:34 +01:00
Monster Iestyn
9fb301ecb5
don't bother with inlining the function, on second thoughts
2018-10-27 16:47:56 +01:00
Monster Iestyn
bb3d850bbf
static the buffer, forgot to do this earlier
2018-10-27 16:27:00 +01:00
Monster Iestyn
e4e76f83c3
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
3b39a25ade
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
Monster Iestyn
ab38e6cebb
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
Monster Iestyn
e95b54e64f
missed this ESLOPE-needed area from a few commits ago apparently :V
2018-10-21 20:35:14 +01:00
Monster Iestyn
772004d3fd
Fix editing slope xydirection with Lua
2018-10-21 18:25:13 +01:00
Monster Iestyn
3ec8743c1b
Fix up the ability to edit slope zdelta and zangle with Lua (zangle is untested as of writing)
2018-10-21 17:32:53 +01:00
Monster Iestyn
e15ed742c1
add ESLOPE ifdef checks around all the Lua slope support code that was there before I was involved
2018-10-21 16:27:54 +01:00
Monster Iestyn
bd0c187e68
Merge branch 'next' into lua-slopes
2018-10-21 16:03:48 +01:00
Monster Iestyn
10f9403619
Merge branch 'master' into next
2018-10-21 15:39:30 +01:00
Monster Iestyn
0e6c5cf342
Merge branch 'mapheader-lua-unarchive-hotfix' into 'master'
...
mapheader lua unarchive hotfix
See merge request STJr/SRB2!302
2018-10-21 10:37:17 -04:00
Monster Iestyn
87afae9cf5
Fix unarchiving of mapheader_t userdata Lua variables
2018-10-21 15:15:54 +01:00
Monster Iestyn
efff869e6e
Add mobj.standingslope to Lua
2018-10-21 15:12:51 +01:00
Monster Iestyn
2ec4f2024f
Added support for pslope_t userdata variables in Lua archive/unarchive code
2018-10-21 15:00:07 +01:00
Monster Iestyn
e5d16c520d
Merge branch 'lua-action-userdata-quickfix' into 'master'
...
Lua action userdata quickfix
See merge request STJr/SRB2Internal!196
2018-10-21 06:00:35 -04:00
Monster Iestyn
9296aaa28c
zangle should be shifted down by ANGLETOFINESHIFT if we're to use FINETANGENT on it
2018-10-20 23:36:06 +01:00
Monster Iestyn
4edeeb6953
Add P_GetZAt to Lua
2018-10-20 21:08:59 +01:00
Steel Titanium
ea4ce70fde
Merge branch 'public-music-cleanup-st' into 'music-clean'
...
Apply music code cleanup changes
See merge request SteelTitanium/SRB2!1
2018-10-20 14:12:58 -04:00
Monster Iestyn
61fa7026a1
add vector2 and vector3 userdata types to simplify getting a slope's o/d/normal
2018-10-20 19:00:37 +01:00
Steel Titanium
87d3552ff9
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2 into music-clean
2018-10-20 14:00:12 -04:00
Monster Iestyn
7d4e27937d
Merge branch 'next' into lua-slopes
...
# Conflicts:
# src/lua_maplib.c
2018-10-20 18:31:06 +01:00
Monster Iestyn
b5c4b476a6
Merge branch 'public_next'
...
# Conflicts:
# src/d_main.c
# src/m_menu.c
# src/s_sound.c
# src/sdl/sdl_sound.c
2018-10-20 15:31:48 +01:00
Monster Iestyn
d57c54f93b
Merge branch 'master' into next
2018-10-20 14:13:13 +01:00
Monster Iestyn
445a6737ea
Merge branch 'public-music-cleanup' into 'master'
...
Music Code Cleanup
See merge request STJr/SRB2!278
2018-10-20 09:12:09 -04:00
Monster Iestyn
b1552fad7f
Merge branch 'smashspike-hotfix' into 'master'
...
Smashspike hotfix
See merge request STJr/SRB2Internal!197
2018-10-20 08:30:03 -04:00
