stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-23 11:10:56 +00:00
Code Issues Projects Releases Packages Wiki Activity
9969 commits 172 branches 41 tags 285 MiB
Commit graph

9969 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jaime Passos
1904e3b5e9 Fix OpenGL 2020-03-17 15:23:13 -03:00
Jaime Passos
c2cd9a71fa Fix con_backpic 2020-03-17 13:05:54 -03:00
Monster Iestyn
31b1188a3e Merge branch 'master' into next 2020-03-15 20:32:43 +00:00
LJ Sonic
0a54c40ff4 Merge branch 'fix-playernode-crash' into 'next' 
Fix buffer overrun with players with no associated node

See merge request STJr/SRB2!810
 2020-03-15 15:36:45 -04:00
Monster Iestyn
3f43dd22f9 Merge branch 'skins-refactor' into 'master' 
Skins refactor

See merge request STJr/SRB2!843
 2020-03-15 15:31:49 -04:00
MascaraSnake
c2443b8e8c Merge branch 'udmf-formatcheck' into udmf-colormaps 2020-03-15 16:26:00 +01:00
MascaraSnake
f689bc88aa Add boolean variable that indicates if current map is in UDMF format 2020-03-15 16:23:15 +01:00
MascaraSnake
bc8a1350e4 Merge branch 'udmf-next' into udmf-colormaps 2020-03-15 09:58:39 +01:00
MascaraSnake
3c294b5e3d Merge branch 'next' into udmf-next 2020-03-15 09:57:42 +01:00
MascaraSnake
e545e5f9ba Add UDMF colormap fields 2020-03-15 09:55:57 +01:00
Steel Titanium
efab0f479c Merge branch 'master' into next 2020-03-14 22:21:12 -04:00
SteelT
49001b207e 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
88fff119ea 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
e80a09a651 Merge branch 'tex' into 'master' 
Replace NextTexAvail with glGenTextures

See merge request STJr/SRB2!828
 2020-03-14 22:12:02 -04:00
SteelT
2d16281d86 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
bdab78152c Check if emblem hints are actually unlocked. 2020-03-13 10:46:57 -04:00
Nev3r
68f60f3c29 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 2020-03-11 09:31:31 +01:00
Monster Iestyn
ddc0762ecc Merge branch 'master' into next 2020-03-09 19:53:08 +00:00
Monster Iestyn
db6a3bbd1f 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
5e705b84ae 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
40e728fdb5 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
f4cb6e1f5e 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
1dd4ed4afa Reorganise r_things.h 2020-03-08 21:17:30 +00:00
Monster Iestyn
e81ef824d6 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
Monster Iestyn
37ecb47436 update Makefile, CMakeLists.txt and MSVC project files 2020-03-08 19:48:23 +00:00
Monster Iestyn
b2d9697e07 remove r_skins.c include in r_things.c, on second thoughts 2020-03-08 19:36:56 +00:00
Monster Iestyn
a67dbfff54 Create r_skins.c/.h, to contain skins code formerly in r_things.c/h 2020-03-08 19:32:07 +00:00
colette
ce29129f3a Fix resyncs never recovering if node and player mismatch 2020-03-08 13:09:39 -04:00
Tatsuru
be338da3f6 I guess 2020-03-08 14:06:18 -03:00
Steel Titanium
e5270ad9c7 Fix guest data being deleted regardless of choice 2020-03-08 00:34:15 -05:00
Steel Titanium
a3f3dd649f Fix guest deletion confirmation returning to Record Attack menu from Nights Mode menu 2020-03-08 00:02:43 -05:00
GoldenTails
cdba9ba033 Fix spaces before someone yells at me for it 2020-03-07 21:48:40 -06:00
GoldenTails
0d92bf3dd0 Florida man fixes sectors with light level 256 blacking out OpenGL objects; mappers riot. 
Disclaimer: I'm not actually from Florida.
 2020-03-07 21:41:52 -06:00
SteelT
bb56aa603f Merge branch 'ss-damage-fix' into 'next' 
Fix Special Stages crashing upon taking damage

See merge request STJr/SRB2!839
 2020-03-06 17:59:57 -05:00
Zipper
4b28e19d16 Update p_inter.c 2020-03-05 18:48:20 -05:00
Zipper
4d8a523da9 Update p_inter.c 2020-03-05 18:30:27 -05:00
ZipperQR
da9bf34175 fix source player being nil 2020-03-05 12:26:27 +03:00
Zwip-Zwap Zapony
bce6349b1d More gamepad deadzone tweakage 2020-03-04 21:44:57 +01:00
Zwip-Zwap Zapony
df220aa2c2 Hotfix for 100% deadzone returning 0 input 
It makes more sense for 100% deadzone to just make it so that
you have to push the axis all the way to trigger it,
rather than 100% deadzone resulting in no axis input
ever happening... So, let's make it be the former way instead
 2020-03-04 21:11:55 +01:00
Zwip-Zwap Zapony
27e084a827 Fix division-by-0 crash with gamepad deadzones 
Fix division-by-0 crash with gamepad deadzones
The problem was that it checked if A was more than B,
then lowered A to a max value, then subtracted B from A,
then divided something by that, without checking if A minus B was 0,
allowing division by 0 if B was the same as that max value

This fixes that by making sure that A is less than the max value
 2020-03-04 17:31:52 +01:00
Jaime Passos
b8db3e2216 Fix NiGHTS Attack crash after render mode change 2020-03-04 09:42:34 -03:00
Tatsuru
761ec3b6a4 Separate PvP damage from non-friendly gametypes 2020-03-03 11:56:57 -03:00
Tatsuru
776951c6a8 Never forget who your enemy is 2020-03-03 11:40:35 -03:00
SteelT
039aeed633 Merge branch 'tolflag-fix' into 'next' 
Fix G_TOLFlag returning the wrong type

See merge request STJr/SRB2!834
 2020-03-02 21:27:45 -05:00
Steel Titanium
10d08fc8bb Merge branch 'master' into next 2020-03-02 15:26:01 -05:00
SteelT
7d14796954 Merge branch 'fix-ogllib' into 'master' 
Fix -OGLlib

See merge request STJr/SRB2!794
 2020-03-02 15:21:50 -05:00
Jaime Passos
67b8a7eb67 Merge remote-tracking branch 'origin/next' into tolflag-fix 2020-03-02 13:14:12 -03:00
Louis-Antoine
04a1f479be Increase the length of the player input buffer 2020-03-02 15:36:28 +01:00
LJ Sonic
75e12f9d9d Merge branch 'fix-io-warning' into 'next' 
Fix compiler warning

See merge request STJr/SRB2!833
 2020-03-02 07:46:46 -05:00
Louis-Antoine
7ba93c184f Fix warning and formatting 2020-03-02 13:33:12 +01:00