mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-06-25 10:22:08 -04:00
Code Issues Packages Projects Releases Wiki Activity
1,311 Commits 6 Branches 52 Tags
27ced1fecabcb7261d70199bae68c3f503e3ec00
Commit Graph

1311 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christopher Leggett e1084c0d6d Removes ARRAY_SIZE in favor of ARRAY_COUNT 
ARRAY_COUNT already exists in `macros.h`, I just didn't find it before.

Addresses https://github.com/HarbourMasters/Shipwright/pull/1050#discussion_r943153833
 2022-08-11 21:24:03 -04:00
Christopher Leggett 4b7548e998 Throws exception if an invalid itemID is used 
Addresses https://github.com/HarbourMasters/Shipwright/pull/1050#discussion_r943694857
 2022-08-11 21:16:39 -04:00
Kenix3 86faa42acf Make libultra OSContPad struct consistent with the one from libultraship 2022-08-11 19:41:53 -04:00
Kenix3 d623ac5918 Copy over right stick Y axis sensitivity in the UI when the X sensitivity is changed. 2022-08-11 19:41:53 -04:00
Kenix3 4a3e43f73f VirtualController -> DummyController in CMake 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
Christopher Leggett e9c193146c Removes commented out function. 2022-08-11 12:32:09 -04:00
Christopher Leggett 929f196ac8 Re-implements GIMESSAGE_UNTRANSLATED as macro 2022-08-11 12:29:47 -04:00
aMannus 1e36de19aa Added more duplicate item handling 2022-08-11 11:57:43 +02:00
briaguya 5156ccbfd5 Merge pull request #1154 from aMannus/maps-compasses-name-change 
Rando: Small fixes for "Maps/Compasses"
 2022-08-11 04:17:21 -04:00
