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

960 commits

Author SHA1 Message Date
Sally Cochenour 33a75fcd30 Remove blend to black 2020-02-02 07:28:31 -05:00
Sally Cochenour 8305d65768 Drop shadows closer to software 2020-02-02 07:28:31 -05:00
Sally Cochenour 07b2a5aca8 FIX COLOR BUG 2020-02-02 07:28:31 -05:00
Jaime Passos 68f4d415fe Merge remote-tracking branch 'origin/next' into sal-oglshaderport 2020-02-01 23:02:15 -03:00
James R 4238003887 Merge remote-tracking branch 'origin/master' into next 2020-01-30 23:54:56 -08:00
Jaime Passos a321ec9135 no more 3dfx 2020-01-28 00:56:22 -03:00
Jaime Passos b0ba9d22a8 i want to die 2020-01-28 00:41:41 -03:00
Jaime Passos b6b875f934 so is the accumulation buffer (deprecated) 2020-01-28 00:33:45 -03:00
Jaime Passos 93fe6a50ac glFog is unused 2020-01-28 00:26:09 -03:00
Jaime Passos 35983c7ae5 load_shaders -> Shader_Load + Shader_SetUniforms 2020-01-28 00:20:10 -03:00
Jaime Passos af7b4795b7 port pfnUpdateTexture 2020-01-28 00:16:38 -03:00
Jaime Passos c87119f18f Fix shader reading yet again 2020-01-27 02:15:34 -03:00
fickleheart bea7ad2185 Merge remote-tracking branch 'upstream/next' into viewroll 2020-01-26 18:01:58 -06:00
Jaime Passos 9e79b337b1 Fix NOTEXTURE_NUM 2020-01-25 22:20:27 -03:00
Jaime Passos e576c1ada1 make up for the lack of ogllog.txt 2020-01-25 22:17:39 -03:00
Jaime Passos 8bcdd105ce I'll put this back in here, I guess. 2020-01-25 21:57:05 -03:00
Jaime Passos 647107a220 Same deal for screen textures 2020-01-25 21:46:52 -03:00
Jaime Passos c219a170da Stop using NextTexAvail you dunce 2020-01-25 21:37:33 -03:00
Jaime Passos b9b1958886 make NOTEXTURE_NUM 1 2020-01-25 21:22:24 -03:00
Jaime Passos 8401e09787 remove includes 2020-01-25 21:21:44 -03:00
Jaime Passos bdc1594b07 Redundant define? 2020-01-24 17:05:40 -03:00
Jaime Passos 075ae996fa GL_DBG_Printf instead of CONS_Alert 2020-01-24 17:04:38 -03:00
Jaime Passos 1c7b584dee I_Error is too extreme I think, just CONS_Alert instead 2020-01-24 17:03:00 -03:00
Jaime Passos 7c4c04ca6a Fix custom shader loading 2020-01-24 16:57:21 -03:00
Jaime Passos 686d8e418e st_translucency went missing in here for... reasons... 2020-01-23 23:52:11 -03:00
Jaime Passos afa9b58cee fix corona compiling lol 2020-01-23 23:41:09 -03:00
Jaime Passos a521e40c0e bye 2020-01-23 23:09:53 -03:00
Jaime Passos 11c3721db4 Fix warnings around load_shaders 2020-01-23 22:30:36 -03:00
Jaime Passos d24060bb94 Wait. 2020-01-23 22:24:35 -03:00
James R 968fea0383 Fix implicit operand because GLSL is a goof or such 2020-01-23 17:22:02 -08:00
Jaime Passos 770135451f Restore some model lighting code that went gone in the shaders code 2020-01-23 22:02:18 -03:00
Jaime Passos 1755c240bf Fix the gl_leveltime problem, I guess. 
This is probably superfluous.
 2020-01-23 21:25:54 -03:00
