mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-02-24 14:51:46 -05:00
Code Issues Projects Releases Wiki Activity
1,302 Commits 3 Branches 38 Tags
Commit Graph

397 Commits

Author SHA1 Message Date
briaguya
11a8dc85ee filter on one side, trees on both 2022-08-18 15:50:25 -04:00
briaguya
fb3320c3ed use macro for rco 2022-08-18 15:15:34 -04:00
briaguya
7fdb194dad refactor location visibility filtering 2022-08-18 14:11:22 -04:00
briaguya
dd9acbbb43 use ordered map to help arrange checks in imgui 2022-08-18 12:19:57 -04:00
briaguya
5ac69e0bd8 start filtering 2022-08-18 08:48:24 -04:00
briaguya
dbb4e3eefc start on tree view 2022-08-18 08:20:52 -04:00
briaguya
3816ed11a4 add area names, fix kak bazaar 2022-08-18 08:20:35 -04:00
aMannus
e500db810b Code cleanup + more names 2022-08-18 13:55:59 +02:00
briaguya
a7d4aa8042 add areas to rcos 2022-08-18 07:37:24 -04:00
briaguya
289a6e5a82 start on RC object stuff 2022-08-18 06:15:02 -04:00
Sarge-117
bb6135fd2b Spacing 2022-08-17 22:07:51 -07:00
aMannus
e25fcc645b More names, fixed translations 2022-08-17 23:57:31 +02:00
aMannus
c1cec5a44a First fully working implementation 2022-08-17 23:30:51 +02:00
aMannus
f9766fa4a6 Initial language support and setup for randomizing 2022-08-17 22:30:21 +02: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
Sarge-117
584f9d16f0 Fix line break 2022-08-17 11:26:07 -07:00
Sarge-117
6862e400f5 Merge remote-tracking branch 'upstream/rando-next' into rando-navi-tips 2022-08-17 11:11:00 -07:00
Sarge-117
2c144c3aa6 Fix typo, fix Master Sword text 2022-08-17 11:10:37 -07:00
Sarge-117
907871915d fix question mark 2022-08-17 11:07:03 -07:00
PurpleHato
3fb582a02b ADD: BAGUETTE 2022-08-17 20:00:20 +02:00
briaguya
ae8c7cb509 add excluded locations set 2022-08-17 11:08:11 -04:00
briaguya
11cc040710 add rcs to itemlocations in 3drando 2022-08-17 10:45:33 -04:00
aMannus
55f71457d8 initial proof of concept 2022-08-17 16:45:19 +02:00
briaguya
5605542452 start playing with imgui filters 2022-08-17 09:03:27 -04:00
briaguya
c933d521c3
Merge pull request #1223 from leggettc18/rando-next-ganonbkhint-fix 
Fix Ganon's Boss Key hints for Keysanity
 2022-08-17 00:09:26 -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
Christopher Leggett
b6d6ede520
Fixes color replacement from being saved to the save file. 
This was bad because replacing `%w` with `\x05\x00` was causing
the string to prematurely terminate.
 2022-08-16 23:04:14 -04:00
Christopher Leggett
ecaf0fd87a
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into rando-next 2022-08-16 22:12:20 -04:00
Christopher Leggett
5a3ab9bcdc
Fixes Ganon's Boss Key hints for keysanity. 2022-08-16 22:12: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
Christopher Leggett
3bc67ef1eb
Fixes chests by allowing for negative getItemIds 2022-08-16 20:28:24 -04:00
lilDavid
46a421f933
Add window to customize specific controls (#1122) 2022-08-16 09:43:09 +02:00
briaguya
ee9ea3f2bd
add 3drando license (#1206) 
Co-authored-by: briaguya <briaguya@alice>
 2022-08-15 21:17:58 -04:00
Sarge-117
4be473fede Add German translations 
Thanks to Menzelmeister on Discord for translating to German
 2022-08-15 14:02:48 -07: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
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
Julien Lemay
8945b2ed48
Fix Save Editor Event Check Inf "A" Row flags (#1138) 
Fix Save Editor Event Check Inf Flags "A" Row flags not working. It was set to "eci1" instead of "eci10".
 2022-08-14 23:02:14 -04:00
Christopher Leggett
0e2530cd49
Fixes Ruto's Letter. 
It was accidentally getting classified as a rando item.
 2022-08-14 20:43:59 -04:00
Christopher Leggett
76f25c18c0
Fixes Ruto's Letter. 
It was accidentally getting classified as a rando item.
 2022-08-14 20:15:33 -04:00
Sarge-117
fa19df9201 Merge remote-tracking branch 'upstream/rando-next' into rando-navi-tips 2022-08-14 10:16:35 -07:00
Christopher Leggett
baa17dda27
Fixes build error for Windows and Mac 2022-08-14 01:32:31 -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
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
7cef38a70a
Fixes "static drops" (i.e. sticks from withered babas) 2022-08-13 13:05:50 -04:00
Christopher Leggett
d167f4a263
Rando-specific items use new textId again. 
This got lost when merging develop-zhora in because I didn't have custom
messages merged when I started this.
 2022-08-13 11:47:12 -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
briaguya
f70c1ff88a
Merge pull request #1160 from aMannus/rando-better-dupe-handling 
Rando: Added more items to have dupe handling
 2022-08-13 00:30:12 -04:00
Christopher Leggett
69086f58c2
Cleanup, bugfixes, removing the - 1s from z_player.c 2022-08-13 00:22:34 -04:00