mirror
/
Shipwright
mirror of https://github.com/HarbourMasters/Shipwright.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
1,539 Commits 3 Branches 36 Tags 132 MiB
Commit Graph

1539 Commits

Author SHA1 Message Date
Sarge-117 e1da7bf9af Merge remote-tracking branch 'upstream/rando-next' into rando-enhanced-magic-arrows 2022-09-03 11:58:38 -07:00
Sarge-117 0151294648 Simplify mudwall collision check 
There was no need to have a second collider specifically for Ice Arrow hits
 2022-09-03 11:24:17 -07:00
briaguya cbc181bc0a
Merge pull request #1392 from lilDavid/re-add_progressive_chus 
Reimplement progressive Bombchus + fix bowling Bombchu prize
 2022-09-03 14:13:17 -04:00
Sarge-117 a397b07ec4 Update location access logic 
Including MQ locations in Spirit and GC now
 2022-09-03 10:37:14 -07:00
briaguya 98dbbfda13
Merge pull request #1395 from leggettc18/starting-bgs 
Fixes Link starting with BGS
 2022-09-03 13:36:12 -04:00
briaguya 1f7122025f
Merge pull request #1394 from leggettc18/leggettc18/issue1390 
Rando-next: Fixes Enemy Drops giving a blue rupee
 2022-09-03 13:33:19 -04:00
Sarge-117 bb04e9d97d Restore checkboxes to enhancements menu 
These got lost in the merge
 2022-09-03 09:57:35 -07:00
Sarge-117 43372155f2 Fix mistake from merge 
oops
 2022-09-03 09:39:42 -07:00
Sarge-117 05f7b65d28 Merge remote-tracking branch 'upstream/rando-next' into rando-enhanced-magic-arrows 2022-09-03 09:30:14 -07:00
Christopher Leggett e079c254f1
Fixes Link starting with BGS 2022-09-03 09:39:03 -04:00
Christopher Leggett 5421ad27c9
Rando-next: Deku Nut and Seed ammo gives a blue rupee 
Fixes #1390
 2022-09-03 09:24:37 -04:00
lil David f5fae6df32 Reimplement progressive Bombchus 2022-09-03 08:11:51 -05:00
briaguya 431231f2be
Merge pull request #1388 from briaguya-ai/z-to-rando-next 
zhora -> rando-next
 2022-09-03 06:10:09 -04:00
briaguya 007540fb39 Merge branch 'develop-zhora' into z-to-rando-next 2022-09-03 05:55:40 -04:00
aMannus f1dc980de8 Fixed autobreak after ImGui cleanup 2022-09-03 05:52:01 -04:00
briaguya ea4e0652e7 bring back new rando dropdown 2022-09-03 04:41:43 -04:00
briaguya 3a6d7fcfd0 and make it build 2022-09-03 04:23:25 -04:00
briaguya 975a854054 Merge branch 'develop-zhora' into z-to-rando-next 2022-09-03 03:47:09 -04:00
briaguya db6eeb79ee
Merge pull request #1387 from leggettc18/leggettc18/issue1366 
More options for Link's Pocket and Null Global Context safe `Item_Give`
 2022-09-03 03:18:50 -04:00
