stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-28 21:50:47 +00:00
Code Issues Projects Releases Packages Wiki Activity
10015 commits 173 branches 41 tags 313 MiB
Commit graph

10015 commits

This branch
This branch
All branches
Author SHA1 Message Date
James R
0313213c59 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
e457b71e7e Merge branch 'execcfg-fixes' into 'master' 
ExecCfg fixes

See merge request STJr/SRB2!821
 2020-04-09 21:24:12 -04:00
James R
dc25177457 You don't need to push the value twice, it's only used once 2020-04-09 17:30:53 -07:00
James R
aca39d6210 Merge remote-tracking branch 'origin/master' into next 2020-04-09 17:04:04 -07:00
James R
b029ccff0d 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
40a74a6211 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
5f7bd9a947 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
2fda89f1c3 Merge branch 'bot-respawn-hook' into 'next' 
BotRespawn hook

See merge request STJr/SRB2!804
 2020-04-09 19:52:25 -04:00
James R
bd7d05fdf0 Merge branch 'gtr-replace' into 'next' 
Separate PvP damage from ringslinger

See merge request STJr/SRB2!831
 2020-04-09 19:51:52 -04:00
James R
2dfe276a73 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
b8d40a5783 Merge branch 'dye' into 'next' 
Expose colorization to mappers and SOC

See merge request STJr/SRB2!679
 2020-04-09 19:50:32 -04:00
James R
78613ec445 Merge branch 'supergoldedit' into 'next' 
Change SKINCOLOR_SUPERGOLD1-5

See merge request STJr/SRB2!805
 2020-04-09 19:50:06 -04:00
James R
4e7283c833 Merge branch 'pk3-directory-start' into 'next' 
Don't skip the first directory entry of PK3 if it's a file

See merge request STJr/SRB2!764
 2020-04-09 19:49:44 -04:00
James R
d4c08a8410 Merge branch 'lightmemedata' into 'next' 
Cvars returned by CV_FindVar did not work with userdataType

See merge request STJr/SRB2!754
 2020-04-09 19:48:39 -04:00
James R
e100f21dda Merge branch 'loop-patch' into 'next' 
Let MUSICDEF set loop point

See merge request STJr/SRB2!762
 2020-04-09 19:47:43 -04:00
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