mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-11-14 21:45:16 -05:00
Code Issues Projects Releases Wiki Activity
1,602 Commits 3 Branches 37 Tags 141 MiB
d928335dd2
Commit Graph

1602 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
briaguya
d90145da47
Merge pull request #1391 from aMannus/rando-skip-scarecrow 
Rando: Add Skip Scarecrow's Song option
 2022-09-03 15:04:58 -04:00
briaguya
8e49f0465c
Merge pull request #1399 from aMannus/rando-bombchu-drops 
Rando: Add Bombchu Drops
 2022-09-03 15:03:30 -04:00
aMannus
6cd8d6ca3a Clean up bool 2022-09-03 20:48:00 +02:00
aMannus
8d033c6766 Update settings.cpp 2022-09-03 20:29:45 +02:00
aMannus
ae0ccb9cca Missing break 2022-09-03 20:18:54 +02:00
aMannus
274242e0d7 Implement rando bombchu drops 2022-09-03 20:17:12 +02: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
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
Garrett Cox
ac6843ca57 Fix for overriding deku scrub messages 2022-09-03 10:34:35 -05:00
Garrett Cox
771d1dfbf5 Fix issues from LUS refactor 2022-09-03 10:09:51 -05:00
Garrett Cox
c037bfc16b Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into shopsanity 2022-09-03 09:49:50 -05:00
Garrett Cox
b92b1eaee6 Use SohImGui::RequestCvarSaveOnNextTick 2022-09-03 09:33:54 -05:00
Garrett Cox
90bf5988ee Adjust Hooks include 2022-09-03 09:30:53 -05:00
Garrett Cox
8be6f6e441 Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into item-tracker-notes 2022-09-03 09:19:14 -05:00
Garrett Cox
ed8966054c Persist item tracker notes 2022-09-03 09:15:05 -05: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
aMannus
8d2f63419f Implement Skip Scarecrow's Song 2022-09-03 14:40:41 +02:00
aMannus
3aefd4c519 gSaveContext access in GameMenuBar.cpp 2022-09-03 12:47:32 +02: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
Garrett Cox
96ccdd6527 Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into shopsanity 2022-09-02 21:15:41 -05:00
briaguya
adcb29fc86
Merge pull request #1379 from garrettjoecox/GetItem-renaming 
Get item renaming
 2022-09-02 22:14:12 -04:00
Garrett Cox
b9a545fffa Merge branch 'GetItem-renaming' of github.com:garrettjoecox/OOT into shopsanity 2022-09-02 20:19:57 -05:00
Garrett Cox
f6fd116adb Cast randoGet for ganons boss key 2022-09-02 20:19:28 -05:00
Garrett Cox
680495ab2b Merge branch 'GetItem-renaming' of github.com:garrettjoecox/OOT into shopsanity 2022-09-02 20:08:06 -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
Garrett Cox
abfeb24ba8 Attempt to fix odd build issue 2022-09-02 20:06:37 -05:00
PurpleHato
f69d9697e9 Struct instead of ImVec + basic comportment for all case 2022-09-03 01:30:47 +02:00