mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-11-01 08:05:07 -04:00
Code Issues Projects Releases Wiki Activity
2,111 Commits 2 Branches 37 Tags 145 MiB
ab83149f9e
Commit Graph

2111 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
briaguya
ab83149f9e clean up 2024-02-19 15:52:58 -05:00
briaguya
e97e843cd9 latest lus main 2024-02-19 15:43:40 -05:00
briaguya
11e4ce671a use open and close 2024-02-19 15:42:23 -05:00
briaguya
15b6d60523 update? 2024-02-19 12:25:04 -05:00
briaguya
6234541b5f the brew macports combo thing is confusing 2024-02-19 12:19:54 -05:00
briaguya
65bc478597 sudo 2024-02-19 11:34:37 -05:00
briaguya
3d902be1c9 sudo 2024-02-19 11:31:23 -05:00
briaguya
ec575303b6 compat 2024-02-19 11:28:37 -05:00
briaguya
3192f1eb6a actually download the thing 2024-02-19 10:58:20 -05:00
briaguya
1c51cd3b71 switch 2024-02-19 10:55:48 -05:00
briaguya
583be7e42d wiiu cmake libzip shenans? 2024-02-19 10:37:23 -05:00
briaguya
5be1fc37be that didn't fix it either... 2024-02-19 10:35:08 -05:00
briaguya
82c9768303 why won't mac find this? 2024-02-19 10:29:19 -05:00
briaguya
67b80eded7 what happened with brew again? 2024-02-19 10:15:24 -05:00
briaguya
69b615e240 was it a cmake conflict? 2024-02-19 10:03:52 -05:00
briaguya
61c6245b04 wii u try a thing 2024-02-19 09:55:38 -05:00
briaguya
d9b2dd03eb bring back +universal 2024-02-19 09:55:30 -05:00
briaguya
cae5948bfc does +universal not work on libzip? 2024-02-19 08:51:59 -05:00
briaguya
75405a8532 try macports 2024-02-19 08:42:04 -05:00
briaguya
6282974bbe manual install? 2024-02-19 08:40:37 -05:00
briaguya
0ec0716a2c brew libzip worked on the LUS side hopefully it works here 2024-02-19 08:34:10 -05:00
briaguya
87fc48f45d back to the version of LUS i actually like 2024-02-19 08:32:36 -05:00
briaguya
bc5f307c0f caps? 2024-02-19 08:28:00 -05:00
briaguya
74e55fee6e using trash branch of lus to try to get libzip to work 2024-02-19 08:21:18 -05:00
briaguya
f7e62372c1 brew 2024-02-19 08:03:52 -05:00
briaguya
98b2f9611f hacking in brew because why not 2024-02-19 08:00:55 -05:00
briaguya
19a651748b vcpkg 2024-02-19 07:58:35 -05:00
briaguya
1c693a2a88 drop compat for now 2024-02-19 07:51:47 -05:00
briaguya
46bbf79cf8 cmake is a libzip 1.7.0+ thing, let's see what has it 2024-02-19 07:40:45 -05:00
briaguya
0a5e6a45b9 apt deps 2024-02-19 07:24:57 -05:00
briaguya
22d9e0d7d2 with the changes 2024-02-19 07:22:23 -05:00
briaguya
8f78ae059a actually use submodule 2024-02-19 06:31:54 -05:00
briaguya
4934ad8e4e test loading from soh.zip 2024-02-19 06:30:21 -05:00
briaguya
6d3e3123ba clang formatted 2024-02-19 03:34:40 -05:00
briaguya
f5d2e58344 test meta files 2024-02-19 03:29:56 -05:00
briaguya
8ee3e736ac newline 2024-02-18 23:30:08 -05:00
briaguya
738a9b80f3 rip em out 2024-02-18 23:28:24 -05:00
briaguya
327d305e00 we crash if we try to SPDLOG in the destructors 2024-02-18 23:14:21 -05:00
Archez
d0b09743b9
Fix missing ImGui::EndDisabled (#3946) 2024-02-15 23:25:16 -05:00
Patrick12115
c484ea227b
[Difficulty Options] Leever Spawn Rate (#3460) 
* Spawn Rate

* Update z_en_reeba.c

Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>

* gEnhancements

* Merging issues

* Added preset entry and changed timer value math

* Update soh/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c

* this should do it

* Update soh/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c

* move out of loop

---------

Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
 2024-02-15 22:12:09 -06:00
Patrick12115
4599212546
[Fixes] Fix Raised Floor Switches (#3851) 
* Lower by 1

* gEnhancements.

* Update z_obj_switch.c

Co-authored-by: Archez <Archez@users.noreply.github.com>

* Moved to Hook

* Properly this time

* Added to presets

* Added a Return;

* Use Hex

Co-authored-by: inspectredc <78732756+inspectredc@users.noreply.github.com>

---------

Co-authored-by: Archez <Archez@users.noreply.github.com>
Co-authored-by: inspectredc <78732756+inspectredc@users.noreply.github.com>
Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
 2024-02-15 22:02:58 -06:00
Garrett Cox
a8d3724a53
Add missing cvars mostly that patrick forgot because he likes ranch dressing but also some that I missed oops (#3944) 2024-02-15 21:28:06 -06:00
Garrett Cox
10b6f8cf80
Merge pull request #3945 from HarbourMasters/develop-macready 
macready -> develop
 2024-02-15 21:21:18 -06:00
briaguya
e0d502b696
resource refactory (#3926) 
* animation

* playeranimation

* stop putting things in the LUS namespace from SoH

* get all the factories out of the namespace

* LUS::

* start on scene command stuff

* i think that's the rest of scene

* reduce copypasta

* collision header

* skeleton

* skeletonlimb

* fix

* path

* cutscene

* text

* audio sample

* sound font

* audiosequence

* background

* Revert "stop putting things in the LUS namespace from SoH"

This reverts commit 0ead6056e6.

* namespace shanans

* wrap all factories in namespace soh

* it's trying to link now

* lus

* scene command override etc

* fix audio loading

* slightly less logspam

* get past the cutscene problem

* in game!

* exporter cleanup

* more exporter cleanup

* clang formatted lus

* msvc

* itny lus change

* variant

* formatty

* fix of some sort i guess?

* use latest lus main

* fix name to enum/factory mapping

* otrexporter
 2024-02-15 21:06:52 -06:00
Miles Acquaviva
7f4fc8dc4a
Abstracted repeated code into functions (#3116) 
* Abstracted repeated code into functions

* Apply suggestions from code review

* Update soh/soh/Enhancements/cosmetics/CosmeticsEditor.cpp

---------

Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
Co-authored-by: Archez <Archez@users.noreply.github.com>
 2024-02-15 21:03:19 -06:00
Patrick12115
db57581d6f
[Cosmetics] Add Vanilla GS DL for Cosmetics Editor (#3937) 
* Add Vanilla DL

* Fixed egregious spacing error
 2024-02-15 20:51:23 -06:00
Pepe20129
7319e4db57
More player documentation from decomp (#3819) 
* FallImpactInfo & AnimSfx stuff

* IA function naming & Player_UseItem

* ActionChange

* Speed modes

* Fix build

* Misc cleanup

* Name Player_Action funcs

* PlayerAgeProperties

* Most of the Player struct

* Update z_player.c

---------

Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
 2024-02-15 20:44:46 -06:00
Malkierian
30a063b75d
[Tweak] Move Personal Notes to Save File (#3909) 
* Moves personal notes to the save file under a new itemTracker save section.

* Update soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp

---------

Co-authored-by: Archez <Archez@users.noreply.github.com>
 2024-02-15 20:44:40 -06:00
DeusVexus
4797c9ad35
Adds the Keese and Guay don't target you cheat (#3267) 
* Adds the Keese and Guay don't target you cheat
that makes keese and guay ignore you as if
you are wearing the skull mask

* changed instances of CVar_GetS32 to CVarGetInteger
added the cvar to presets.h

---------

Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
 2024-02-15 20:29:09 -06:00
inspectredc
457a75e9f8
More Sword Toggle Options (#3889) 
* Sword Unequipping Toggle

* better macro

* less ugly format

* cvar prefix

* Update soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c

* Update soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c

---------

Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
 2024-02-15 20:15:44 -06:00