mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-05-31 09:31:26 -04:00
Code Issues Packages Projects Releases Wiki Activity
606 Commits 6 Branches 52 Tags
cab9499a765b089434612ebc856b54d2e7115e62
Commit Graph

606 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
briaguya cab9499a76 Merge pull request #338 from HarbourMasters/develop-zhora 
zhora -> rando-next
 2022-07-21 21:05:35 -04:00
David Chavez d299284751 Merge pull request #878 from dcvz/develop-zhora-merge 
Rachael -> Zhora
 2022-07-22 03:01:16 +02:00
David Chavez b3d3148383 Merge branch 'develop-rachael' into develop-zhora 2022-07-22 02:34:55 +02:00
earthcrafterman 2ad78887b9 Added a time saver option to allow players to instantly put items away (#600) 
* Added a time saver option to allow players to instantly put items away

Expanded the range of damage multiplication to 80 (20 hearts of damage for each quarter heart) so players can play a sudden death challenge

* The damage sliders are now comboboxes
Damage multiplication is now exponential instead of incremental

The FPS slider is now a text input

* Splitting into solely being a quick putaway PR

* Removed some leftover code from the split
 2022-07-22 02:31:49 +02:00
briaguya 623cb35f19 Merge pull request #877 from briaguya-ai/fix-song-only 
fix dot song Only vs only issue
 2022-07-21 20:21:59 -04:00
David Chavez 1ca12feaed Adds Xcode project (#769) 
* Add Xcode project

Add dynamic lib paths

Generate resources scripts

Fix after rebase

tweak targets

Set min deployment target

* remove project

* readd project with correct gitignore
 2022-07-21 20:15:45 -04:00
briaguya 84236e7ac3 stop floor under shadow statue opening immediately (#857) 
* stop floor under shadow statue opening immediately

* use ActorResetFunc to reset sStatueRotY

Co-authored-by: briaguya <briaguya@alice>
 2022-07-22 02:11:13 +02:00
briaguya 27d37e9d00 fix dot song Only vs only issue 2022-07-21 20:06:19 -04:00
KiritoDev 1cbaa592d0 Added 'Auto' controller backend (#850) 2022-07-22 01:36:28 +02:00
Baoulettes df756b2ce0 Cosmetics editor - Feature requested (#841) 
* Precise positionning, reset margin and pos

* Fix big hearts issues

* add + and - to the editor

* add const to the char*

* Fix labels issues
 2022-07-22 01:33:39 +02:00
lilDavid c7c16c39b0 Add fixes for power crouch stab to the Enhancements menu (#874) 
* Add optional fixes for power crouch stab

* Add line break in "Fix Megaton Hammer" tooltip

Co-authored-by: PurpleHato <linkvssangoku.jr@gmail.com>

Co-authored-by: PurpleHato <linkvssangoku.jr@gmail.com>
 2022-07-22 01:22:09 +02:00
vaguerant 059045481c Controller option: Navi on L (#861) 2022-07-22 01:21:18 +02:00
Christopher Leggett 44dbd3a8a9 Fixes naming discrepancy of textbox positions. (#854) 
Equivalent to https://github.com/zeldaret/oot/pull/1329
 2022-07-22 01:13:04 +02:00
Jeffrey Crowell 753031df17 allow roms with spaces to be extracted (#868) 
using subprocess instead of os.system() is a little safer, and allows
for roms with spaces to be extraced.

i've noticed this is somewhat common in people reporting issues on
discord.
 2022-07-22 01:12:43 +02:00
Sarge-117 52f22275e3 Fix Giant's Knife unexpected behaviours (#834) 
* Giant's Knife Behaviour Fixes

Fixes a case where Giant's Knife (specifically, breaking and re-buying it) can behave unexpectedly if you don't have a Kokiri Sword in your inventory.  Also fixes the broken icon not showing up in inventory after you break it.

* less whitespace

* fix 0xE check

Accidentally committed with the wrong check

* Move the grayscale code up

Moved the grayscaling portion up higher in the function and renamed "bool not_acquired" to "bool age_restricted".  Thanks to @vaguerant for the suggestion!
 2022-07-22 00:39:04 +02:00
Baoulettes c19beca980 Fast Save Loader crashes fixes (#848) 2022-07-22 00:36:46 +02:00
briaguya eb49053e73 Prevent unrestricted items camera crash (#852) 2022-07-22 00:35:30 +02:00
RaelCappra d08b1d277e Savestate crash fix on Ubuntu (#843) 2022-07-22 00:34:35 +02:00
RaelCappra e41873fff4 Savestate crash fix on Ubuntu (#843) 2022-07-22 00:34:04 +02:00
briaguya dfa929a16f Reset var for shadow boss key room spike walls (#860) 2022-07-22 00:31:26 +02:00
Christopher Leggett 880e3928cf Fixes odd rando interaction with malon after receiving her check. (#867) 2022-07-22 00:28:43 +02:00
Jeffrey Crowell 41d1bbe137 Fix nullptr dereference in morpha (#870) 
reported on discord, i don't have the ability to reproduce this, but it
appears to be a benign fix, as the only time that the tent2 is checked
down later is guarded by a null check.
 2022-07-22 00:27:44 +02:00
David Chavez e519caa554 Merge pull request #871 from jbodner09/fix-zelda-skip 
Fix Child Zelda Skip rando setting always on
 2022-07-22 00:23:53 +02:00
briaguya 6df2a03fd2 Merge pull request #875 from aMannus/ux-fixes 
Fixed rename breaking maps/compasses
 2022-07-21 14:51:31 -04:00
Josh Bodner 1d208c7dc2 Revert to using boolean in json 2022-07-21 11:04:37 -07:00
Josh Bodner 2edc81ee2d Attempt to restore formatting of randomizer.cpp 2022-07-21 11:03:28 -07:00
aMannus 6f082e1769 Fixed rename breaking maps/compasses 2022-07-21 17:32:28 +02:00
briaguya b16a96fbad Merge pull request #862 from aMannus/spoopy-spiders 
Rando: Add skullsanity and nighttime GS tokens require Sun's Song
 2022-07-21 06:38:58 -04:00
aMannus 8f89b969cb Tiny code cleanup 2022-07-21 12:25:16 +02:00
aMannus 9ce552659a Changed iceTrapped var name/type and tooltip 2022-07-21 12:22:36 +02:00
aMannus 37134cbc9a Fixed ice traps (maybe actually this time) 2022-07-21 08:30:48 +02:00
aMannus 2c5bdbfd4b Merge branch 'rando-next' into spoopy-spiders 2022-07-21 08:30:31 +02:00
Josh Bodner cddca2700a Move Child Zelda spoiler write out of for loop so it's not repeatedly hit 2022-07-20 23:08:57 -07:00
Josh Bodner 17b3f65276 Fix the issue for real 2022-07-20 22:57:18 -07:00
Josh Bodner 75a4d2cf99 Actually use the same strings everywhere lol 2022-07-20 21:50:55 -07:00
Josh Bodner 795ee54f2b Remove use of std::format since Jenkins doesn't like it 2022-07-20 21:44:32 -07:00
briaguya 76215b8fc6 Merge pull request #872 from briaguya-ai/fix-starting-inventory 
fix starting inventory
 2022-07-20 23:47:27 -04:00
briaguya 1944b68d19 fix starting inventory 2022-07-20 23:36:39 -04:00
Josh Bodner 3633bdeeaf Fix Child Zelda Skip rando setting always on 2022-07-20 19:57:38 -07:00
aMannus a7936942b1 Fixes for double spiders & ice traps 
getItemId should've been set earlier to make sure double spiders didn't screw up ice traps.

Additionally Item_Give() was still being called with skultulla tokens as the default value so it granted a token when picking up an ice trap.

Skulltula freeze was also happening on ice traps which it shouldn't do, so that's fixed now too.
 2022-07-20 22:47:25 +02:00
aMannus 0cc59a9370 Fix for spooders to overwroote each ooder 2022-07-20 17:15:22 +02:00
aMannus 3be2dbd005 Added nighttime GS sun's song option 2022-07-20 14:33:12 +02:00
aMannus 36d451eb85 Add setting tooltip and fixed an oopsie 2022-07-20 14:07:01 +02:00
aMannus 715a4f7315 Added all remaining tokens(?) 2022-07-20 13:37:28 +02:00
aMannus 5c25364eff Nother batch of spooders 2022-07-20 11:56:03 +02:00
aMannus bee6fdb8ba Small fix after UX merge 2022-07-20 11:04:01 +02:00
aMannus a4af34c8dc Merge branch 'rando-next' into spoopy-spiders 2022-07-20 10:58:53 +02:00
aMannus bfd76dc244 Added comment 2022-07-19 23:20:05 +02:00
briaguya 670f84e183 Merge pull request #674 from aMannus/rando-settings-overhaul 
Rando: Randomizer Settings Menu UX Rework
 2022-07-19 17:04:02 -04:00
aMannus 69de5ac14a Fixed all possible ice trap scenarios 2022-07-19 22:29:52 +02:00