44e510e867
Merge remote-tracking branch 'upstream/rando-next' into rando-navi-tips
2022-08-23 16:55:04 -07:00
e2633c9be1
Moved name variables out of InsertRupeeName()
2022-08-23 23:36:59 +02:00
e8c25fe528
Matched CMakeLists.txt spacing
2022-08-23 22:43:09 +02:00
694c643aee
Include missing files in CMakeLists.txt
2022-08-23 22:35:26 +02:00
ed1708508a
add SHIP_HOME (Linux) ( #1210 )
2022-08-23 22:29:28 +02:00
2283471b7b
%RUPEE% -> #RUPEE#
2022-08-23 22:23:01 +02:00
50b3038a13
Made functions static
2022-08-23 22:14:13 +02:00
20737a2045
Fix various issues including crash yay
2022-08-23 11:46:08 -05:00
b0cdfc1be1
Only update vectors when options change
2022-08-23 09:44:11 -05:00
267c27036c
Allow aligning text to the left
2022-08-23 08:06:53 -05:00
35fefdecb0
Changed CVar name
2022-08-23 09:45:40 +02:00
d0f8374c4c
Changed checkbox to default to on, invert logic
2022-08-23 09:42:32 +02:00
e12e1d67c6
Prevents optimizations for debug configuration on Windows. ( #1270 )
2022-08-23 09:32:49 +02:00
2e7fd2b0be
More cleanup and tweaks
2022-08-23 00:33:07 -05:00
28edabdbe4
Fixes missed type change.
2022-08-23 00:08:22 -04:00
4ee1eba67b
Merge branch 'get-item-rework' into get-item-rework-rando-next
2022-08-22 19:48:34 -04:00
3a67e2a806
Fixes potential issue with if statement.
2022-08-22 19:40:58 -04:00
10c05892bf
Uses more descriptive type name for ItemIDs for creating custom messages.
2022-08-22 19:38:30 -04:00
01dbfc71ad
Documents our new GiveItemEntry fuctions.
2022-08-22 19:32:42 -04:00
d39a1a0bdf
[macos] Embed dependencies for ZAPD in bundle ( #1271 )
2022-08-22 10:43:50 +02:00
d17e4dc042
merge in get-item-rework-rando-next
2022-08-22 02:05:41 -04:00
e12fda29fe
Merge branch 'get-item-rework' into merge-fix
2022-08-22 02:03:04 -04:00
f87f636828
Update BUILDING.md ( #1228 )
2022-08-21 22:14:05 -04:00
eed3942b81
Restore Gold skulltula CS from the "0.9" version ( #1217 )
...
* GS CS
* add to defaults
2022-08-21 22:11:23 -04:00
f5112a709a
Add'l Console Commands ( #1207 )
...
* Added console commands
* Style conformance
2022-08-21 22:01:51 -04:00
f6bb46a0dc
FIX: Disable Draw Distance, Miniboss music could still play in DC with Lizalfos under certain conditions ( #1170 )
...
Thanks @jbodner09 for the report 💯
2022-08-21 21:57:55 -04:00
de9465c22a
Fixes goofup of ImGui window from bad merge conflict resolution.
2022-08-21 21:48:01 -04:00
51e4485966
LUS Cleanup: Merge Window and GlobalCtx2 classes. ( #1259 )
...
* Merges GlobalCtx2 and Window classes.
* Includes condition variable in File.
* add mac specific include
* sstream to get past "implicit instantiation of undefined template" error
* switch/wiiu includes
* that file doesn't exist
* more wii u globalctx2 stuff
Co-authored-by: briaguya <briaguya@alice>
2022-08-21 21:08:01 -04:00
58a60e3f44
Merge branch 'item-tracker-v3' of github.com:garrettjoecox/Shipwright into item-tracker-v3
2022-08-21 17:17:19 -05:00
f52ba103aa
Attempt to fix windows build error
2022-08-21 17:07:24 -05:00
d8e7a247f4
Merge branch 'get-item-rework' into get-item-rework-rando-next
2022-08-21 17:04:53 -04:00
5298bda0e2
Merge branch 'rando-next', remote-tracking branch 'origin' into get-item-rework-rando-next
2022-08-21 16:42:15 -04:00
1d9e52b169
Merge remote-tracking branch 'origin' into get-item-rework
2022-08-21 16:41:41 -04:00
91cb6f2360
This should fix a bug with the Gerudo Archery minigame.
...
I wasn't able to get the bug to happen after making this change.
2022-08-21 16:40:16 -04:00
2bbd618599
Cleans up another if statement in item00
2022-08-21 15:35:10 -04:00
e5bca727ac
Cleans up an if statement for item00.
2022-08-21 15:22:18 -04:00
e1b403a31b
Removes unused Randomizer_GetItemIdFromGetItemId.
2022-08-21 15:14:50 -04:00
b3307883c7
Update soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp
2022-08-21 13:32:01 -05:00
3aa82eaaf1
Support only enabling while paused, better align dungeon name text
2022-08-21 12:59:40 -05:00
196e2acd3a
Merge pull request #1267 from leggettc18/skullsanity-saveeditor-fix
...
Stops syncing GS Flags with GS Token Count with Skullsanity on
2022-08-21 10:37:46 -04:00
7066536249
Add #define, fix conflicting delcaration
...
Also re-ordered randomizer.cpp a bit to have the text array above CreateNaviRandoMessages()
2022-08-20 22:17:02 -07:00
fc963cf44c
Merge branch 'get-item-rework' into get-item-rework-rando-next
2022-08-20 18:01:23 -04:00
4dff1443a6
Fixes rendering of treasure chest game items.
2022-08-20 18:00:44 -04:00
7d2170c82b
Stops syncing GS Flags with GS Token Count with Skullsanity on.
2022-08-20 17:25:06 -04:00
341ac29fa5
Various tweaks, added button combo and re-added notes
2022-08-20 14:36:38 -05:00
3adb17c55d
Merge remote-tracking branch 'upstream/rando-next' into rando-navi-tips
2022-08-20 11:23:10 -07:00
ccce87cb89
Change int to u8
...
Jenkins plz
2022-08-20 11:16:46 -07:00
9c92139eca
Merge pull request #1265 from leggettc18/frog-hint-fix
...
Adds Frog Reward hints from 3dsrando.
2022-08-20 13:52:45 -04:00
4f2f72b941
Adds Frog Reward hints from 3dsrando.
...
Fixes the intermittent crash when generating a seed rando-next started
having.
2022-08-20 13:07:53 -04:00
6fc3c8cf77
Merge remote-tracking branch 'upstream/rando-next' into rando-navi-tips
2022-08-20 00:13:56 -07:00
Sarge-117