* Change CMake process to copy assets necessary for OTR creation to VS run directory.
Remove reference to ExtractAssets target from Windows build instructions.
* Unify build instructions where appropriate across PC platforms.
Clarify commented parts of some commands.
* PR feedback.
* start on arch
* noconfirm
* git
* noconfirm
* just skip cache
* cmake
* ninja
* gcc
* lsb
* sdl2
* png
* sdl net
* boost
* imagemagick and add opensuse
* non interactive
* git
* cmake
* add a bunch
* things
* more
* try to matrix
* soh otr i guess
* needs
* trying to figure out how matrix include works
* make the matrix?
* matrix debug
* install?
* echo?
* yuck
* cannot locate package false
* parens for good measure
* lsb
* libsdl2
* suse
* i forgot opensuse uses gcc-c++ instead of g++ for the package name
* png
* sdl
* more
* suse packages....
* fedora cmake
* 2?
* png
* handle old sdl2 net
* apt
* not sure if this is a problem for both clang and gcc on opensuse or just clang
* devel
* cmake min version
* def don't want this here but it's here for now
* does this do anything
* mantic because cmake version
* libopengl?
* fedora ninja
* fedora g++
* lsb
* fedora sdl
* libpng
* do a build
* clang fix
* give early returns values
* ImageMagick
* Update BUILDING.md
* something
* plain boost instead of devel?
* not packing so we don't need this part
* base?
* don't have it can't need it
* just use boost download on opensuse i guess
* move workflow
* bring back the file
* lus main?
* detach
* parse sohver arg and store version file in otr
* parse args for soh.otr gen only
* pass soh version from built in extractor
* update launch scripts, cmake and extract steps to pass soh version
* check otr versions and error or ask to regenerate
* add wiiu core header for osfatal
* review feedback
* remove soh dummy version for lus change instead
* only configure linux script for linux
* change lus commit
* rename soh version to port version
* fix submodules
* bump OTRExporter
* clean up error messages for switch/wiiu
* strings not char array
* typo
* init wiiu before otr detection
* Add message for mac/linux extraction
* remove unneeded exits
* change version number types to u16 to fix 32bit devices
* bump otrexporter
* Add the flag and fix errors
* switch assert and skin matrix
* new LUS
* Use normal assert
* hopefully fix WiiU
Signed-off-by: Louis <louist103@pop-os.localdomain>
---------
Signed-off-by: Louis <louist103@pop-os.localdomain>
Co-authored-by: Louis <louist103@pop-os.localdomain>
Co-authored-by: Christopher Leggett <chris@leggett.dev>
* linux local debug working
* built in extraction working on linux
* try a thing
* one more thing to try
* try using dir
* does this get the subdirectories?
* component before pattern
* loop i guess
* maybe component was the issue?
* zapd stuff i guess
* maybe this
* this feels promising
* g != q
* appimage is working, try fixing glfw issue on windows
* don't copy zapd.exe
* hopefully this gets the things we need in the assets dir
* is that where those went?
* try another thing
* another thing to try
* grasping at straws
* cmake makes no sense sometimes
* really just trying anything here now
* this is what i was expecting to work
* ls
* try doing it without the cmake again
* i think this might do the trick
* try with a slash
* one more thing to try
* pal_oot.txt
* maybe this makes things work on mac
---------
Co-authored-by: briaguya <briaguya@alice>
* WIP adding new config version.
* Implements a ConfigVersionUpdater
* Updates to account for new LUS-side changes.
* Change `ConfigVersionUpdater` to store `toVersion`
* fix typo
* Bump LUS
* Ship -> LUS namespace change
* z_scene_otr Ship -> LUS namespace
* Starting to get SoH to build with LUS imgui changes.
* start stuff
* gamecontroleditor build issues resolved maybe
* cosmetics editor and what not
* console
* actor viewer
* more stuff
* more stuff
* on to errors that make sense
* putting this down for a bit
* no idea what these errors mean now
* some kind of progress maybe
* latest lus main
* more
* back to linker errors and being lost
* Fixes command function signature.
* More fixes
* Even more fixes
* Bump LUS
* More Fixes.
* Fixes even more errors.
* lus bump
* input editor as var
* audio editor working
* it builds with this
* bump lus
* it opens
* bump lus to latest main again
* make sure to do all the command registering in debugconsole
* lus and what not
* switch type stuff plz
* undo
* do the thing that fixes the thing
* fix mac?
* correctly show/hide menubar on boot
* bump lus
* input blocking updates
* bump lus
* Bump LUS
* Press F1 to open enhancement menus moved to SoH
* lus and rendering backend stuff
* audio backend and lus
* Bump LUS
* Fixes WindowBackend dropdown
* Bump LUS
* misc -> utils and moves binarytools to utils.
* Window refactor
* bump lus
* make it work
* Fixes for moved files again
* Bump LUS
* Mercury -> Config
* Bump LUS
* Reacts to removed LUS hooks and bump LUS
* Remove Hook: GfxInit
* Removes debug audio_setgamevolume to 1
* use non-crashing branch of lus
* fix: make audio init work without hooks
* game icon stuff
* multifix bmp
* use input viewer class branch for now
* just "Ship" it's cleaner
* Bump LUS
* Removed ExitGame hook.
* Bump LUS
* Hook system removed from LUS.
* More LUS updates
* Changes to make window position saving.
* Bump LUS
* Bump LUS (for real)
* LUS resources now return a specialized pointer.
* Bump LUS
* Fixes issue in SetPathways::GetPointerSize
* Bump LUS to 1.0.0
* builds but crashes
* fix crash
* better macro names in debug console
* remove commeted out line
* remove redundant check tracker settings window logic
* remove commented out line
* move the *
* remove extra seqplayers enum def
* this sneaky little guy was hiding behind a wii u ifdef
* remove extra check tracker header
---------
Co-authored-by: Kenix <kenixwhisperwind@gmail.com>
Co-authored-by: briaguya <briaguya@alice>
* Trick and Glitch Rando UI implemented
* initial temp connection between ui and backend trick logic
Hacky way to connect the logic for testing. Ran into 1 crash but cannot reproduce
* UI overhaul to look more like AudioEditor tag section
* Mapped 3d tricks to enums and save cvar bug fixes
* Trick Logic Complete
Testing on whether the logic works as expected needs to be done
* Releasable trick version, tricks match text fixes also
* Remove 3D glitch logic location access
Easier to clean it up now than get confused
* Variable typo fix & initial trick enum reorganisation
* Removal of oot3d glitches
* bongo logic fix
* UI includes difficulty tags + cleanup and removal of glitched logic interface
* Bug fixes
* added enabled tricks to spoiler log
* comment clean up
* completed once over through logic
* merge fix
* update sohimgui to LUS
* Remove redundant 3d rando trick options
* Comment clean up
* Central GS Irons Logic Fix
* Farores wind central logic fix
---------
Co-authored-by: Christopher Leggett <chris@leggett.dev>
* Add dynamic actor IDs
* Convert Ivan to use new actor system
* attempt to fix linux build
* attempt to fix linux build
* merge
* Cleanup
* Fix missing math functions on Windows.
* Removes a stubbed function to fix non-windows builds.
* Update soh/soh/ActorDB.cpp
Co-authored-by: Adam Bird <Archez@users.noreply.github.com>
---------
Co-authored-by: Christopher Leggett <chris@leggett.dev>
Co-authored-by: Adam Bird <Archez@users.noreply.github.com>
* add version info and other details to windows exe properties
* configure properties file directly to src dir
* move version name in properties and change to Title Case
* wip
* const
* split zapd into two targets
* Workingish.
* fix working dir and copy xmls on build (#2)
* dont change current working dir with dialog prompts
* copy asset xmls to target dir
* make zpadlib public
* Messagebox.
* Check for WIN32
* threading
* Cleanups to the exporter and main.
* Multi extraction.
* Fix byteswap header includes.
* Fix another byteswap include.
* fix again.
* stddef size_t
* Add other targets for ZAPDLib
* Non windows.
* IDYES IDNO
* Linux fixes
* hopefully remove switch and wiiu from building extractor
* Please?
* validate roms and add another valid rom
* ifdef out extract.h for switch and wiiu
* Maybe update lux
* Remove ZAPDlib from switch and WiiU
* more rules
* Update soh/soh/Extractor/Extract.cpp
Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
* Update ZAPDTR/ZAPD/ExecutableMain.cpp
Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
* Update ZAPDTR/ZAPD/CMakeLists.txt
Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
* Update ZAPDTR/ZAPD/GameConfig.cpp
Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
* Update ZAPDTR/ZAPD/Globals.cpp
Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
* Update ZAPDTR/ZAPD/Main.cpp
Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
* Update soh/CMakeLists.txt
Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
* Update soh/soh/Extractor/Extract.cpp
Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
* Update soh/soh/Extractor/Extract.cpp
Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
* Update soh/soh/Extractor/Extract.cpp
Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
* the last fix
* Add context to a comment
---------
Co-authored-by: Adam Bird <archez39@me.com>
Co-authored-by: Adam Bird <Archez@users.noreply.github.com>
Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
* update
* Update generate-builds.yml
* Update generate-builds.yml
* sohotr in CI?
* paths
* gitignore soh.otr
* Fix
* no COMMAND maybe?
* try generating otr as it's own step
* deps
* f
* g
* h
* a
* cc
* ccc
* m
* blarg
* try uploading
* try
* s
* copy things
* wii u?
* wiiu
* don't fail
* windows without cpack?
* wut
* whoops
* see all the things plz
* b
* v
* zip working maybe
* ok but this tho
* pdb and switch
* mac lus
* soh.otr in appimage
* down first
* mac
* bundle soh otr into mac app and read it from the bundle
* appimage fix
* try just downloading for mac?
* i like to mv it mv it
* mv to the right place
* no more otrgui
* bring back otrgui and assets
* echo blarg
* echo
* zapd.exe
* clean and remove
* a
* space
---------
Co-authored-by: louis <louist103@gmail.com>
Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com>
Co-authored-by: briaguya <briaguya@alice>
Co-authored-by: Adam Bird <archez39@me.com>
* Rename "SFX Editor" to "Audio Editor"
* Move some functionality out into a new class `AudioCollection`
* Add a tab to exclude sfx/sequences from shuffle pool
---------
Co-authored-by: briaguya <briaguya@alice>
Co-authored-by: briaguya <briaguya>
Co-authored-by: David Chavez <david@dcvz.io>
* Begin GameInteractor
* Basic skeleton of PoC
* WIP
* First 2 CC effects transitioned to GameInteractor
* Prepare GameInteractor classes for CrowdControl
* More effects & replace chaosEffects with GameInteractor
* CC connection fixes & all CC effects (enemy spawns still borked)
* First couple of build error fixes
* Fix build
* Proper enemy spawning
* Clean up old CC code
* Extract link size/invisibility into GameInteractor
* Small fix/cleanup
* Suggestions for PR
* Address PR comment
* Addressed more comments & small adjustments
* Fix crash when spawning enemies
* Remove Remove()
* Move checks into Apply() and move CC and some console commands to it
* Use inheritance to abstract check on application
* Rename prefix Actions with RawAction
* Make Remove return a Result
* Fix issue with compilation
* debugconsole -> GameInteractionEffects progress
* Add State in GI
* Unify some Effects
* Port more debug console items
* Remove state modifyiers from raw actions
* Port over last raw action / state in console
* Adjust some types
* Consolidate link size modifier effect
* Adjust more types
* Define category strings in CC
* Clean up remaining non defined strings
* Fix bug in timed effects
* Rename old pack
* CC fixes
* Translate GI enum function
* Console cleanup/fixes/consistency
Co-authored-by: David Chavez <david@dcvz.io>
* Initial Auto-Location Tracking
* Updates styling for checked items in Check Tracker
* Fixes crashing issues with Check Tracker rendering
* Auto scroll Check Tracker windows to current area
* Checks Tracker only shows checked locations once in game
* Fixes issue where Check Tracker would auto-scroll to wrong location when entering a grotto
* Fixes gerudo fortress checks showing in tracker when settings have them removed
* InfTable Check Location Fixes: Lost Dog Richard, Rolling Gorons, HBA 1000, Thawed Zora
* Fixes most Event Chk Inf Checks on Check Tracker, and Frogs
* Check Tracker - Song from Malon now works
* Check Tracker
- Fixes Claim Check check not tracking
- Fixes spoiler for Claim Check check when getting Biggoron's Sword
- Fixes LACS being spoiled and not tracking
* Check Tracker - Fixes#2 for Skull Mask and Mask of Truth checks
* Check Tracker
- Adds support for merchants
- Fixes#7 for Bomchu Salesman
- Fixes#12 for Medigoron
* Check Tracker - Fixes#8 for Song from Saria
* Check Tracker - Fixes#9 for Adult Shooting Gallery
* Check Tracker - Fixes#10 for Composer Grave
* Check Tracker - Fixes#14 for Song from Ocarina of Time
* Check Tracker - Fixes#16 for Shooting the Sun
* Check Tracker - Fixes#19 for Darunia's Joy
* Save Editor - Adds missing label for Treasure Chest Game
* Check Tracker - Fixes Great Faries checks
* Check Tracker - Fixes Sheik at Temple
* Check Tracker - Fixes Great Fairy auto-scroll to wrong location
* Check Tracker - Updates blue warp checks
- Fixes Bongo Bongo and Twinrova checks
* Check Tracker - Fixes Dampe's Gravedigging Tour
* Check Tracker - Fixes Prescription to King Zora
* Check Tracker - Fixes Bazaar showing under wrong area on tracker between adult/child
* Check Tracker - Fixes scroll for Hyrule Market and Bazaar
* Check Tracker - Fixes giving Adult Trade Items shown on tracker: Broken Sword, Saw, Cojiro, Eyeball Froge, and Eyedrops
* Cleans up item_location
* Check Tracker - Item List
- Fixes item list not updating when changing seeds/options
- Separates item exclusion list from item check list
- Clean up comments
* Check Tracker - Adds Skip functionality to buttons
* Check Tracker - Refactors adult trade items to RandomizerInf
* Check Tracker - Fixes an issue where any time an item is removed the tracker would cause an application crash
* Check Tracker - Item names are now dependent on file language
* Check Tracker - Fixes Gerudo Card check not showing in Fast setting
* Reorders headers to (hopefully) avoid CI build conflicts on linux/consoles
* Explicitly defines vector header in randomizer.h to fix compile errors
* Complete Refactor of Check Tracker ImGui
* Adds missing check tracker files to CMakeLists
* Reverts the Item_location whitespace cleanup from ad10807c
* Check Tracker - Loading Fixes
- Fixes a bug where loading a save file a second time would add all the checks again
- Fixes a bug where the check tracker would not render at all until in a save file
* Check Tracker - Fixes a bug where checks would sometimes fail to load
* Check Tracker - Fixes duplicated checks when using Only on Pause or Only on Combo
* Check Tracker - Works around issue where single characters don't show in EnhancementCombobox, and fixes a label for combo buttons held option
* Check Tracker - Applies all Check Tracker changes to Item Location
* Check Tracker - Updated Check List
- Adds Link's pocket, either in KF or HM depending on starting age
- Supports Scrubs and Merchants
- Uses enums instead of magic numbers
- Updates DC Scrub Short Names for MQ
* Check Tracker - Adds a performance mode option
* Check Tracker - List Fixes (requires new rando generation)
- Fixes Frogs Rupees always visible
- Fixes Kokiri Sword Chest not showing
- Fixes Weird Egg not showing
* Check Tracker - MQ List basic support
* Check Tracker - MQ/Vanilla anti-spoilers
* Check Tracker - Collecting a compass now spoils the area
* Check Tracker - Basic Vanilla Support and fixes
- Vanilla items show in check tracker, even if many won't auto check
- Fixes an issue with Gerudo Fortress Keys
- Refactors IsVisibleInCheckTracker to randomizer_check_tracjer
* Check Tracker - Fixes merge conflict from 08a487f35e
* Check Tracker - Fixes tracker loading as Floating when default value is set to Windowed
* Randomizer Location Exclusion List
- Adds Scrubs, Merchants, Shops. Adult Trade items, MQ Dungeons, and Bean Salesman
- Fixes Kokiri Sword Chest, Weird Egg, and Frog Song Rupees from misbehaving
- Updates Gerudo Fortress logic to be dependent on Open/Fast/Normal Fortress
- Removes Invalid Check
- Adds RO Enum for MQ settings
- Updates magic values to RO enum
* Location Exclusion List - Scrubs that are always randomized now always show on the list
* For now, removes some extra code only needed for a Check Tracker.
* Randomizer Location Exclusion List - Fixes Eyeball Frog from showing up when Adult Trade Items was off
* Location Tracker - Updates Eyedrops to use RandomizerInf instead of Chest
* Check Tracker - Fixes a bug where Link's Pocket item wasn't acting as checked for area item count
* Check Tracker - Fixes a bug where Locations would incorrectly say Vanilla due to the first check in the area being a non-MQ check
* Check Tracker - Fixes a crash when Check Tracker is docked but not visible
* Check Tracker - Fixes areas being spoiled when loading different save files
* Check Tracker - Only reset variables if they are initialized
* Check Tracker - Cleans up old comments, unused variables, methods, and macros, adds language TODOs,
* Check Tracker - Readds rainbow UI elements after Cosmetics Editor refactor
* Check Tracker - Removal of flag lookup that was refactored, no longer needed header, and some trivial whitespace fixes.
* Check Tracker - Refactors Index to Bitmask code to a macro
* Check Tracker - Changes ordering from alphabetical to RandomizerCheck ordering
* Check Tracker - Wraps everything in a namespace to avoid global variable usage
* Check Tracker - Explicitly defines for-loop scope
* Check Tracker - refactors dungeon lookup from static array to function
* Fixes a bug when using EnhancementColor with alpha
* Check Tracker - Refactors all colour to use direct conversions
* Check Tracker - refactors settings loading and check visibility for readability
* Check Tracker - Fixes a bug where the wrong label showed on the Check Tracker BG Color
* UIWidgets - Adds Alpha bar to EnhancementColor when using alpha parameter
* initial pass for entrance tracker
* add search meta tags to entrance tracker data; clear entrance tracker on title screen
* rename to use playstate/play
* fix lus imports
* move discovered entrance info to SohStats struct
* Add scene info and highlighting to entrance tracker
* hide undiscovered text when searching
* add comments for entrance tracker
* fix merge conflict error
* account for zora river -> hyrule field water entrance in tracker
* fix assignement error
* remove unneeded defaults from debug file init
* adjust entrance tracker settings and add more search tags
* convert magic numbers to defines; add more comments to entrance tracker; clarify variable names
* add reverse index to entrance tracker data to compare with instead of using strings
* rename variables
* First test of gathering some gameplay stats
* timer changes and other stuff
* Move code to new files + rename
* Name change - gamePlayStats
* Finish rename, remove n64ddFlag checks
* Improve item get times
* Better time tracking, more stats,
* Put button under Enhancements
* Fix merge conflict
* Add pauseCount, fix bug with rando items
* Adjust inits/declarations
* step counter
* Name change: "itemGetTime" to "timestamp"
* Tidying + CI test
* Set up array for stat counts
* Macro
#define GAMEPLAYSTAT_TOTAL_TIME (gSaveContext.gameplayStats.playTimer / 2 + gSaveContext.gameplayStats.pauseTimer / 3)
* Add boss defeat timestamps
* Add sword swings, pots broken, bushes cut
* fix int type
* Add counts for enemies defeated
Broken down by enemy, with a total
* Add ammo used
* Hide breakdowns until count > 0
* Forgot Big Octo
* Count chests opened
* Update after LUS submodule
* Enemy count spacing
* Comments
* Count 3 mini Floormasters as 1 Floormaster
+ some cleanup
* Comments
* Colour coding for timestamps on quest items
i.e. medallions/stones/songs
* Move stat into the sohStats struct
+ rearrange the counts enum for easier addition of future counts
* Some documentation + count button presses
* Stop counting button presses when Ganon defeated
* Couple bugfixes
Add count for Gerudo Thief, fix step counter counting in some situations where it shouldn't
* Fix comment
* First pass on SFX Editor
* Fix crash at night in Colossus (and probably other undocumented issues)
The SFX editor was swapping out the bytes corresponding to the sequence
to be played regardless of the audio command being issued. This fix
ensures the swap will only happen on commands which actually treat those
bytes as a sequence identifier.
* enabling a few more songs/fanfares
* Removing a few broken bgms, fixing the preview button returning to the wrong bgm
* Fixes restoration from miniboss music to previous one
* add timed minigame into the sounds pool
* A few small tweaks
* More cleanup and add instruments
* adjust usage of getReverseReplacementSeq
* Changes from feedback and prefix external methods with SfxEditor
Co-authored-by: RaelCappra <rael.cappra@gmail.com>
