Monster Iestyn
e01c7ae743
Merge branch 'copyright-info-update' into 'master'
...
Update copyright info
See merge request STJr/SRB2!309
2018-11-10 08:33:09 -05:00
Alam Arias
1c22c6a1f9
Merge pull request #320 from monster-psychic-cat/remote_view_fixes
...
Minor remote viewpoint bugfixes.
2018-11-09 16:09:20 -05:00
Monster Iestyn
f974bb96ac
Merge branch 'music-clean' into 'master'
...
Some code cleanup.
See merge request STJr/SRB2!298
2018-11-09 10:58:57 -05:00
Monster Iestyn
7cc5caf69c
Merge branch 'winsock-error-handling-fixes' into 'master'
...
Winsock error handling fixes
See merge request STJr/SRB2!303
2018-11-08 15:49:35 -05:00
TCLScrufflet
1602904011
Merge branch 'master' into remote_view_fixes
2018-11-07 17:57:49 -02:00
MPC
1cc8619c9e
Minor remote viewpoint bugfixes.
2018-11-05 20:40:51 -02:00
Monster Iestyn
86ad6de35b
Merge branch 'file-loading-hotfix' into 'master'
...
File loading hotfix
See merge request STJr/SRB2!310
2018-11-02 19:03:59 -04:00
Monster Iestyn
0f37411e2b
Make sure handles of files opened by W_LoadWadFile are closed if we abort loading the files for whatever reason.
...
ESPECIALLY if the file is already loaded in SRB2, that's just silly.
2018-11-02 20:48:12 +00:00
Monster Iestyn
ba5f5be3bb
Merge branch 'patch-offsets-fix' into 'master'
...
Patch offsets fix
See merge request STJr/SRB2!305
2018-11-02 07:00:37 -04:00
Steel Titanium
5a0cfc10f4
Update copyright info on some files
2018-11-01 14:47:19 -04:00
Monster Iestyn
c450a1aee2
Merge branch 'mi-minor-refactoring-backport' into 'master'
...
MI minor refactoring
See merge request STJr/SRB2!294
2018-10-31 16:49:30 -04:00
Monster Iestyn
61c1b12960
Merge branch 'multipatchtex-translucent-cyanpixel-fix-backport' into 'master'
...
Multi-patch texture support for transparency AND translucency
See merge request STJr/SRB2!293
2018-10-31 16:48:38 -04: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
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
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
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
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
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
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
mazmazz
cc0d1db9d8
Merge remote-tracking branch 'steeltitanium/music-clean' into test-public-music-cleanup
2018-10-19 23:56:56 -04:00
mazmazz
a288b95458
Merge remote-tracking branch 'public-gitlab/master' into public-music-cleanup
2018-10-19 22:04:26 -04:00
Monster Iestyn
423403eab5
Merge branch 'sound-handle-fix' into 'master'
...
Handle fix for SDL Mixer
See merge request STJr/SRB2!301
2018-10-14 15:46:25 -04:00
Monster Iestyn
b720cb10dc
Merge branch 'pris_accurate-gif-delay' into 'master'
...
More accurate GIF delay
See merge request STJr/SRB2!276
2018-10-14 15:44:33 -04:00
Monster Iestyn
cc7d9509f2
Merge branch 'mi-a-bit-of-cleanup-backport' into 'master'
...
MI's unimportant code cleanup
See merge request STJr/SRB2!295
2018-10-14 15:43:32 -04:00
Sryder
3886888b30
Fix missing commas and missed interface
2018-10-14 10:14:07 +01:00
Sryder
6184f91dd3
Add an int to I_PlaySound to tell an interface which channel number SRB2 is using.
...
I've voided this out on other sound interfaces than SDL Mixer ones because I'm both not sure whether they need it, and not sure how to make them work with it if they do.
2018-10-13 23:01:11 +01:00
Steel Titanium
450b536147
Remove the condition in restartaudio command.
...
No longer needed as S_RegisterSoundStuff will return early if in
dedicated mode.
2018-10-11 20:11:37 -04:00
Steel Titanium
b3faed190b
Move commands and console variable into s_sound.c
2018-10-11 16:29:43 -04:00
Monster Iestyn
9c464742b7
Remove "playerdeadview" variable; it's not been used for its stated purpose for who knows how long now
...
Besides rankings popping up when you die just sounds weird anyway, maybe I'm just used to SRB2 not doing it I guess
2018-10-11 20:00:45 +01:00
Monster Iestyn
ef78c942f7
Remove unused ObjectPlace_OnChange prototype (from when Objectplace was a consvar, which it is not anymore)
2018-10-11 20:00:34 +01:00
Monster Iestyn
49c5a6f7e4
Remove unused "runcount" variable from p_local.h
2018-10-11 20:00:23 +01:00
Monster Iestyn
91b2f5e570
"t" is not needed to take out fencepost cases from viewangletox
2018-10-11 20:00:05 +01:00
Monster Iestyn
07dd527e7e
Removed unused function prototypes in d_main.h
...
Also corrected what appears to be a typo in some comments above?
2018-10-11 19:59:47 +01:00
Monster Iestyn
61a29bed85
Remove unused sscount variable
...
(it's only set to 0 in software, and only ++'d in OpenGL, what kind of sense does that make?)
2018-10-11 19:59:26 +01:00
Monster Iestyn
a4419abfdc
debugfile is only used by DEBUGFILE code, no need to declare/define it for anything else
2018-10-11 19:59:09 +01:00
Monster Iestyn
38ec0cc50a
These convar externs aren't moving files, I'm just shifting them up to live with their relatives
2018-10-11 19:39:28 +01:00
Monster Iestyn
0ad0f8afc4
Move analog consvars to g_game.h
2018-10-11 19:39:11 +01:00
Monster Iestyn
933508db89
Moved screenshot/movie consvar externs to m_misc.h
2018-10-11 19:38:11 +01:00
Monster Iestyn
e2a4c59e21
cv_controlperkey probably belongs in g_input.h too
2018-10-11 19:37:48 +01:00
Monster Iestyn
4b7af892e1
Moved most of d_netcmd.h's 2P mouse consvar externs to the files with their 1P counterparts
2018-10-11 19:37:24 +01:00
Monster Iestyn
72ab305bf4
Change when and specifically what colormap[] is applied to in R_Draw2sMultiPatchTranslucentColumn_8
2018-10-11 17:05:23 +01:00
