mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-05-31 17:41:30 -04:00
Code Issues Packages Projects Releases Wiki Activity
1,218 Commits 6 Branches 52 Tags
6561073c7b98289e59397e7c3dd4819b621bd2cb
Commit Graph

326 Commits

Author SHA1 Message Date
Christopher Leggett 6561073c7b Implements ImGui Checkbox to enable or disable color-coded-keys. 2022-08-24 00:07:16 -04:00
Christopher Leggett c7b998b33b Implements better way to use new draw functions and adds Double Defense colors. 2022-08-23 23:48:14 -04:00
Christopher Leggett 28afbec341 Adds support for custom drawing functions, and adds one for Small Keys and Boss Keys. 2022-08-23 21:12:21 -04:00
Christopher Leggett 4ee1eba67b Merge branch 'get-item-rework' into get-item-rework-rando-next 2022-08-22 19:48:34 -04:00
Christopher Leggett 3a67e2a806 Fixes potential issue with if statement. 2022-08-22 19:40:58 -04:00
Christopher Leggett 01dbfc71ad Documents our new GiveItemEntry fuctions. 2022-08-22 19:32:42 -04:00
Christopher Leggett e12fda29fe Merge branch 'get-item-rework' into merge-fix 2022-08-22 02:03:04 -04:00
Christopher Leggett 2bbd618599 Cleans up another if statement in item00 2022-08-21 15:35:10 -04:00
Christopher Leggett e5bca727ac Cleans up an if statement for item00. 2022-08-21 15:22:18 -04:00
Christopher Leggett e1b403a31b Removes unused Randomizer_GetItemIdFromGetItemId. 2022-08-21 15:14:50 -04:00
Christopher Leggett fc963cf44c Merge branch 'get-item-rework' into get-item-rework-rando-next 2022-08-20 18:01:23 -04:00
Christopher Leggett 4dff1443a6 Fixes rendering of treasure chest game items. 2022-08-20 18:00:44 -04:00
Christopher Leggett 4e2707aefc Merge branch 'develop-zhora' of github.com:HarbourMasters/Shipwright into get-item-rework 2022-08-19 18:51:00 -04:00
Christopher Leggett a51b844a23 Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into get-item-rework-rando-next 2022-08-17 15:43:42 -04:00
Christopher Leggett 914af77234 Fixes fanfare getItemId overlap 2022-08-17 12:23:39 -04:00
briaguya 03151647b1 Merge pull request #1227 from HarbourMasters/develop-zhora 
zhora -> rando-next
 2022-08-16 23:59:11 -04:00
Kenix3 72981221ad Merge pull request #1226 from HarbourMasters/develop-rachael 
rachael -> zhora
 2022-08-16 23:40:06 -04:00
