Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Holidays in Hyrule #3

Open
wants to merge 86 commits into
base: develop
Choose a base branch
from
Open

Holidays in Hyrule #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
86 commits
Select commit Hold shift + click to select a range
409f443
Removal of Kakariko Center Tree, Bushes, and NPC's for both ages.
Caladius Oct 31, 2023
e62fea9
Spawn Child Tree near Anju and fix Bushes that spawn near Graveyard e…
Caladius Oct 31, 2023
160ce44
Modifications to TH for The End
Caladius Nov 3, 2023
63af883
Christmas Ornament Hunt first pass
aMannus Nov 3, 2023
6da79ea
Fix Triforce Count u16 mistakes
aMannus Nov 3, 2023
cc79b2a
Fix build
aMannus Nov 4, 2023
297540e
Updated models & updated text
aMannus Nov 4, 2023
4e3f174
Merge branch 'ChristmasWork' into christmas-tree
aMannus Nov 4, 2023
a494d21
Don't grant ganon's boss key on ending
aMannus Nov 4, 2023
13474a2
Updated tree & updated GBK
aMannus Nov 4, 2023
4c0365f
Remove old GBK stuff
aMannus Nov 4, 2023
c2a7517
Merge pull request #4 from aMannus/christmas-tree
Caladius Nov 4, 2023
51459c2
Despawn Kakariko objects only when in Triforce Hunt Mode, clean up GB…
Caladius Nov 4, 2023
711b392
Move ending to christmas tree code
aMannus Nov 4, 2023
40f07b5
Merge pull request #5 from aMannus/christmas-tree
Caladius Nov 4, 2023
10990bb
Update tree model
aMannus Nov 6, 2023
7064ac9
Add star to tree
aMannus Nov 7, 2023
1bf2d98
Merge pull request #6 from aMannus/christmas-tree
Caladius Nov 8, 2023
dbd96dd
Merge branch 'develop' into ChristmasWork
Caladius Nov 8, 2023
ebaac0b
Christmas Decorations base actor
aMannus Nov 15, 2023
f71cc5f
Merge pull request #8 from aMannus/christmas-tree
Caladius Nov 15, 2023
d8a7a6c
Use Correct Player Boot Enums in CC (#3403)
inspectredc Nov 16, 2023
3234256
bump lus (#3405)
briaguya-ai Nov 16, 2023
0ddb071
Version bump to MacReady Charlie (#3406)
briaguya-ai Nov 16, 2023
6ba7317
Big boi commit, v2 Dana overlay DLs, un-unaliving Kak NPCs and moving…
Caladius Nov 16, 2023
1f5d81a
Merge branch 'develop' into christmas-tree
aMannus Nov 16, 2023
5abd7e4
Merge branch 'ChristmasWork' into christmas-tree
aMannus Nov 16, 2023
c829dfb
Big cleanup, change checks for non-triforce hunt, add more Dana kak m…
aMannus Nov 16, 2023
4d77e5c
Merge pull request #9 from aMannus/christmas-tree
Caladius Nov 16, 2023
bf5e4a6
Cucco Lady hat
MelonSpeedruns Nov 17, 2023
ba2d136
Merge branch 'ChristmasWork' into test-christmas
MelonSpeedruns Nov 17, 2023
d2adf55
removed patch file
MelonSpeedruns Nov 17, 2023
f4e4545
Re-implement King Dodongo's Lava texture effects (#3434)
Archez Nov 23, 2023
bdb2012
Fix audio cutoff issues (#3428)
garrettjoecox Nov 24, 2023
f2df029
fix: skybox crash for mask shop (#3427)
Archez Nov 24, 2023
d50ad47
Fix #3417 Symlinks to Directories in Mods Dir Aren't Traversed (#3418)
rehashedsalt Nov 24, 2023
95f27ac
Fix kokiri sword unequipping when using switch age cheat/enhancements…
inspectredc Nov 24, 2023
8476896
Add festive hats
garrettjoecox Nov 24, 2023
523eeed
Merge pull request #11 from garrettjoecox/test-christmas
Caladius Nov 26, 2023
3cf9d65
Disable Fix Vine Fall when Climb Everything is enabled (#3439)
Malkierian Nov 26, 2023
435f8f7
Add snowballs to kak & hyrule field
garrettjoecox Nov 27, 2023
17df373
Fix Christmas Ornament final camera shot
aMannus Nov 27, 2023
48643c6
Merge branch 'develop-macready' into christmas-tree
aMannus Nov 27, 2023
acac97e
Switch tunics and kokiri colors to be red by default
aMannus Nov 27, 2023
3ab16b7
Changed all checks for `!gPlayState` to `!GameInteractor::IsSaveLoade…
Malkierian Nov 27, 2023
3106947
Merge pull request #13 from aMannus/christmas-tree
Caladius Nov 27, 2023
69c4936
Merge pull request #12 from garrettjoecox/snoball
Caladius Nov 27, 2023
5fdd828
ToT assets + room display check
PurpleHato Nov 28, 2023
04dda55
A few misc changes
garrettjoecox Nov 28, 2023
717074f
Fix: Missing TextIDs for MQ PAL and change lava size (#3449)
Archez Nov 28, 2023
18961d9
Merge pull request #15 from garrettjoecox/a-few-more-hats
Caladius Nov 28, 2023
3809f4f
Merge pull request #14 from PurpleHato/ToTChristmas
Caladius Nov 28, 2023
420bdab
Random Enemy Sizes fixes (#3452)
aMannus Nov 28, 2023
9d215b6
Separate Arrows Equip Dupe Fix (#3450)
inspectredc Nov 28, 2023
073daa8
Fixes
garrettjoecox Nov 28, 2023
f45c43a
Merge pull request #16 from garrettjoecox/fixes
Caladius Nov 28, 2023
621afc9
sort patch otrs (#3430)
briaguya-ai Nov 29, 2023
02256fa
bump LUS to 1.4.0 (#3461)
briaguya-ai Nov 29, 2023
33fe877
Fix bugs dont despawn cheat to work with soil patches (#3457)
Archez Nov 29, 2023
c4f3462
Flag tracker (#3447)
Malkierian Nov 29, 2023
fdcd9a7
Race Integrity QoL (#3445)
garrettjoecox Nov 29, 2023
d523b10
Change declaration of Morpha tentacle verts to combine them all and a…
Rozelette Nov 28, 2023
dd5e72a
limit entrance discovered saving to end of operation (#3459)
Archez Nov 29, 2023
f14c390
[Vanilla Fix] Slow Down Darunia's Dance (#3438)
Malkierian Nov 29, 2023
818addf
delta bump (#3465)
briaguya-ai Nov 29, 2023
58977e7
Merge branch 'develop-macready' into christmas-tree
aMannus Nov 29, 2023
2a886a4
Default magic color, ornament hunt tracker icon, small fix
aMannus Nov 29, 2023
06cd814
Default hearts color
aMannus Nov 29, 2023
4a4a231
Scale down ornament hunt models slightly
aMannus Nov 29, 2023
d8b8f95
Merge pull request #17 from aMannus/christmas-tree
Caladius Nov 29, 2023
5084414
Tweak icebergs
garrettjoecox Nov 29, 2023
ffac273
Merge pull request #18 from garrettjoecox/tweak-ice-bergs
Caladius Nov 29, 2023
3956d0a
Fix GBK check
aMannus Nov 29, 2023
a26bf13
Merge pull request #19 from aMannus/christmas-tree
Caladius Nov 29, 2023
5a54826
Register alt assets
aMannus Nov 29, 2023
f2f84c9
More xmas stuff
garrettjoecox Nov 30, 2023
7d52010
Potential fix for end title not showing up
aMannus Nov 30, 2023
0aa1e4e
Merge pull request #20 from garrettjoecox/moar
Caladius Nov 30, 2023
c5a93ef
Merge branch 'ChristmasWork' into christmas-tree
aMannus Nov 30, 2023
ef4cb6a
Add blender source file for ToT decorations
aMannus Nov 30, 2023
ba10fe4
Merge pull request #21 from aMannus/christmas-tree
Caladius Nov 30, 2023
7ca2623
Move blender source file to different path
aMannus Nov 30, 2023
e0d7468
Merge pull request #22 from aMannus/christmas-tree
Caladius Nov 30, 2023
1bfe2d1
fix crown
inspectredc Nov 30, 2023
4fcf1b0
Merge pull request #23 from inspectredc/phantom-ganon-crown-fix
Caladius Nov 30, 2023
c2c4816
Version Name Change, Triforce Tracker Defaults
Caladius Dec 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ set(CMAKE_CXX_STANDARD 20 CACHE STRING "The C++ standard to use")

set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version")

project(Ship VERSION 8.0.1 LANGUAGES C CXX)
set(PROJECT_BUILD_NAME "MacReady Bravo" CACHE STRING "")
project(Ship VERSION 8.0.3 LANGUAGES C CXX)
set(PROJECT_BUILD_NAME "Holiday 2023" CACHE STRING "")
set(PROJECT_TEAM "github.com/harbourmasters" CACHE STRING "")

set_property(DIRECTORY ${CMAKE_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT soh)
Expand Down
2 changes: 1 addition & 1 deletion libultraship
Open in desktop
Submodule libultraship updated 8 files
+0 −2 .github/workflows/build-validation.yml
+5 −0 src/audio/SDLAudioPlayer.cpp
+1 −0 src/audio/SDLAudioPlayer.h
+1 −0 src/graphic/Fast3D/gfx_dxgi.cpp
+11 −2 src/port/switch/SwitchImpl.cpp
+5 −0 src/window/gui/ConsoleWindow.cpp
+1 −0 src/window/gui/ConsoleWindow.h
+2 −1 src/window/gui/StatsWindow.cpp
Binary file added soh/assets/custom/objects/object_festivehats/antlers_64
View file
Open in desktop
Binary file not shown.
11 changes: 11 additions & 0 deletions soh/assets/custom/objects/object_festivehats/gCuccoLadyHatDL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<DisplayList Version="0">
<CallDisplayList Path="objects/object_festivehats/mat_gCuccoLadyHatDL_f3dlite_hatcolour"/>
<CallDisplayList Path="objects/object_festivehats/gCuccoLadyHatDL_tri_0"/>
<PipeSync/>
<SetGeometryMode G_LIGHTING="1" />
<ClearGeometryMode G_TEXTURE_GEN="1" />
<SetCombineLERP A0="G_CCMUX_0" B0="G_CCMUX_0" C0="G_CCMUX_0" D0="G_CCMUX_SHADE" Aa0="G_ACMUX_0" Ab0="G_ACMUX_0" Ac0="G_ACMUX_0" Ad0="G_ACMUX_ENVIRONMENT" A1="G_CCMUX_0" B1="G_CCMUX_0" C1="G_CCMUX_0" D1="G_CCMUX_SHADE" Aa1="G_ACMUX_0" Ab1="G_ACMUX_0" Ac1="G_ACMUX_0" Ad1="G_ACMUX_ENVIRONMENT"/>
<Texture S="65535" T="65535" Level="0" Tile="0" On="0"/>
<EndDisplayList/>
</DisplayList>

31 changes: 31 additions & 0 deletions soh/assets/custom/objects/object_festivehats/gCuccoLadyHatDL_tri_0
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<DisplayList Version="0">
<LoadVertices Path="objects/object_festivehats/gCuccoLadyHatDL_vtx_0" VertexBufferIndex="0" VertexOffset="0" Count="16"/>
<Triangle1 V00="0" V01="1" V02="2"/>
<Triangle1 V00="0" V01="3" V02="1"/>
<Triangle1 V00="4" V01="3" V02="0"/>
<Triangle1 V00="4" V01="5" V02="3"/>
<Triangle1 V00="6" V01="5" V02="4"/>
<Triangle1 V00="6" V01="7" V02="5"/>
<Triangle1 V00="8" V01="7" V02="6"/>
<Triangle1 V00="8" V01="9" V02="7"/>
<Triangle1 V00="10" V01="9" V02="8"/>
<Triangle1 V00="10" V01="11" V02="9"/>
<Triangle1 V00="12" V01="11" V02="10"/>
<Triangle1 V00="12" V01="13" V02="11"/>
<Triangle1 V00="14" V01="13" V02="12"/>
<Triangle1 V00="14" V01="15" V02="13"/>
<LoadVertices Path="objects/object_festivehats/gCuccoLadyHatDL_vtx_0" VertexBufferIndex="0" VertexOffset="16" Count="16"/>
<Triangle1 V00="0" V01="1" V02="2"/>
<Triangle1 V00="0" V01="3" V02="1"/>
<Triangle1 V00="1" V01="3" V02="4"/>
<Triangle1 V00="5" V01="1" V02="6"/>
<Triangle1 V00="7" V01="8" V02="9"/>
<Triangle1 V00="10" V01="11" V02="12"/>
<Triangle1 V00="13" V01="14" V02="15"/>
<LoadVertices Path="objects/object_festivehats/gCuccoLadyHatDL_vtx_0" VertexBufferIndex="0" VertexOffset="32" Count="9"/>
<Triangle1 V00="0" V01="1" V02="2"/>
<Triangle1 V00="3" V01="4" V02="5"/>
<Triangle1 V00="6" V01="7" V02="8"/>
<EndDisplayList/>
</DisplayList>

43 changes: 43 additions & 0 deletions soh/assets/custom/objects/object_festivehats/gCuccoLadyHatDL_vtx_0
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<Vertex Version="0">
<Vtx X="971" Y="326" Z="-377" S="112" T="1008" R="6" G="79" B="156" A="255"/>
<Vtx X="998" Y="-107" Z="-499" S="-16" T="-16" R="224" G="12" B="134" A="255"/>
<Vtx X="798" Y="-27" Z="-448" S="-16" T="1008" R="229" G="11" B="132" A="255"/>
<Vtx X="1172" Y="246" Z="-429" S="112" T="-16" R="4" G="81" B="158" A="255"/>
<Vtx X="1099" Y="450" Z="-72" S="240" T="1008" R="47" G="118" B="0" A="255"/>
<Vtx X="1300" Y="370" Z="-123" S="240" T="-16" R="47" G="118" B="0" A="255"/>
<Vtx X="1107" Y="272" Z="233" S="368" T="1008" R="51" G="68" B="94" A="255"/>
<Vtx X="1307" Y="192" Z="182" S="368" T="-16" R="51" G="69" B="94" A="255"/>
<Vtx X="989" Y="-103" Z="360" S="496" T="1008" R="27" G="245" B="124" A="255"/>
<Vtx X="1189" Y="-184" Z="308" S="496" T="-16" R="27" G="245" B="124" A="255"/>
<Vtx X="815" Y="-456" Z="233" S="624" T="1008" R="247" G="171" B="94" A="255"/>
<Vtx X="1015" Y="-537" Z="182" S="624" T="-16" R="246" G="171" B="93" A="255"/>
<Vtx X="687" Y="-580" Z="-72" S="752" T="1008" R="209" G="138" B="0" A="255"/>
<Vtx X="887" Y="-661" Z="-123" S="752" T="-16" R="209" G="138" B="0" A="255"/>
<Vtx X="680" Y="-402" Z="-377" S="880" T="1008" R="206" G="195" B="156" A="255"/>
<Vtx X="880" Y="-483" Z="-429" S="880" T="-16" R="203" G="195" B="158" A="255"/>
<Vtx X="798" Y="-27" Z="-448" S="1008" T="1008" R="229" G="11" B="132" A="255"/>
<Vtx X="880" Y="-483" Z="-429" S="880" T="-16" R="203" G="195" B="158" A="255"/>
<Vtx X="680" Y="-402" Z="-377" S="880" T="1008" R="206" G="195" B="156" A="255"/>
<Vtx X="998" Y="-107" Z="-499" S="1008" T="-16" R="224" G="12" B="134" A="255"/>
<Vtx X="1139" Y="-375" Z="-543" S="880" T="-16" R="207" G="250" B="139" A="255"/>
<Vtx X="887" Y="-661" Z="-123" S="752" T="-16" R="209" G="138" B="0" A="255"/>
<Vtx X="1084" Y="-652" Z="-328" S="752" T="-16" R="202" G="156" B="199" A="255"/>
<Vtx X="998" Y="-107" Z="-499" S="-16" T="-16" R="224" G="12" B="134" A="255"/>
<Vtx X="1172" Y="246" Z="-429" S="112" T="-16" R="4" G="81" B="158" A="255"/>
<Vtx X="1285" Y="-11" Z="-543" S="-16" T="-16" R="225" G="38" B="139" A="255"/>
<Vtx X="1300" Y="370" Z="-123" S="240" T="-16" R="47" G="118" B="0" A="255"/>
<Vtx X="1307" Y="192" Z="182" S="368" T="-16" R="51" G="69" B="94" A="255"/>
<Vtx X="1504" Y="201" Z="-22" S="240" T="-16" R="54" G="100" B="57" A="255"/>
<Vtx X="1189" Y="-184" Z="308" S="496" T="-16" R="27" G="245" B="124" A="255"/>
<Vtx X="1015" Y="-537" Z="182" S="624" T="-16" R="246" G="171" B="93" A="255"/>
<Vtx X="1302" Y="-440" Z="194" S="496" T="-16" R="11" G="209" B="118" A="255"/>
<Vtx X="1307" Y="192" Z="182" S="368" T="-16" R="51" G="69" B="94" A="255"/>
<Vtx X="1189" Y="-184" Z="308" S="496" T="-16" R="27" G="245" B="124" A="255"/>
<Vtx X="1448" Y="-76" Z="194" S="368" T="-16" R="41" G="26" B="117" A="255"/>
<Vtx X="1015" Y="-537" Z="182" S="624" T="-16" R="246" G="171" B="93" A="255"/>
<Vtx X="887" Y="-661" Z="-123" S="752" T="-16" R="209" G="138" B="0" A="255"/>
<Vtx X="1152" Y="-679" Z="-22" S="624" T="-16" R="227" G="146" B="57" A="255"/>
<Vtx X="1172" Y="246" Z="-429" S="112" T="-16" R="4" G="81" B="158" A="255"/>
<Vtx X="1300" Y="370" Z="-123" S="240" T="-16" R="47" G="118" B="0" A="255"/>
<Vtx X="1436" Y="228" Z="-328" S="112" T="-16" R="29" G="110" B="199" A="255"/>
</Vertex>
13 changes: 13 additions & 0 deletions soh/assets/custom/objects/object_festivehats/gEponaRudolphHatDL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<DisplayList Version="0">
<CallDisplayList Path="objects/object_festivehats/mat_gEponaRudolphHatDL_f3dlite_rednose"/>
<CallDisplayList Path="objects/object_festivehats/gEponaRudolphHatDL_tri_0"/>
<CallDisplayList Path="objects/object_festivehats/mat_gEponaRudolphHatDL_f3dlite_antlers"/>
<CallDisplayList Path="objects/object_festivehats/gEponaRudolphHatDL_tri_1"/>
<PipeSync/>
<SetGeometryMode G_LIGHTING="1" />
<ClearGeometryMode G_TEXTURE_GEN="1" />
<SetCombineLERP A0="G_CCMUX_0" B0="G_CCMUX_0" C0="G_CCMUX_0" D0="G_CCMUX_SHADE" Aa0="G_ACMUX_0" Ab0="G_ACMUX_0" Ac0="G_ACMUX_0" Ad0="G_ACMUX_ENVIRONMENT" A1="G_CCMUX_0" B1="G_CCMUX_0" C1="G_CCMUX_0" D1="G_CCMUX_SHADE" Aa1="G_ACMUX_0" Ab1="G_ACMUX_0" Ac1="G_ACMUX_0" Ad1="G_ACMUX_ENVIRONMENT"/>
<Texture S="65535" T="65535" Level="0" Tile="0" On="0"/>
<EndDisplayList/>
</DisplayList>

47 changes: 47 additions & 0 deletions soh/assets/custom/objects/object_festivehats/gEponaRudolphHatDL_tri_0
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
<DisplayList Version="0">
<LoadVertices Path="objects/object_festivehats/gEponaRudolphHatDL_vtx_0" VertexBufferIndex="0" VertexOffset="0" Count="16"/>
<Triangle1 V00="0" V01="1" V02="2"/>
<Triangle1 V00="0" V01="3" V02="1"/>
<Triangle1 V00="0" V01="4" V02="3"/>
<Triangle1 V00="0" V01="5" V02="4"/>
<Triangle1 V00="5" V01="6" V02="4"/>
<Triangle1 V00="5" V01="7" V02="6"/>
<Triangle1 V00="8" V01="7" V02="5"/>
<Triangle1 V00="8" V01="9" V02="7"/>
<Triangle1 V00="9" V01="8" V02="10"/>
<Triangle1 V00="9" V01="10" V02="11"/>
<Triangle1 V00="12" V01="9" V02="11"/>
<Triangle1 V00="12" V01="11" V02="13"/>
<Triangle1 V00="14" V01="12" V02="13"/>
<Triangle1 V00="14" V01="13" V02="15"/>
<LoadVertices Path="objects/object_festivehats/gEponaRudolphHatDL_vtx_0" VertexBufferIndex="0" VertexOffset="16" Count="16"/>
<Triangle1 V00="0" V01="1" V02="2"/>
<Triangle1 V00="0" V01="2" V02="3"/>
<Triangle1 V00="4" V01="0" V02="3"/>
<Triangle1 V00="4" V01="3" V02="5"/>
<Triangle1 V00="6" V01="4" V02="5"/>
<Triangle1 V00="6" V01="5" V02="7"/>
<Triangle1 V00="8" V01="6" V02="7"/>
<Triangle1 V00="8" V01="7" V02="9"/>
<Triangle1 V00="10" V01="8" V02="9"/>
<Triangle1 V00="10" V01="9" V02="11"/>
<Triangle1 V00="12" V01="8" V02="10"/>
<Triangle1 V00="12" V01="13" V02="8"/>
<Triangle1 V00="14" V01="13" V02="12"/>
<Triangle1 V00="15" V01="14" V02="12"/>
<LoadVertices Path="objects/object_festivehats/gEponaRudolphHatDL_vtx_0" VertexBufferIndex="0" VertexOffset="32" Count="16"/>
<Triangle1 V00="0" V01="1" V02="2"/>
<Triangle1 V00="0" V01="2" V02="3"/>
<Triangle1 V00="0" V01="3" V02="4"/>
<Triangle1 V00="5" V01="6" V02="7"/>
<Triangle1 V00="6" V01="8" V02="7"/>
<Triangle1 V00="6" V01="9" V02="8"/>
<Triangle1 V00="10" V01="9" V02="6"/>
<Triangle1 V00="10" V01="11" V02="9"/>
<Triangle1 V00="12" V01="11" V02="10"/>
<Triangle1 V00="12" V01="13" V02="11"/>
<Triangle1 V00="7" V01="8" V02="14"/>
<Triangle1 V00="7" V01="14" V02="15"/>
<EndDisplayList/>
</DisplayList>

22 changes: 22 additions & 0 deletions soh/assets/custom/objects/object_festivehats/gEponaRudolphHatDL_tri_1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<DisplayList Version="0">
<LoadVertices Path="objects/object_festivehats/gEponaRudolphHatDL_vtx_1" VertexBufferIndex="0" VertexOffset="0" Count="16"/>
<Triangle1 V00="0" V01="1" V02="2"/>
<Triangle1 V00="0" V01="2" V02="3"/>
<Triangle1 V00="0" V01="3" V02="4"/>
<Triangle1 V00="0" V01="4" V02="5"/>
<Triangle1 V00="5" V01="4" V02="6"/>
<Triangle1 V00="5" V01="6" V02="7"/>
<Triangle1 V00="5" V01="7" V02="8"/>
<Triangle1 V00="5" V01="8" V02="0"/>
<Triangle1 V00="9" V01="10" V02="11"/>
<Triangle1 V00="9" V01="12" V02="10"/>
<Triangle1 V00="9" V01="13" V02="12"/>
<Triangle1 V00="9" V01="14" V02="13"/>
<Triangle1 V00="14" V01="9" V02="15"/>
<LoadVertices Path="objects/object_festivehats/gEponaRudolphHatDL_vtx_1" VertexBufferIndex="0" VertexOffset="16" Count="5"/>
<Triangle1 V00="0" V01="1" V02="2"/>
<Triangle1 V00="0" V01="2" V02="3"/>
<Triangle1 V00="0" V01="3" V02="4"/>
<EndDisplayList/>
</DisplayList>

50 changes: 50 additions & 0 deletions soh/assets/custom/objects/object_festivehats/gEponaRudolphHatDL_vtx_0
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
<Vertex Version="0">
<Vtx X="2038" Y="-313" Z="-237" S="-401" T="-17" R="208" G="162" B="185" A="255"/>
<Vtx X="1947" Y="-152" Z="0" S="-401" T="-145" R="140" G="205" B="0" A="255"/>
<Vtx X="1944" Y="-123" Z="-112" S="-401" T="-17" R="140" G="222" B="218" A="255"/>
<Vtx X="2043" Y="-366" Z="0" S="-401" T="-145" R="208" G="138" B="0" A="255"/>
<Vtx X="2358" Y="-266" Z="0" S="-145" T="-145" R="88" G="164" B="0" A="255"/>
<Vtx X="2289" Y="-260" Z="-157" S="-145" T="-17" R="67" G="163" B="200" A="255"/>
<Vtx X="2439" Y="-67" Z="0" S="-17" T="-145" R="125" G="235" B="0" A="255"/>
<Vtx X="2340" Y="-132" Z="-253" S="-17" T="-17" R="82" G="222" B="166" A="255"/>
<Vtx X="2038" Y="-313" Z="-237" S="-145" T="239" R="208" G="162" B="185" A="255"/>
<Vtx X="2063" Y="-196" Z="-293" S="-17" T="239" R="216" G="221" B="141" A="255"/>
<Vtx X="1944" Y="-123" Z="-112" S="-145" T="239" R="140" G="222" B="218" A="255"/>
<Vtx X="1958" Y="-60" Z="-158" S="-17" T="239" R="153" G="254" B="181" A="255"/>
<Vtx X="2099" Y="34" Z="-321" S="111" T="239" R="221" G="46" B="143" A="255"/>
<Vtx X="1977" Y="63" Z="-173" S="111" T="239" R="175" G="57" B="176" A="255"/>
<Vtx X="2352" Y="147" Z="-244" S="111" T="-17" R="61" G="78" B="177" A="255"/>
<Vtx X="2197" Y="159" Z="-131" S="111" T="-17" R="240" G="122" B="224" A="255"/>
<Vtx X="2411" Y="155" Z="0" S="111" T="-145" R="95" G="85" B="0" A="255"/>
<Vtx X="2352" Y="147" Z="-244" S="111" T="-17" R="61" G="78" B="177" A="255"/>
<Vtx X="2197" Y="159" Z="-131" S="111" T="-17" R="240" G="122" B="224" A="255"/>
<Vtx X="2228" Y="163" Z="0" S="111" T="-145" R="5" G="127" B="0" A="255"/>
<Vtx X="2352" Y="147" Z="244" S="111" T="-273" R="61" G="78" B="79" A="255"/>
<Vtx X="2197" Y="159" Z="131" S="111" T="-273" R="240" G="122" B="32" A="255"/>
<Vtx X="2099" Y="34" Z="321" S="111" T="-529" R="221" G="46" B="113" A="255"/>
<Vtx X="1977" Y="63" Z="173" S="111" T="-529" R="175" G="57" B="80" A="255"/>
<Vtx X="2063" Y="-196" Z="293" S="-17" T="-529" R="216" G="221" B="115" A="255"/>
<Vtx X="1958" Y="-60" Z="158" S="-17" T="-529" R="153" G="254" B="75" A="255"/>
<Vtx X="2038" Y="-313" Z="237" S="-145" T="-529" R="208" G="162" B="71" A="255"/>
<Vtx X="1944" Y="-123" Z="112" S="-145" T="-529" R="140" G="222" B="38" A="255"/>
<Vtx X="2289" Y="-260" Z="157" S="-145" T="-273" R="67" G="163" B="56" A="255"/>
<Vtx X="2340" Y="-132" Z="253" S="-17" T="-273" R="82" G="222" B="90" A="255"/>
<Vtx X="2358" Y="-266" Z="0" S="-145" T="-145" R="88" G="164" B="0" A="255"/>
<Vtx X="2043" Y="-366" Z="0" S="-401" T="-145" R="208" G="138" B="0" A="255"/>
<Vtx X="2043" Y="-366" Z="0" S="-401" T="-145" R="208" G="138" B="0" A="255"/>
<Vtx X="2289" Y="-260" Z="157" S="-145" T="-273" R="67" G="163" B="56" A="255"/>
<Vtx X="2038" Y="-313" Z="237" S="-401" T="-273" R="208" G="162" B="71" A="255"/>
<Vtx X="1944" Y="-123" Z="112" S="-401" T="-273" R="140" G="222" B="38" A="255"/>
<Vtx X="1947" Y="-152" Z="0" S="-401" T="-145" R="140" G="205" B="0" A="255"/>
<Vtx X="2358" Y="-266" Z="0" S="-145" T="-145" R="88" G="164" B="0" A="255"/>
<Vtx X="2439" Y="-67" Z="0" S="-17" T="-145" R="125" G="235" B="0" A="255"/>
<Vtx X="2340" Y="-132" Z="253" S="-17" T="-273" R="82" G="222" B="90" A="255"/>
<Vtx X="2352" Y="147" Z="244" S="111" T="-273" R="61" G="78" B="79" A="255"/>
<Vtx X="2411" Y="155" Z="0" S="111" T="-145" R="95" G="85" B="0" A="255"/>
<Vtx X="2340" Y="-132" Z="-253" S="-17" T="-17" R="82" G="222" B="166" A="255"/>
<Vtx X="2352" Y="147" Z="-244" S="111" T="-17" R="61" G="78" B="177" A="255"/>
<Vtx X="2063" Y="-196" Z="-293" S="-17" T="239" R="216" G="221" B="141" A="255"/>
<Vtx X="2099" Y="34" Z="-321" S="111" T="239" R="221" G="46" B="143" A="255"/>
<Vtx X="2099" Y="34" Z="321" S="111" T="-529" R="221" G="46" B="113" A="255"/>
<Vtx X="2063" Y="-196" Z="293" S="-17" T="-529" R="216" G="221" B="115" A="255"/>
</Vertex>
23 changes: 23 additions & 0 deletions soh/assets/custom/objects/object_festivehats/gEponaRudolphHatDL_vtx_1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<Vertex Version="0">
<Vtx X="-51" Y="-1835" Z="-336" S="1124" T="1240" R="226" G="228" B="120" A="255"/>
<Vtx X="1312" Y="-1676" Z="-441" S="1987" T="1268" R="2" G="232" B="125" A="255"/>
<Vtx X="1099" Y="-892" Z="-181" S="1885" T="1872" R="2" G="232" B="125" A="255"/>
<Vtx X="66" Y="-801" Z="-244" S="1240" T="1982" R="237" G="242" B="125" A="255"/>
<Vtx X="-1194" Y="-1229" Z="-816" S="358" T="1684" R="192" G="228" B="106" A="255"/>
<Vtx X="-525" Y="-2017" Z="-504" S="813" T="1145" R="206" G="206" B="106" A="255"/>
<Vtx X="-1544" Y="-2071" Z="-1356" S="19" T="1016" R="182" G="207" B="91" A="255"/>
<Vtx X="-1149" Y="-2858" Z="-1650" S="171" T="359" R="206" G="185" B="93" A="255"/>
<Vtx X="-237" Y="-3221" Z="-1543" S="731" T="29" R="227" G="171" B="90" A="255"/>
<Vtx X="-51" Y="-1835" Z="336" S="1124" T="1240" R="226" G="228" B="136" A="255"/>
<Vtx X="1099" Y="-892" Z="181" S="1885" T="1872" R="2" G="232" B="131" A="255"/>
<Vtx X="1312" Y="-1676" Z="441" S="1987" T="1268" R="2" G="232" B="131" A="255"/>
<Vtx X="66" Y="-801" Z="244" S="1240" T="1982" R="237" G="242" B="131" A="255"/>
<Vtx X="-1194" Y="-1229" Z="816" S="358" T="1684" R="192" G="228" B="150" A="255"/>
<Vtx X="-525" Y="-2017" Z="504" S="813" T="1145" R="206" G="206" B="150" A="255"/>
<Vtx X="-237" Y="-3221" Z="1543" S="731" T="29" R="227" G="171" B="166" A="255"/>
<Vtx X="-525" Y="-2017" Z="504" S="813" T="1145" R="206" G="206" B="150" A="255"/>
<Vtx X="-237" Y="-3221" Z="1543" S="731" T="29" R="227" G="171" B="166" A="255"/>
<Vtx X="-1149" Y="-2858" Z="1650" S="171" T="359" R="206" G="185" B="163" A="255"/>
<Vtx X="-1544" Y="-2071" Z="1356" S="19" T="1016" R="182" G="207" B="165" A="255"/>
<Vtx X="-1194" Y="-1229" Z="816" S="358" T="1684" R="192" G="228" B="150" A="255"/>
</Vertex>
11 changes: 11 additions & 0 deletions soh/assets/custom/objects/object_festivehats/gHorseAntlersDL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<DisplayList Version="0">
<CallDisplayList Path="objects/object_festivehats/mat_gHorseAntlersDL_f3dlite_antlers"/>
<CallDisplayList Path="objects/object_festivehats/gHorseAntlersDL_tri_0"/>
<PipeSync/>
<SetGeometryMode G_LIGHTING="1" />
<ClearGeometryMode G_TEXTURE_GEN="1" />
<SetCombineLERP A0="G_CCMUX_0" B0="G_CCMUX_0" C0="G_CCMUX_0" D0="G_CCMUX_SHADE" Aa0="G_ACMUX_0" Ab0="G_ACMUX_0" Ac0="G_ACMUX_0" Ad0="G_ACMUX_ENVIRONMENT" A1="G_CCMUX_0" B1="G_CCMUX_0" C1="G_CCMUX_0" D1="G_CCMUX_SHADE" Aa1="G_ACMUX_0" Ab1="G_ACMUX_0" Ac1="G_ACMUX_0" Ad1="G_ACMUX_ENVIRONMENT"/>
<Texture S="65535" T="65535" Level="0" Tile="0" On="0"/>
<EndDisplayList/>
</DisplayList>

22 changes: 22 additions & 0 deletions soh/assets/custom/objects/object_festivehats/gHorseAntlersDL_tri_0
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<DisplayList Version="0">
<LoadVertices Path="objects/object_festivehats/gHorseAntlersDL_vtx_0" VertexBufferIndex="0" VertexOffset="0" Count="16"/>
<Triangle1 V00="0" V01="1" V02="2"/>
<Triangle1 V00="0" V01="2" V02="3"/>
<Triangle1 V00="0" V01="3" V02="4"/>
<Triangle1 V00="0" V01="4" V02="5"/>
<Triangle1 V00="5" V01="4" V02="6"/>
<Triangle1 V00="5" V01="6" V02="7"/>
<Triangle1 V00="5" V01="7" V02="8"/>
<Triangle1 V00="5" V01="8" V02="0"/>
<Triangle1 V00="9" V01="10" V02="11"/>
<Triangle1 V00="9" V01="12" V02="10"/>
<Triangle1 V00="9" V01="13" V02="12"/>
<Triangle1 V00="9" V01="14" V02="13"/>
<Triangle1 V00="14" V01="9" V02="15"/>
<LoadVertices Path="objects/object_festivehats/gHorseAntlersDL_vtx_0" VertexBufferIndex="0" VertexOffset="16" Count="5"/>
<Triangle1 V00="0" V01="1" V02="2"/>
<Triangle1 V00="0" V01="2" V02="3"/>
<Triangle1 V00="0" V01="3" V02="4"/>
<EndDisplayList/>
</DisplayList>

23 changes: 23 additions & 0 deletions soh/assets/custom/objects/object_festivehats/gHorseAntlersDL_vtx_0
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<Vertex Version="0">
<Vtx X="-51" Y="-1835" Z="-336" S="1124" T="1240" R="226" G="228" B="120" A="255"/>
<Vtx X="1312" Y="-1676" Z="-441" S="1987" T="1268" R="2" G="232" B="125" A="255"/>
<Vtx X="1099" Y="-892" Z="-181" S="1885" T="1872" R="2" G="232" B="125" A="255"/>
<Vtx X="66" Y="-801" Z="-244" S="1240" T="1982" R="237" G="242" B="125" A="255"/>
<Vtx X="-1194" Y="-1229" Z="-816" S="358" T="1684" R="192" G="228" B="106" A="255"/>
<Vtx X="-525" Y="-2017" Z="-504" S="813" T="1145" R="206" G="206" B="106" A="255"/>
<Vtx X="-1544" Y="-2071" Z="-1356" S="19" T="1016" R="182" G="207" B="91" A="255"/>
<Vtx X="-1149" Y="-2858" Z="-1650" S="171" T="359" R="206" G="185" B="93" A="255"/>
<Vtx X="-237" Y="-3221" Z="-1543" S="731" T="29" R="227" G="171" B="90" A="255"/>
<Vtx X="-51" Y="-1835" Z="336" S="1124" T="1240" R="226" G="228" B="136" A="255"/>
<Vtx X="1099" Y="-892" Z="181" S="1885" T="1872" R="2" G="232" B="131" A="255"/>
<Vtx X="1312" Y="-1676" Z="441" S="1987" T="1268" R="2" G="232" B="131" A="255"/>
<Vtx X="66" Y="-801" Z="244" S="1240" T="1982" R="237" G="242" B="131" A="255"/>
<Vtx X="-1194" Y="-1229" Z="816" S="358" T="1684" R="192" G="228" B="150" A="255"/>
<Vtx X="-525" Y="-2017" Z="504" S="813" T="1145" R="206" G="206" B="150" A="255"/>
<Vtx X="-237" Y="-3221" Z="1543" S="731" T="29" R="227" G="171" B="166" A="255"/>
<Vtx X="-525" Y="-2017" Z="504" S="813" T="1145" R="206" G="206" B="150" A="255"/>
<Vtx X="-237" Y="-3221" Z="1543" S="731" T="29" R="227" G="171" B="166" A="255"/>
<Vtx X="-1149" Y="-2858" Z="1650" S="171" T="359" R="206" G="185" B="163" A="255"/>
<Vtx X="-1544" Y="-2071" Z="1356" S="19" T="1016" R="182" G="207" B="165" A="255"/>
<Vtx X="-1194" Y="-1229" Z="816" S="358" T="1684" R="192" G="228" B="150" A="255"/>
</Vertex>
11 changes: 11 additions & 0 deletions soh/assets/custom/objects/object_festivehats/gLinkAdultHatTrimDL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<DisplayList Version="0">
<CallDisplayList Path="objects/object_festivehats/mat_gLinkAdultHatTrimDL_f3dlite_santahat_white"/>
<CallDisplayList Path="objects/object_festivehats/gLinkAdultHatTrimDL_tri_0"/>
<PipeSync/>
<SetGeometryMode G_LIGHTING="1" />
<ClearGeometryMode G_TEXTURE_GEN="1" />
<SetCombineLERP A0="G_CCMUX_0" B0="G_CCMUX_0" C0="G_CCMUX_0" D0="G_CCMUX_SHADE" Aa0="G_ACMUX_0" Ab0="G_ACMUX_0" Ac0="G_ACMUX_0" Ad0="G_ACMUX_ENVIRONMENT" A1="G_CCMUX_0" B1="G_CCMUX_0" C1="G_CCMUX_0" D1="G_CCMUX_SHADE" Aa1="G_ACMUX_0" Ab1="G_ACMUX_0" Ac1="G_ACMUX_0" Ad1="G_ACMUX_ENVIRONMENT"/>
<Texture S="65535" T="65535" Level="0" Tile="0" On="0"/>
<EndDisplayList/>
</DisplayList>

Loading
Loading