The-Homebrew-Cloud/cemu_graphic_packs
2
0
Fork 0
mirror of https://github.com/cemu-project/cemu_graphic_packs.git synced 2025-01-11 09:19:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

[BotW] Fix Merging Conflicts.

Browse Source 
Guess it's time for me to fire Darkemaste
This commit is contained in:
Michael 2017-04-01 13:31:31 -07:00
parent a72f5560fa
commit f54f220a78
9 changed files with 1 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Enthusiast/BreathOfTheWild_2880p/rules.txt
View File

@ -25,7 +25,6 @@ formatsExcluded = 0x008 # exclude the intro background texture
overwriteWidth = 5120 overwriteWidth = 5120
overwriteHeight = 2432 overwriteHeight = 2432
<<<<<<< HEAD
[TextureRedefine] #TV4 [TextureRedefine] #TV4
width = 1152 width = 1152
height = 648 height = 648
@ -33,10 +32,8 @@ formatsExcluded = 0x008 # exclude the intro background texture
overwriteWidth = 4608 overwriteWidth = 4608
overwriteHeight = 2592 overwriteHeight = 2592
=======
#Breaks lighting effects when scaled. #Breaks lighting effects when scaled.
#Disabling this breaks heatwaves and shadow LODs #Disabling this breaks heatwaves and shadow LODs
>>>>>>> origin/master
[TextureRedefine] #half-res1 [TextureRedefine] #half-res1
width = 640 width = 640
height = 360 height = 360
@ -79,7 +76,6 @@ overwriteHeight = 576
width = 160 width = 160
height = 90 height = 90
overwriteWidth = 720 overwriteWidth = 720
<<<<<<< HEAD
overwriteHeight = 360 overwriteHeight = 360
[TextureRedefine] # O [TextureRedefine] # O
@ -110,7 +106,4 @@ overwriteHeight = 1440
width = 854 width = 854
height = 480 height = 480
overwriteWidth = 2560 overwriteWidth = 2560
overwriteHeight = 1440 overwriteHeight = 1440
=======
overwriteHeight = 360
>>>>>>> origin/master

7
Enthusiast/BreathOfTheWild_4320p/rules.txt
View File

@ -25,7 +25,6 @@ formatsExcluded = 0x008 # exclude the intro background texture
overwriteWidth = 7680 overwriteWidth = 7680
overwriteHeight = 3648 overwriteHeight = 3648
<<<<<<< HEAD
[TextureRedefine] #TV4 [TextureRedefine] #TV4
width = 1152 width = 1152
height = 648 height = 648
@ -33,10 +32,8 @@ formatsExcluded = 0x008 # exclude the intro background texture
overwriteWidth = 6912 overwriteWidth = 6912
overwriteHeight = 3888 overwriteHeight = 3888
=======
#Breaks lighting effects when scaled. #Breaks lighting effects when scaled.
#Disabling this breaks heatwaves and shadow LODs #Disabling this breaks heatwaves and shadow LODs
>>>>>>> origin/master
[TextureRedefine] #half-res1 [TextureRedefine] #half-res1
width = 640 width = 640
height = 360 height = 360
@ -79,7 +76,6 @@ overwriteHeight = 864
width = 160 width = 160
height = 90 height = 90
overwriteWidth = 960 overwriteWidth = 960
<<<<<<< HEAD
overwriteHeight = 540 overwriteHeight = 540
[TextureRedefine] # O [TextureRedefine] # O
@ -111,6 +107,3 @@ width = 854
height = 480 height = 480
overwriteWidth = 2560 overwriteWidth = 2560
overwriteHeight = 1440 overwriteHeight = 1440
=======
overwriteHeight = 540
>>>>>>> origin/master

7
Enthusiast/BreathOfTheWild_5760p/rules.txt
View File