Jaime Passos 544d6acc51 Delete USE_PALETTED_TEXTURE again 2020-01-23 20:21:13 -03:00
Jaime Passos 1601f0c66f Update copyright text 2020-01-23 20:12:15 -03:00
Jaime Passos 014638ead7 Fix view aiming / shearing 2020-01-23 19:44:46 -03:00
Jaime Passos 7266e0876a towards 2020-01-23 19:17:05 -03:00
Tatsuru 9e4c519cad In-map visual indicator 2020-01-19 19:02:03 -03:00
Sally Cochenour 7e333c6331 input is reserved apparently 2020-01-18 09:25:09 -05:00
James R 94a2f0bb4f Don't draw Tails' tails in first person (MF2_LINKDRAW) 2020-01-17 20:56:32 -08:00
James R 762223db7c Duplicated code is gone, so sad 2020-01-17 20:53:36 -08:00
fickleheart 7bd9344dd0 I think this fixes the compile errors 2020-01-17 21:55:16 -06:00
Sally Cochenour a12d6885a3 Merge branch 'gl-dropshadows' into oglshaderport 2020-01-17 22:29:31 -05:00
Sally Cochenour 43828f265c Use shadow cvar 2020-01-17 22:20:04 -05:00
fickleheart 84329fcd26 OGL can have little a viewroll 2020-01-17 19:01:45 -06:00
Sally Cochenour 56f96674b0 Slope contrast 
Off by default
 2020-01-16 16:45:49 -05:00
Sally Cochenour e5215e929c Merge branch 'gl-dropshadows' into oglshaderport 2020-01-16 14:55:55 -05:00
Sally Cochenour 4e481340ce OpenGL shadows 2020-01-16 12:37:32 -05:00
James R 542e38e717 Don't draw player mobj in first person 
This solves that annoying albeit slightly amusing bug
where your sprite clips into your view during a quake.

For OpenGL, this also solves the player's model
rendering while in first person. So you'll no
longer be looking through Sonic's body!
 2020-01-16 03:18:05 -08:00
Monster Iestyn c7ab065b0a Merge branch 'master' into next 2020-01-11 18:38:09 +00:00
Sally Cochenour 5fac6f542e Merge branch 'namirays' into oglshaderport 2020-01-11 09:32:59 -05:00
MascaraSnake 023624ebb7 Merge branch 'minor-ogl-improvements' into 'next' 
Minor OpenGL improvements

See merge request STJr/SRB2!661
 2020-01-10 13:32:37 -05:00
James R 5c60f8b529 Merge branch 'software-fov' into 'master' 
Software FOV

See merge request STJr/SRB2!662
 2020-01-10 00:33:24 -05:00
Sally Cochenour 487e1b02f1 Remove smooth setting 
It got denied before for Software so I won't include it in the merge request :(
 2020-01-09 01:28:14 -05:00
James R 66cf1be0d8 Don't clip player MD2 either! 2020-01-08 20:52:34 -08:00
toaster d89050f073 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into public_hexang 
# Conflicts:
#	src/r_defs.h
 2020-01-08 21:47:47 +00:00
James R 7deb18bdc9 Merge remote-tracking branch 'origin/master' into next 2020-01-08 13:27:14 -08:00
toaster 0b1108425d Hexafaceted sprite angle support (See merge request description coming soon). 
Also, some minor memory efficiency fixes to both rotsprite and ordinary sprite rotations.
 2020-01-08 20:49:14 +00:00
Sally Cochenour d49cd9755b Fullbright transparent planes 
(I disagree with this feature so hard but w/e)

(cherry picked from commit fe809b2734)
 2020-01-08 13:13:07 -05:00
Sally Cochenour 15075d4e1b More blend image updates 
- Allow the translations that don't make use a blend image to work without requiring a blend image to be present
- Fix TC_RAINBOW not working properly
- TC_METALSONIC now remaps the _blend image to SKINCOLOR_COBALT, then inverts all of the blue, replicating how it works in Software

(cherry picked from commit 74d7f256a7)
 2020-01-08 13:12:37 -05:00
Sally Cochenour 65a02b0f8f Increase precision of smooth contrast 
(cherry picked from commit 4c6664292e)
 2020-01-08 13:12:15 -05:00
