James R
aad225932d
Merge branch 'SF_NONIGHTSSUPER' into 'next'
...
Skin flag for disabling super colors in NiGHTS
See merge request STJr/SRB2!782
2020-04-09 19:47:20 -04:00
James R
673a842043
Merge remote-tracking branch 'origin/next' into SF_NONIGHTSSUPER
2020-04-09 16:47:52 -07:00
James R
1edc300d0c
Merge branch 'lua-hook-cleanup' into 'next'
...
Lua hook cleanup
See merge request STJr/SRB2!851
2020-04-09 19:40:09 -04:00
James R
a4fa4351d8
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
b4ab284d21
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
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
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
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
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
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
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
fickleheart
f32ab5918e
Define SERVER_URL_PROTOCOL const for easy reconfiguration
2020-03-21 07:47:29 -05:00
MascaraSnake
06f9246fd3
Updates and fixes for the ZB config
2020-03-21 12:06:52 +01:00
MascaraSnake
e2c9815606
Merge branch 'master' into next
2020-03-21 09:40:57 +01:00
MascaraSnake
2107b89586
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
feb18208cb
Add support for srb2:// URL handler (server links)
2020-03-21 01:36:39 -05:00
Louis-Antoine
892a8dd6e7
Make SRB2 flat like Earth
2020-03-20 18:55:29 +01:00
Monster Iestyn
7a585e2498
Merge branch 'next' into demos-refactor
...
# Conflicts:
# src/g_game.c
(also update g_demo.c)
2020-03-20 17:48:31 +00:00
LJ Sonic
37b70fe857
Merge branch 'delete-lua' into 'next'
...
Delete Lua
See merge request STJr/SRB2!852
2020-03-20 09:53:24 -04:00
fickleheart
78ec210896
hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh
2020-03-19 18:55:10 -05:00
Jaime Passos
5eaa73b6ac
Fix lib_setSpriteInfo indexes being off-by-one
2020-03-19 19:09:34 -03:00
Monster Iestyn
4236ae7c08
We don't need m_cheat.h either in g_demo.c
2020-03-19 21:10:23 +00:00
Monster Iestyn
6610150bfe
We definitely don't need these files to compile!
2020-03-19 20:43:56 +00:00
Monster Iestyn
dd76be16cb
Create G_FreeGhosts, for the benefit of G_DeferedInitNew (assuming it actually needs to do ghosts = NULL; at all)
2020-03-19 20:42:51 +00:00
