Commit Graph

1259 Commits

Author SHA1 Message Date
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
vaguerant
f865db5444
MM Bunny Hood enhancements: no age restrictions & wear across entrances (#560)
* Remove age restriction on MM Bunny Hood

* Handle mask slot changing; init Link wearing mask

* Reset mask state after selling
2022-07-05 19:29:43 -04:00
Baoulettes
a5df9dddf0
Use Macro for __FILE__ & __LINE__ when possible (#559)
* 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
2022-07-05 19:29:34 -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
e5b59742ae change sunset in save editor so dampe is out 2022-07-04 10:53:12 -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
5ce2ecd6c8 Update README.md 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
louist103
e7c2aff97e Fix audio, boot commands, and save staes. 2022-07-04 10:44:31 -04:00
rozlette
668f9bee10 Fix testing masks of DPad 2022-07-04 10:44:10 -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
d63c0077ee Add more files 2022-06-27 23:17:37 -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
vaguerant
82f790d082 Change Power to Upgrades 2022-06-27 23:17:16 -04:00
vaguerant
a58ddd4f55 Map Select name fixes 2022-06-27 23:17:16 -04:00
Kenix3
cc22fe17bb Headphones setting in game should now work.
Resolves #13
2022-06-27 22:10:00 -04:00
rozlette
447e68a659 Fixed some instances where the original OOT save is erroneously preserved or recreated, leading to another conversion next time you launched the game 2022-06-26 12:08:39 -04:00
rozlette
0f84682bc0 Add margins for dpad 2022-06-26 12:06:31 -04:00
rozlette
284a7fba95 Invalidate message item icon texture before drawing 2022-06-26 12:06:19 -04:00
rozlette
b96bd4ea9d Fix title cards for market potion shop and bombchu shop 2022-06-26 12:06:04 -04:00
rozlette
8535568f53 Fix ability to assign equipment you don't own 2022-06-26 12:05:28 -04:00
Christopher Leggett
1f1de82bb8 casts jya_cobra's shadowTexture pointer to uintptr_t instead of s32. 2022-06-25 11:00:56 -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
PurpleHato
0fc75bb873 FIX: Increased the maximum actor limit for draw distance
Fix issue #529
2022-06-23 20:10:39 -04:00
rozlette
375932f43b Move UI location arrays from static to global to accomodate customizable UI 2022-06-22 23:13:32 -04:00
rozlette
fd06827e2b DPad items 2022-06-22 23:13:32 -04:00
David Chavez
57fb04accc Ignore all named saves
Necessary after new save format
2022-06-22 22:59:14 -04:00
briaguya
ba74653f61 fix linux crash 2022-06-22 22:58:46 -04:00
sholdee
bd22074ec8 Move macOS to parallel stage 2022-06-22 18:22:59 -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
vaguerant
77e7080a8c
Two-hand shield cheat fix: use 1-handed reflect anim (#504) 2022-06-21 22:27:13 -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
d5db4a86bd
Merge pull request #431 from HarbourMasters/zelda64
Ship of Harkinian 64 bit compilation
2022-06-21 22:17:47 -04:00
David Chavez
f8e3dcd7c0 Jenkins: Fix path to soh.exe 2022-06-21 22:10:24 -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
53fc151453
Update soh/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c
Thanks I overlooked it :)

Co-authored-by: BountyChocolate123456 <101743444+BountyChocolate123456@users.noreply.github.com>
2022-06-20 22:33:31 +02:00
Baoulettes
14df96eacd
Merge branch 'develop' into 3DProjectiles 2022-06-20 22:32:45 +02:00