* hacks to align strings for clang... wow just wow
* start work to getting built with clang
* fix issues with struct constructors, all builds, doesn't link still
* fix some narrowing issues that clang complains about
* fix compliation of zapd
* fix null deref in VersionInfo
* builds with clang
* make stringbuilding use StringHelper instead of addition
* fix linking
* add CLANG SHIP overlay on clang built versions
* doesn't need to be volatile
* mark unknown strings as extern
* rename some stuff
* can't align extern
* hopefully fix compilation for everythign
* expandtab
* allow setting LD
* Revert "allow setting LD"
This reverts commit 711aba6db2.
maybe to use lld it should be a LDFLAG?
* -Wno-deprecated-declarations is required for newer versions of clang
on macOS 13 beta sdk, the version of apple clang requires this
* Add jenkins support for clang
* Forward CXX flags to stormlib compilation
* Move GCC only flags to check
* use exports to set multiarch setup
* Fix Jenkins forever
* use make instead of cmake --build
add some flags to build with clang-11 as well
* address review coments
- rework extraction to allow multi thread
- misc readability cleanup
* update makefile to add WARN on linux+clang
Co-authored-by: David Chavez <david@dcvz.io>
* Fix upgrade name text not rendering
* Use cvar and don't render equip help for empty item slots
* Fix rendering logic
* Fix incorrect item name rendered for one frame
* Reorder comparison
* Remove extra indent
* Remove accidental changes
* branch init + few fixes
* Reset button
* Several texts fixes and default color to GameCube
* space issues
* some more extra space that was not needed.
* space yes last time ...
* Arrows being able to be rainbow some more texts fixes
* more texts fixes
* c-buttons some plurial fix
* -
* 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>
* First batch some overlay
* Almost all overlay
* effect & gamestate
* kaleido stuffs
* more overlay
* more left over from code folder
* remaining hardcoded line and file
* Open & Close _DISP __FILE__ & __LINE__ clean up
* Some if (1) {} remove
* LOG_xxxx __FILE__ , __LINE__ cleaned
* ASSERT macro __FILE__ __LINE__
* mtx without line/file in functions
* " if (1) {} " & "if (0) {}" and tab/white place
* LogUtils as macro
* GameState_, GameAlloc_, SystemArena_ & ZeldaArena_
* Revert "GameState_, GameAlloc_, SystemArena_ & ZeldaArena_"
This reverts commit 0d85caaf7e.
* Like last commit but as macro
* Fix matrix not using macros
* use function not macro
* DebugArena_* functions
GameAlloc_MallocDebug
BgCheck_PosErrorCheck as macros
removed issues with ; in macro file
* 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.
* Add checkbox to make holding the D-pad act like holding the joystick on the file and pause screens. Also fix unguarded debug camera action.
* Removed new cvar from UI, made it enabled by default and control the D-pad hold behavior with the existing cvar instead, changed cvar for debug check too
* 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)
* #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
* 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>
* Boss title fixes.
* Proper X/Y/H/W
* Proper x,y,w,h
* Proper X,Y,W,H
* Actually had wrong height (was 32, should be 40)
* one of the last x,y,h,w fix
* WIP really need a better way to check it.
* Fix Ganondorf title card.
* better conditional logic
* No more workaround!
* Add two var in the TitleCardContext structures
* Added hasTranslation to Phantom Ganon's Horse
funny how that the horse that hold the title card.
* Add hasTranslation to Dodongo.
* Revert workaround and add hasTranslation=false
* Added hasTranslation to big piggy Ganon
* Add hasTranslation to Gohma
* Add hasTranslation to Morpha
* Add hasTranslation to Twins first part.
* Add hastranslation to that eletro "dude"
* Add hastranslation to bongo bongo
* Added hasTranslation to airwing v2
* add hasTranslation to TitleCard_InitBossName init
* isBossCard to true now that I can confirm it work
imagine in TitleCard_InitBossName setting isBossCard to false...
* no need to use bool there is seem to not like it
* change bool to s16
* 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
* 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