* -
* DPad/some margin fix(left side)
* various ImGui stuff and fixes
* disabled kaleido menu (non working)
* fix win being dumb
* same for C btn this time
* Fix windows build
* Beating hearts fix
* Default win size and some placement fix
* Fix Dpad Ammo & C notes, Kaleido, white dog
* some texts fix and tab move
* Add stone of agony, some fixes and build correctly
* precise item place with Dpad
* Gamecube -> GameCube
Co-authored-by: Baoulettes <iMacWin10>
* use ini window resolution
* use arguments for directx window size
* default 640x480 not 320x240
* kick off a build
* and revert
* default config 640x480 not 320x240
* add todo
Co-authored-by: briaguya <briaguya@alice>
* Adds toggles for disabling random drops and fixed heart drops
* Changed the "No Fixed Heart Drops" toggle to the more useful "No Random Heart Drops" toggle
* Adds an explanation that the no heart drops option is similar to Hero Mode
* Moved difficulty options into their own sub-menu
Moved time saver options into their own sub-menu
Moved clutter reducing options into their own sub-menu
* fixed the tag name of mweep speed
* Moved Skip Text to Experimental
* 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
David Chavez