[BotW] Fix Merging Conflicts.

Guess it's time for me to fire Darkemaste
2024-12-23 16:31:50 +01:00 · 2017-04-01 13:31:31 -07:00 · 2017-04-01 13:31:31 -07:00 · f54f220a78
commit f54f220a78
parent a72f5560fa
9 changed files with 1 additions and 48 deletions
--- a/Enthusiast/BreathOfTheWild_2880p/rules.txt
+++ b/Enthusiast/BreathOfTheWild_2880p/rules.txt
@ -25,7 +25,6 @@ formatsExcluded = 0x008 # exclude the intro background texture
 overwriteWidth = 5120
 overwriteHeight = 2432

-<<<<<<< HEAD
 [TextureRedefine] #TV4
 width = 1152
 height = 648
@ -33,10 +32,8 @@ formatsExcluded = 0x008 # exclude the intro background texture
 overwriteWidth = 4608
 overwriteHeight = 2592

-=======
 #Breaks lighting effects when scaled.
 #Disabling this breaks heatwaves and shadow LODs
->>>>>>> origin/master
 [TextureRedefine] #half-res1
 width = 640
 height = 360
@ -79,7 +76,6 @@ overwriteHeight = 576
 width = 160
 height = 90
 overwriteWidth = 720
-<<<<<<< HEAD
 overwriteHeight = 360

 [TextureRedefine] # O
@ -110,7 +106,4 @@ overwriteHeight = 1440
 width = 854
 height = 480
 overwriteWidth = 2560
-overwriteHeight = 1440
-=======
-overwriteHeight = 360
->>>>>>> origin/master
+overwriteHeight = 1440
--- a/Enthusiast/BreathOfTheWild_4320p/rules.txt
+++ b/Enthusiast/BreathOfTheWild_4320p/rules.txt
@ -25,7 +25,6 @@ formatsExcluded = 0x008 # exclude the intro background texture
 overwriteWidth = 7680
 overwriteHeight = 3648

-<<<<<<< HEAD
 [TextureRedefine] #TV4
 width = 1152
 height = 648
@ -33,10 +32,8 @@ formatsExcluded = 0x008 # exclude the intro background texture
 overwriteWidth = 6912
 overwriteHeight = 3888

-=======
 #Breaks lighting effects when scaled.
 #Disabling this breaks heatwaves and shadow LODs
->>>>>>> origin/master
 [TextureRedefine] #half-res1
 width = 640
 height = 360
@ -79,7 +76,6 @@ overwriteHeight = 864
 width = 160
 height = 90
 overwriteWidth = 960
-<<<<<<< HEAD
 overwriteHeight = 540

 [TextureRedefine] # O
@ -111,6 +107,3 @@ width = 854
 height = 480
 overwriteWidth = 2560
 overwriteHeight = 1440
-=======
-overwriteHeight = 540
->>>>>>> origin/master
--- a/Enthusiast/BreathOfTheWild_5760p/rules.txt
+++ b/Enthusiast/BreathOfTheWild_5760p/rules.txt
@ -25,7 +25,6 @@ formatsExcluded = 0x008 # exclude the intro background texture
 overwriteWidth = 10240
 overwriteHeight = 4864

-<<<<<<< HEAD
 [TextureRedefine] #TV4
 width = 1152
 height = 648
@ -33,10 +32,8 @@ formatsExcluded = 0x008 # exclude the intro background texture
 overwriteWidth = 9216
 overwriteHeight = 5184

-=======
 #Breaks lighting effects when scaled.
 #Disabling this breaks heatwaves and shadow LODs
->>>>>>> origin/master
 [TextureRedefine] #half-res1
 width = 640
 height = 360
@ -79,7 +76,6 @@ overwriteHeight = 1152
 width = 160
 height = 90
 overwriteWidth = 1281
-<<<<<<< HEAD
 overwriteHeight = 721

 [TextureRedefine] # O
@ -111,6 +107,3 @@ width = 854
 height = 480
 overwriteWidth = 2560
 overwriteHeight = 1440
-=======
-overwriteHeight = 721
->>>>>>> origin/master
--- a/Performance/BreathOfTheWild_360p/rules.txt
+++ b/Performance/BreathOfTheWild_360p/rules.txt
@ -25,7 +25,6 @@ formatsExcluded = 0x008 # exclude the intro background texture
 overwriteWidth = 640
 overwriteHeight = 304

-<<<<<<< HEAD
 [TextureRedefine] #TV4
 width = 1152
 height = 648
@ -33,10 +32,8 @@ formatsExcluded = 0x008 # exclude the intro background texture
 overwriteWidth = 576
 overwriteHeight = 324

-=======
 #Breaks lighting effects when scaled.
 #Disabling this breaks heatwaves and shadow LODs
->>>>>>> origin/master
 [TextureRedefine] #half-res1
 width = 640
 height = 360