Sally Cochenour ac365a0c81 Fake contrast 2020-01-08 13:11:53 -05:00
Sally Cochenour 6476a92817 Update blend textures to smooth out colors that have duplicate indices 2020-01-08 13:09:29 -05:00
Sally Cochenour fe809b2734 Fullbright transparent planes 
(I disagree with this feature so hard but w/e)
 2020-01-08 04:10:23 -05:00
Sally Cochenour 465b3b1559 Water surface shader 
Does not warp anything beneath the surface YET, just the texture itself, but it's far better than nothing
 2020-01-08 03:37:46 -05:00
Sally Cochenour 7d8ff43019 Basic fog shader 
HWR_FogBlockAlpha is still very inaccurate, which gives different results than Software even with the shader, but it's a start
 2020-01-07 20:55:36 -05:00
Sally Cochenour ca5b56181b Merge next 2020-01-07 07:35:39 -05:00
Alam Ed Arias 21c224fce0 idented hell 2020-01-06 09:58:05 -05:00
MascaraSnake 759b1c82e2 Add missing glseg checks (and remove a superfluous one) 2020-01-06 14:40:59 +01:00
Jaime Passos 9086b1851d Fix chroma key 2020-01-05 22:04:19 -03:00
Jaime Passos d93adbacbb Fix GetTextureUsed 2020-01-05 18:10:33 -03:00
Jaime Passos 6d754821fb AA trees are not needed at all for rotated patches 2020-01-05 03:10:03 -03:00
Jaime Passos 874d4d01ee Don't Y-billboard papersprite models (?!?!??!??!?!?) 2020-01-01 18:00:01 -03:00
Jaime Passos c7794d4ce0 Remove unused parameter 2020-01-01 17:36:55 -03:00
Alam Ed Arias af57468e68 Merge branch 'master' into next 2020-01-01 14:29:30 -05:00
Jaime Passos 98b7d8aaca Fix broken model light lists in ACZ3 2020-01-01 15:55:18 -03:00
Jaime Passos c460775cd7 Merge branch 'fixcoronalist' into 'master' 
Fix broken corona list

See merge request STJr/SRB2!605
 2019-12-31 14:25:49 -05:00
fickleheart 8bc58807aa Software FOV ported from kart 
also fixes high software FOVs having buggy walls
 2019-12-31 11:22:05 -06:00
James R fc8c0f8a9a Merge remote-tracking branch 'origin/master' into next 2019-12-30 13:16:53 -08:00
Sally Cochenour 74d7f256a7 More blend image updates 
- Allow the translations that don't make use a blend image to work without requiring a blend image to be present
- Fix TC_RAINBOW not working properly
- TC_METALSONIC now remaps the _blend image to SKINCOLOR_COBALT, then inverts all of the blue, replicating how it works in Software
 2019-12-29 16:36:53 -05:00
Nev3r 389b9e35c4 Add XNOD, XGLN and XGL3 BSP formats recognition and support. 2019-12-29 14:17:51 +01:00
Jaime Passos f997866b4d Fix broken dynlight list because of a SPR_NON2 that doesn't exist 2019-12-28 22:57:37 -03:00
Sally Cochenour a66fb15ff2 Merge branch 'next' into oglshaderport 2019-12-28 13:58:41 -05:00
Jaime Passos 96609e45ae OpenGL funny 2019-12-27 00:02:30 -03:00
Jaime Passos 56fd29a42a stuff 2019-12-26 21:27:30 -03:00
Jaime Passos c0390f5186 Merge remote-tracking branch 'origin/next' into rotsprite2 2019-12-26 20:27:29 -03:00
Sally Cochenour 4c6664292e Increase precision of smooth contrast 2019-12-25 22:50:41 -05:00
Sally Cochenour 3eb6570123 Fake contrast 2019-12-25 20:09:31 -05:00
Sally Cochenour 439474882a Update blend textures to smooth out colors that have duplicate indices 2019-12-25 18:46:30 -05:00
Sally Cochenour da3d5a0184 Merge next 2019-12-25 14:41:31 -05:00
Sally Cochenour 7851bef929 Port of Jimita's shader stuff + my lighting shader 
Co-Authored-By: Jaime Passos <jimita@users.noreply.github.com>
 2019-12-25 14:22:01 -05:00
