fickleheart
4db9ceca03
Merge remote-tracking branch 'upstream/master' into netgame-urls
2020-04-09 20:48:52 -05:00
James R
8335a44864
Merge branch 'md2-rollangle' into 'master'
...
Fix MD2 rollangle in reverse gravity
See merge request STJr/SRB2!818
2020-04-09 21:25:02 -04:00
James R
d3a4647c3b
Merge branch 'hw-horizon' into 'master'
...
OGL horizon lines
See merge request STJr/SRB2!861
2020-04-09 21:24:41 -04:00
James R
0596dbd137
Merge branch 'execcfg-fixes' into 'master'
...
ExecCfg fixes
See merge request STJr/SRB2!821
2020-04-09 21:24:12 -04:00
James R
aff934a5b5
Merge branch 'hide-useless-1p-menu-options' into 'master'
...
Hide record & NiGHTS attack options if there are no available maps for them.
See merge request STJr/SRB2!868
2020-04-09 19:57:27 -04:00
James R
1bbb4d1f95
Merge branch 'ra-emblemhints' into 'master'
...
Allow emblem hints (and radar) in record attack.
See merge request STJr/SRB2!820
2020-04-09 19:56:17 -04:00
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
sphere
aa419915d7
Use M_GametypeHasLevels again (properly this time) to save memory.
2020-04-02 17:59:56 +02:00
sphere
bc1e636cbb
Actually check for available maps correctly. Whoops!
2020-04-02 16:07:38 +02: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
sphere
f2721604fc
Hide record/NiGHTS attack if there are no available maps for them.
2020-03-24 16:10:30 +01:00
fickleheart
61c5005972
Reduce near renderdist to lessen visible texture distortion
2020-03-23 08:23:36 -05:00
fickleheart
09c2e4fe26
Split horizon lines for minimal distortion
2020-03-22 12:52:17 -05:00
fickleheart
6749cb89b5
Distort far edges to viewz for a flat horizon line
2020-03-22 12:28:49 -05:00
fickleheart
3bf609e819
GL horizon lines
2020-03-22 12:13:59 -05: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
fickleheart
ee754b211f
Define SERVER_URL_PROTOCOL const for easy reconfiguration
2020-03-21 07:47:29 -05: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
8219268f2e
Add support for srb2:// URL handler (server links)
2020-03-21 01:36:39 -05: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
sphere
db26ce5139
Check if emblem hints are actually unlocked.
2020-03-13 10:46:57 -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