Jaime Passos
6976b9bf01
Merge remote-tracking branch 'origin/master' into renderswitch
2019-12-10 23:01:10 -03:00
Jaime Passos
ed5373c3e8
LMFAOOOOOOOOOOOOOOOOOOOOOOOO
2019-12-08 04:15:25 -03:00
Jaime Passos
5d2bbb53fc
Optimize mipmaps
2019-12-08 03:23:37 -03:00
Jaime Passos
2c53951f7f
Update hw_main.c
2019-12-08 02:27:51 -03:00
Jaime Passos
85cde87ae1
Just in case?
2019-12-07 23:55:28 -03:00
fickleheart
fb61700f41
Fix dereferencing uninitialized pointer
2019-12-01 16:16:27 -06:00
fickleheart
157366ba77
Remove (redundant?) skywalls that seemed to drop performance
2019-12-01 15:39:30 -06:00
fickleheart
155da626dc
I don't like your sprite clipping fix, so here's mine
2019-12-01 12:34:25 -06:00
fickleheart
7025a23f25
Merge remote-tracking branch '[remote name redacted]/jimita-shaders'
...
# Conflicts:
# src/hardware/hw_main.c
2019-12-01 11:58:24 -06:00
toaster
dbeec7dacc
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
Jaime Passos
3ed8470b58
remove unused levelwipes
2019-11-18 19:22:46 -03:00
Jaime Passos
925940b44e
Merge remote-tracking branch 'origin/master' into f_wipes
2019-11-18 18:48:19 -03:00
toaster
5afa5f12ee
Disable the GL sprite shadows behind a #define.
...
Reasoning:
* They're horribly broken (they completely ignore slopes).
* A similar final demo GL-only feature (coronas) has been completely disabled.
* Nobody's going to bugfix them before release because not even the devteam's resident GL users use them.
* They look ugly.
2019-11-17 22:18:46 +00:00
Jaime Passos
2ccdb483cd
Update hw_main.c
2019-11-15 19:40:58 -03:00
Jaime Passos
46f88101b2
Small mistake
2019-11-15 19:36:25 -03:00
Jaime Passos
ffa03980f4
Move scope of wipelumpname
2019-11-15 19:09:02 -03:00
Jaime Passos
150283b20a
I don't get it
2019-11-15 19:04:40 -03:00
Jaime Passos
aecba1ec40
Shadowed declaration and unused parameters
2019-11-15 18:58:45 -03:00
Jaime Passos
bc7686c16a
LEVELWIPES
2019-11-15 18:21:12 -03:00
Jaime Passos
dc7f8bafd5
Merge remote-tracking branch 'origin/master' into f_wipes
2019-11-14 19:57:51 -03:00
TehRealSalt
80bb59031c
Blizzard weather option + much more sane workflow for adding new precipitation options
...
"precipprops" lets you create a new precipitation type by picking a mobj type to use, how many random states it has, and flags for effects such as thunder/lightning. Seesound on the mobj type sets an ambient sound (like rain drops) and mass sets the sound's frequency in tics. This could open up the possibility for SOC/Lua Weather options later.
2019-11-14 04:26:41 -05:00
Jaime Passos
24d20d2abb
Merge remote-tracking branch 'origin/master' into rotsprite_i
2019-11-12 21:38:02 -03:00
Jaime Passos
4acdb54d87
Merge remote-tracking branch 'origin/master' into f_wipes
2019-11-12 20:36:06 -03:00
Jaime Passos
845b82668b
Merge remote-tracking branch 'origin/master' into renderswitch
2019-11-12 20:25:40 -03:00
MascaraSnake
fae4fb16e9
Merge branch 'internal-md3-vanilla-c' into 'master'
...
Internal MD3 merge 2 good riddance glBegin
See merge request STJr/SRB2Internal!362
2019-11-12 15:44:20 -05:00
MascaraSnake
ee58e7d234
Merge branch 'texture-flats-optimization' into 'master'
...
Texture flat optimization
Closes #257
See merge request STJr/SRB2Internal!405
2019-11-12 15:42:04 -05:00
Latapostrophe
51e454e7aa
fix conflict
2019-11-12 00:41:26 +01:00
Latapostrophe
3361b94934
dontencoreremap flag + colormaps
2019-11-12 00:40:25 +01:00
Latapostrophe
61db3f79da
Merge branch 'gl-encore' into gl-qol
2019-11-12 00:23:56 +01:00
Jaime Passos
c2aab97d10
fix conflict
2019-11-12 00:23:26 +01:00
Latapostrophe
f0bfd08c81
fix encore for ogl
2019-11-12 00:21:37 +01:00
Jaime Passos
911238945c
fix invisible planes, fix flat animation
2019-11-08 23:42:15 -03:00
Jaime Passos
c7c6a0d5b3
make hwrender compile
2019-11-08 22:58:41 -03:00
Jaime Passos
79c81d3c0b
Update hw_main.c
2019-11-05 12:31:50 -03:00
Jaime Passos
ffc9626355
fix fades for real
2019-11-05 12:10:42 -03:00
Jaime Passos
5fabd3f165
function renaming
2019-11-05 10:28:19 -03:00
toaster
31524531a9
Fix TC_DASHMODE and associated not being applied in GL. (Won't conflict with md3 branch because these lines weren't modified there!)
2019-11-04 13:11:04 +00:00
toaster
7cd2fc7ac3
Slightly unrelated to the express purpose of the branch, but since I was here, and I noticed it was a problem when ~~playing~~ testing with md3s in ACZ: Don't draw the midtextures for horizon lines.
2019-11-03 10:23:21 +00:00
toaster
2a16cf539a
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into internal-md3-vanilla-c
...
Merge seems fine, but won't compile for some reason.
2019-11-02 18:34:12 +00:00
Jaime Passos
76a5b60e39
Merge remote-tracking branch 'origin/master' into f_wipes
2019-10-28 23:14:00 -03:00
Jaime Passos
1c46be78af
add r_patch.c
2019-10-28 15:28:42 -03:00
Jaime Passos
116fb2639e
Merge remote-tracking branch 'origin/master' into rotsprite_i
2019-10-28 14:29:10 -03:00
MascaraSnake
7e27bcb915
Merge branch 'openglskydome2' into 'master'
...
OpenGL sky dome
See merge request STJr/SRB2Internal!350
2019-10-12 11:06:47 -04:00
MascaraSnake
4f7026d169
Merge branch 'OGL_regressions' into 'master'
...
Correct minor OGL regressions
See merge request STJr/SRB2Internal!361
2019-10-12 09:53:20 -04:00
MascaraSnake
86a77b4886
Only apply NiGHTS draw distance to hoops, because it turns out they're pretty much the sole cause of NiGHTS lag
2019-10-11 21:02:11 +02:00
Jaime Passos
09c9714daf
Merge remote-tracking branch 'origin/master' into internal-md3-vanilla-c
2019-10-06 17:40:41 -03:00
toaster
7f085863e2
* Add rudimentary support for MF2_LINKDRAW in GL.
...
* Allow MF_ENEMY objects to flash, just as they do in Software.
2019-10-06 16:31:13 +01:00
Jaime Passos
61f29c9dd6
Giant mistake
2019-09-29 14:12:53 -03:00
Jaime Passos
dfe05a650c
hehee
2019-09-29 12:13:51 -03:00
Jaime Passos
c02c7fb28b
JIMITA DO THE SOC
2019-09-28 19:13:51 -03:00