Christopher Leggett 350d0b91ed
Removes unneeded `GiveLinkItem` functions. 2022-09-03 02:47:42 -04:00
Christopher Leggett 36cc9d562c
Adds more options for Link's starting item. 2022-09-03 02:34:21 -04:00
briaguya 6daf357fd9
fix include fix build (#1385) 
Co-authored-by: briaguya <briaguya@alice>
 2022-09-03 02:13:20 -04:00
Christopher Leggett 2015e3a041
Converts Song from Impa to use `Item_Give` 2022-09-03 01:48:07 -04:00
Baoulettes d2fa0d6485 Rando: Fix Fast File Select seed loading (#1252) 
* FixRandoLoading

* better methode
 2022-09-03 01:33:24 -04:00
Ada b14fb37b81 Update libultraship/libultraship/Lib/Fast3D/gfx_pc.cpp 
Co-authored-by: David Chavez <david@dcvz.io>
 2022-09-03 01:33:24 -04:00
Ada edb5261b07 Fixes ToT Fog 2022-09-03 01:33:24 -04:00
Christopher Leggett a5804ca2b2
Makes `Item_Give` safe to use with a NULL globalCtx. 
This should allow it's use for giving items to Link's Pocket
during rando save initialization.
 2022-09-03 01:22:33 -04:00
louist103 8118947ab0
Windows crash handler. (#1383) 
* Windows crash handler.

* Fix naming convention.
 2022-09-03 01:15:43 -04:00
briaguya 50daabb794
Merge pull request #1353 from Sarge-117/update-navi-hints-rando 
Rando: Navi text: Update German spellings, add some hints
 2022-09-03 00:53:39 -04:00
briaguya df8f94da70
Merge pull request #1382 from leggettc18/leggettc18/issue1365 
Fixes Ganon's Castle Crash and Trials coming from old save file
 2022-09-03 00:43:43 -04:00
Christopher Leggett a07ea091f0
Fixes crash when entering Ganon's Castle lobby on linux. 2022-09-03 00:20:50 -04:00
Christopher Leggett fba8fc2b74
Fix Ganons Trials coming from old save files. Fixes #1365 2022-09-03 00:20:07 -04:00
David Chavez 0ce0ab1260
Phase 1: Separate ImGui Drawing From LUS (#1310) 
* Update LUS imported paths

* Introduce GameMenuBar

* Fix imports after LUS import paths change

* Move Randomizer

* Replace needs_save

* Migrate Developer Tools

* Migrate Cheats

* Migrate Enhancements

* Separate UIWidgets

* Add missing Hooks.cpp file

* Migrate Settings

* Remove UI methods from LUS

* Cleanup imports and exposed properties

* Cleanup more methods

* Fix project generation

* Fix CI compilation

* Remove resolved TODO
 2022-09-03 00:00:04 -04:00
Sarge-117 9441b2ab1d Update logic Cvar names 2022-09-02 19:37:02 -07:00
briaguya adcb29fc86
Merge pull request #1379 from garrettjoecox/GetItem-renaming 
Get item renaming
 2022-09-02 22:14:12 -04:00
Sarge-117 33779823c8 Merge remote-tracking branch 'upstream/rando-next' into rando-enhanced-magic-arrows 2022-09-02 19:10:28 -07:00
Sarge-117 6fe51cdd24 Remove redundancy in KD room 2022-09-02 19:10:16 -07:00
Garrett Cox f6fd116adb Cast randoGet for ganons boss key 2022-09-02 20:19:28 -05:00
Garrett Cox e0b0776e02 Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into GetItem-renaming 2022-09-02 20:07:34 -05:00
briaguya c1894f108f
Merge pull request #1380 from leggettc18/rando-next-key-fix 
Fixes Ganon's Boss Key setting discrepancy
 2022-09-02 18:33:47 -04:00
briaguya 34d99441d6
Merge pull request #1321 from aMannus/rando-settings-menu-even-moar-changes 
Rando: Even more randomizer settings menu changes
 2022-09-02 17:00:52 -04:00
Christopher Leggett 0cdcc27e53
Fixes Ganon's Boss Key shuffled while regular boss Keys aren't. 2022-09-02 15:45:55 -04:00
Garrett Cox a95edd25de Merge branch 'GetItemFromGet-changes' of github.com:garrettjoecox/OOT into GetItem-renaming 2022-09-02 14:18:18 -05:00
Garrett Cox 1aa33a7940 Remove comments in OTRGlobals 2022-09-02 14:17:45 -05:00
Garrett Cox 1659f1f386 Re-add GetItemObtainabilityFromRandomizerCheck 2022-09-02 14:00:10 -05:00
Christopher Leggett 64aca78450
Fixes Switch/Wii U crashes with Wonder Rupees and Bottleable Entities (#1360) 
* Reorders switch statement to prevent some code that shouldn't execute.

* Potentially fixes bottleable entities crash

* Solves lack of ItemEntry for GI_MAX

* Adds comment clarifying new GetItemEntry
 2022-09-02 19:19:12 +02:00
Garrett Cox ee2f38ad91 Renaming of some randomizer item/check/get methods 2022-09-02 10:34:20 -05:00
Garrett Cox c7a7059db4 Minor adjustments from feedback and rename CanObtain to ItemObtainability 2022-09-02 09:38:41 -05:00
Garrett Cox 676f8945ab Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into GetItemFromGet-changes 2022-09-02 09:15:31 -05:00
Sarge-117 164a43c9cb Update logic for King Dodongo's room 
Explicitly check for BlueFireAccess && HasBottle here, since using the Ice Arrows on the bombable floor is tricky due to its collision being very tiny
 2022-09-01 22:00:46 -07:00