Commit graph

819 commits

Author SHA1 Message Date
James R
ba9f866acf Merge branch 'exitmove-tweaks' into 'next'
Exitmove tweaks

See merge request STJr/SRB2!709
2020-02-18 21:58:18 -05:00
Monster Iestyn
41bdc91bf0 Merge branch 'master' into next 2020-02-18 17:38:05 +00:00
James R
d6251a763b Merge branch 'viewroll' into 'next'
Rolling

See merge request STJr/SRB2!690
2020-02-17 00:10:57 -05:00
James R
b20750f88c 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
fickleheart
51ef6b3684 Merge remote-tracking branch 'upstream/master' into viewroll 2020-02-16 21:32:57 -06:00
MascaraSnake
4c4596a45f Clean up the mess that is extracolormap_t::fog 2020-02-16 20:19:24 +01:00
Jaime Passos
fc81f2dce5 change prefix to "PLAYER" 2020-02-15 12:40:41 -03:00
Jaime Passos
61bbcb02c6 player model prefix 2020-02-11 23:54:39 -03:00
Jaime Passos
6568a57c58 allow models for skin/sprites with same name 2020-02-08 20:44:43 -03:00
James R
ff2ec925ee Merge remote-tracking branch 'origin/master' into next 2020-01-30 23:54:56 -08:00
fickleheart
62c75c0c81 Merge remote-tracking branch 'upstream/next' into viewroll 2020-01-26 18:01:58 -06:00
Tatsuru
065b8adf42 In-map visual indicator 2020-01-19 19:02:03 -03:00
James R
ef459ba647 Don't draw Tails' tails in first person (MF2_LINKDRAW) 2020-01-17 20:56:32 -08:00
James R
a1a6956618 Duplicated code is gone, so sad 2020-01-17 20:53:36 -08:00
fickleheart
3d432b4c60 I think this fixes the compile errors 2020-01-17 21:55:16 -06:00
Sally Cochenour
664fb9cf6e Use shadow cvar 2020-01-17 22:20:04 -05:00
fickleheart
a48b36f387 OGL can have little a viewroll 2020-01-17 19:01:45 -06:00
Sally Cochenour
6ddb5437a4 OpenGL shadows 2020-01-16 12:37:32 -05:00
James R
362c74ea65 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
54f1cd601e Merge branch 'master' into next 2020-01-11 18:38:09 +00:00
MascaraSnake
595537267a 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
4652e87948 Merge branch 'software-fov' into 'master'
Software FOV

See merge request STJr/SRB2!662
2020-01-10 00:33:24 -05:00
Sally Cochenour
d6e15bd2cd 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
adf76f6e78 Don't clip player MD2 either! 2020-01-08 20:52:34 -08:00
toaster
456778f950 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
f97afe47fa Merge remote-tracking branch 'origin/master' into next 2020-01-08 13:27:14 -08:00
toaster
336b6ad85e 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
0365716299 Fullbright transparent planes
(I disagree with this feature so hard but w/e)

(cherry picked from commit fe809b2734d430655966151e56f96963e2d7b2cf)
2020-01-08 13:13:07 -05:00
Sally Cochenour
3191c365de 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 74d7f256a7849d0c829177614b37089e2446f86b)
2020-01-08 13:12:37 -05:00
Sally Cochenour
1871d01de6 Increase precision of smooth contrast
(cherry picked from commit 4c6664292e1f9b0d5c2ff34e28f05a8b63a4dd45)
2020-01-08 13:12:15 -05:00
Sally Cochenour
23cb9a018d Fake contrast 2020-01-08 13:11:53 -05:00
Sally Cochenour
e4744f6c34 Update blend textures to smooth out colors that have duplicate indices 2020-01-08 13:09:29 -05:00
Alam Ed Arias
ca130c4313 idented hell 2020-01-06 09:58:05 -05:00
MascaraSnake
33c35230c2 Add missing glseg checks (and remove a superfluous one) 2020-01-06 14:40:59 +01:00
Jaime Passos
c47ab3b31f Fix chroma key 2020-01-05 22:04:19 -03:00
Jaime Passos
e9e82b5ea0 Fix GetTextureUsed 2020-01-05 18:10:33 -03:00
Jaime Passos
71f7130abe AA trees are not needed at all for rotated patches 2020-01-05 03:10:03 -03:00
Jaime Passos
c32e481689 Don't Y-billboard papersprite models (?!?!??!??!?!?) 2020-01-01 18:00:01 -03:00
Jaime Passos
4630b8615c Remove unused parameter 2020-01-01 17:36:55 -03:00
Alam Ed Arias
be11a1d249 Merge branch 'master' into next 2020-01-01 14:29:30 -05:00
Jaime Passos
7f178d3bb7 Fix broken model light lists in ACZ3 2020-01-01 15:55:18 -03:00
Jaime Passos
86e8f35c44 Merge branch 'fixcoronalist' into 'master'
Fix broken corona list

See merge request STJr/SRB2!605
2019-12-31 14:25:49 -05:00
fickleheart
1419ec72d5 Software FOV ported from kart
also fixes high software FOVs having buggy walls
2019-12-31 11:22:05 -06:00
James R
67ca512120 Merge remote-tracking branch 'origin/master' into next 2019-12-30 13:16:53 -08:00
Nev3r
d689e06c6a Add XNOD, XGLN and XGL3 BSP formats recognition and support. 2019-12-29 14:17:51 +01:00
Jaime Passos
ba40acf626 Fix broken dynlight list because of a SPR_NON2 that doesn't exist 2019-12-28 22:57:37 -03:00
Jaime Passos
b8e91a50a5 OpenGL funny 2019-12-27 00:02:30 -03:00
Jaime Passos
f65ac6feab stuff 2019-12-26 21:27:30 -03:00
Jaime Passos
070adb4191 Merge remote-tracking branch 'origin/next' into rotsprite2 2019-12-26 20:27:29 -03:00
Jaime Passos
f55b4bf6ad Merge remote-tracking branch 'origin/master' into renderswitch 2019-12-25 05:43:46 -03:00