fickleheart
|
e3b17cd82b
|
Use po2 patches to fix mipmaps
|
2020-03-14 15:52:25 -05:00 |
|
fickleheart
|
b9d7b3e5c5
|
Merge remote-tracking branch 'upstream/master' into shaders-222
# Conflicts:
# src/hardware/r_opengl/r_opengl.c
# src/i_video.h
# src/r_main.c
# src/r_main.h
# src/screen.c
# src/sdl/i_video.c
# src/sdl/ogl_sdl.c
# src/w_wad.c
|
2020-03-14 12:52:15 -05:00 |
|
Steel Titanium
|
76f26cda24
|
Merge branch 'master' into next
|
2020-02-21 21:01: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
|
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
|
7060083db5
|
Update copyright year to 2020
|
2020-02-19 14:08:45 -08:00 |
|
James R
|
92f65fd822
|
Merge branch 'exitmove-tweaks' into 'next'
Exitmove tweaks
See merge request STJr/SRB2!709
|
2020-02-18 21:58:18 -05:00 |
|
Monster Iestyn
|
2b3034a7af
|
Merge branch 'master' into next
|
2020-02-18 17:38:05 +00:00 |
|
Jaime Passos
|
d0ee4ad440
|
Change the default setting of cv_grshearing to Off
|
2020-02-17 12:30:02 -03:00 |
|
Jaime Passos
|
00bdb41640
|
Merge remote-tracking branch 'origin/master' into sal-oglshaderport
|
2020-02-17 12:28:16 -03:00 |
|
James R
|
d0b9027d0a
|
Merge branch 'viewroll' into 'next'
Rolling
See merge request STJr/SRB2!690
|
2020-02-17 00:10:57 -05:00 |
|
James R
|
94aec0101f
|
Merge branch 'grfang' into 'master'
Allow models for skin/sprites with same name
See merge request STJr/SRB2!767
|
2020-02-16 23:21:07 -05:00 |
|
Sally Cochenour
|
07d71778dc
|
FIX COLOR BUG
|
2020-02-17 01:19:28 -03:00 |
|
fickleheart
|
c4b390bc76
|
Merge remote-tracking branch 'upstream/master' into viewroll
|
2020-02-16 21:32:57 -06:00 |
|
MascaraSnake
|
512c6f24a9
|
Clean up the mess that is extracolormap_t::fog
|
2020-02-16 20:19:24 +01:00 |
|
Jaime Passos
|
a98e84faa0
|
change prefix to "PLAYER"
|
2020-02-15 12:40:41 -03:00 |
|
Jaime Passos
|
6b8195dbc1
|
player model prefix
|
2020-02-11 23:54:39 -03:00 |
|
Jaime Passos
|
598daac093
|
allow models for skin/sprites with same name
|
2020-02-08 20:44:43 -03:00 |
|
Jaime Passos
|
7cfc8d022e
|
allow models for skin/sprites with same name
|
2020-02-08 20:29:28 -03:00 |
|
Jaime Passos
|
b38f336dc5
|
why does this still exist?
|
2020-02-08 18:19:27 -03:00 |
|
Jaime Passos
|
d633435cd6
|
i'm not paying too much attention, am i.
|
2020-02-08 18:08:56 -03:00 |
|
Jaime Passos
|
11e6cf0ade
|
add "third person only" option to gr_shearing.
|
2020-02-08 17:42:26 -03:00 |
|
Jaime Passos
|
90eb6a6011
|
Merge remote-tracking branch 'tehrealsalt/oglshaderport' into sal-oglshaderport
|
2020-02-03 01:17:26 -03:00 |
|
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 |
|