th-2021 791f7774a5 [cmake] Split OTRGui into it's own target (#1116) 2022-08-11 10:05:54 +02:00
sholdee e88000aeb0 [ci] asset stage tweaks (#1120) 2022-08-11 10:05:26 +02:00
aMannus e7c793df9b Fixed comment too 2022-08-11 08:57:18 +02:00
aMannus ac70d92b31 Changed maps/compasses location in UI 2022-08-11 08:55:29 +02:00
aMannus 67edf574f2 Rename maps/compasses 2022-08-11 08:35:37 +02:00
briaguya 0017168aa4 Merge pull request #1153 from briaguya-ai/mask-select-check-for-open-shop 
add check for mask shop being open to mask select
 2022-08-11 02:30:44 -04:00
briaguya 388319deac add kak gate check for mask select 2022-08-11 02:01:25 -04:00
Christopher Leggett 0431dce989 Removes now unused ItemIDs and GetItemIDs 
Also makes all the necessary changes to other code that was still
using them indirectly through the GI to GID map that was removed.
There's quite a lot of changes here and I haven't had time to test them
yet.
 2022-08-11 02:01:01 -04:00
briaguya 2af572aa30 add check for mask shop being open to mask select 2022-08-11 01:51:43 -04:00
briaguya b03d23f61f Merge pull request #1152 from briaguya-ai/develop-zhora 
zhora -> rando-next
 2022-08-11 01:36:05 -04:00
Christopher Leggett cb81023255 Renames, relocates, and implements ModIndex enum. 2022-08-11 00:38:28 -04:00
Christopher Leggett cdd4628d7a Refactors rando's GetItemEntry array into two arrays. 
One array is for the vanilla items that don't have GetItemEntries in
vanilla, the other is for rando exclusive items. They are stored in
separate arrays before getting added to the table so that we can apply
different modIndexes. The items in the first table have are handled
by the vanilla Item_Give, and the second table needed a custom
`Randomizer_Item_Give` function.
 2022-08-11 00:24:34 -04:00
Kenix3 d34a6d7666 Fixes error in LUS where there were multiple Vertex classes declared. 2022-08-10 23:14:29 -04:00
briaguya 7ea210aa63 Merge pull request #1147 from PurpleHato/RandoItemTrackerV2 
FIX: Rando Item Tracker non initialized small key were not transparent
 2022-08-10 22:30:49 -04:00
PurpleHato 9ccc7908fa FIX: Rando Item Tracker non initialized small key were not transparent 2022-08-11 04:21:28 +02:00
briaguya 85ad427b99 Merge pull request #1141 from aMannus/rando-gerudo-bridge-fix 
Rando: Fix gerudo card incorrectly given to link when bridge is open
 2022-08-10 21:44:49 -04:00
briaguya 23b2ed7bee Merge pull request #1146 from PurpleHato/KeysanityTranslation 
ADD: French Translation for Rando Custom Messages
 2022-08-10 21:25:28 -04:00
PurpleHato d73ab42641 ADD: French Translation for Rando Custom Messages 2022-08-11 03:02:36 +02:00
Christopher Leggett 4787f2f98b Removes some commented out code. 2022-08-10 21:00:52 -04:00
Christopher Leggett dcb8e21314 Replaces ::find with ::at and adds exception handling 2022-08-10 20:57:47 -04:00
briaguya 9d7df7c102 Merge pull request #1139 from aMannus/rando-dont-skip-useful-cutscenes 
Rando: Add "Enable Glitch-Useful Cutscenes" option
 2022-08-10 20:30:01 -04:00
Christopher Leggett 6e37897449 Removes unused function override 2022-08-10 20:28:44 -04:00
briaguya ddfa85b533 Merge pull request #1143 from PurpleHato/RandoItemTrackerV2 
FIX: Key Tracker showing -1 and always transparent small keys
 2022-08-10 20:23:27 -04:00
Christopher Leggett 17c9ce7804 Merge branch 'develop-zhora' of https://github.com/HarbourMasters/Shipwright into get-item-rework 2022-08-10 20:23:27 -04:00
Kenix3 3bcc9514ab Cleanup ControlDeck class 2022-08-10 20:21:36 -04:00
PurpleHato 212bf936f0 FIX: Key Tracker showing -1 and always transparent small keys 
TWEAK: also disabled notes properly this time
 2022-08-11 00:05:58 +02:00
aMannus 1947278fdf Fixes gerudo card bug with open bridge 2022-08-10 23:14:31 +02:00
aMannus 36dd0f669e Fixed woopsie 2022-08-10 21:54:16 +02:00
aMannus e259e87588 ADD: Enable Glitch-Useful Cutscenes option to rando 2022-08-10 21:51:10 +02:00
Sarge-117 0f6e7ede48 Merge remote-tracking branch 'upstream/rando-next' into rando-navi-tips 2022-08-10 11:15:37 -07:00
Sarge-117 af03a80ad3 Create const "NaviMsgCount" 
So the number of messages doesn't have to be changed in 3 places when adding new entries
 2022-08-10 11:06:38 -07:00
briaguya aba8da5257 Merge pull request #1137 from lilDavid/fix_trade_shuffle_save_editor 
Fix adult trade shuffle in save editor
 2022-08-10 12:36:32 -04:00
briaguya b420ad88c4 Merge pull request #1136 from briaguya-ai/make-array-big-enough-for-all-the-checks 
make array big enough for all the checks
 2022-08-10 12:07:58 -04:00
lilDavid fc08229a46 Save editor: Link adult trade item slot and flags 2022-08-10 11:00:49 -05:00
briaguya d74220d3ac don't give link's pocket garbage 2022-08-10 11:55:47 -04:00
briaguya f5d7955547 ensure itemlocations is big enough for every check 2022-08-10 11:39:10 -04:00
briaguya d535d0be9a make array big enough for all the checks 2022-08-10 11:21:10 -04:00
briaguya 35f69f6fd6 Merge pull request #1132 from briaguya-ai/complete-mask-quest 
complete mask quest
 2022-08-10 06:41:11 -04:00
briaguya d523ba5127 complete mask quest 2022-08-10 06:28:10 -04:00
briaguya 2dbdbea3d2 Merge pull request #1130 from briaguya-ai/initialize-tracker-item-size 
initialize icon size on item tracker
 2022-08-10 04:43:20 -04:00