Commit Graph

3383 Commits

Author SHA1 Message Date
aMannus 21c53aff93 Crude archipelago log window 2025-05-18 22:56:27 +02:00
briaguya 53566c9a73 fix incorrect __VA_ARGS__ use in lusprintf version of osSyncPrintf (#5510) 2025-05-18 16:25:24 -04:00
briaguya 50f42b93fe fix "is valid for C/ObjC but not for C++" warnings (#5512) 2025-05-18 16:25:00 -04:00
aMannus 68f73d86f5 Move menu to Network tab, clean up switch 2025-05-18 20:42:55 +02:00
aMannus e7ab37c6cc Make it build baby! 2025-05-18 20:31:19 +02:00
aMannus 95cc7ae8e2 File directory cleanup and options window separation 2025-05-18 14:36:37 +02:00
aMannus 3dd7ef6a59 Merge pull request #61 from jeromkiller/AddArchipelagoClientLib
Add archipelago client lib
2025-05-18 13:31:04 +02:00
Malkierian ecad59e31f Add tooltip to Generate Seed button when disabled indicating the need to be on File Select. (#5509) 2025-05-17 18:52:45 -07:00
Pepper0ni 8e34942924 Toggle the vanilla flags instead of the rando flags when removing one time scrubs (#5504) 2025-05-17 18:06:24 -07:00
xxAtrain223 e0d5fbec42 Available Checks Prices (#5446)
* Improved the item location price availability.

* Moved the available checks price logic into location_access.cpp.

* Fixed typo and clarified check status identified.
2025-05-17 18:05:20 -07:00
Eric Hoey b30fff5d57 Skip Forest Temple Basement Pillars Cutscene (#5473)
* vb forest pillar cs skip

* change to one point cutscene skip

* rm whitespace
2025-05-17 17:56:57 -07:00
xxAtrain223 66351fa4e4 Remove freestanding key from Bottom of the Well Perimeter. (#5496) 2025-05-17 17:30:01 -07:00
xxAtrain223 9cb6530858 Fix Enable Available Checks from title screen. (#5502) 2025-05-17 17:29:53 -07:00
briaguya 3c0e7bcf72 bump lus (to bump imgui) (#5501) 2025-05-17 17:12:05 -04:00
briaguya b418db7792 bump lus (#5500) 2025-05-17 15:35:51 -04:00
Jerom Venneker 82ef6c55ef Disabled (but not removed) mapping of old OoT ap items and locations. Not tested because I can't get the world to host yet :( 2025-05-17 20:05:37 +02:00
briaguya 4f0ed2949e fix seed gen underflow (#5499) 2025-05-17 07:55:21 -07:00
briaguya 026c7619da set soh c standard to 23 (#5498) 2025-05-17 02:16:59 -04:00
Christopher Leggett 6acabae38f Prevent another use of gSaveContext during Seed Generation (#5458)
* Prevent BeanPlanted using gSaveContext for seed gen

* address malk's comment about extern

---------

Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
2025-05-16 23:11:04 -07:00
Archez 9010b8c540 port over nametag improvements from 2ship (#5160) 2025-05-17 01:09:23 -04:00
Malkierian e673eaefb6 Warnings Round 2 (mostly Rando) (#5486)
* Handle virtually all warnings in `soh/Enhancements/randomizer`.
Handle order of operations warning in FasterHeavyBlockLift.

* Missed a few.

* Add float-specific versions of some M_PI and M_SQRT defines, and swap them in for the static casts in draw.cpp.

* Swap a static cast for M_PIf in check tracker code.
2025-05-16 21:54:36 -07:00
Malkierian 23a5198986 Merge pull request #5497 from HarbourMasters/develop-blair
blair -> dev
2025-05-16 21:46:00 -07:00
Pepper0ni 5b6844ccd8 reapply changes needed for C23 build on develop (#5467) 2025-05-17 00:41:14 -04:00
Malkierian b900f8599a Bump LUS to latest, and handle tinyxml and gfx_pc changes. (#5470) 2025-05-16 21:14:55 -07:00
briaguya 4fd0bf402e set c standard to 17 (#5492) 2025-05-16 15:07:52 -07:00
Pepper0ni e8c2db8151 remove all refernces to Doge (#5488) 2025-05-15 19:51:14 -07:00
Jerom Venneker c5fdcb4064 Merge remote-tracking branch 'fork/aManchipelago' into AddArchipelagoClientLib 2025-05-14 12:37:46 +02:00
Malkierian 45d9fe54d2 Warnings Squashing Round 1 (#5469)
* Fix truncation warning in `entrance.h`.

* Fix type warning in fishsanity.cpp

* Fix implicit conversion warnings in BossRush, Mouse, and UIWidgets.hpp.

* Add Random_Float and use it in GameInteractor_RawAction.cpp.
Make non-specified seed init a separate function.

* clang after type change

* Fix truncation and conversion warnings in ExtraTraps.cpp.

* Resolve type conversion warnings in InputViewer.cpp.

* Resolve some type conversion warnings in hook_handlers.cpp.

* Remove `Random_Float`, and apply `RandomDouble` where it was being used instead.
Add proper range notation to `RandomDouble` to denote the lack of inclusivity for the max part of the range.

* Convert c-style casts to static_cast.
2025-05-13 19:30:04 -07:00
Jerom Venneker ea13bc635f Fixed recieving items from chests 2025-05-13 22:02:59 +02:00
Philip Dubé afc52f07d2 location_access: don't short circuit event access logic (#5216)
event logic is only run while event isn't set
2025-05-13 12:30:22 -07:00
Philip Dubé eb95f9060f Faster empty bottle, faster bean skulltula (#5355)
* Faster empty bottle, faster bean skulltula

* shipinit
2025-05-13 12:30:04 -07:00
Philip Dubé f9cde383b7 ignore out of bounds entrance overrides in json (#5253)
was causing segfault when using settings from door shuffle on develop
2025-05-12 20:33:21 -07:00
Pepper0ni f72085b6ca fix oversight in dragon room of MQ water (#5482) 2025-05-12 20:31:40 -07:00
Jerom Venneker e2d0d8f511 Added found locations to scouts as well 2025-05-12 21:39:05 +02:00
Jerom Venneker ae736e6f2c Bump apclientpp to version 0.6.0 2025-05-12 21:22:37 +02:00
Jerom Venneker ead3d2f515 Fixed menu and added poll call to apcpp to help connecting 2025-05-12 21:12:44 +02:00
Jerom Venneker a0696518b1 Replaced APCpp library with APClientpp, project builds but doesn't work yet 2025-05-11 21:47:29 +02:00
Jerom Venneker f8ecb68404 Merged aMannuses changes to swap out APCpp for apclientpp 2025-05-08 22:35:19 +02:00
aMannus c109e5c2da Update ASIO to 1.30.2 2025-05-08 19:48:40 +02:00
aMannus 85e9ce7ed1 Potential Mac fix 2025-05-08 19:26:03 +02:00
Jerom Venneker 3053d92015 Made some notes on differences between SoH and the existing OoT APworld 2025-05-08 19:20:24 +02:00
aMannus be50419a42 Merge pull request #60 from briaguya-ai/depsandstuff
fix linux ci
2025-05-08 06:51:37 +02:00
briaguya ee7cb4ee22 back to 12 2025-05-07 20:24:07 -04:00
briaguya 345247c95a Merge branch 'aManchipelago' into depsandstuff 2025-05-07 20:23:43 -04:00
briaguya b299de0bd7 cpp20 fix for valijson
i couldn't tell what version of valijson was in here, so i just fixed the error (it was the same as one of the errors websocketspp had)
2025-05-07 18:34:31 -04:00
briaguya 00ac813735 manually apply cpp20 fixes from https://github.com/zaphoyd/websocketpp/pull/1060
the patch link from  https://github.com/zaphoyd/websocketpp/issues/1068#issuecomment-1364647094 didn't work for some reason, so i looked at the 1060 PR

the PR had 10 commits https://github.com/zaphoyd/websocketpp/pull/1060/commits, all but 2 of which seemed entirely unrelated to the cpp20 fix

so i manually pulled the changes from the 2 cpp 20 related commits:
* https://github.com/zaphoyd/websocketpp/pull/1060/commits/9b7fdd5b988b3b443fda60a5852173d0268d309e
* https://github.com/zaphoyd/websocketpp/pull/1060/commits/0823cfea38acb9827b9d5a742b0f394ed5b30d68

Co-authored-by: Andre Azevedo <andre.azevedo@gmail.com>
2025-05-07 18:10:30 -04:00
Eric Hoey 804a24861b add option description to LACS reward options (#5472) 2025-05-07 14:45:42 -07:00
briaguya 5040201a03 update wspp version from 0.8.1 to 0.8.2 2025-05-07 17:33:40 -04:00
aMannus 1389da5641 Update github runner to use GCC 14 2025-05-07 23:05:01 +02:00
aMannus 05e9696ca0 Merge branch 'develop' into aManchipelago 2025-05-07 21:04:16 +02:00