Jaime Passos 03a3b02301 Merge remote-tracking branch 'origin/master' into renderswitch 2019-12-25 05:43:46 -03:00
James R 3f339384c8 Merge branch 'hwrtexfix' into 'master' 
Fix model texture blending

See merge request STJr/SRB2!546
 2019-12-24 14:44:19 -05:00
Jaime Passos 1b81232d32 sike 2019-12-18 11:47:26 -03:00
Jaime Passos e359f802fd Update comments 2019-12-17 16:14:26 -03:00
Jaime Passos cc54163210 Merge remote-tracking branch 'origin/master' into renderswitch 2019-12-17 16:12:44 -03:00
Jaime Passos 141d0376a5 Merge remote-tracking branch 'origin/master' into flats-in-walls 2019-12-17 15:05:16 -03:00
Jaime Passos e3ab21c85f opengl 2019-12-17 13:48:48 -03:00
Jaime Passos c6f36fc470 un-ROTSPRITE rollangle and spriteinfo 2019-12-17 13:09:25 -03:00
Jaime Passos 369563ad92 allow models to change colors more than once. 2019-12-17 12:50:41 -03:00
Jaime Passos 4e814cd424 FINALLY, COLORCUBIUM 2019-12-12 23:18:39 -03:00
Jaime Passos 228b29e23b HWR_AllowModel 2019-12-12 22:53:19 -03:00
Jaime Passos ca83bafae8 Initialise the variable, obviously 2019-12-12 22:32:19 -03:00
Jaime Passos a138a3ab5f Merge remote-tracking branch 'origin/dashmode-shader' into opengl-is-a-bad-renderer 2019-12-12 22:31:34 -03:00
Jaime Passos 08794559f0 Fix TC_ blending 2019-12-12 22:26:28 -03:00
Jaime Passos 01399c7076 Update hw_main.c 2019-12-12 21:52:59 -03:00
Jaime Passos ff348fb60a Add missing prototype, ugh 2019-12-12 21:43:19 -03:00
Jaime Passos af3cf93683 grafik designe is m passion 2019-12-12 21:41:13 -03:00
Jaime Passos d80bfb4e94 PU_HWRCACHE_UNLOCKED bmomento bróder 2019-12-12 21:23:55 -03:00
Jaime Passos 08d4a36f63 Texture blending port 
Co-authored-by: TehRealSalt <tehrealsalt@gmail.com>
 2019-12-12 21:22:36 -03:00
Jaime Passos 6c3111d809 Stop crashing with models because someone keeps freeing those tags 2019-12-12 19:54:47 -03:00
Jaime Passos 3bebfb279e Fix gr_anisotropicmode 2019-12-12 18:28:05 -03:00
Jaime Passos 58a08504c8 Make gr_spritebillboarding on by default sorry not sorry Azeon 2019-12-12 17:48:43 -03:00
Jaime Passos a4b0195430 Model lighting 2019-12-12 17:48:29 -03:00
Jaime Passos f077d17301 Save filtering mode and anisotropic mode cvars to config 2019-12-12 17:37:55 -03:00
Jaime Passos db61d1a705 Remove HWR_AddEngineCommands 2019-12-12 17:35:41 -03:00
Jaime Passos bf520b9e33 Please, for the love of God, Jesus and Bastet, ADD EVERY OPENGL COMMAND REGARDLESS OF THE FREAKING RENDERER!!!!!!!!!!!!!!!!!!!!!!!!!!! 2019-12-12 17:30:19 -03:00
Jaime Passos 08e3caf9bb Remove unused cvars 2019-12-12 16:53:31 -03:00
Jaime Passos 792750ee48 Add HWD_SET_MODEL_LIGHTING state 2019-12-12 16:48:37 -03:00
Jaime Passos 0652ffd67f Merge remote-tracking branch 'origin/master' into flats-in-walls 2019-12-11 21:53:47 -03:00
lachwright 8a70759e0a Add TC_DASHMODE color shader 2019-12-12 01:27:41 +08:00
Jaime Passos 9248f12d55 Merge remote-tracking branch 'origin/master' into renderswitch 2019-12-10 23:01:10 -03:00
Jaime Passos 4d83db5bb2 Die, Apple! 2019-12-08 22:31:59 -03:00
Jaime Passos 5c02bc59db Speed up level loading 
Don't flush every texture just because the palette MAY have changed
 2019-12-08 22:28:13 -03:00