@ -25,7 +25,6 @@ formatsExcluded = 0x008 # exclude the intro background texture
overwriteWidth = 10240 overwriteWidth = 10240
overwriteHeight = 4864 overwriteHeight = 4864
<<<<<<< HEAD
[TextureRedefine] #TV4 [TextureRedefine] #TV4
width = 1152 width = 1152
height = 648 height = 648
@ -33,10 +32,8 @@ formatsExcluded = 0x008 # exclude the intro background texture
overwriteWidth = 9216 overwriteWidth = 9216
overwriteHeight = 5184 overwriteHeight = 5184
=======
#Breaks lighting effects when scaled. #Breaks lighting effects when scaled.
#Disabling this breaks heatwaves and shadow LODs #Disabling this breaks heatwaves and shadow LODs
>>>>>>> origin/master
[TextureRedefine] #half-res1 [TextureRedefine] #half-res1
width = 640 width = 640
height = 360 height = 360
@ -79,7 +76,6 @@ overwriteHeight = 1152
width = 160 width = 160
height = 90 height = 90
overwriteWidth = 1281 overwriteWidth = 1281
<<<<<<< HEAD
overwriteHeight = 721 overwriteHeight = 721
[TextureRedefine] # O [TextureRedefine] # O
@ -111,6 +107,3 @@ width = 854
height = 480 height = 480
overwriteWidth = 2560 overwriteWidth = 2560
overwriteHeight = 1440 overwriteHeight = 1440
=======
overwriteHeight = 721
>>>>>>> origin/master

3
Performance/BreathOfTheWild_360p/rules.txt
View File

@ -25,7 +25,6 @@ formatsExcluded = 0x008 # exclude the intro background texture
overwriteWidth = 640 overwriteWidth = 640
overwriteHeight = 304 overwriteHeight = 304
<<<<<<< HEAD
[TextureRedefine] #TV4 [TextureRedefine] #TV4
width = 1152 width = 1152
height = 648 height = 648
@ -33,10 +32,8 @@ formatsExcluded = 0x008 # exclude the intro background texture
overwriteWidth = 576 overwriteWidth = 576
overwriteHeight = 324 overwriteHeight = 324
=======
#Breaks lighting effects when scaled. #Breaks lighting effects when scaled.
#Disabling this breaks heatwaves and shadow LODs #Disabling this breaks heatwaves and shadow LODs
>>>>>>> origin/master
[TextureRedefine] #half-res1 [TextureRedefine] #half-res1
width = 640 width = 640
height = 360 height = 360

3
Performance/BreathOfTheWild_540p/rules.txt
View File

@ -25,7 +25,6 @@ formatsExcluded = 0x008 # exclude the intro background texture
overwriteWidth = 960 overwriteWidth = 960
overwriteHeight = 456 overwriteHeight = 456
<<<<<<< HEAD
[TextureRedefine] #TV4 [TextureRedefine] #TV4
width = 1152 width = 1152
height = 648 height = 648
@ -33,10 +32,8 @@ formatsExcluded = 0x008 # exclude the intro background texture
overwriteWidth = 864 overwriteWidth = 864
overwriteHeight = 486 overwriteHeight = 486
=======
#Breaks lighting effects when scaled. #Breaks lighting effects when scaled.
#Disabling this breaks heatwaves and shadow LODs #Disabling this breaks heatwaves and shadow LODs
>>>>>>> origin/master
[TextureRedefine] #half-res1 [TextureRedefine] #half-res1
width = 640 width = 640
height = 360 height = 360

3
Quality/BreathOfTheWild_1080p/rules.txt
View File

@ -25,7 +25,6 @@ formatsExcluded = 0x008 # exclude the intro background texture
overwriteWidth = 1920 overwriteWidth = 1920
overwriteHeight = 912 overwriteHeight = 912
<<<<<<< HEAD
[TextureRedefine] #TV4 [TextureRedefine] #TV4
width = 1152 width = 1152
height = 648 height = 648
@ -33,10 +32,8 @@ formatsExcluded = 0x008 # exclude the intro background texture
overwriteWidth = 1728 overwriteWidth = 1728
overwriteHeight = 972 overwriteHeight = 972
=======
#Breaks lighting effects when scaled. #Breaks lighting effects when scaled.
#Disabling this breaks heatwaves and shadow LODs #Disabling this breaks heatwaves and shadow LODs
>>>>>>> origin/master
[TextureRedefine] #half-res1 [TextureRedefine] #half-res1
width = 640 width = 640
height = 360 height = 360

7
Quality/BreathOfTheWild_1440p/rules.txt
View File

