Commit Graph

457 Commits

Author SHA1 Message Date
Baoulettes 0d85caaf7e GameState_, GameAlloc_, SystemArena_ & ZeldaArena_ 2022-06-28 22:09:15 +02:00
Baoulettes 4606929b31 LogUtils as macro 2022-06-28 13:06:24 +02:00
Baoulettes 0ef8463fce
Merge branch 'HarbourMasters:develop' into openclose_disp_macro 2022-06-28 11:29:14 +02: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
Baoulettes cd0cea28fb " if (1) {} " & "if (0) {}" and tab/white place 2022-06-28 00:00:16 +02:00
Baoulettes d627ec320d mtx without line/file in functions 2022-06-27 22:56:31 +02:00
Baoulettes 73d9bafe74 ASSERT macro __FILE__ __LINE__ 2022-06-27 21:52:00 +02:00
Baoulettes 1cdaf454c2 LOG_xxxx __FILE__ , __LINE__ cleaned 2022-06-27 17:12:34 +02:00
Baoulettes 9e06677f46 Some if (1) {} remove 2022-06-27 16:39:29 +02:00
Baoulettes 146fbb0d1b Open & Close _DISP __FILE__ & __LINE__ clean up 2022-06-27 16:29:52 +02:00
Baoulettes 4a3905b62b remaining hardcoded line and file 2022-06-27 16:05:59 +02:00
Baoulettes ac48cae6c8 more left over from code folder 2022-06-27 00:43:29 +02:00
Baoulettes 9ea4e2423a more overlay 2022-06-26 23:28:36 +02:00
Baoulettes a9b1695ed5 kaleido stuffs 2022-06-26 23:17:28 +02:00
Baoulettes e6c3c71649 effect & gamestate 2022-06-26 23:13:08 +02:00
Baoulettes 2e793f0d56 Almost all overlay 2022-06-26 22:54:35 +02:00
Baoulettes c20c4ee1a0 First batch some overlay 2022-06-26 19:35:32 +02: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
Kenix3 a7ed748973
Update soh/src/code/audio_load.c 2022-06-20 16:03:03 -04:00
Kevin Alexis Contreras 43503ead83 Fixed audio_heap_size 2022-06-20 13:04:01 -05:00