Commit Graph

352 Commits

Author SHA1 Message Date
Ada
24856a6e8c
ImGui grammer, consistency, and clarity fixes (#625)
* ImGui grammer, consistency, and clarity fixes

Co-Authored-By: Stormghetti <56653191+Stormghetti@users.noreply.github.com>

* Adds more new lines for users on smaller displays

Co-Authored-By: Stormghetti <56653191+Stormghetti@users.noreply.github.com>

Co-authored-by: Stormghetti <56653191+Stormghetti@users.noreply.github.com>
2022-07-09 20:37:38 -04:00
Baoulettes
260669f981
Cosmetics texts fixes (#604)
* 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
2022-07-06 19:50:59 -04:00
David Chavez
58f3786a35
[macos] Distribute optimized builds (#599) 2022-07-06 18:49:45 -04:00
Sirius902
e8bfa61fc2
Add N64 weird frames and OOB Bombchus cvars (#602)
* Add gN64WeirdFrames and gBombchuOOB cvars

* Rename gBombchuOOB to gBombchusOOB

* Fix pipeline
2022-07-06 18:46:01 -04:00
David Chavez
537722d57a
Fix portability use of std::clamp (#596) 2022-07-05 23:53:42 -04:00
qurious-pixel
fd0fb25de1
[CI] Create an Appimage for 64bit builds (#570)
* [CI] Create AppImage file

* [CI] Updated Jenkinsfile

* [MISC] fix indentation

* [MISC] Fix indentation

* [MISC] Fix indentation

* [CI] 7z appimage and readme
2022-07-05 21:10:14 -04:00
Baoulettes
a2d64864dd
Cosmetics menu rework (#589)
* -

* 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>
2022-07-05 20:52:01 -04:00
briaguya
1ad2931f80
use ini window resolution (#410)
* 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>
2022-07-05 20:02:47 -04:00
earthcrafterman
306cfd0654
Restoration Item Sliders (#595)
* Allows players to set custom restoration values for potions and milk

* Fixed a dumb oversight

* implemented fairy sliders
2022-07-05 19:34:33 -04:00
briaguya
2b99e65d24
update pulseaudio for 44.1khz audio (#587)
* use pulseaudio defaults

* spaces/tabs

* pulseaudio values tuned for n64 audio at 44.1khz

* update tlength

* remove one hardcoded samplerate

Co-authored-by: briaguya <briaguya@alice>
2022-07-05 19:30:30 -04:00
vaguerant
0b7137b8b0
Cheat: Infinite Epona Boost (#577)
* Cheat: Infinite Epona Boost

* Edit for readability
2022-07-05 19:30:17 -04:00
David Chavez
c5e84c17a5
Use unordered maps in some hot paths (#566)
* Use unordered maps in some hot paths

* Address PR comments
2022-07-05 19:29:57 -04:00
qurious-pixel
a9c3c7541e
Controller Navigation Fix-Up (#544)
* Controller Navigation Fix-Up

* [MISC] Fix typo
2022-07-04 21:30:50 -04:00
David Chavez
a31be1f3d1
Update to latest docking imgui (#582)
* Update to latest `docking` imgui

commit: 67410d53f739b6a0df138e2252f0e5136b42062f

* Fix modified import for SDL

* Update imgui_impl_sdl.cpp

* Add Imgui include path for better imports
2022-07-04 10:54:09 -04:00
briaguya
8615418630 missed a couple spots 2022-07-04 10:48:39 -04:00
briaguya
b8602994fb change name based on PR comment 2022-07-04 10:48:39 -04:00
briaguya
923bf3b0e4 special char doesn't work with default imgui font 2022-07-04 10:48:39 -04:00
briaguya
21142bdb26 command on mac 2022-07-04 10:48:39 -04:00
briaguya
b730af5e8a implement reset 2022-07-04 10:48:39 -04:00
briaguya
f9b831d5c0 add menu from https://github.com/PurpleHato/Shipwright/tree/ResetMenu 2022-07-04 10:48:39 -04:00
earthcrafterman
818d5f90a8
Add toggles for disabling heart drops and random drops (#507)
* 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
2022-07-04 10:42:43 -04:00
rozlette
c14e4f387c Add more files 2022-06-27 23:17:37 -04:00
rozlette
39a50a406b Update names 2022-06-27 23:17:37 -04:00
rozlette
9f5618def4 Rename Soh* files 2022-06-27 23:17:37 -04:00
Kenix3
cc22fe17bb Headphones setting in game should now work.
Resolves #13
2022-06-27 22:10:00 -04:00
rozlette
65016499ab Get rid of erroneous int casts 2022-06-25 11:00:08 -04:00
PurpleHato
efd4b26f3d FIX: Remove duplicates of gNewDrops from the enhancements menu 2022-06-23 20:10:53 -04:00
rozlette
fd06827e2b DPad items 2022-06-22 23:13:32 -04:00
briaguya
ba74653f61 fix linux crash 2022-06-22 22:58:46 -04:00
David Chavez
e42b18cf71
Add Support for macOS (#441)
* 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>
2022-06-22 14:59:21 -04:00
Kenix3
77fc202694
Merge pull request #413 from Baoulettes/3DProjectiles
[Mod]Enable 3D Projectiles for monsters
2022-06-21 22:24:29 -04:00
Kenix3
d3436fc1e4
Merge pull request #362 from GreatArgorath/ShortBiggoron
Adds option for shorter Biggoron quest
2022-06-21 22:22:41 -04:00
Kenix3
1435b5d314
Merge branch 'develop' into zelda64 2022-06-21 19:27:46 -04:00
Vague Rant
abcf713cc1 Fix Anubis fireballs 2022-06-21 14:44:35 -04:00
louist103
5bf4128add Add all slots 2022-06-21 14:31:28 -04:00
Baoulettes
14df96eacd
Merge branch 'develop' into 3DProjectiles 2022-06-20 22:32:45 +02:00
Ian Drake
39d8b77b02
Added save filename and path to config file (#130)
* 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
2022-06-20 13:54:44 -04:00
earthcrafterman
36b9b9519d
Added three sliders for multiplying damage (#478)
* 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.
2022-06-20 13:51:59 -04:00
PurpleHato
5549ad9388
TWEAK: Kokiri Draw distance V2 (#486)
* ADD: Saria's logic

* TWEAK: Kokiri Draw Distance change doesn't need a reload anymore

* ADD: Mido's logic
2022-06-20 13:50:32 -04:00
vaguerant
b56426a67d
Skip first-time pickup messages for consumable items (#495) 2022-06-20 13:50:06 -04:00
Ada
45cb350b7a
Merge branch 'develop' into ShortBiggoron 2022-06-20 18:45:35 +01:00
louist103
73ff7ef3da
Guard vision (#466)
* Vision

* Wrap it in a CVAR

* Cleanup the code and fix a savestate bug
2022-06-20 13:39:06 -04:00
Kevin Alexis Contreras
e945a86d46 Added fixes based on the reviews 2022-06-19 02:03:04 -05:00
Kevin Alexis Contreras
b0278de3a8 Code cleanup 2022-06-19 00:07:29 -04:00
Kevin Alexis Contreras
3a65119267 Added mp3 support for samples 2022-06-19 00:07:29 -04:00
Kenix3
d6eb59d0af
Update libultraship/libultraship/Lib/Fast3D/U64/PR/ultra64/gbi.h 2022-06-18 10:00:32 -04:00
PurpleHato
8d4b15325a ADD: Color for the bottom text 2022-06-17 17:16:38 -04:00
PurpleHato
f7bcbe3049 Batter space management
Semi-responsive logic for small resolution
2022-06-17 17:16:38 -04:00
PurpleHato
e66c4751ea TWEAK: Forgot to push the sohimgui 2022-06-17 17:16:38 -04:00
briaguya
dd42cca2cf Merge branch 'develop' into z64-devmerge 2022-06-17 00:39:07 -04:00
Kevin Alexis Contreras
bb90be6748 Merge branch 'zapd_audio_support' into zelda64 2022-06-16 23:09:50 -05:00
briaguya
3e6307bf96
No forced navi (Prevent forced Navi conversations) (#453)
* no forced navi

* imgui option for it

* remove double owl from sloppy merge

Co-authored-by: briaguya <briaguya@alice>
2022-06-16 21:43:46 -04:00
David Chavez
587c46cacf
Enable High DPI mode in SDL (#490) 2022-06-16 21:08:47 -04:00
vaguerant
ac8acaeba4
Cheat: shield with two-handed weapons (#487) 2022-06-16 21:08:32 -04:00
louist103
93e69c924d
Add time. (#462) 2022-06-16 20:57:01 -04:00
PurpleHato
72ebeaad3b
Fix: SohImGui behavior and cleanup (#461)
* 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>
2022-06-16 20:48:42 -04:00
qurious-pixel
f29fb01887
Add Controller Navigation (#429)
* 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
2022-06-16 20:43:34 -04:00
getBrainError
3d24f3f595
Improved Collision Viewer (#435)
* 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
2022-06-16 20:40:27 -04:00
Christopher Leggett
bf0935a5a2
Gravedigging tour fix (#388)
* 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)
2022-06-16 20:36:13 -04:00
Nicholas Estelami
b9a8118e33 Ready for round 2? 2022-06-16 20:35:52 -04:00
Nicholas Estelami
f581e3e79f Let's try again 2022-06-16 20:35:52 -04:00
Nicholas Estelami
2a2ef17302 Fixed Linux issues (I think) 2022-06-16 20:35:52 -04:00
Nicholas Estelami
34ef1d2fd0 Updated resource types 2022-06-16 20:35:52 -04:00
Nicholas Estelami
bb6f5abbbf Updated sequence file format and updated resource version to Rachael 2022-06-16 20:35:52 -04:00
Nicholas Estelami
960a29e513 Fixed StormLib Forward Slash BackSlash issues 2022-06-16 20:35:52 -04:00
Nicholas Estelami
c930bd0138 Added names for the soundfonts. 2022-06-16 20:35:52 -04:00
Nicholas Estelami
0a629ea6e9 Fixed last remaining audio bugs 2022-06-16 20:35:52 -04:00
Nicholas Estelami
6c94c8690e Updated sample rate to 44100hz 2022-06-16 20:35:52 -04:00
Nicholas Estelami
c49cee3521 Audio support nearly complete. 2022-06-16 20:35:52 -04:00
Nicholas Estelami
b3e299dbde Replaced StormLib .lib files with source code.
Some modifications to handle backslashes and forward slashes, along with some optimizations to speed up OTR generation.
2022-06-16 20:35:52 -04:00
Nicholas Estelami
941c19f2c3 Audio decompiled and WIP custom sample support 2022-06-16 20:35:52 -04:00
Nicholas Estelami
4c99fc497c Ready for round 2? 2022-06-16 20:00:38 -04:00
Nicholas Estelami
b8334e5757 Let's try again 2022-06-16 19:46:07 -04:00
Nicholas Estelami
ce36822c80 Fixed Linux issues (I think) 2022-06-16 19:24:18 -04:00
Nicholas Estelami
1ec0161247 Updated resource types 2022-06-16 19:09:07 -04:00
Nicholas Estelami
dcb1b59c1b Updated sequence file format and updated resource version to Rachael 2022-06-15 16:09:22 -04:00
Nicholas Estelami
510a38a6bc Fixed StormLib Forward Slash BackSlash issues 2022-06-15 16:09:22 -04:00
Nicholas Estelami
416173fa79 Added names for the soundfonts. 2022-06-15 15:57:52 -04:00
Nicholas Estelami
99e3d9a899 Fixed last remaining audio bugs 2022-06-15 15:57:52 -04:00
Nicholas Estelami
5d3b21bd2b Updated sample rate to 44100hz 2022-06-15 15:57:52 -04:00
Nicholas Estelami
114c6e01d9 Audio support nearly complete. 2022-06-15 15:57:52 -04:00
Nicholas Estelami
746c7a5303 Replaced StormLib .lib files with source code.
Some modifications to handle backslashes and forward slashes, along with some optimizations to speed up OTR generation.
2022-06-15 15:57:52 -04:00
Nicholas Estelami
b8c9f7f1ce Audio decompiled and WIP custom sample support 2022-06-15 15:57:52 -04:00
Kevin Alexis Contreras
5b43e4652f Updated zapd_audio_support into zelda64 2022-06-15 09:42:37 -05:00
KiritoDev
d0ce76e5c6
Merge branch 'develop' into zelda64 2022-06-15 09:14:58 -05:00
Nicholas Estelami
b3396446af Fixed StormLib Forward Slash BackSlash issues 2022-06-14 18:56:17 -04:00
Kevin Alexis Contreras
3dc33b6f84 Added GetSampleRate function 2022-06-14 14:04:47 -05:00
louist103
5fcddaa066 Remove another unused thing. 2022-06-14 11:28:46 -04:00
louist103
15b28370fc Fix 2022-06-14 11:28:46 -04:00
Nicholas Estelami
9e313dd18b Added XML attributes and fixed odd crash 2022-06-14 01:29:52 -04:00
Nicholas Estelami
bff206e30b Added names for the soundfonts. 2022-06-14 01:13:18 -04:00
Nicholas Estelami
c5df54ae27 Fixed last remaining audio bugs 2022-06-14 01:13:18 -04:00
Nicholas Estelami
c82df705a6 Updated sample rate to 44100hz 2022-06-14 01:13:18 -04:00
Nicholas Estelami
61760401bc Audio support nearly complete. 2022-06-14 01:13:18 -04:00
Nicholas Estelami
b83cd172b2 Replaced StormLib .lib files with source code.
Some modifications to handle backslashes and forward slashes, along with some optimizations to speed up OTR generation.
2022-06-14 01:13:18 -04:00
Nicholas Estelami
b889880cc7 Audio decompiled and WIP custom sample support 2022-06-14 01:13:18 -04:00
Kevin Alexis Contreras
9cf537eaff Fixed ocarina loop points 2022-06-13 21:53:26 -05:00
Nicholas Estelami
36eb47e631 Fixed last remaining audio bugs 2022-06-13 21:54:25 -04:00
Kevin Alexis Contreras
4ddb2d81b7 Merge branch 'zapd_audio_support' into zelda64 2022-06-13 17:10:34 -05:00
Nicholas Estelami
405e6019d2 Updated sample rate to 44100hz 2022-06-13 18:09:22 -04:00
PurpleHato
2a1145785e
Tweak: Draw Distance Kokiri menu behavior (#459)
* 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
2022-06-13 16:57:08 -04:00
PurpleHato
45e18f9aca Tweak: Typo fixed 2022-06-13 16:40:47 -04:00
PurpleHato
c927403fa5 Fixed: Kaleido Link Rotation
I made a fucksie woopsie while refactoring
2022-06-13 16:40:47 -04:00
PurpleHato
fde3c8e98f Fix: Dualsense (PS5) Gyro
No needs to use the hacky stuff anymore :D
2022-06-13 16:38:34 -04:00
Kevin Alexis Contreras
da724c0632 Changed audio freq from 32KHZ to 44KHZ on SDLAudioPlayer 2022-06-13 14:40:35 -05:00
Kevin Alexis Contreras
8b63cf93d8 Updated zapd_audio_support on zelda64 2022-06-13 11:41:43 -05:00
KiritoDev
8a7aa5fa53
Merge branch 'develop' into zelda64 2022-06-13 10:18:38 -05:00
Kevin Alexis Contreras
9e851ebd93 Updated ResourceMgr to develop changes 2022-06-13 10:17:48 -05:00
Kevin Alexis Contreras
aa66e01740 Fixed conflicts with develop 2022-06-13 10:12:56 -05:00
PurpleHato
f00178e45d FIX: Remove duplicates of Disable Navi Call 2022-06-11 15:57:30 -04:00
BountyChocolate123456
1cb3cd5509
#243 Add option to disable black bars letterboxes (#376)
* #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>
2022-06-11 12:07:13 -04:00
Josh Bodner
1feef9d5d6
Added slider to increase vine/ladder climbing speed (#375)
* 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!
2022-06-11 12:07:00 -04:00
Ada
f3dda92e78
Adds option to stop the game from freezing the player when picking up gold skulltula's (#365) 2022-06-11 12:06:42 -04:00
Nicholas Estelami
f1b81b7f82 Audio support nearly complete. 2022-06-10 13:37:50 -04:00
Josh Bodner
257cc41d2b
Stop the dropped item despawn timer on demand (#382)
* Stop the despawn timer on demand

* But do make them disappear once they're collected!
2022-06-09 17:28:58 -04:00
Vague Rant
e4fe289f70 Restore Hover Fishing bug from 1.0 2022-06-08 19:10:55 -04:00
Baoulettes
55fa1996ba Update SohImGuiImpl.cpp 2022-06-08 19:07:56 -04:00
briaguya
5b7dad1de2 fast chests 2022-06-08 18:32:12 -04:00
louist103
c6622e6c87 Update ResourceMgr.cpp 2022-06-08 18:30:54 -04:00
louist103
cf872d1e0d cleanups 2022-06-08 18:30:54 -04:00
PurpleHato
ac2127094b
ADDED: Draw Distance toggle under Experimental enhancement + Bugfix (#398)
* 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
2022-06-08 18:00:10 -04:00
vaguerant
d01d6ff3d1
Add Fireproof Deku Shield cheat (#440) 2022-06-06 19:26:16 -04:00
vaguerant
8cbc4d27eb
Add GUI toggle for Ganon blood color, also fix minor unrelated typos in ImGui (#411)
* Add GUI toggle for Ganon blood color

* Move to new Restoration section

* rm accidental line break

* Simplify booleans
2022-06-06 19:21:06 -04:00
vaguerant
596d5b478b
Fix Navi text HUD position (#406)
* Fix Navi text HUD position

* Force cvar to return 0 or 1

As suggested by Gary

* Disable all bug fixes by default

per Kenix
2022-06-06 19:16:47 -04:00
PurpleHato
f9c86c9821 fix: inverted the array size valye 2022-06-06 14:26:47 -04:00
PurpleHato
d87df5f670 Fixed from @louist103 and @Emill review 2022-06-06 14:26:47 -04:00
PurpleHato
6c34c03cdf FIX: EnhancementCombobox
It was returning the wrong value and could mess array sizes.
2022-06-06 14:26:47 -04:00
Vague Rant
c08439a562 Implement Cow of Time enhancement 2022-06-06 13:57:27 -04:00
Random06457
af8c5ab978 fix Makefile typo 2022-06-04 10:09:50 -05:00
Random06457
b5d5930fed change OSMesg definition and fix memory corruptions 2022-06-04 10:09:50 -05:00
Random06457
72fcd19a9e fix compilation 2022-06-04 10:09:50 -05:00
MelonSpeedruns
3b1d82c3ca
Merge pull request #437 from PurpleHato/FixNaviColor
FIX: Default Navi's colors have been altered recent merged PRs
2022-06-03 13:29:50 -04:00
Kevin Alexis Contreras
5ec6c01a78 Disabled RTC on soh and lus 2022-06-03 14:24:39 -05:00
David Chavez
e1affbdf9a Fix function prototypes and types 2022-06-02 12:43:16 -05:00
PurpleHato
902b842bcb FIX: Default Navi's colors have been altered recent merged PRs
This fix restore Navi's original colors which have been altered with recent merged PRs
2022-06-02 19:14:14 +02:00
Baoulettes
23946d5798
Merge branch 'develop' into ComboBox-Simplification 2022-06-02 04:46:42 +02:00
Baoulettes
0bfe2fec67
fix win build crash (#425)
sizeof issue make it crash on windows.
Thanks Melon :)
2022-06-01 22:06:32 -04:00
Kevin Alexis Contreras
332f8f93fb Merge branch 'zapd_audio_support' into zelda64 2022-06-01 15:12:28 -05:00
Kevin Alexis Contreras
0320107fc0 Merge branch 'zapd_audio_support' into zelda64 2022-06-01 15:11:11 -05:00
Nicholas Estelami
fc7da35054 Replaced StormLib .lib files with source code.
Some modifications to handle backslashes and forward slashes, along with some optimizations to speed up OTR generation.
2022-06-01 16:05:05 -04:00
Nicholas Estelami
6f5ce7d715 Audio decompiled and WIP custom sample support 2022-06-01 13:06:32 -04:00
Kevin Alexis Contreras
0067a69795 Merge develop into zelda64 2022-05-31 17:49:39 -05:00
Baoulettes
ea0ea0366b
Merge branch 'develop' into 3DProjectiles 2022-05-29 23:02:19 +02:00
briaguya
daec428cb3
call SDL_Quit() before exit(0) (linux window closing issue) (#408)
* use _Exit(0) on linux

* use SDL_Quit() instead of _Exit(0)

* remove unnecessary call, add bandaid comment

Co-authored-by: briaguya <briaguya@alice>
2022-05-29 16:45:27 -04:00
PurpleHato
08c161fd13
Enhancement: More options for Kaleido Link (#394)
* 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
2022-05-29 16:40:50 -04:00
Baoulettes
29d4cd27c4
Fix Radiobutton uniqueness issues (#397)
* Fix Radiobox uniqueness issues

* C++ ? and build fix I think

* To match the edit made in .c
2022-05-29 16:38:21 -04:00
Baoulettes
7913398110
EnhancementColor3 tweak SohImGui Clean (#400)
* 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
2022-05-29 12:57:09 -04:00
Emill
ccab94c765
Implement AnyFPS + option to queue one rendered frame (#401) 2022-05-29 12:16:23 -04:00
Baoulettes
14ca2ab377
Merge branch 'develop' into ComboBox-Simplification 2022-05-29 18:02:21 +02:00
louist103
533c216ad3
Cleanup ImGui strings (#359)
* Cleanup

* Emills suggestion

* fixes
2022-05-29 11:47:09 -04:00