* Fixed soh filters
* add more makefile changes
* almost ready
* more updates
* update
* update
* Update Makefiles to handle both platforms
* Allow for overriding the CXX and CC executables
* Restore original structure while supporting custom CXX flags
* Remove some platform specific libs
* Dynamic target name
* Make X11 paths package-agnostic
* Remove changes to `gfx_opengl.cpp`
* Use OpenGL2 on MacOS instead of OpenGL3
* make it actually render something
* render at least the first texture, still need to figure out the second
one
* Let’s use OpenGL 3 again
* maybe this works to get the right texture? link's eyes still look off a bit
* did this work?
* set the platform to macos
* actual numbers are right, but logic is ugly XXX/TODO, i know
* add zlib to ldflags for ZAPDUtils
* A bit of cleanup
* Revert unneeded changes
* Remove GL_CHECK
* Fix issues with z64 branch
* use an std::map instead of a giant array
* three point filter fix (#2)
* Fix mac compilation
* fix audio for 64 bit
* revert audio heap size, keep bigger pools
* Add more Apple specific checks to our modifications
* Add building instructions for macOS
* Remove unecessary step from building instructions
* Add missing SDL2 & GLEW to Linux LDLIBS
* Update BUILDING.md
Co-authored-by: BountyChocolate123456 <101743444+BountyChocolate123456@users.noreply.github.com>
* Update soh/.gitignore to include other arch binaries
Co-authored-by: BountyChocolate123456 <101743444+BountyChocolate123456@users.noreply.github.com>
* Use right platform name for debugging window
Co-authored-by: BountyChocolate123456 <101743444+BountyChocolate123456@users.noreply.github.com>
* Fix stormlib on macos (arm64)
* Simplify some of the ifdef checks
* Revert an older no longer necessary fix
* Remove remaining unecessary deviations
* Update building instructions after StormLib changes
* Feature: Use OpenGL 4.1 (#1)
* Further tweak the BUILDING
* Tidy up
* reword -j message
* Add Jenkins CI Support (#2)
* Fix type issues
* add target <appbundle> and <filledappbundle>
add makefile targets to create an .app
`filledappbundle` creates the target with the .otr included
this should perhaps be moved to Application Support though
* pull gcc's rpath from otool output
* move make target to the end so it's not default
* Add Jenkins and make exe in par with other platforms
* Actually save build artefacts
* Fix artefact path
* Remove x11 mentions and linking (not used)
* Update building instructions for generating app
* use appsupport directory
* Add new app icon
* Update target to match macOS types
* Update more audio types
* fix null deref in Audio_PlayFanfare
* Remove old import from z64
* address final nit with apple ifdefs
Co-authored-by: KiritoDev <36680385+KiritoDv@users.noreply.github.com>
Co-authored-by: Jeffrey Crowell <github@crowell.biz>
Co-authored-by: BountyChocolate123456 <101743444+BountyChocolate123456@users.noreply.github.com>
* Added save filename and path to config file
Closes#110
* Moved FileIO to libultraship
* Moved OOT Specific Code to OTRGlobals and made libultraship for general file IO. Combined config options.
* Moved filesystem include into GlobalCtx2.h
* Added three sliders for multiplying damage:
1) Generic Slider, includes everything not multiplied by other sliders
2) Fall Damage Slider, includes all fall damage
3) Void Damage Slider, includes all void out damage
* Included tooltips
* Modified func_80837B18 to handle the modified flag the same as Player_InflictDamage does
* hotfix of a dumb oversight
* Fixed an oversight that led to compile failure on Linux and probably more things that weren't noticeable in unit testing
* I keep missing dumb mistakes.
I keep missing dumb mistakes.
Is this the last dumb mistake I've missed?
* Oh crud it's because I declared func_80837B18_modified after func_80837B18 isn't it? I am the ultimate dumbus.
* Fix: SohImGui behavior and cleanup
- FIX: Once Save Editor / Collision Viewer are closed, set their values back to 0 so they don't automatically open once we click on Developer Tools
- FIX: Same kind of fixes for every cosmetics editor
- FIX: Typo "gCosmticsEditor" to "gCosmeticEditor"
- TWEAK: Cleanup of useless stylizing options on Cosmetics
* TWEAK: Reset a pointer that I edited for some testing
* FIX: Typo from Assignable tunic / boots tooltip
* move cvar.h includes out of extern c block
* remove extra line
Co-authored-by: briaguya <briaguya@alice>
* Add Controller Navigation
- Apply Rainbow patch
- Add Controller Navigation
- Controller "Back" button opens F1 Menu
- Controller Rumble/Gyro settings at the bottom of the controller menu
* Restore changes from PR #306
Add back update from https://github.com/HarbourMasters/Shipwright/pull/306
* Add Tooltip of new functionality
Tooltip:
Allows controller navigation of the menu bar
D-pad to move between items, A to select, and X to grab focus on the menu bar
* set & save check
* Fixes for switch port
* Add fishing pole as sword in save editor
Adds fishing pole as a sword to the save editor under current equipment.
* Improve Collision Viewer
Made all the values of the collision viewer persistent.
Switched all color pickers to the EnhancementColor picker.
Added a checkbox to enable/disable collision viewer.
* Update SohImGuiImpl.cpp
Probably fixed linux build error
* Update colViewer.cpp
Hopefully fixed it this time. Lets wait for jenkins.
* Fixed colors
Some color values were wrong
* Update SohImGuiImpl.cpp & SohImGuiImpl.h
* Fixes the Gravedigging Tour heartpiece bug.
Basically just causes Dampe's Gravedigging Tour Heart Piece to set a Collect flag on the Graveyard Scene when collected instead of a GetItemInf flag when it's spawned. I did this by simply the result of Item_DropCollectible to a variable called reward and running reward->collectibleFlag = 0x19 if the reward was a heartpiece.
There may be a better way to do this. This is unlike most of the other dropped items with collectible flags in the game, which have some binary operations performed on the item to be dropped before passing it into Item_DropCollectible. See z_en_geldb.c and z_bg_haka_tubo.c for examples of this. I tried to find some way to do something more like that here but I was unable to wrap my head around the binary operations being performed. I may revisit this in the future.
* Reimplements vanilla bug, adds cvar and checkbox for the fix.
* Adds some newlines to the Tooltip
* Shortens ImGui tooltip.
* Removes the hardcoded Purple Rupee/Heart Piece reward.
* Sets collectibleFlag whether cvar is on or not to prevent duping.
* Sets Gravedigging Tour Fix to enabled by default
* Simplifies logic for whether or not to spawn heart piece
* Adds TempClear flag set and check for heart piece.
This originally introduced a bug where the player could spawn multiple
heart pieces by simply not collecting the one that spawns and continuing
to dig up spots. This fixes that by checking a temp clear flag before
spawning the heart piece and setting it when the heart piece spawns.
Since this is a temp clear flag it will not stay set if the player
exits the scene, so this still does fix the bug of locking the
player out of the heart piece when spawning it and leaving without
picking it up.
As far as I can tell this temp clear flag isn't used anywhere else
in this scene. The only one used in this scene I could find is that
killing the first Poe in this scene sets flag 0x02 (or maybe it's
0x01, not sure if the flags start at 1 or 0).
* Replaces magic numbers with constants defined in z_en_tk.h
* Updates comment explaining changed code.
* Replaces another magic number I forgot to replace last commit.
* Replaces TempClear flag with local variable
* Removes TempClearFlag const and moves others out of .h to .c (felt like they made more sense there)
* ADDED: Draw Distance toggle under Experimental enhancement
* FIXED: Dark Link Apparition + Kokiri NPC spawn
* Added a Toggle for Kokiri NPC since they are mystics
* TWKEA: Desciription got the Kokiri draw distance
* FIXED: Horses behavior
Fixed Epona shout on title screen + Epona call from songFixed Zelda and Ganon horses that could still be seen on camera pan on the castle escape cinematic
* Tweak: Draw Distance: Kokiris menu behavior
Force the Kokiri Draw Distance to be set to 0 if the Draw Distance is disabled
* #243 Add option to disable black bars letterboxes
* #243 Add option to disable black bars letterboxes
* Update libultraship/libultraship/SohImGuiImpl.cpp
* Update libultraship/libultraship/SohImGuiImpl.cpp
* Update libultraship/libultraship/SohImGuiImpl.cpp
Co-authored-by: Ada <60364512+GreatArgorath@users.noreply.github.com>
* Add new line
Co-authored-by: Ada <60364512+GreatArgorath@users.noreply.github.com>
* Added slider to increase vine/ladder climbing speed
* moved to cheats menu and made steps more granular
* Fix granularity math
* back to the enhancements menu!
* ADDED: Draw Distance toggle under Experimental enhancement
* FIXED: Dark Link Apparition + Kokiri NPC spawn
* Added a Toggle for Kokiri NPC since they are mystics
* TWKEA: Desciription got the Kokiri draw distance
* FIXED: Horses behavior
Fixed Epona shout on title screen + Epona call from songFixed Zelda and Ganon horses that could still be seen on camera pan on the castle escape cinematic
* Enhancement: More options for Kaleido Link
ADDED: 14 animations to use
ADDED: 2 random mode
ADDED: Link rotation on the menu with DPAD-Left and Right
ADDED: Reset position with DPAD-Up and Down
* ADDED/ Choice to use C-Button or D-pad
* HUD Logic fix and cleaning
* array revert it was just fo rme to read it better
* Fix tunic logic seem like my cleaning was not good
* I had declared default in CPP
It resulted to overwrite what user would make oof.
Also a ! was missing.
* There, Default here is better.
* magic bar and used bar what switched
while updating EnhancementColor
* hud mod update
* Update SohImGuiImpl.h
* should fix build
* Players can now spam their way through Kaepora Gaebora dialogue
* Turned the Owl Text Inversion into a toggle
Instead of replacing the Kokiri Owl Text at boot, a new Text Entry is added for it
* Attempt to make it compile on Linux
* Added multilingual support
* Commented the code to clear up confusion
* Update SohImGuiImpl.cpp
* Add int variant of CVar_ Get/Set/Register
* Add variant of CVar_ Get/Set/Register
* Add LoadHUDColors()
* Added temporary menu for custom colors
* vars added
* added section load
* variables save/load
* register boolean for colors radiobox
* Minimap recolor
* Hearts (top left) color, incl. DD variant
* Add A/B/C/Start btn colors and rupee
* A & C button icon and save prompt cursor.
* A & C notes and cursor
* Some notes I forgot tbh was open since hours.
* Shops cursor color with included pulse
* Wrong section was added
* Fixed some logic there and removed an unused if
* Moved a condition to make it better.
* That what happen when you left it open for hours
* Update z_message_PAL.c
* Added color array for A button
* Get/Set/Register Int not needed anymore
* Update Cvar.h
* Update Cvar.cpp
* Removed HUDCOLOR_SECTION moved it to cosmetics
Updated Tunics and navi mod too.
* changed categorie name and updated
* Updated Cosmetics menu and add colors there
* Update GameSettings.cpp
* Update GameSettings.h
* A more generic name
* Update SohImGuiImpl.cpp
* Update bootcommands.c
* update var name
* var name update
* var name update (creative name I know...)
* Updated variables names to match gHudColors
* to lazy to name this one
* gHudColors renaming stuff there too
* guess what, variable renaming.
* Update Tunic/Navi mods with new variable name.
* Updated Links tunic variable names
* Fix condition for Right C button
* Add condition to check if the button is on
* Added system to check if color tunics is turned on.
* Added empty C button colors
* Add ability to move Hearts
* Ability to move minimap (incl. dgn one)
Add Dungeon icon fix requirement. once merged I will fix conflict with this one.
* Compass icon move with the minimap
* Added several button move function
* stone of agony folly the interface too.
* fix minimap alpha
* Fixes notes env color (was showing incorrectly)
* PR repo mass update, cleaning incoming
* Clean_PR stuff
* useless there ...
* Properly load the function.
Imagine creating a pseudo function to load load of colour and you actually forgot to add it, could not be me right , RIGHT ?
* fix conflict and useless edit
* Fix default color for A/B and C btns
* Fix Rupee default color in ImGUI
* Reworked Tunics handling, much better this way
* Fix minimap default color
* C button default color fix
* better behavior and default color fix
* Fixed every default color to match gamecube style
* Fix dungeon entrance icon n.2
it was not using margin and always show icon system
* This need a scene else it show everywhere oof
* Removes the code that plays the low health alarm sound effect, by removing that instead of making HealthMeter_IsCritical always return false, Link will still play the tired animation when low on health.
* Made the low health alarm an enhancement toggle
* Adds tooltip function and tooltips to various ImGui menu items
* Update SohImGuiImpl.cpp
* Adds more tooltips and changes input scale tooltip
Adds for anti-aliasing settings, cheats, and debug settings
Changes tooltip for input scale to be more clear
* Fixes typos, makes N64 mode more clear, and americanizes it
* Update SohImGuiImpl.cpp
* Standardises D-pad spelling
* Update SohImGuiImpl.cpp
* Fixes typo, changes dungeon entrances tooltip, and fixes tabs
* Clearer wording
* Removes full stop
* Removes spaces from new line
* Removes space after \n
* Makes Linux compile
* Fixes wording
* Initial Linux/GCC support commit
* Add instructins for linux in the README
* apply suggestions by @Erotemic and @Emill
* Fix python 3.10 symlink line
* Fix func_80041E80 type mismatch (#3)
Type mismatch functions.h:664
* Makefile: clean OTRExporter/libultraship/ZAPDTR with distclean and fix CXX_FILES
* Makefile: find C/CXX_FILES automatically
* Makefile: remove ugly conditions in find commands
* cleanup _MSC_VER usage
* fix Windows build
* cleanup extraction scripts
* fix Windows build
* Fix Windows path separator issue
* fix rumble support for linux
* use glew-cmake in dockerfile
* add pulseaudio backend
* fix ZAPDTR linkage
* Check for "soh.elf" in directory (#6)
hide second button if `soh.exe` or `soh.elf` is present
* Fix hardcoded segment addresses (#5)
* fix condition
* hack lus -> soh dep for ZAPDTR
Co-authored-by: sholdee <102821812+sholdee@users.noreply.github.com>
Co-authored-by: qurious-pixel <62252937+qurious-pixel@users.noreply.github.com>
Co-authored-by: GaryOderNichts <12049776+GaryOderNichts@users.noreply.github.com>
* Adding Languages section
* Added LanguagesSection
* Register the Cvar
* Added switcher method
* Added Language selection menu + function
* function ref.
* Conflict fixes to be sure nothing else is modded
* space removed
* no need to have conditions since ID are the same
Added back EndMenu into the Cheats section. Preventing the dropdown from expanding across the screen.
Co-Authored-By: IShallRiseAgain <49771132+IShallRiseAgain@users.noreply.github.com>
* Rumble indefinitely until turned off
* Add rumble cvar
* Register CVar
* Check if controller can rumble to insert rumble pak
* Reduce verbosity of checks
* Remove extraneous const_cast
* Once again remove extraneous const_cast
* Add per-controller settings
* Add nice spacing
* Only display controller entry if pad connected
* Const some stuff
* Fix L/R buttons color in Kaleido menu.
I know this is a bug even official game but that definitely a logic bug.
That could be considered are a mods.
This make both button L and R have the same color on Hover and normal.
* Update z_kaleido_scope_PAL.c
* Condition to be on
Added condition to be on only if toggled on
* Cvar registers
* bool addition
* Added the item in menu
* Added bool in bootcommands
By default it is on.
* Hide and make it forced on by default
* Hide menu entry for that fix
* Add Enhancement 3D Dropped Items
It will change most of dropped item to there 3D models variant, Exclude Rupee from Hyrule Castle (when you are child and in quest to see Zelda.)
* Fix z_kaleido_scope_PAL.c L and R button color issues
This fix an issue in IF and gDPSetPrimColor for button L & R icon.
making it with an else to place the on hover and normal color properly in both button so they both have exact same colour
* Fix quite a big logic issue for 3D item drops
In short,case logic required to be different with break; old version make it all fucked up with improper values.
* Clean Const that was present nor not.
* Update z_kaleido_scope_PAL.c
* Update z_kaleido_scope_PAL.c
* Visual / Audio Stone of Agony
This add Sound and blinking icon for the item Stone of Agony.
Useful for peoples that have issues with rumble anything other person that is also blind or deaf.
This is made with these second person in mind, home they will like it :)
* Adding bool there
Yes I do fiels one by one to be sure
* Adding the Cvar register
1 file left :D
* Adding the main change in func_80848EF8
And that the last file :)
* Adds fast text option
Changes previous "fast text" option to "skip text", and adds a new "fast text" option, which makes text appear 5 times faster.
* Fixes magic numbers
* Changes text speed to a slider (unfinished)
Got most of the code working, but only works upon reloading the game, unsure of how to fix this.
* Makes text speed adjustable via a slider
* Cleans up changes to z_message_PAL.c
