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
Louis-Antoine
dece2adbe6
Fix allowjoin off affecting single player
2020-03-30 22:11:48 +02: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
toaster
0f591967ff
Disable continues outside of no-save/Ultimate by default, but allow SOC to re-enable them globally.
...
Please look at the merge request description for a full explanation, since I know the vanilla team has been hashing this out and I don't want to add fuel to the fire without at least presenting a solid case.
2020-03-26 20:16:44 +00:00
toaster
c74dde0f0f
Minor optimisations surrounding R_DrawFlippedMaskedColumn.
...
* Replace the texheight parameter provided directly to it with a previously existing (now renamed) global used for the same purpose, so that it can be used as an interchangeable function pointer with R_DrawMaskedColumn.
* Using the above, optimise R_DrawVisSprite to call a function pointer in a tighter loop rather than check SC_VFLIP each time around.
* SHORT macro can involve repeated operations; calculate once and put in memory for both RANGECHECK and papersprite.
* Remove irrelevant range check (already covered by existing range check immediately above) from R_DrawFlippedMaskedColumn and R_DrawMaskedColumn.
* "Warning: avoiding a crash in %s %d" is a terrible error message, and it chips away at the tightness of the loop just for something most people will never see printed. Replace with a PARANOIA I_Error in case someone actively wants to go hunting for its cause.
2020-03-26 16:09:19 +00:00
MascaraSnake
8414cb09e8
Merge branch 'invertplanes-bruh' into 'next'
...
Standardize the behavior of FF_INVERTSIDES and FF_INVERTPLANES
See merge request STJr/SRB2!863
2020-03-25 12:25:48 -04:00
MascaraSnake
58e8ec6500
Standardize the behavior of FF_INVERTSIDES and FF_INVERTPLANES
2020-03-25 08:34:52 +01:00
Zachary McAlpin
3b93250c55
Moved LUAh_GameQuit(void) function to the end of the lua_hooklib.c
2020-03-24 22:55:25 -05:00
Zachary McAlpin
61447c20be
Screw merge conflicts
2020-03-24 20:38:46 -05:00
Sonic Edge
fa21eb198a
Character select in Nights mode.
2020-03-24 16:21:33 -04: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
Monster Iestyn
1677aff989
Merge branch 'demos-refactor' into 'next'
...
Demos refactor
See merge request STJr/SRB2!853
2020-03-22 17:52:45 -04:00
Monster Iestyn
0a288260fc
Merge branch 'buggle-trouble' into 'next'
...
P_HomingAttack related fixes
See merge request STJr/SRB2!836
2020-03-22 16:57:22 -04:00
Monster Iestyn
0a360e1d90
Merge branch 'fix-setspriteinfo' into 'next'
...
Fix lib_setSpriteInfo indexes being off-by-one
See merge request STJr/SRB2!854
2020-03-22 16:40:34 -04: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
Louis-Antoine
39fae7fc06
Remove redundant conditional in P_IsClimbingValid
2020-03-22 17:45:07 +01:00
Louis-Antoine
2f5d3311f5
Cleanup P_IsClimbingValid
2020-03-22 17:39:51 +01:00
Louis-Antoine
f6cbf71df2
Remove unused define
2020-03-22 17:29:15 +01:00
Louis-Antoine
29294a53cc
Encapsulate plane height checks
2020-03-22 17:28:50 +01:00
Louis-Antoine
3cf315f6da
Fix typo in camera handling code
2020-03-22 15:21:23 +01:00
MascaraSnake
be5eb29bea
Merge branch 'udmf-next' into udmf-colormaps
2020-03-22 12:57:19 +01:00
MascaraSnake
547f3887e3
Add wall spike arrow to UDB config as well
2020-03-22 12:56:59 +01:00
MascaraSnake
f5a8f7a79b
Merge branch 'next' into udmf-next
2020-03-22 12:56:21 +01:00
MascaraSnake
5aee7a27eb
Merge branch 'master' into next
2020-03-22 12:55:56 +01:00
MascaraSnake
331e906548
Add arrow to wall spike in ZB config
2020-03-22 12:55:34 +01:00
MascaraSnake
7586f8f58d
Merge branch 'udmf-next' into udmf-colormaps
2020-03-22 08:08:47 +01:00
MascaraSnake
d87bb1fcad
Move UDB configs into a subfolder
2020-03-22 08:08:34 +01:00
MascaraSnake
62603ff226
Merge branch 'udmf-next' into udmf-colormaps
2020-03-22 08:05:05 +01:00
MascaraSnake
1d7e830bdc
Add UDB config
2020-03-22 08:04:28 +01:00
MascaraSnake
8850962810
Merge branch 'next' into udmf-next
2020-03-22 07:52:09 +01:00
MascaraSnake
93587d393d
Merge branch 'master' into next
2020-03-22 07:51:35 +01:00
MascaraSnake
5edec462a3
Minor ZB config fix
2020-03-22 07:50:57 +01:00
MascaraSnake
4c03fd5783
Merge branch 'next' into udmf-next
2020-03-21 20:18:07 +01:00
MascaraSnake
19aedbb0a7
Merge branch 'master' into next
2020-03-21 20:17:48 +01:00
MascaraSnake
828bc47846
Another ZB config fix
2020-03-21 20:17:28 +01:00
MascaraSnake
9b76d3af6f
Merge branch 'next' into udmf-next
...
# Conflicts:
# extras/conf/Includes/SRB222_linedefs.cfg
# extras/conf/Includes/SRB222_misc.cfg
# src/p_spec.c
2020-03-21 20:04:31 +01:00
MascaraSnake
59899f3cce
Merge branch 'master' into next
2020-03-21 19:16:52 +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
0942c3f39a
Merge branch 'delete-slopes' into 'next'
...
Delete slopes
See merge request STJr/SRB2!857
2020-03-21 09:35:27 -04: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
9c3544e8d7
Merge branch 'master' into next
2020-03-21 09:40:57 +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