@ -25,7 +25,6 @@ formatsExcluded = 0x008 # exclude the intro background texture
overwriteWidth = 2560 overwriteWidth = 2560
overwriteHeight = 1216 overwriteHeight = 1216
<<<<<<< HEAD
[TextureRedefine] #TV4 [TextureRedefine] #TV4
width = 1152 width = 1152
height = 648 height = 648
@ -33,10 +32,8 @@ formatsExcluded = 0x008 # exclude the intro background texture
overwriteWidth = 2304 overwriteWidth = 2304
overwriteHeight = 1296 overwriteHeight = 1296
=======
#Breaks lighting effects when scaled. #Breaks lighting effects when scaled.
#Disabling this breaks heatwaves and shadow LODs #Disabling this breaks heatwaves and shadow LODs
>>>>>>> origin/master
[TextureRedefine] #half-res1 [TextureRedefine] #half-res1
width = 640 width = 640
height = 360 height = 360
@ -55,13 +52,9 @@ height = 288
overwriteWidth = 1280 overwriteWidth = 1280
overwriteHeight = 576 overwriteHeight = 576
<<<<<<< HEAD
[TextureRedefine] #q-res1
=======
#Makes bloom look "pixelated" when scaled. #Makes bloom look "pixelated" when scaled.
#Disabling this breaks ambient occlusion #Disabling this breaks ambient occlusion
[TextureRedefine] #q-res1, main bloom, AO [TextureRedefine] #q-res1, main bloom, AO
>>>>>>> origin/master
width = 320 width = 320
height = 180 height = 180
overwriteWidth = 641 overwriteWidth = 641

7
Quality/BreathOfTheWild_2160p/rules.txt
View File

@ -25,7 +25,6 @@ formatsExcluded = 0x008 # exclude the intro background texture
overwriteWidth = 3840 overwriteWidth = 3840
overwriteHeight = 1824 overwriteHeight = 1824
<<<<<<< HEAD
[TextureRedefine] #TV4 [TextureRedefine] #TV4
width = 1152 width = 1152
height = 648 height = 648
@ -33,8 +32,6 @@ formatsExcluded = 0x008 # exclude the intro background texture
overwriteWidth = 3456 overwriteWidth = 3456
overwriteHeight = 1944 overwriteHeight = 1944
[TextureRedefine] #half-res1
=======
#Breaks lighting effects when scaled. #Breaks lighting effects when scaled.
#Disabling this breaks heatwaves and shadow LODs #Disabling this breaks heatwaves and shadow LODs
[TextureRedefine] #half-res1, soft pass toon shader, [TextureRedefine] #half-res1, soft pass toon shader,
@ -56,13 +53,9 @@ height = 288
overwriteWidth = 1920 overwriteWidth = 1920
overwriteHeight = 864 overwriteHeight = 864
<<<<<<< HEAD
[TextureRedefine] #q-res1
=======
#Makes bloom look "pixelated" when scaled. #Makes bloom look "pixelated" when scaled.
#Disabling this breaks ambient occlusion #Disabling this breaks ambient occlusion
[TextureRedefine] #q-res1 Main bloom pass, AO [TextureRedefine] #q-res1 Main bloom pass, AO
>>>>>>> origin/master
width = 320 width = 320
height = 180 height = 180
overwriteWidth = 960 overwriteWidth = 960

3
Quality/BreathOfTheWild_900p/rules.txt
View File

@ -25,7 +25,6 @@ formatsExcluded = 0x008 # exclude the intro background texture
overwriteWidth = 1600 overwriteWidth = 1600
overwriteHeight = 760 overwriteHeight = 760
<<<<<<< HEAD
[TextureRedefine] #TV4 [TextureRedefine] #TV4
width = 1152 width = 1152
height = 648 height = 648
@ -33,10 +32,8 @@ formatsExcluded = 0x008 # exclude the intro background texture
overwriteWidth = 1440 overwriteWidth = 1440
overwriteHeight = 810 overwriteHeight = 810
=======
#Breaks lighting effects when scaled. #Breaks lighting effects when scaled.
#Disabling this breaks heatwaves and shadow LODs #Disabling this breaks heatwaves and shadow LODs
>>>>>>> origin/master
[TextureRedefine] #half-res1 [TextureRedefine] #half-res1
width = 640 width = 640
height = 360 height = 360