mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-11-11 20:15:07 -05:00
Code Issues Projects Releases Wiki Activity
1,217 Commits 3 Branches 37 Tags 142 MiB
c7b998b33b
Commit Graph

124 Commits

Author SHA1 Message Date
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
4ee1eba67b
Merge branch 'get-item-rework' into get-item-rework-rando-next 2022-08-22 19:48:34 -04:00
Christopher Leggett
01dbfc71ad
Documents our new GiveItemEntry fuctions. 2022-08-22 19:32:42 -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
briaguya
03151647b1
Merge pull request #1227 from HarbourMasters/develop-zhora 
zhora -> rando-next
 2022-08-16 23:59:11 -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
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
170b297a7a Introduce some new methods and migrate most actors to them 2022-08-15 14:33:29 -05: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
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
lilDavid
282192eb5e Properly hatch pocket cucco using Sun's Song 2022-08-12 17:02:03 -05: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
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
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
65356b6ced
Merge pull request #1051 from garrettjoecox/keysanity 
Keysanity + Shuffle Compasses & Maps
 2022-08-10 02:28:14 -04:00
lilDavid
aef77a0913
Merge branch 'rando-next' into trade_quest_shuffle 2022-08-09 20:40:00 -05:00
lilDavid
12d45685b9 Move files in with other rando files 2022-08-09 19:57:40 -05:00
Garrett Cox
e8c4378d17 Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into keysanity 2022-08-08 22:47:29 -05:00
briaguya
8410a79b26
Merge branch 'rando-next' into zhora-to-next 2022-08-08 22:27:04 -04:00
briaguya
816fac6c06 Merge branch 'develop-zhora' into zhora-to-next 2022-08-08 22:23:06 -04:00
briaguya
317de33a8b Merge branch 'develop-rachael' into rachael-to-zhora 2022-08-08 21:43:04 -04:00
lilDavid
f80ba4102a
Add instant boomerang recall (#1006) 2022-08-08 19:55:07 -04:00
Garrett Cox
8f55dd0624 Add support for shuffling maps and compasses 2022-08-08 14:07:02 -05:00
Garrett Cox
8b59466ce5 Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into keysanity 2022-08-07 15:41:44 -05:00
Garrett Cox
ec801530b7 Move some more items around, boss keys still broken 2022-08-07 14:32:54 -05:00
Christopher Leggett
cfce0eba3d
Implements fixes for competing getItem calls. 2022-08-06 22:51:15 -04:00
briaguya
46c3541458 seems to be working, still needs cleanup 2022-08-06 18:07:16 -04:00
lilDavid
6603a9a474 Add adult trade shuffle to randomizer 2022-08-06 12:58:08 -05:00
Christopher Leggett
ba160cf997
merge in develop-zhora 2022-08-06 12:26:38 -04:00
briaguya
5574442fdc fix ganon's boss key 2022-08-06 04:30:03 -04:00
Garrett Cox
b420638267 Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into keysanity 2022-08-06 00:48:55 -05:00
briaguya
61c88386a1 Merge branch 'develop-zhora' into zhora-to-next 2022-08-06 00:26:50 -04:00
Garrett Cox
4a78375c8f And like magic, keysanity working :D 2022-08-05 23:08:46 -05:00
briaguya
97d363c91e
Merge pull request #1019 from garrettjoecox/shuffleCows 
Add shuffleCows options for randomizer
 2022-08-06 00:03:27 -04:00
th-2021
1ebca42f46
Move to cmake across all platforms (#363) 2022-08-05 07:59:19 +02:00
Josh Bodner
c23457d666
Automatically save after every scene transition (#984) 
* Automatically save after every scene transition

* Refactor and don't save in grottos

* Don't save in cutscenes

* Save after getting items as well

* Fix paren
 2022-08-05 00:15:49 -04:00
Christopher Leggett
95d439bb30
Adds rough ability to differentiate between rando and vanilla items.merge stashed changes from before develop-zhora merge 2022-08-04 20:54:51 -04:00
briaguya
facd1723f8
don't use signed ints for epochs (#1044) 
Co-authored-by: briaguya <briaguya@alice>
 2022-08-04 17:32:23 -04:00
briaguya
2d22099805
Merge pull request #1039 from HarbourMasters/develop-zhora 
zhora -> rando-next
 2022-08-03 21:02:29 -07:00
briaguya
739434e3e4 Merge branch 'develop-rachael' into rachael-to-zhora 2022-08-03 23:01:11 -04:00
Kenix3
0f7a88bd5a
This should fix (all?) 60fps interpolation issues left. (#938) 
* This should fix (all?) 60fps interpolation issues left.

Resolves #631 #917

* Update z_fishing.c

* Re-adds Emil's interpolation in certain places.

* move open/close disps out of if statments checking timer based vars, revert fishing to use recordopen/closed child

* move disps out of ifs for morpha

* use recordopen/recordclose for volv

* recordopen/recordclose for ganondorf

* switch back to recordopen/recordclose for ganondorf floor

* Frame interpolation now uses a 64bit parameter rather than 32.

* More 60fps fixes

* Fix close child typo

* add todo calls to recordopen/recordclose

* fix build

* revert long long frame interpolation

* add some epochs

* add more epochs

* bongo epochs

* the rest of the epochs

* fix the typo fix the build

* interpolation fixes pr cleanup

* init/cleanup bongo epochs

* bongo hand trails

* Fixes niw feathers

* Fixes bongo bongo hands, and replaces epoch * i with epoch + i

* don't update epochs

Co-authored-by: briaguya <briaguya@alice>
 2022-08-03 22:36:13 -04:00
Garrett Cox
723e34a06a Move some flags around and use global array instead of flag for shuffle cows 2022-08-03 08:44:48 -05:00
briaguya
ac776ce7bc Merge branch 'develop-zhora' into zhornext 2022-08-02 15:49:59 -04:00
David Chavez
53229f0905 Merge branch 'develop-rachael' into rachael-zhora 
# Conflicts:
#	libultraship/libultraship/ImGuiImpl.cpp
 2022-08-02 20:05:40 +02:00
briaguya
d1ddc2a0c3 Merge branch 'develop-zhora' into zhora-to-rnext-merge 2022-08-02 13:02:13 -04:00
David Chavez
61c68666d6
Closer align Makefiles & Dockerfiles (#748) 2022-08-02 16:22:20 +02:00