--- a/Performance/BreathOfTheWild_540p/rules.txt
+++ b/Performance/BreathOfTheWild_540p/rules.txt
@ -25,7 +25,6 @@ formatsExcluded = 0x008 # exclude the intro background texture
 overwriteWidth = 960
 overwriteHeight = 456

-<<<<<<< HEAD
 [TextureRedefine] #TV4
 width = 1152
 height = 648
@ -33,10 +32,8 @@ formatsExcluded = 0x008 # exclude the intro background texture
 overwriteWidth = 864
 overwriteHeight = 486

-=======
 #Breaks lighting effects when scaled.
 #Disabling this breaks heatwaves and shadow LODs
->>>>>>> origin/master
 [TextureRedefine] #half-res1
 width = 640
 height = 360
--- a/Quality/BreathOfTheWild_1080p/rules.txt
+++ b/Quality/BreathOfTheWild_1080p/rules.txt
@ -25,7 +25,6 @@ formatsExcluded = 0x008 # exclude the intro background texture
 overwriteWidth = 1920
 overwriteHeight = 912

-<<<<<<< HEAD
 [TextureRedefine] #TV4
 width = 1152
 height = 648
@ -33,10 +32,8 @@ formatsExcluded = 0x008 # exclude the intro background texture
 overwriteWidth = 1728
 overwriteHeight = 972

-=======
 #Breaks lighting effects when scaled.
 #Disabling this breaks heatwaves and shadow LODs
->>>>>>> origin/master
 [TextureRedefine] #half-res1
 width = 640
 height = 360
--- a/Quality/BreathOfTheWild_1440p/rules.txt
+++ b/Quality/BreathOfTheWild_1440p/rules.txt
@ -25,7 +25,6 @@ formatsExcluded = 0x008 # exclude the intro background texture
 overwriteWidth = 2560
 overwriteHeight = 1216

-<<<<<<< HEAD
 [TextureRedefine] #TV4
 width = 1152
 height = 648
@ -33,10 +32,8 @@ formatsExcluded = 0x008 # exclude the intro background texture
 overwriteWidth = 2304
 overwriteHeight = 1296

-=======
 #Breaks lighting effects when scaled.
 #Disabling this breaks heatwaves and shadow LODs
->>>>>>> origin/master
 [TextureRedefine] #half-res1
 width = 640
 height = 360
@ -55,13 +52,9 @@ height = 288
 overwriteWidth = 1280
 overwriteHeight = 576

-<<<<<<< HEAD
-[TextureRedefine] #q-res1
-=======
 #Makes bloom look "pixelated" when scaled.
 #Disabling this breaks ambient occlusion
 [TextureRedefine] #q-res1, main bloom, AO
->>>>>>> origin/master
 width = 320
 height = 180
 overwriteWidth = 641
--- a/Quality/BreathOfTheWild_2160p/rules.txt
+++ b/Quality/BreathOfTheWild_2160p/rules.txt
@ -25,7 +25,6 @@ formatsExcluded = 0x008 # exclude the intro background texture
 overwriteWidth = 3840
 overwriteHeight = 1824

-<<<<<<< HEAD
 [TextureRedefine] #TV4
 width = 1152
 height = 648
@ -33,8 +32,6 @@ formatsExcluded = 0x008 # exclude the intro background texture
 overwriteWidth = 3456
 overwriteHeight = 1944

-[TextureRedefine] #half-res1
-=======
 #Breaks lighting effects when scaled.
 #Disabling this breaks heatwaves and shadow LODs
 [TextureRedefine] #half-res1, soft pass toon shader, 
@ -56,13 +53,9 @@ height = 288
 overwriteWidth = 1920
 overwriteHeight = 864

-<<<<<<< HEAD
-[TextureRedefine] #q-res1
-=======
 #Makes bloom look "pixelated" when scaled.
 #Disabling this breaks ambient occlusion
 [TextureRedefine] #q-res1 Main bloom pass, AO 
->>>>>>> origin/master
 width = 320
 height = 180
 overwriteWidth = 960
--- a/Quality/BreathOfTheWild_900p/rules.txt
+++ b/Quality/BreathOfTheWild_900p/rules.txt
@ -25,7 +25,6 @@ formatsExcluded = 0x008 # exclude the intro background texture
 overwriteWidth = 1600
 overwriteHeight = 760

-<<<<<<< HEAD
 [TextureRedefine] #TV4
 width = 1152
 height = 648
@ -33,10 +32,8 @@ formatsExcluded = 0x008 # exclude the intro background texture
 overwriteWidth = 1440
 overwriteHeight = 810

-=======
 #Breaks lighting effects when scaled.
 #Disabling this breaks heatwaves and shadow LODs
->>>>>>> origin/master
 [TextureRedefine] #half-res1
 width = 640
 height = 360