Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

spockalicious #2751

Merged
merged 94 commits into from
Apr 27, 2023
Merged

spockalicious #2751

merged 94 commits into from
Apr 27, 2023

Conversation

briaguya-ai
Copy link
Contributor

@briaguya-ai briaguya-ai commented Apr 27, 2023 •
edited by github-actions bot
Loading

NEstelami and others added 30 commits January 31, 2023 15:19
@NEstelami
Rough mockup of LUS XML loading
df3ac62
@NEstelami
Updated code for merge
ce74801
@NEstelami
Loading from FS support and custom DList WIP implementation
d6e578a
@NEstelami
Added current directory support to F3D and impl most of the dlist cmds
e2b493d
@NEstelami
WIP Skeleton support
0ce6568
@NEstelami
Almost done
639a2c1
@NEstelami
Rebase fixes
a581e43
@NEstelami
Submodule updates
210b460
@dcvz
HD Texture Support
d8d26f9
@NEstelami
Fixes
9cbdc2a
Merge remote-tracking branch 'origin/develop-ghost' into textures-mer…
c97686b 
…ge-stuff
bump lus
9ca5963
fix exporter build, header update
b5fdac2
soh builds
333bbbe
setMesh image path cleanup
38a01a1
Merge remote-tracking branch 'origin/develop-ghost' into textures-mer…
23c7ba1 
…ge-stuff
Merge remote-tracking branch 'origin/otrexporter_asset_compiler' into…
475ff6d 
… models-merge-stuff
@Kenix3
Update soh/src/overlays/actors/ovl_player_actor/z_player.c
69863c6
@Kenix3
Update soh/src/overlays/actors/ovl_player_actor/z_player.c
b549706
@Kenix3
Update OTRExporter/OTRExporter/Main.cpp
f84571c
@Kenix3
Update ZAPDTR/ZAPD/ZResource.h
ec18a22
@Kenix3
Update soh/src/code/z_skelanime.c
9c8a4d9
@Kenix3
Update OTRExporter/OTRExporter/Main.cpp
d22d217
@briaguya-ai
Merge pull request #14 from HarbourMasters/models-merge-stuff
9c2d973 
Models merge stuff
@KiritoDv
Fixed jpeg backgrounds and decreased icon buffer size
6738a4a
@KiritoDv
Bump lus
064ff8e
@KiritoDv
Increased even more the buffer because it crashes on long texts
7d24123
@KiritoDv
Removed print because sometimes the if is not triggered when the imag…
ae9ff05 
…e is already byteswapped
@briaguya-ai
dev -> ghost
d5e2e9c
@briaguya-ai
Merge pull request #18 from HarbourMasters/develop
349a2db 
dev -> ghost
briaguya-ai and others added 27 commits April 22, 2023 03:49
@briaguya-ai @Rozelette
fix carpet man (#52)
259bccb 
Co-authored-by: Rozelette <Rozelette@users.noreply.github.com>
@briaguya-ai
dev -> ghost
cb6e26f
@briaguya-ai
get ship model and lus texture into soh.otr, use gAuthenticLogo to …
f7c3130 
…toggle between ship and authentic (#55)
@briaguya-ai
dev -> ghost
42dbc87
@Rozelette
Use libultra features for CPU-modified textures (#40)
5cd0b96 
* Use libultra features for CPU-modified textures

* Comment
@briaguya-ai
bump lus on ghost (#58)
a0f87e2
@briaguya-ai
dev -> ghost
8400697
@briaguya-ai
dev -> ghost
d6c5e6b
@briaguya-ai
fix: properly use Interface_LoadActionLabel to display start button…
a02b284 
… text (#61)
@briaguya-ai
dev -> ghost
2e44ef3
@briaguya-ai
dev -> ghost
be7d6c8
@Kenix3 @briaguya-ai
Changes hd -> alt for texture replacement. (#65)
b73da59 
* Changes hd -> alt for texture replacement.

* Renames variables in gfxprint for hd -> alt change.

* Update soh/soh/resource/type/Skeleton.cpp

---------

Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
@leggettc18
Fixes kaleido dungeon maps (#67)
e5d0029
@Kenix3
skeleton stuff (#69)
1e6a5a9
@briaguya-ai
comment out wii u build (#70)
7c52dec
@briaguya-ai
bump lus (#71)
11aef76
@briaguya-ai
Rework readme (#72)
7ecd104 
* Update README.md

* docs

* put custom music docs somewhere

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* dark/light title image

* lus

* Update README.md
@KiritoDv @leggettc18
Fixed vanilla minimap (#73)
dad54b9 
* Fixed vanilla minimap

* Workaround for pulsing SD maps with non-broken HD maps.

---------

Co-authored-by: Christopher Leggett <chris@leggett.dev>
@briaguya-ai @leggettc18 @Kenix3
Skeleton fix fixed (#75)
188c744 
* WIP skelton patcher fix

* Fixes skeleton reference change.

* Adds const back to name in ResourceMgr_LoadSkeletonByName

---------

Co-authored-by: Christopher Leggett <chris@leggett.dev>
Co-authored-by: Kenix <kenixwhisperwind@gmail.com>
@Kenix3
Fixes z_message_otr memory leak.
7f94792
@Kenix3
Update soh/soh/z_message_OTR.cpp
59bc925
@Kenix3
Fixes z message otr memory
67461bd
@briaguya-ai
dev -> ghost
38503d2
@Kenix3
Update soh/src/code/game.c
beef00f
@briaguya-ai
docs: add how to find otr files to switch instructions (#78)
00452b1
@briaguya-ai
bump lus (#79)
b56ce15
@briaguya-ai
comment out RegisterBlendedTexture in king d (#80)
e516abe
@briaguya-ai briaguya-ai merged commit 4166dbf into develop Apr 27, 2023
@briaguya-ai briaguya-ai deleted the develop-ghost branch April 28, 2023 00:32
@briaguya-ai briaguya-ai mentioned this pull request Jun 13, 2023
Closed
5 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@briaguya-ai @NEstelami @dcvz @Kenix3 @KiritoDv @stratomaster64 @MelonSpeedruns @Rozelette @leggettc18