| Age | Commit message (Collapse) | Author |
|---|
|
|
|
|
|
Full credit to danielryb for submitting this to recomp
Co-authored-by: danielryb <59661841+danielryb@users.noreply.github.com>
|
|
|
|
|
|
|
|
* Scrolling texture interpolation
Co-authored-by: Nicholas Estelami <NEstelami@users.noreply.github.com>
* Interpolate remaining GIs
* Clean up gDPSetTileSizeInterp
---------
Co-authored-by: Nicholas Estelami <NEstelami@users.noreply.github.com>
|
|
|
|
Co-authored-by: Garrett <garrettjcox@gmail.com>
|
|
|
|
|
|
* Add Aliens and initial code moved from old build.
* Update Enemy Souls to latest Develop and fix issues.
* Change Stalchild Animation to Idle
* Fix Stalchild Eyes
* Adds Hiploop to keep in line with Enemy Drops
* correction
* Update Matrix Calls
* Remove comment
* Remove Garo for now
* Add Octorok Soul req for Upper Canyon Access
* Add soul requirement for Red Switch
* Grant Soul INF when the option is off
* Adds Nejiron Soul
* Add Flying Pot Soul
* ew (#14)
* cleanup
* Add Bubble Soul
* Adds Freezard
* Change Soul behaivor to Invincible
* header cleanup and arg consolidation
* Fixes OnFileCreate to actually shuffle Enemy Souls. took this op. to fix up Boss Souls shuffling as it was needed to cleanly shuffle Enemy Souls.
* Naming Updates
* Name Updates pt2
* Add Tracker Icons and adds a Default to avoid erroring
* Fix Iron Knuckle Helmet
* revert item icon default and add soul flame to tatl target for enemies that are invincible.
* Move VBs to GameInteractor_VanillaBehavior.h
* Use VB_PERFORM_AC_COLLISION for enemy souls
* Add enemy souls for closer parity with drops
Stub out enemy draw funcs
Use macros to streamline existing skeleton inits
Logically account for enemy souls in CanKillEnemy
Fix logical quirk with Ikana ice arrows
* Draw everything
* Remove unused INIT arg from SETUP_FLEX_SKEL
* Add Igos, Keeta, Gomess
Make soul RIs contiguous, separate boss and enemy
Ignore target color for EnInvadepoh
Remove Real Bombchus and Flying Pots for now
Require Gekko and Snapper souls for beating both
* Add Enemy Souls to item tracker
* clang format
---------
Co-authored-by: mckinlee <mckinlee@ymail.com>
Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
|
|
* alternative solution?
* feedback
|
|
* initial implementation
* oops
* feedback
|
|
* Add Clocks as Items feature
* refactor
* some clean up
* forgot to clangify
* use proper randoinf flags and some fixes
* proper skipsotcutscene fix
* Animated Clock Item (Thank you Caladius!)
* Close attempt at animating the clock, not perfect but a good start.
* Git gud Clock
* fix clock item get crash
Co-Authored-By: Caladius <Caladius@users.noreply.github.com>
* some enhancements
* logic refactor, minor changes, and new enhancements
* huge rework
* clang
* fix a oops; any day, not current day
* housekeeping and starting items menu support
* splits up some milkroad regions and fixes a audio bug
* i suck at merging
* feedback update
* scarecrow dance fix
* add clocks to new item tracker
* day 2 bean patches
* add time logic to enemy drops and simplify day 2 bean macro
* rebrand to "Shuffle Time"
* more eblo feedback
* some more feedback
* rename feedback
* pauseSaveEntrance fix
* fix take 2
* Time Shuffle cleanup
Fix pause save Time Shuffle bug
Fix event queue daytelop bug
Finish merge commit header include
Clean up with shouldRegister
Co-authored-by: mckinlee <mckinlee@ymail.com>
---------
Co-authored-by: Caladius <Caladius@users.noreply.github.com>
Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
|
|
* initial implementation
* feedback
* feedback 2
|
|
* Embed enemy drop checks into individual Regions
Exclude tooltips from enemy drops in check tracker
* Shuffle the rest of the enemies
* Move Gold Skulltula condition
* Clean up and fix enemy drop check minimum value
* Name Real Bombchu drops for consistency with souls
* Update documentation
|
|
(#1386)
|
|
* Save play time, support timer display options
* Use ShipSaveContext, add OnGameCompletion hook
|
|
* Ported Audio Options from SoH Audio Editor
*Moved "Mute Low HP Alarm" to Audio Editor -> Audio Options
Changed Cvar
From: "gEnhancements.Sfx.LowHpAlarm"
To: "gAudioEditor.LowHpAlarm"
*Moved "Mute Carpenter Sounds" to Audio Editor -> Audio Options
Changed Cvar
From: "gEnhancements.Sfx.MuteCarpenterSfx"
To: "gAudioEditor.MuteCarpenterSfx"
*Moved "Mute Crying Goron Child" to Audio Editor -> Audio Options
Changed Cvar
From: "gEnhancements.Sfx.ChildGoronCry"
To: "gAudioEditor.ChildGoronCry"
*Added "Disable Tatle Call Audio"
*Added "Disable Enemy Proximity Music"
*Added "Randomize All Music and Sound Effects on New Scene"
*Added "Randomize All Music and Sound Effects on Randomizer Generation"
*Added "Display Sequence Name on Overlay" and "Overlay Duration" Slider
*Added "Link's Voice Pitch Multiplier" Slider
* *Ported "AddSearchWidget" Functionally
Enabled for Audio Editor -> Audio Options
* Cleaned up some code I missed and ran clang format.
* Renamed "OnScene" Hook to "OnSceneChange"
* Made it so "Link's Voice Pitch Multiplier" slider only effects Link's voice.
* Forgot the "AudioHook.cpp" file its needed for the
"Display Sequence Name on Overlay" option.
* Moved the "Sfx" folder to the "Audio" folder.
* Removed extra line breaks between sections in "RegisterAudioWidgets()".
* Renamed "OnGenerationCompletion" hook to "OnRandoSeedGeneration"
* Changed "gAudioEditor.*" to use "CVAR_AUDIO("*") in "AudioEditor.cpp"
* Added "AddAudioSearchWidget" function
Changed all "BenGui::mBenMenu->AddSearchWidget lines to use
"AddAudioSearchWidget".
* Changed the "OnSeqPlayerInit" hook parameters type to use the "s32" Macro.
* Update BenMenu/BenGui include paths: Replaced "../../" with "2s2h/".
* Ran Clang Format.
* Added "DisableEnemyProximityMusic.cpp"
Added "VB_PLAY_ENEMY_PROXIMITY_MUSIC" enum to "GIVanillaBehavior" in
"GameInteractor.h"
"Audio_UpdateEnemyBgmVolume" is now wrapped in a "GameInteractor_Should"
* Added "DisableTatlCallAudio.cpp"
Added "VB_PLAY_TATL_CALL_AUDIO" enum to "GIVanillaBehavior" in
"GameInteractor.h"
"Audio_PlaySfx(NA_SE_VO_NAVY_CALL)" is now wrapped in a "GameInteractor_Should"
* Added "LinksVoicePitchMultiplier.cpp"
Added "Enable Link's Voice Pitch Multiplier" checkbox to Audio Editor
The "Link's Voice Pitch Multiplier" slider is now disabled when
"Enable Link's Voice Pitch Multiplier" is not enabled.
Added "VB_LINK_VOICE_PITCH_MULTIPLIER" enum to "GIVanillaBehavior" in
"GameInteractor.h"
"AudioSfx_PlaySfx" in the file "z_actor.c" in function "Player_PlaySfx"
is now wrapped in a "GameInteractor_Should".
* Removed "OnSceneChange" Hook.
Removed "GameInteractor_ExecuteOnSceneChange".
Removed "GameInteractor_ExecuteOnSceneChange(play->sceneId);" from
"z_play_2SH.cpp:OTRPlay_SpawnScene" function
Renamed "AudioEditorRegisterOnSceneChangeHook" to
AudioEditorRegisterOnRoomInitHook".
* Made Changes requested by Eblo to "LinksVoicePitchMultiplier.cpp" and
"z_actor.c"
* WIP Randomize On New Scene
|
|
Merge develop-mion->develop
|
|
* Fix UB in Item_DropCollectible hook usage
* Clang format
* Again
|
|
|
|
* Replace ActorExtension with ObjectExtension
* We only need cassert here, not all of LUS
* Expose ObjectExtension_Free to C++
* Remove unneeded vector include
|
|
* Initial Trap Implementation with 1 Trap Example.
* New TrapTypes and Per Trap Custom Messages
* Spruce up Menu and add placeholders for toggling traps
* Reordering and clean up
* Seeded Trap Models
* Trap Type Opt-in
* Add Jinx Trap
* Add Enemy (Like Like) Trap
* Fix Shop Item draws and convert for Progressive
* Placeholder for Custom Model
* Implemented time trap[Please Squash this] (#13)
* Implemented time trap
* Finished comment because im braindead today
* Forgot to fix indentation(whoops)
* Changed things not mess with the games code, added some more Time Trap messages
* Removed a include I forgot to yoink from the base code.
* Removed header define for VerifyTimeSkip
* Clangit
* Missed some leftovers from a merge conflict.
* Clang format throwing a fit over a empty line
* Added Timeskip CVar placeholder
* Fixed issue where game crashes past midnight
* Added Moonfall skipping prevention messures.
* Added fallback loop to handle the remaining cycles in the event of a overflow.
* Cleaner implementation
* Keep it simple stupid
* changed function name to be more accurate
* Removed outdated comment, used TimeSkipInc for moonfall skip prevention
* Reverted max trap(accidentally pushed it while testing)
* Removed old unused value
* Reduced the iteration by 1 to be closer to where it was at before.
* Will this fix Windows?
* Added TRAP_TIME to trapToCvarMap
* Corrected typo on comment
* Clangit...again
* Added calls to load environment values and adjust the weather.
* Update Time Trap and clean up code
* Add Flash effect to Time Trap
* Added a few more timeTrapMessages
* I hate you clang format
* Fix Trading Post Kick Out Time
* Added map for all locations I can think of that close.
* Clangit yet again
* Removed Inn handling because the edge case related to it closing cannot happen
* Corrected a whoopie I made when I was dealing with a conflict
* Removed pointless condition check that is always true
* Removed duped variable
* Removed unnecessary data from SCENE_8ITEMSHO kickout entry
* Removed now used TRADING_POS_ACTOR_PARAM
---------
Co-authored-by: Caladius <clatini88@gmail.com>
* Comment out Kick Out code for later TODO
* Clean out commented code
* Adds Wallet Trap and updates some tooltips
* More Trap Messages
* Even more trap messages
* moooooore messages
* update for clang
* Feedback changes for Time Trap
* Update Trap functions
* Fix Matrix call
* Trap Model Import (Thanks Zrc)
* rename
* Adjust size
* update name for uniformity
* Update mm/2s2h/Rando/MiscBehavior/Traps.cpp
Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
* Update mm/2s2h/Rando/MiscBehavior/Traps.cpp
Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
* feedback updates
* Update notifications to remove color codes from trap messages when item skip is on
* VBify Object Dependency
* Fix comma
* fix headers
* Refactor ObjectDependency hook
* Check if item get cutscenes are being skipped
* Use brackets for LUS include
* Header update
---------
Co-authored-by: sitton76 <58642183+sitton76@users.noreply.github.com>
Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
|
|
* Small cleanup to heaps.c
* Remove stdio.h
* _aligned_free
* Fix mac
* Format
|
|
* Implement most of the Enemy Drops
* Fix Glitchless Generation
* Fix duplicate Logic Checks
* Add Slime Items and fix Linux Floating Point.
* Add Comment for Enemy Drops RC Sets
* Adds Leever and fixes Position Check issue.
* Adds GBC for Logic check
* Add Hiploop
* Adds Skullfish (Enemy only drops items inside GBT)
* Feedback Updates
* Updates
* Update to Switch for Actor Selection
* More Enemy Locations
* Fix Mini Baba and remove actors that dont drop items
* Update mm/2s2h/Rando/Logic/Logic.h
Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
* Update mm/2s2h/Rando/ActorBehavior/EnemyDrops.cpp
Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
* Update mm/2s2h/Rando/ActorBehavior/EnemyDrops.cpp
Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
* Update mm/2s2h/Rando/Logic/Regions/Miscellaneous.cpp
Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
* Add case for ACTOR_BOSS_05 in Logic.h
* Update mm/2s2h/Rando/Types.h
Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
* Update mm/2s2h/Rando/ActorBehavior/EnemyDrops.cpp
Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
* Clang format actor position
* Need swim for Bio Deku Baba
* Define RC_ENEMY_DROP_BIO_DEKU_BABA in checks
* GitHub spacing how dare you
* Update mm/2s2h/Rando/StaticData/Checks.cpp
Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
* Update mm/2s2h/Rando/Types.h
Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
* Update mm/2s2h/Rando/ActorBehavior/EnemyDrops.cpp
Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
* Update mm/2s2h/Rando/Logic/Regions/Miscellaneous.cpp
Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
* Update mm/2s2h/Rando/Logic/Regions/Miscellaneous.cpp
Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
* Update mm/2s2h/Rando/StaticData/Checks.cpp
Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
* Update mm/2s2h/Rando/Types.h
Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
* Update mm/2s2h/Rando/ActorBehavior/EnemyDrops.cpp
Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
* Update mm/2s2h/Rando/Logic/Regions/Miscellaneous.cpp
Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
* Update mm/2s2h/Rando/ActorBehavior/EnemyDrops.cpp
Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
* Update mm/2s2h/Rando/Logic/Regions/Miscellaneous.cpp
Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
* Update mm/2s2h/Rando/StaticData/Checks.cpp
Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
* Update mm/2s2h/Rando/Types.h
Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
* Apply suggestion from @Eblo
---------
Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
|
|
* Bump LUS and OTRExporter, add null audio backend
* Missed an include change
* And again
* Thanks macOS
* Another one
* Bump LUS again, fixing SDL audio backend bug
* Sync LUS bump changes to merged PRs
* Bump LUS again
* Update CMakeLists.txt includes
|
|
|
|
* Adds support for Timesplits
* clanged
* Fix Popout Crash
* wip file saving; fixes Bow and Red Potion splits
* Add Active Row Highlighting
* Fix D-Pad Bottle Collection
* Cleanup and Add Boss Splits.
* Add names to Boss Icons
* clang v2
* Linker fix
* Move time formatting to ShipUtils (this also cleaned up DisplayOverlay).
* clang v3
* Adds Saving/Loading splits from file.
* Update inventory range to exclude heart piece.
* Update column name to not be abbreviated
* Adds Magic Meters and Double Defense
* clang cuz ya boi alwayz fogetz
* Fix Fairy Splits with CS Skip Enabled
* Move songColorMap to ShipUtils along with the function to get the color. Fixed Song Icon sizing.
* Adds default Window size and allows resizing.
* Allow scrolling of splits list
* Adds Entrance Splits and cleans up the UI.
Adds new splitType to the object so I added a small solution to handle older files that may not have it for testing.
* UI Update and Entrance Filters.
* Adds split list to the options window to fill out the space.
* Fix ID mismatching.
* Add Split Comparing Functionality
* clang
* Compare Split text display corrections
* Adds auto scrolling to follow Active Splt if list is bigger than the window. Also locks the Header Row when visible to always be visible at the top instead of scrolling with the list.
* Adds Tooltips for options
* Fix time coloring for splits with no previous data.
* Fix crash and ID mismatch
* Feedback Updates
* Extern is needed since my definition is in the cpp file it seems.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* player face docs
* more docs
* cleanup
* toto
* more comments
* fix bss, names
* better comment
* PR, fix comment
* fix bss
* sEyeTextures comment
* FaceChange_UpdateBlinkingNonHuman
---------
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
|
|
* Document inconsistent empty C-button disabling bug
* Fixed formatting
|
|
|
|
|
|
* gEffectSsOverlayTable
* Sync with OoT docs
|
|
* MapDisp_AllocDungeonMap
* func_80B833C4
* func_80ABD92C
* EnFirefly comment offsets
|
|
* CutsceneCamera_UpdateSplines fake match
* CutsceneCamera_Init -1 splineIndex
* Eye Point comment
* func_80B781DC better fake
* func_80B32F04
* ObjSwitch_Update
* ObjSwitch_InitTrisCollider
* ObjAqua_Init
* EnTrt_ItemGiven
* func_80C10E98 partly
* EnTest7_WarpCsWarp this to 1
* EnTest6_InvertedSoTCutscene better fake
* EnTest6_DrawAmmoDropRupee
* EnPoSisters_MatchPlayerY
* func_8095B76C
* EnMinifrog_Init
* func_80A5C0B8
* EnKnight_UpdateEffects
* EnKnight_FlyingHeadAttack
* EnKakasi_Init
* EnInvadepoh_ModelInfo_GetNextFaceAnim
* BgAstrBombwall_InitCollider like func_809CE068
* Player_UpdateInterface
* Player_CsAction_TranslateReverse
* DynaPoly_AddBgActorToLookup better fake
* CutsceneManager_FindEntranceCsId
* func_800AE930 better fake
* Math3D_CylVsLineSeg better fake
* MapDisp_InitBossRoomStorey
* Play_Init
* EnTimeTag_Diary_Wait better fake
* Remove fake label from Player_SwordFromIA
* Player_PostLimbDrawGameplay partly
* EffectBlure_AddVertex prev temp
* Player_PostLimbDrawGameplay attempt 2
* AudioMgr_StopAllSfxExceptSystem
* Camera_Normal0
* Camera_Jump2
* Camera_Normal3
* PR review
|
|
* kaleido_map double parens
* ObjUm PostLimbDraw fake match
* z_parameter double parens
* voice_internal func_801A541C return type
* audio load missing return comments
* EnTest7_DrawFeathers
* EnTest7_UpdateFeathers
* format
|
|
* actor movement
* cleanup
* missed one
|
|
* name flags, TODO: comments
* comments
* improve comments
* small cleanup
* cleanup comment
|
|
* culling docs
* cleanup
* PR suggestions
|
|
* Remove THIS macro
* Revert changes to the documentation
* Undo revert to STYLE.md
|
|
* more matches
* more functions
* merge, I hope
* wrath done-ish
* 5 nonmatchings
* more matchings
* more improvements
* more stuff
* stuff
* docs part 1 / infinity
* more docs
* .
* more adjustments
* linked assets
* Document object_boss07 and match Boss07_Incarnation_Intro (thanks Synray!)
* more stuff
* play part 2
* lol merge
* update
* unk types
* SWEET GOOGLY MOOGLY IT MATCHES
* cam fixes
* adjust damage stuff
* if?
* stuff
* signs
* macro stuff. clean up later
* names
* Some small cleanup
* cleanup and docs
* more cleanup
* Wrath shadow docs
* Use `EVENTINF_INTRO_CS_WATCHED_MAJORA` after merging
* Update functions.txt
* Types cleanup
* Some low hanging fruit
* Undefined_syms.txt
* More static -> battle handler
* Lots of naming cleanup
* Remove z_boss_07_dmgtbl.inc
The reasoning behind removing this file is simple; it wasn't all that long, so extracting it out to an included file didn't really add much, and it made refactoring and/or things much harder, since you needed to check in multiple places to change things.
* Get most of the limb stuff named (and actually update the spec)
* Some minor cleanup
* Updating the repo with what we talked about in discord
* Some syncing with Odolwa and other misc name stuff
* Some Odolwa/Bio Baba sync
* Another bit of Odolwa/Bio Baba sync
* Name a lot of incarnation limb variables
* Finalize the incarnation intro variable stuff
* Fix a goof
* `incarnationWrathTransition` variables
* `generalCollider` and always use "tentacle"
* Completely remove "shot," always use "projectile"
* Clean up `Boss07_Mask_Draw`
* Name `maskShakeTimer`
* Give better names to a few more things
* Some beam-related struct vars
* undefined_syms
* More beam names
* More beam stuff
* Beam, pt 100000
* Some intro struct members
* Some timers
* More non-beam stuff, back to beam
* Done with beam finally
* All but one of the subcam variables, some other stuff
* Some variable names and cleanup
* More cleanup
* jumpSfxTimer -> landSfxTimer
* actionState -> subAction and a little bit of syncing with Odolwa
* A couple more variables sync
* Buncha variables
* Lots of non-whip variables
* Commit what I have before starting on some of the grab stuff
* All but one struct var done
* Lots of header cleanup
* Finish the header file
* Fix build after merging main
* Damage effect enums
* Update damage effect enums for Incarnation and Wrath
* Update damage effect enums for Mask and Remains
* First pass at top damage effects
* Do a few sub action enums so I have something to show
* Fix the damage effect enums, clean up a lot of subaction enums
* All remaining sub action enums, cleanup damage effect enums, other misc cleanup
* Finish enums
* Finish data
* Push up what I have
* Consistency
* scroll -> texScroll
* low hanging fruit
* PR + small fix
* Happy with >20% of functions
* Happy with >40% of functions
* Happy with >60% of functions
* Happy with >75% of functions
* Happy with >90% of functions
* Happy with >95% of functions
* Happy with `Boss07_Wrath_DeathCutscene`
* Happy with `Boss07_Mask_FireBeam`
* Happy with `Boss07_Wrath_CheckWhipCollisions`
* Happy with everything but `Boss07_Mask_Draw`
* Happy with all functions I think?
* Clean up forward declarations
* Write a half-decent file header
* Fix after merging
* Fix some minor stuff here and there
* Minor fix in the file header because I forgot I renamed this
* Respond to engineer's review
* Respond to Anghelo's review
* Replace as many actor lookups with for-loops as I can in Odolwa/Majora
* Change the comment about the hookshot from a `@note` to a `@bug`
* `drag` -> `deceleration`
* Extra scopes for the matrix stuff in `Boss07_Mask_DrawBeam`
* Use decimal numbers in the various `FillShadowTex` functions
---------
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: petrie911 <pmontag@Monday.localdomain>
Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>
Co-authored-by: petrie911 <pmontag@PHYS-S129.iowa.uiowa.edu>
Co-authored-by: petrie911 <petrie911@users.noreply.github.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
|