Jaime Passos c6769e7220 Die 2019-12-08 22:12:56 -03:00
Jaime Passos 7f58002e12 Merge branch 'opengl-is-a-bad-renderer' of https://git.magicalgirl.moe/STJr/SRB2 into opengl-is-a-bad-renderer 2019-12-08 21:10:48 -03:00
Jaime Passos 25464c867a Translate the French 2019-12-08 21:10:14 -03:00
Alam Ed Arias e91a689478 Merge branch 'master' into opengl-is-a-bad-renderer 2019-12-08 12:50:45 -05:00
Alam Ed Arias 623629b04a OpenGL: note that the Buffer API is OpenGL 1.5, so we can be used in STATIC_OPENGL 2019-12-08 12:33:11 -05:00
Alam Ed Arias 35168ddeae OpenGL: yflip is used to hold more then true/false 2019-12-08 12:32:23 -05:00
Jaime Passos d8a804febc LMFAOOOOOOOOOOOOOOOOOOOOOOOO 2019-12-08 04:15:25 -03:00
Jaime Passos cc12496e9c Optimize mipmaps 2019-12-08 03:23:37 -03:00
Jaime Passos ce61b17117 Update hw_main.c 2019-12-08 02:27:51 -03:00
Jaime Passos 964978a337 Delete md2_transform 2019-12-08 02:25:53 -03:00
Jaime Passos bc60a0a887 Make some things clearer here. 2019-12-08 01:54:03 -03:00
Jaime Passos 40b862967d Just in case? 2019-12-07 23:55:28 -03:00
Jaime Passos e9e0683d5e Cleanup FreeMipmapColormap 2019-12-07 23:46:05 -03:00
MascaraSnake a3549cc8f2 Merge branch 'datestuff' into 'master' 
Date stuff

See merge request STJr/SRB2Internal!618
 2019-12-06 16:10:36 -05:00
Steel Titanium d415cd5c6d
Update copyright date on source files 2019-12-06 13:49:42 -05:00
Alam Ed Arias f576e61753 OpenGL cast to float, not store in double 2019-12-06 13:45:11 -05:00
Alam Ed Arias 3120c99eeb Fix compiling for MSVC 2019-12-05 12:38:50 -05:00
Jaime Passos 81cfca29d8 Fix FreeMipmapColormap yet again 2019-12-04 15:50:17 -03:00
Alam Ed Arias b5738620c1 Fixup compiling errors 2019-12-02 12:12:26 -05:00
Jaime Passos c9ff8ec26b Fix FreeMipmapColormap crash 2019-11-24 17:37:11 -03:00
toaster 95ed442d55 Prevent Knuckles latching onto horizon special linedefs. 
Also, update all references to the horizon special to use a #defined constant instead of a magic number.
 2019-11-23 14:20:41 +00:00
MascaraSnake 6545284eaf Merge branch 'gfz-debris' into 'master' 
VAdaPEGA's GFZ debris

See merge request STJr/SRB2Internal!505
 2019-11-22 15:27:11 -05:00
lachwright c5d085d333 Add missing GFZD spriteset 2019-11-21 01:14:24 +08:00
Jaime Passos e0a9b3d695 Merge remote-tracking branch 'origin/subtitlesubterfuge' into remove-unused-levelwipes 2019-11-19 21:49:45 -03:00
MascaraSnake 2418e33a00 Merge branch 'cobalt-ai' into 'master' 
CobaltBW's Tails AI

See merge request STJr/SRB2Internal!358
 2019-11-18 17:26:28 -05:00
Jaime Passos 1e4060af8c remove unused levelwipes 2019-11-18 19:22:46 -03:00
MascaraSnake 3df0afb7db Merge branch 'f_wipes' into 'master' 
Colormapped fades

See merge request STJr/SRB2Internal!469
 2019-11-18 17:21:09 -05:00