David Chavez 6b0338a37d [zret] Port some documentation changes (#1164) 
* zret: Documentation pass on scene/room commands #1226

* Update OTR scene

* zret: Document the lens system #1079

* zret: Misc. doc/cleanup 4 #1093

* zret: Fix misc 8 #1150

* zret: Document Distortions from z_camera and z_view #1102
 2022-08-16 21:53:28 -04:00
GaryOderNichts a3d0962054 Fix ocarina right stick controls (#1211) 2022-08-16 13:47:41 +02:00
lilDavid 46a421f933 Add window to customize specific controls (#1122) 2022-08-16 09:43:09 +02:00
Christopher Leggett cc31479772 Merge branch 'get-item-rework' into get-item-rework-rando-next 2022-08-16 00:43:17 -04:00
Garrett Cox f874d83432 Add a few missing cases 2022-08-15 22:59:42 -05:00
Garrett Cox 64965ee926 Use GiveItemEntryFromActorWithFixedRange in item00 2022-08-15 22:22:47 -05:00
Garrett Cox d0d567697b Fix logical errors and migrate most of the rest of the rando checks to GiveItemEntryFromActor 2022-08-15 22:10:31 -05:00
Garrett Cox 170b297a7a Introduce some new methods and migrate most actors to them 2022-08-15 14:33:29 -05:00
Garrett Cox 806019d0cb Move check for gRandoQuestItemFanfares into MOD_NONE block within Audio_PlayFanfare_Rando 2022-08-15 12:48:57 -05:00
Garrett Cox 06b1074e2a Replace Randomizer_GetRandomizedItemId with Randomizer_GetRandomizedItem and Randomizer_GetItemIdFromKnownCheck with Randomizer_GetItemFromKnownCheck 2022-08-15 12:10:35 -05:00
Christopher Leggett bff5406e69 Merge branch 'get-item-rework' into get-item-rework-rando-next 2022-08-15 02:36:29 -04:00
Christopher Leggett 6b4f300eda Makes sure we aren't using getItemEntry when not randoed. 2022-08-15 02:17:06 -04:00
Christopher Leggett 9c59624d64 Makes freestanding items set player->getItemEntry. 
This prevents freestanding items from setting the global modIndex.
This is part of a larger transition that needs to happen to switch
to setting getItemEntries for all of the rando items. This prevents
some things that set getItemId of GI_MAX from granting a Fire Medallion
when the global modIndex is MOD_RANDOMIZER.
 2022-08-15 02:08:32 -04:00
briaguya 42bce9d33e don't abuse epochs (#1179) 
* don't abuse epochs

* update bongo hand trails

Co-authored-by: briaguya <briaguya@alice>
 2022-08-14 23:18:12 -04:00
aMannus d575a3dda6 Fixed rotation of freestanding key checks in rando (#1135) 2022-08-14 23:01:30 -04:00
GaryOderNichts 68e7f2e6c1 Wii U support (#1097) 
* Wii U support

* [WiiU] Combined Dockerfile

* [WiiU] Combined Dockerfile

* [WiiU] Combined Dockerfile

* Add Jenkins support

* wiiu: fix scissor clamp

* wiiu: improve button remapping

* wiiu: fix scaling issues

* Update Dockerfile after merge

* Pull assets before build

* Only stop container once

* Adjust logging sinks

* wiiu: Change button mapping to match PC version

* wiiu: Implement controller changes

* wiiu: Update BUILDING.md

Co-authored-by: qurious-pixel <62252937+qurious-pixel@users.noreply.github.com>
Co-authored-by: David Chavez <david@dcvz.io>
 2022-08-14 22:57:24 -04:00
Christopher Leggett 3bf92a348c Fixes crashes with Audio_PlayFanfare_Rando. 2022-08-14 13:19:41 -04:00
Christopher Leggett 203785f76a Fixes Link's Pocket being a Dungeon Reward from Impa. 2022-08-14 12:22:24 -04:00
Christopher Leggett 6d7498829d Wraps up a few missed type changes. 2022-08-14 11:54:43 -04:00
Christopher Leggett 0604dbfef8 Cleans up and updates item fanfares. 2022-08-14 11:43:25 -04:00
Christopher Leggett f7707a3890 Merge branch 'get-item-rework' into get-item-rework-rando-next 2022-08-14 01:02:12 -04:00
Christopher Leggett 5998dcff7a Simplifies sram init for rando-specific items 2022-08-13 23:27:03 -04:00
Christopher Leggett 6c3fff7412 Fixes Link's Pocket items. 2022-08-13 22:56:46 -04:00
Christopher Leggett c8d085cb49 Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into get-item-rework-rando-next 
Hopefully everything works here. Need to do some testing.
 2022-08-13 22:43:19 -04:00
Christopher Leggett 76282830d3 Fixes LACS/Prelude situation... again. 2022-08-13 15:30:18 -04:00
Christopher Leggett 58c9f64a16 Extends GetItemEntry to include GID. 
This allows for using it later when drawing freestanding items.

Addresses https://github.com/HarbourMasters/Shipwright/pull/1050#discussion_r943168136
 2022-08-13 01:44:19 -04:00
Christopher Leggett 11db45eef6 Extends GetItemEntry to include getItemId 
Also adapts some existing calls for both the entry and the id to only
get the entry.
 2022-08-13 01:32:36 -04:00
Christopher Leggett 69086f58c2 Cleanup, bugfixes, removing the - 1s from z_player.c 2022-08-13 00:22:34 -04:00
lilDavid 92d0d3e35e Let Cojiro crow in Adult Trade Shuffle 2022-08-12 17:12:52 -05:00
lilDavid e9354cc9a1 Don't spawn Fado and the carpenter's son at once 2022-08-12 17:12:19 -05:00
lilDavid 282192eb5e Properly hatch pocket cucco using Sun's Song 2022-08-12 17:02:03 -05:00
Kenix3 86faa42acf Make libultra OSContPad struct consistent with the one from libultraship 2022-08-11 19:41:53 -04:00
Kenix3 094388187f Cleans up Controllers 
Renames VirtualController to DummyController.
Makes controller axis treated the same as buttons.
Made Controller class members private or protected
Made Controller class treat deadzones, sensitivities, and press thresholds consistently.
 2022-08-11 19:41:53 -04:00