Commit graph

9658 commits

Author SHA1 Message Date
James R
b6b617cab7 Merge branch 'fix-256-brightness' into 'master'
Florida man fixes sectors with light level 256 blacking out OpenGL objects; mappers riot.

See merge request STJr/SRB2!840
2020-04-09 19:53:40 -04:00
James R
0b91ef071f Merge branch 'sdlglcontext' into 'master'
Only initialise OpenGL if the user intends to load it (for real this time)

See merge request STJr/SRB2!796
2020-04-09 19:51:20 -04:00
James R
cc6649f20e Merge branch 'fix-consbackpic' into 'master'
Fix console backpic

See merge request STJr/SRB2!850
2020-04-09 19:39:16 -04:00
James R
a2a4a4a321 Merge branch 'fixed2float-funcs' into 'master'
Turn FIXED_TO_FLOAT into a function

See merge request STJr/SRB2!869
2020-04-09 19:37:22 -04:00
SteelT
7f5913a516 Merge branch 'fix-keepbody-ping' into 'master'
Fix disconnected players being kicked for high ping

See merge request STJr/SRB2!866
2020-03-31 20:25:43 -04:00
Monster Iestyn
8aed1de7de use ATTRINLINE rather than inline to match some of the other functions in this file, though I'm told modern compilers ignore inlining info as they actually decide themselves now
(though I could pretend we still support the older ones lol)
2020-03-30 20:25:56 +01:00
Monster Iestyn
4ddb1d170a Turn the fixed-float convert macros into inline functions, like those in GZDoom. The old macros get to be just the same as calling these inline functions. 2020-03-30 19:58:46 +01:00
Louis-Antoine
b0b21aada6 Fix disconnected players being kicked for high ping 2020-03-28 15:23:15 +01:00
MascaraSnake
331e906548 Add arrow to wall spike in ZB config 2020-03-22 12:55:34 +01:00
MascaraSnake
5edec462a3 Minor ZB config fix 2020-03-22 07:50:57 +01:00
MascaraSnake
828bc47846 Another ZB config fix 2020-03-21 20:17:28 +01:00
MascaraSnake
91f6c68a8f Merge branch 'config-fixes' into 'master'
Updates and fixes for the ZB config

See merge request STJr/SRB2!859
2020-03-21 14:16:04 -04:00
MascaraSnake
915e6fce23 Add Object Special text for Star Post 2020-03-21 15:16:07 +01:00
LJ Sonic
fee49140e1 Merge branch 'skip-empty-gametypes' into 'master'
Skip empty gametypes in level select menu

See merge request STJr/SRB2!819
2020-03-21 08:52:54 -04:00
MascaraSnake
7c8fa41b54 Updates and fixes for the ZB config 2020-03-21 12:06:52 +01:00
MascaraSnake
4b71029bdd Remove the multi-file ZB configs. We're stick with the single-file config for ZB and doing all the UDMF stuff in UDB 2020-03-21 09:40:37 +01:00
fickleheart
077b4f14e2 hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh 2020-03-19 18:55:10 -05:00
fickleheart
0208d1e837 Avoid infinite loops if no maps are selectable (y tho) 2020-03-18 22:56:20 -05:00
SteelT
d2d8fe64f5 Merge branch 'fix-nights-mode-menu-wrong-return' into 'master'
NiGHTS Mode menu fixes

See merge request STJr/SRB2!841
2020-03-18 15:41:17 -04:00
SteelT
f3a275930b Merge branch 'deadzone-sigfpe-fix' into 'master'
Fix division-by-0 crash from 100% gamepad deadzones, and lack of input from 0% deadzones

See merge request STJr/SRB2!838
2020-03-18 15:39:04 -04:00
LJ Sonic
b46b698c91 Merge branch 'screenshot-menu-header' into 'master'
Actually use the "SCREENSHOT OPTIONS" header for its menu.

See merge request STJr/SRB2!832
2020-03-18 10:56:35 -04:00
Jaime Passos
876d4cd02b Fix OpenGL 2020-03-17 15:23:13 -03:00
Jaime Passos
7ac4c3eea7 Fix con_backpic 2020-03-17 13:05:54 -03:00
Monster Iestyn
c0b85396e0 Merge branch 'skins-refactor' into 'master'
Skins refactor

See merge request STJr/SRB2!843
2020-03-15 15:31:49 -04:00
SteelT
d62229a25f Merge branch 'nadraw-fix' into 'master'
Fix NiGHTS Attack crash after render mode change

See merge request STJr/SRB2!837
2020-03-14 22:19:35 -04:00
SteelT
f9912eaad5 Merge branch 'hwrflipcolchromakey' into 'master'
Fix HWR_DrawFlippedColumnInCache ignoring chroma key TF

