Sally Coolatta
2af68a5fe7
Merge r_plane.c
2020-08-08 17:04:26 -04:00
Jaime Passos
c385eca5d2
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into pictureformats
2020-07-06 19:29:14 -03:00
James R
3162a203be
Merge remote-tracking branch 'pub/master' into wtf
2020-06-03 15:57:09 -07:00
MascaraSnake
f713487f3c
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
Sally Coolatta
63917ffccc
The start of the scary 2.2 merge
...
All conflicts are left in-tact. We should be collaborating on solving these files one at a time.
2020-05-29 13:43:38 -04:00
Louis-Antoine
74fa35221d
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
6af2871fa5
Rename P_GetZAt to P_GetSlopeZAt and P_GetZAt2 to P_GetZAt
2020-05-18 15:23:56 +02:00
filpAM
ac314d5f34
Fix visplane getting allocated twice
2020-05-16 00:20:52 +00:00
Jaime Passos
c69a4f9ced
Merge remote-tracking branch 'origin/next' into pictureformats
2020-05-15 01:34:54 -03:00
MascaraSnake
8efec04051
Remove POLYOBJECTS and POLYOBJECTS_PLANES defines
2020-05-02 12:08:31 +02:00
Louis-Antoine
4e7605f0e2
Make SRB2 flat like Earth
2020-03-20 18:55:29 +01:00
Jaime Passos
81a57d5fac
Merge remote-tracking branch 'origin/next' into pictureformats
2020-03-07 20:43:16 -03:00
James R
f164320c88
Make the order of displayplayers irrelevant and split splitscreen into splitscreen and r_splitscreen
2020-02-23 23:20:20 -08:00
Steel Titanium
fc042e90f0
Merge branch 'master' into next
2020-02-21 21:01:29 -05:00
James R
2274129f57
Update copyright year to 2020
2020-02-19 14:08:45 -08:00
Jaime Passos
b0ce2e088f
Merge remote-tracking branch 'origin/next' into pictureformats
2020-02-19 02:25:36 -03:00
MascaraSnake
4c4596a45f
Clean up the mess that is extracolormap_t::fog
2020-02-16 20:19:24 +01:00
Jaime Passos
e2d0ddfb54
R_GetTextureFlat -> R_GetLevelFlat
2020-01-07 13:27:59 -03:00
Jaime Passos
82998100d3
Move location of R_CheckPowersOfTwo and R_CheckFlatLength
2020-01-07 12:46:46 -03:00
Jaime Passos
fb0d9cdede
Move location of R_GetTextureFlat
2020-01-07 12:45:22 -03:00
Jaime Passos
b6ced0884e
Organise header files, use R_GetFlat
2020-01-07 12:43:27 -03:00
Jaime Passos
96340ac80c
Move texture stuff to its own file
2020-01-07 12:35:10 -03:00
Jaime Passos
c4e082d56e
Fix patch conversion
2020-01-06 20:39:38 -03:00
Jaime Passos
385a6cf3c3
Cleanup, NOW
2020-01-06 20:16:48 -03:00
James R
469e5a7c9b
Fix NOPNG compiling
2019-12-24 11:37:37 -08:00
Jaime Passos
ca3323d19b
Move position of R_PlaneRipple in the file so this looks more organised
2019-12-14 19:50:40 -03:00
Jaime Passos
96bfc1da8f
Merge remote-tracking branch 'origin/master' into ripple2
2019-12-14 19:36:54 -03:00
Jaime Passos
ea52225869
Remove SPANDRAWFUNC_MMX, as it's not needed anymore.
2019-12-13 19:02:36 -03:00
Jaime Passos
b47cc01f50
Separate non-powers-of-two draw routines into its own file
2019-12-13 13:11:56 -03:00
Jaime Passos
9a5876f9d3
stuff
2019-12-13 12:26:47 -03:00
Jaime Passos
a337ed749c
Update r_plane.c
2019-12-11 12:36:54 -03:00
Jaime Passos
bd51f26807
Tilted water
2019-12-10 17:01:19 -03:00
Steel Titanium
a5cdb0a4b3
Update copyright date on source files
2019-12-06 13:49:42 -05:00
Jaime Passos
99217974d0
fix missing mmx check
2019-11-22 17:30:53 -03:00
Jaime Passos
24d20d2abb
Merge remote-tracking branch 'origin/master' into rotsprite_i
2019-11-12 21:38:02 -03:00
Jaime Passos
a1339b60ad
Merge remote-tracking branch 'origin/master' into texture-flats-optimization
2019-11-08 23:01:29 -03:00
Jaime Passos
116fb2639e
Merge remote-tracking branch 'origin/master' into rotsprite_i
2019-10-28 14:29:10 -03:00
MascaraSnake
2004577314
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
58d4fce2bc
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
ac36d13420
Use long double suffix
2019-10-22 21:48:15 -07:00
James R
91588db299
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
08c3210e52
fix holey textures
2019-10-13 18:37:41 -03:00
Jaime Passos
e2ce3988fb
Merge remote-tracking branch 'origin/master' into rotsprite_i
2019-09-28 12:14:55 -03:00
TehRealSalt
20663affc0
Flip sky direction
2019-09-18 19:46:59 -04:00
Jaime Passos
e3ceadbfe3
Fix powers-of-two checks
2019-09-12 14:32:31 -03:00
Jaime Passos
285ba4ee06
Enable usage of R_DrawSpan_8_MMX if drawing a flat with powers-of-two dimensions
2019-09-10 17:25:21 -03:00
Jaime Passos
6860e4a85d
if that function can't return NULL why should i do this?
2019-09-07 19:02:50 -03:00
Jaime Passos
1095c4a4c7
fix non powers of two spans
2019-09-07 18:20:49 -03:00
Jaime Passos
27970e22e1
fix translucency
2019-09-07 16:54:26 -03:00
Jaime Passos
25bb9d1f88
define stuff idk
2019-09-06 19:41:29 -03:00