76f26cda24
Merge branch 'master' into next
2020-02-21 21:01:29 -05:00
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
93046c5e59
Merge remote-tracking branch 'origin/master' into next
2020-02-20 17:30:50 -08:00
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
7060083db5
Update copyright year to 2020
2020-02-19 14:08:45 -08:00
92f65fd822
Merge branch 'exitmove-tweaks' into 'next'
...
Exitmove tweaks
See merge request STJr/SRB2!709
2020-02-18 21:58:18 -05:00
2b3034a7af
Merge branch 'master' into next
2020-02-18 17:38:05 +00:00
d0b9027d0a
Merge branch 'viewroll' into 'next'
...
Rolling
See merge request STJr/SRB2!690
2020-02-17 00:10:57 -05:00
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
07d71778dc
FIX COLOR BUG
2020-02-17 01:19:28 -03:00
c4b390bc76
Merge remote-tracking branch 'upstream/master' into viewroll
2020-02-16 21:32:57 -06:00
512c6f24a9
Clean up the mess that is extracolormap_t::fog
2020-02-16 20:19:24 +01:00
a98e84faa0
change prefix to "PLAYER"
2020-02-15 12:40:41 -03:00
6b8195dbc1
player model prefix
2020-02-11 23:54:39 -03:00
598daac093
allow models for skin/sprites with same name
2020-02-08 20:44:43 -03:00
4238003887
Merge remote-tracking branch 'origin/master' into next
2020-01-30 23:54:56 -08:00
bea7ad2185
Merge remote-tracking branch 'upstream/next' into viewroll
2020-01-26 18:01:58 -06:00
9e4c519cad
In-map visual indicator
2020-01-19 19:02:03 -03:00
94a2f0bb4f
Don't draw Tails' tails in first person (MF2_LINKDRAW)
2020-01-17 20:56:32 -08:00
762223db7c
Duplicated code is gone, so sad
2020-01-17 20:53:36 -08:00
7bd9344dd0
I think this fixes the compile errors
2020-01-17 21:55:16 -06:00
43828f265c
Use shadow cvar
2020-01-17 22:20:04 -05:00
84329fcd26
OGL can have little a viewroll
2020-01-17 19:01:45 -06:00
4e481340ce
OpenGL shadows
2020-01-16 12:37:32 -05:00
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
c7ab065b0a
Merge branch 'master' into next
2020-01-11 18:38:09 +00:00
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
5c60f8b529
Merge branch 'software-fov' into 'master'
...
Software FOV
See merge request STJr/SRB2!662
2020-01-10 00:33:24 -05:00
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
66cf1be0d8
Don't clip player MD2 either!
2020-01-08 20:52:34 -08:00
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
7deb18bdc9
Merge remote-tracking branch 'origin/master' into next
2020-01-08 13:27:14 -08:00
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
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
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
65a02b0f8f
Increase precision of smooth contrast
...
(cherry picked from commit 4c6664292e
2020-01-08 13:12:15 -05:00
ac365a0c81
Fake contrast
2020-01-08 13:11:53 -05:00
6476a92817
Update blend textures to smooth out colors that have duplicate indices
2020-01-08 13:09:29 -05:00
21c224fce0
idented hell
2020-01-06 09:58:05 -05:00
759b1c82e2
Add missing glseg checks (and remove a superfluous one)
2020-01-06 14:40:59 +01:00
9086b1851d
Fix chroma key
2020-01-05 22:04:19 -03:00
d93adbacbb
Fix GetTextureUsed
2020-01-05 18:10:33 -03:00
6d754821fb
AA trees are not needed at all for rotated patches
2020-01-05 03:10:03 -03:00
874d4d01ee
Don't Y-billboard papersprite models (?!?!??!??!?!?)
2020-01-01 18:00:01 -03:00
c7794d4ce0
Remove unused parameter
2020-01-01 17:36:55 -03:00
af57468e68
Merge branch 'master' into next
2020-01-01 14:29:30 -05:00
98b7d8aaca
Fix broken model light lists in ACZ3
2020-01-01 15:55:18 -03:00
c460775cd7
Merge branch 'fixcoronalist' into 'master'
...
Fix broken corona list
See merge request STJr/SRB2!605
2019-12-31 14:25:49 -05:00
8bc58807aa
Software FOV ported from kart
...
also fixes high software FOVs having buggy walls
2019-12-31 11:22:05 -06:00
fc8c0f8a9a
Merge remote-tracking branch 'origin/master' into next
2019-12-30 13:16:53 -08:00
Steel Titanium