Nev3r
98e67871f5
Merge branch 'fix-vibing-slopes' into 'next'
...
Fix vibing slope planes
See merge request STJr/SRB2!1335
2020-12-16 11:15:41 -05:00
Jaime Ita Passos
fa9db2d644
Fix vibing slope planes
...
I messed up the multiplication order for texture scaling: it multiplied a floating point number with a fixed point number, instead of multiplying two floats and then converting the result into a fixed point number.
2020-12-16 00:26:08 -03:00
Jaime Ita Passos
ca78fc69ca
Restore the viewpoint's angle in R_DrawPlanes instead
2020-12-14 01:14:55 -03:00
Jaime Ita Passos
5bdee63117
Fix a crash
2020-11-23 12:53:59 -03:00
Jaime Ita Passos
5e890ee6f8
Merge branch 'next' into spritestuff2
2020-11-19 00:52:43 -03:00
Jaime Passos
8f65b98c24
Remove NOWATER define
2020-11-05 00:00:08 -03:00
Jaime Passos
c07c80fd9e
Plane optimization and cleanup
2020-11-04 23:46:34 -03:00
Jaime Passos
b872222b50
Implement blend modes
2020-10-27 00:03:41 -03:00
Hannu Hanhi
7941a5fb63
R_FindPlane optimization
2020-10-18 01:27:01 +03:00
Jaime Passos
4b7bfce95e
Implement sloped floor sprites
2020-10-13 22:42:07 -03:00
Jaime Passos
cc97e22e2f
Changes to sprite rendering:
...
- Added render flags (see r_defs.h)
- Implemented floor splats
- Drop shadow sprite rendering through render flags
2020-10-12 00:13:22 -03:00
Jaime Passos
7911deebf8
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into pictureformats
2020-07-06 19:29:14 -03:00
MascaraSnake
33ed36cf4b
Effect 6 flag allows cutting of cyan pixels on FOF and PolyObject planes (even if they're translucent)
2020-06-03 19:41:47 +02:00
Louis-Antoine
d0abd6e86c
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into slope-cleanup
...
# Conflicts:
# src/hardware/hw_main.c
# src/p_spec.c
2020-05-18 16:14:05 +02:00
Louis-Antoine
a06c4a8c98
Rename P_GetZAt to P_GetSlopeZAt and P_GetZAt2 to P_GetZAt
2020-05-18 15:23:56 +02:00
Jaime Passos
1a79f6246d
Merge remote-tracking branch 'origin/next' into pictureformats
2020-05-15 01:34:54 -03:00
MascaraSnake
485a4e5035
Remove POLYOBJECTS and POLYOBJECTS_PLANES defines
2020-05-02 12:08:31 +02:00
Louis-Antoine
892a8dd6e7
Make SRB2 flat like Earth
2020-03-20 18:55:29 +01:00
Jaime Passos
26e367eb9b
Merge remote-tracking branch 'origin/next' into pictureformats
2020-03-07 20:43:16 -03:00
Steel Titanium
76f26cda24
Merge branch 'master' into next
2020-02-21 21:01:29 -05:00
James R
7060083db5
Update copyright year to 2020
2020-02-19 14:08:45 -08:00
Jaime Passos
2893803c68
Merge remote-tracking branch 'origin/next' into pictureformats
2020-02-19 02:25:36 -03:00
MascaraSnake
512c6f24a9
Clean up the mess that is extracolormap_t::fog
2020-02-16 20:19:24 +01:00
Jaime Passos
5b5f371b0c
R_GetTextureFlat -> R_GetLevelFlat
2020-01-07 13:27:59 -03:00
Jaime Passos
76a6710f8b
Move location of R_CheckPowersOfTwo and R_CheckFlatLength
2020-01-07 12:46:46 -03:00
Jaime Passos
06d6e2e027
Move location of R_GetTextureFlat
2020-01-07 12:45:22 -03:00
Jaime Passos
762ce146eb
Organise header files, use R_GetFlat
2020-01-07 12:43:27 -03:00
Jaime Passos
f85476c723
Move texture stuff to its own file
2020-01-07 12:35:10 -03:00
Jaime Passos
218fdaeaf8
Fix patch conversion
2020-01-06 20:39:38 -03:00
Jaime Passos
edb0bbcd6d
Cleanup, NOW
2020-01-06 20:16:48 -03:00
James R
be063c454a
Fix NOPNG compiling
2019-12-24 11:37:37 -08:00
Jaime Passos
4d87bcca13
Move position of R_PlaneRipple in the file so this looks more organised
2019-12-14 19:50:40 -03:00
Jaime Passos
871ebef332
Merge remote-tracking branch 'origin/master' into ripple2
2019-12-14 19:36:54 -03:00
Jaime Passos
a27a225a81
Remove SPANDRAWFUNC_MMX, as it's not needed anymore.
2019-12-13 19:02:36 -03:00
Jaime Passos
6720279969
Separate non-powers-of-two draw routines into its own file
2019-12-13 13:11:56 -03:00
Jaime Passos
fa58c1fb26
stuff
2019-12-13 12:26:47 -03:00
Jaime Passos
be13f463f0
Update r_plane.c
2019-12-11 12:36:54 -03:00
Jaime Passos
f51253a0a8
Tilted water
2019-12-10 17:01:19 -03:00
Steel Titanium
d415cd5c6d
Update copyright date on source files
2019-12-06 13:49:42 -05:00
Jaime Passos
227f69f063
fix missing mmx check
2019-11-22 17:30:53 -03:00
Jaime Passos
245881ec55
Merge remote-tracking branch 'origin/master' into rotsprite_i
2019-11-12 21:38:02 -03:00
Jaime Passos
ae838d4879
Merge remote-tracking branch 'origin/master' into texture-flats-optimization
2019-11-08 23:01:29 -03:00
Jaime Passos
79e99dc471
Merge remote-tracking branch 'origin/master' into rotsprite_i
2019-10-28 14:29:10 -03:00
MascaraSnake
2a8e5b7bff
Merge branch 'james-kart' into 'master'
...
My changes to Kart
See merge request STJr/SRB2Internal!406
2019-10-25 15:36:40 -04:00
toaster
d89d8acc59
I can't figure out how to make this consistent at all, so in order to have the water look good in levels designed for it, I think it's necessary to effectively revert everything with SHITPLANESPARENCY to a roughly 2.1-equivalent behaviour.
2019-10-24 20:40:03 +01:00
James R
0b314a82bb
Use long double suffix
2019-10-22 21:48:15 -07:00
James R
e15ffd2bc8
Optimize texture/patch/png/flat flat caching
...
SIGSEGV in the case where you have a TEXTURES entry, but no texture or flat,
has been fixed.
Missing flats for now yield a HOM instead of REDFLR as well.
OpenGL also doesn't work yet. And I'm too tired for now to bother with it.
2019-10-20 20:24:03 -07:00
Jaime Passos
88d19a2d9c
fix holey textures
2019-10-13 18:37:41 -03:00
Jaime Passos
5118f8589d
Merge remote-tracking branch 'origin/master' into rotsprite_i
2019-09-28 12:14:55 -03:00
Jaime Passos
a0ec86ce01
Fix powers-of-two checks
2019-09-12 14:32:31 -03:00