See merge request STJr/SRB2!826
2020-03-14 22:13:19 -04:00
SteelT
6fa5ec298c Merge branch 'tex' into 'master'
Replace NextTexAvail with glGenTextures

See merge request STJr/SRB2!828
2020-03-14 22:12:02 -04:00
SteelT
84d5b72735 Merge branch 'acz-fence' into 'master'
Fix ASTBlendPixel blending with nothing

See merge request STJr/SRB2!827
2020-03-14 22:11:23 -04:00
Monster Iestyn
fb2b105159 Merge branch 'archive-sprite2-hotfix' into 'master'
Archive sprite2 Hotfix

See merge request STJr/SRB2!845
2020-03-09 15:50:55 -04:00
LJ Sonic
bdbcdfe595 Merge branch 'patch-1' into 'master'
Fix desyncs never recovering if node and player mismatch

See merge request STJr/SRB2!842
2020-03-09 12:56:41 -04:00
Monster Iestyn
5defb33266 One line fix: don't assume 0 (aka SPR2_STND) is the default value for sprite2, but rather what the state sets for it
This fixes some issues with a custom character tested during netplay, which did not have SPR2_WAIT sprites and therefore fell back to SPR2_STND sprites. Unfortunately, the fact they used SPR2_STND instead meant the sprite2 was not synced at all!
2020-03-09 15:04:22 +00:00
Monster Iestyn
f186def0bf Include r_skins.h instead of r_things.h in many files where all they wanted from it was skins stuff
(oddly enough, this actually revealed some secret file dependencies previously included via r_things.h! I also needed to include d_player.h in r_skins.h itself it seems)
2020-03-09 13:54:56 +00:00
Monster Iestyn
34c4da018a Reorganise r_things.h 2020-03-08 21:17:30 +00:00
Monster Iestyn
d35464204e Set the "spritename" variable within R_AddSingleSpriteDef rather than externally to it, since R_InstallSpriteLump is the only place it gets used anyway
This way we don't have to make it some extern in order for r_skins.c to use it
2020-03-08 19:51:18 +00:00
Monster Iestyn
12468abff5 update Makefile, CMakeLists.txt and MSVC project files 2020-03-08 19:48:23 +00:00
Monster Iestyn
a12833ccd2 remove r_skins.c include in r_things.c, on second thoughts 2020-03-08 19:36:56 +00:00
Monster Iestyn
9013398151 Create r_skins.c/.h, to contain skins code formerly in r_things.c/h 2020-03-08 19:32:07 +00:00
colette
e4a3fcea26 Fix resyncs never recovering if node and player mismatch 2020-03-08 13:09:39 -04:00
Steel Titanium
b9c7eafdfe Fix guest data being deleted regardless of choice 2020-03-08 00:34:15 -05:00
Steel Titanium
0cd8a94a5b Fix guest deletion confirmation returning to Record Attack menu from Nights Mode menu 2020-03-08 00:02:43 -05:00
GoldenTails
69a9f44259 Fix spaces before someone yells at me for it 2020-03-07 21:48:40 -06:00
GoldenTails
e0f6559595 Florida man fixes sectors with light level 256 blacking out OpenGL objects; mappers riot.
Disclaimer: I'm not actually from Florida.
2020-03-07 21:41:52 -06:00
Zwip-Zwap Zapony
160b5b9b8e More gamepad deadzone tweakage 2020-03-04 21:44:57 +01:00
Zwip-Zwap Zapony
c2a7f0c98e Hotfix for 100% deadzone returning 0 input
It makes more sense for 100% deadzone to just make it so that
you have to push the axis all the way to trigger it,
rather than 100% deadzone resulting in no axis input
ever happening... So, let's make it be the former way instead
2020-03-04 21:11:55 +01:00
Zwip-Zwap Zapony
04921ab484 Fix division-by-0 crash with gamepad deadzones
Fix division-by-0 crash with gamepad deadzones
The problem was that it checked if A was more than B,
then lowered A to a max value, then subtracted B from A,
then divided something by that, without checking if A minus B was 0,
allowing division by 0 if B was the same as that max value

This fixes that by making sure that A is less than the max value
2020-03-04 17:31:52 +01:00
Jaime Passos
b800e013d0 Fix NiGHTS Attack crash after render mode change 2020-03-04 09:42:34 -03:00
SteelT
800d277dec Merge branch 'fix-ogllib' into 'master'
Fix -OGLlib

See merge request STJr/SRB2!794
2020-03-02 15:21:50 -05:00
sphere
422bc7439b Actually use the "SCREENSHOT OPTIONS" header for its menu. 2020-03-02 13:23:54 +01:00
Jaime Passos
fa8e87ea16 Set pixel RGBA to nothing instead of the alpha only 2020-02-29 19:36:50 -03:00
Jaime Passos
86dd35c32b Fix NOTEXTURE_NUM 2020-02-28 18:57:34 -03:00