lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
9622 commits 1 branch 29 tags 122 MiB
Commit graph

9622 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
Jaime Passos b8db3e2216 Fix NiGHTS Attack crash after render mode change 2020-03-04 09:42:34 -03: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 94107a5320 Set pixel RGBA to nothing instead of the alpha only 2020-02-29 19:36:50 -03:00
Jaime Passos 4a489c4d95 Fix NOTEXTURE_NUM 2020-02-28 18:57:34 -03:00
Jaime Passos 9b88edc458 Same deal for screen textures 2020-02-28 18:57:15 -03:00
Jaime Passos 48b352049f Stop using NextTexAvail 2020-02-28 18:56:41 -03:00
Jaime Passos 4446b0d563 Fix ACZ fence texture 2020-02-28 17:33:58 -03:00
Jaime Passos 7f32a53233 Fix HWR_DrawFlippedColumnInCache ignoring chroma key TF 2020-02-28 17:31:41 -03:00
Jaime Passos 8350a8c58a Merge branch 'new-color-chat-fix' into 'master' 
Fix new skin colors using default chat color

See merge request STJr/SRB2!822
 2020-02-25 20:38:36 -05:00
Jaime Passos b9fb6182ac Merge branch 'amycrash' into 'master' 
Fix Amy cameo's love hearts crashing the Software renderer due to invalid translucency tables

See merge request STJr/SRB2!823
 2020-02-25 20:38:15 -05:00
Jaime Passos fe93155578 Fix Amy cameo's love hearts crashing the Software renderer due to invalid translucency tables 2020-02-24 20:03:08 -03:00
Steel Titanium ce801e1076 Fix new skin colors using default chat color 2020-02-24 16:58:19 -05:00
James R 711c8ed6b4 Merge branch 'console-in-menus-mk-ii' into 'master' 
Console in menus again!

See merge request STJr/SRB2!797
 2020-02-23 18:15:43 -05:00
James R 95b8f950b4 Merge branch 'nomd5-crash' into 'master' 
Fix crash under NOMD5

See merge request STJr/SRB2!807
 2020-02-23 18:15:04 -05:00
James R 3394102927 Merge branch 'exitmove-hideflags' into 'master' 
Don't spawn the exitmove flags in Single Player

See merge request STJr/SRB2!813
 2020-02-23 18:13:38 -05:00
Tatsuru ff8a62819b Oopsie 2 2020-02-22 22:36:44 -03:00
Tatsuru 4c00e33096 Oopsie 2020-02-22 21:14:05 -03:00
SteelT 0770f77371 Merge branch '2.2.2-prep' into 'next' 
2.2.2 preparation

See merge request STJr/SRB2!811
 2020-02-22 17:27:19 -05:00
Steel Titanium 03e38e9486 Enable use of the patch file 2020-02-22 16:42:24 -05:00
Steel Titanium 1c1163bd0f Update version number to 2.2.2 2020-02-22 16:37:13 -05:00
James R af12f26f37 Merge remote-tracking branch 'origin/master' into next 2020-02-21 21:06:27 -08:00
James R f6df71ba54 Fix NOMD5 compiling 2020-02-21 21:06:04 -08:00
James R 0f2b8b8b2c Register servername etc. under NOMD5 
This fixes crashes in the menus.
 2020-02-21 20:04:28 -08:00
Steel Titanium 76f26cda24 Merge branch 'master' into next 2020-02-21 21:01:29 -05:00
SteelT cfd190c453 Merge branch 'warp-gamedata-corruption-fix' into 'next' 
Warp gamedata corruption fix

See merge request STJr/SRB2!802
 2020-02-21 21:00:29 -05:00
SteelT a1cf58cf7f Merge branch 'update-copyright-year' into 'master' 
Update copyright year

See merge request STJr/SRB2!801
 2020-02-21 20:59:56 -05:00
James R 93046c5e59 Merge remote-tracking branch 'origin/master' into next 2020-02-20 17:30:50 -08:00
James R 08627752b2 Fix NOPNG compiling 2020-02-20 17:30:32 -08:00
James R fb0bedf02c Merge branch 'ogl-colorbug' into 'master' 
Fix OpenGL "color bug"

See merge request STJr/SRB2!795
 2020-02-20 19:32:34 -05:00
James R 62d943b609 Merge branch 'thin-fixed' into 'next' 
Add more strings (and respective functions) for v.drawString().

See merge request STJr/SRB2!770
 2020-02-20 19:27:01 -05:00
Monster Iestyn 5c33ff0458 clarify the situation a bit more in the comments 2020-02-20 20:38:01 +00:00
Monster Iestyn 903cc311a7 move -warp code to a later part of D_SRB2Main so G_LoadGameData isn't upset by G_SetGameModified 2020-02-20 20:31:11 +00:00
James R 54794f325d :) 2020-02-19 14:44:22 -08:00
James R 61470201f9 Regex bruh moment 2020-02-19 14:37:42 -08:00
James R 7060083db5 Update copyright year to 2020 2020-02-19 14:08:45 -08:00