sphere
806884a3f4
Use M_GametypeHasLevels again (properly this time) to save memory.
2020-04-02 17:59:56 +02:00
sphere
3074880ac1
Actually check for available maps correctly. Whoops!
2020-04-02 16:07:38 +02:00
Steel Titanium
9a242818a7
Merge branch 'master' into next
2020-03-31 20:46:54 -04:00
SteelT
6620364158
Merge branch 'fix-allowjoin' into 'next'
...
Delete singleplayer
See merge request STJr/SRB2!870
2020-03-31 20:45:02 -04:00
SteelT
b6f1155ae1
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
ad12e29fda
Fix allowjoin off affecting single player
2020-03-30 22:11:48 +02:00
Monster Iestyn
befae492fe
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
2e27b3ea87
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
8130599a4f
Fix disconnected players being kicked for high ping
2020-03-28 15:23:15 +01:00
toaster
da86c17ee1
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
ce2a1aa3b2
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
e471134746
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
92c74814cf
Standardize the behavior of FF_INVERTSIDES and FF_INVERTPLANES
2020-03-25 08:34:52 +01:00
Zachary McAlpin
decce7905b
Moved LUAh_GameQuit(void) function to the end of the lua_hooklib.c
2020-03-24 22:55:25 -05:00
Zachary McAlpin
21353f1209
Screw merge conflicts
2020-03-24 20:38:46 -05:00
Sonic Edge
60f7e35383
Character select in Nights mode.
2020-03-24 16:21:33 -04:00
sphere
99a5192872
Hide record/NiGHTS attack if there are no available maps for them.
2020-03-24 16:10:30 +01:00
fickleheart
719f29d27e
Reduce near renderdist to lessen visible texture distortion
2020-03-23 08:23:36 -05:00
Monster Iestyn
4722fbbc2a
Merge branch 'demos-refactor' into 'next'
...
Demos refactor
See merge request STJr/SRB2!853
2020-03-22 17:52:45 -04:00
Monster Iestyn
23b6679b3a
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
3b9dd31faf
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
f9027ccaeb
Split horizon lines for minimal distortion
2020-03-22 12:52:17 -05:00
fickleheart
14d6a01292
Distort far edges to viewz for a flat horizon line
2020-03-22 12:28:49 -05:00
fickleheart
deff1565dc
GL horizon lines
2020-03-22 12:13:59 -05:00
Louis-Antoine
6ffbc89f42
Remove redundant conditional in P_IsClimbingValid
2020-03-22 17:45:07 +01:00
Louis-Antoine
478f0f2059
Cleanup P_IsClimbingValid
2020-03-22 17:39:51 +01:00
Louis-Antoine
ea631715a6
Remove unused define
2020-03-22 17:29:15 +01:00
Louis-Antoine
6f9422d380
Encapsulate plane height checks
2020-03-22 17:28:50 +01:00
Louis-Antoine
077543f2e9
Fix typo in camera handling code
2020-03-22 15:21:23 +01:00
MascaraSnake
d596dcf79d
Merge branch 'udmf-next' into udmf-colormaps
2020-03-22 12:57:19 +01:00
MascaraSnake
ab133e50c9
Add wall spike arrow to UDB config as well
2020-03-22 12:56:59 +01:00
MascaraSnake
c931b4fa67
Merge branch 'next' into udmf-next
2020-03-22 12:56:21 +01:00
MascaraSnake
5864788333
Merge branch 'master' into next
2020-03-22 12:55:56 +01:00
MascaraSnake
48e8c9058a
Add arrow to wall spike in ZB config
2020-03-22 12:55:34 +01:00
MascaraSnake
34221d05fc
Merge branch 'udmf-next' into udmf-colormaps
2020-03-22 08:08:47 +01:00
MascaraSnake
79bfe14678
Move UDB configs into a subfolder
2020-03-22 08:08:34 +01:00
MascaraSnake
2133bc89e6
Merge branch 'udmf-next' into udmf-colormaps
2020-03-22 08:05:05 +01:00
MascaraSnake
c4b5c20d3d
Add UDB config
2020-03-22 08:04:28 +01:00
MascaraSnake
2c8daabba1
Merge branch 'next' into udmf-next
2020-03-22 07:52:09 +01:00
MascaraSnake
bc1e42d222
Merge branch 'master' into next
2020-03-22 07:51:35 +01:00
MascaraSnake
6911097b56
Minor ZB config fix
2020-03-22 07:50:57 +01:00
MascaraSnake
faac3c7023
Merge branch 'next' into udmf-next
2020-03-21 20:18:07 +01:00
MascaraSnake
c5b4d4bd7e
Merge branch 'master' into next
2020-03-21 20:17:48 +01:00
MascaraSnake
c806d8a5e8
Another ZB config fix
2020-03-21 20:17:28 +01:00
MascaraSnake
1580e14cbc
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
42445b39d7
Merge branch 'master' into next
2020-03-21 19:16:52 +01:00
MascaraSnake
a2729ddefc
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
d2c83e1cda
Add Object Special text for Star Post
2020-03-21 15:16:07 +01:00
LJ Sonic
006b1e8c0e
Merge branch 'delete-slopes' into 'next'
...
Delete slopes
See merge request STJr/SRB2!857
2020-03-21 09:35:27 -04:00
LJ Sonic
fa9c2f43f7
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
