toaster
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
toaster
377194b077
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into showconditionset
...
# Conflicts:
# src/m_menu.c
2020-01-08 20:00:50 +00:00
toaster
d2da441a57
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into morehints
...
# Conflicts:
# src/m_menu.c
2020-01-08 19:18:35 +00:00
Sally Cochenour
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
Sally Cochenour
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
Sally Cochenour
65a02b0f8f
Increase precision of smooth contrast
...
(cherry picked from commit 4c6664292e
2020-01-08 13:12:15 -05:00
Sally Cochenour
ac365a0c81
Fake contrast
2020-01-08 13:11:53 -05:00
Sally Cochenour
6476a92817
Update blend textures to smooth out colors that have duplicate indices
2020-01-08 13:09:29 -05:00
James R
0d3c03ccd6
Left word jump (whoo that took long)
2020-01-08 02:54:17 -08:00
James R
9e703f935a
Right word jump
2020-01-08 01:03:44 -08:00
MascaraSnake
faac4ea545
Don't create colormap data out of sidedef text for fake planes linedef (the colormap data isn't even used anymore)
2020-01-08 09:28:37 +01:00
MascaraSnake
45404f7f27
Merge branch 'next' of git.magicalgirl.moe:STJr/SRB2 into next
2020-01-08 08:43:55 +01:00
MascaraSnake
031e7cfb82
Fix a condition in the flame jet thinkers I accidentally messed up
2020-01-08 08:43:36 +01:00
fickleheart
6211c80a69
Mixed code and declaration stuff
2020-01-08 00:22:17 -06:00
fickleheart
5abf0c24f9
oh god I forget why this is here but let's not remove it now
2020-01-08 00:21:03 -06:00
James R
0597d0ccbd
Merge branch 'dashmode-tweaks' into 'next'
...
Dashmode tweaks
See merge request STJr/SRB2!646
2020-01-08 01:10:44 -05:00
fickleheart
c133e645f7
Merge remote-tracking branch 'upstream/next' into next-newcontrols
2020-01-07 23:43:43 -06:00
Jaime Passos
cdc2a8a923
Fix shadowed declarations
2020-01-07 20:07:35 -03:00
Jaime Passos
8202ea86b7
Fix Picture_GetPatchPixel
2020-01-07 20:05:40 -03:00
Jaime Passos
ae748d6d5c
Fix patch generation
2020-01-07 20:05:33 -03:00
Jaime Passos
ce7f81c78d
use enum for bpp
2020-01-07 20:04:18 -03:00
Jaime Passos
79116ae471
Provide some cleaner method to generate textures as flats.
...
R_GenerateTextureAsFlat
2020-01-07 16:51:02 -03:00
Jaime Passos
b8625d9efb
AA trees are not needed at all for rotated patches
2020-01-07 16:10:38 -03:00
Jaime Passos
5a2ad5c2f3
Merge remote-tracking branch 'origin/next' into pictureformats
2020-01-07 16:10:25 -03:00
Jaime Passos
854d31a08b
How did I even manage to do this?
2020-01-07 14:12:19 -03:00
Jaime Passos
1358507785
Fix OpenGL
2020-01-07 14:07:14 -03: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
lachwright
01b8bd21cc
Dashmode tweaks:
...
- Remove the ability for non-SF_MACHINE players in dashmode to break spikes and monitors
- Replace instances of dashmode magic numbers with dashmode constants
- Add dashmode constants to dehacked.c
2020-01-07 15:38:48 +08:00
James R
fc1eff6eee
Merge branch 'amyhearts-fix' into 'next'
...
Fix NPC Amy's love hearts crashing if they didn't have a set fuse
See merge request STJr/SRB2!641
2020-01-07 01:05:09 -05:00
lachwright
e069e149d9
Apply skin's highresscale to continue screen
2020-01-07 13:56:54 +08:00
Tatsuru
360e8f28b4
ifdefs make indenting confusing
2020-01-07 01:24:04 -03:00
Jaime Passos
9e0d28f32f
How did I mess this up?
2020-01-06 22:08:51 -03:00
Jaime Passos
a089863823
Missing check
2020-01-06 21:16:33 -03:00
Jaime Passos
db8735129a
Don't force 16bpp if the bit depth was already higher!
2020-01-06 21:02:25 -03:00
Jaime Passos
42895b2c5f
Make error messages consistent
2020-01-06 20:42:46 -03:00
Jaime Passos
218fdaeaf8
Fix patch conversion
2020-01-06 20:39:38 -03:00
Jaime Passos
d5c44350c2
Initialise
2020-01-06 20:20:05 -03:00
Jaime Passos
edb0bbcd6d
Cleanup, NOW
2020-01-06 20:16:48 -03:00
Steel Titanium
808d731652
Update copyright statements for changed names
2020-01-06 17:16:27 -05:00
MascaraSnake
b95d1cef01
Merge branch 'ignore-glsegs' into 'next'
...
Add missing glseg checks (and remove a superfluous one)
See merge request STJr/SRB2!642
2020-01-06 17:08:32 -05:00
Jaime Passos
4407eb0c0a
Fix warnings
2020-01-06 18:31:08 -03:00
Jaime Passos
a1af6b9134
Picture formats test
2020-01-06 18:22:23 -03:00
Alam Ed Arias
5b93230a94
Merge branch 'master' into next
2020-01-06 10:28:21 -05:00
Alam Ed Arias
21c224fce0
idented hell
2020-01-06 09:58:05 -05:00
MascaraSnake
759b1c82e2
Add missing glseg checks (and remove a superfluous one)
2020-01-06 14:40:59 +01:00
MascaraSnake
1cbf7aba0d
Merge branch 'move-map-copying' into 'next'
...
Reorder map loading
See merge request STJr/SRB2!635
2020-01-06 04:24:39 -05:00
