<feed xmlns='http://www.w3.org/2005/Atom'>
<title>2ship2harkinian/.gitmodules, branch 1.1.2</title>
<subtitle>2Ship2Harkinian: Majora’s Mask PC port</subtitle>
<link rel='alternate' type='text/html' href='https://git.dog6.net/2ship2harkinian/'/>
<entry>
<title>Bump LUS and use nlohmann json from package manager (#254)</title>
<updated>2024-05-22T14:05:03+00:00</updated>
<author>
<name>Archez</name>
<email>Archez@users.noreply.github.com</email>
</author>
<published>2024-05-03T01:31:59+00:00</published>
<link rel='alternate' type='text/html' href='https://git.dog6.net/2ship2harkinian/commit/?id=6fca358aa2a919f3680de7d01ec2cac487c98f62'/>
<id>6fca358aa2a919f3680de7d01ec2cac487c98f62</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>convert submodule definitions to https (#17)</title>
<updated>2024-05-22T14:04:57+00:00</updated>
<author>
<name>Archez</name>
<email>Archez@users.noreply.github.com</email>
</author>
<published>2024-01-11T03:58:02+00:00</published>
<link rel='alternate' type='text/html' href='https://git.dog6.net/2ship2harkinian/commit/?id=5968258d2ce5b1b9c47ca140ddeab53f697e7e5f'/>
<id>5968258d2ce5b1b9c47ca140ddeab53f697e7e5f</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Initial commit for 2S2H</title>
<updated>2024-05-22T14:04:51+00:00</updated>
<author>
<name>Garrett Cox</name>
<email>garrettjcox@gmail.com</email>
</author>
<published>2024-01-05T16:15:41+00:00</published>
<link rel='alternate' type='text/html' href='https://git.dog6.net/2ship2harkinian/commit/?id=2332f63f5a9ca4b949f029c11a9744d601d7155f'/>
<id>2332f63f5a9ca4b949f029c11a9744d601d7155f</id>
<content type='text'>
Co-authored-by: Louis &lt;35883445+louist103@users.noreply.github.com&gt;
Co-authored-by: Nicholas Estelami &lt;NEstelami@users.noreply.github.com&gt;
Co-authored-by: Random06457 &lt;28494085+Random06457@users.noreply.github.com&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Co-authored-by: Louis &lt;35883445+louist103@users.noreply.github.com&gt;
Co-authored-by: Nicholas Estelami &lt;NEstelami@users.noreply.github.com&gt;
Co-authored-by: Random06457 &lt;28494085+Random06457@users.noreply.github.com&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>Convert every submodule into subrepo (#170)</title>
<updated>2021-06-07T22:31:56+00:00</updated>
<author>
<name>Anghelo Carvajal</name>
<email>angheloalf95@gmail.com</email>
</author>
<published>2021-06-07T22:31:56+00:00</published>
<link rel='alternate' type='text/html' href='https://git.dog6.net/2ship2harkinian/commit/?id=b6904aa2cc756e1b553d65cce2f04410d21d0210'/>
<id>b6904aa2cc756e1b553d65cce2f04410d21d0210</id>
<content type='text'>
* remove ZAPD submodule

* git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "ca229f19"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "ca229f19"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"

* git subrepo clone https://github.com/simonlindholm/decomp-permuter.git tools/decomp-permuter

subrepo:
  subdir:   "tools/decomp-permuter"
  merged:   "1e4b85a7"
upstream:
  origin:   "https://github.com/simonlindholm/decomp-permuter.git"
  branch:   "main"
  commit:   "1e4b85a7"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"

* Remove asm-differ

* git subrepo clone https://github.com/simonlindholm/asm-differ.git tools/asm-differ

subrepo:
  subdir:   "tools/asm-differ"
  merged:   "eaf72269"
upstream:
  origin:   "https://github.com/simonlindholm/asm-differ.git"
  branch:   "master"
  commit:   "eaf72269"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"

* remove asm-processor

* git subrepo clone https://github.com/simonlindholm/asm-processor.git tools/asm-processor

subrepo:
  subdir:   "tools/asm-processor"
  merged:   "85288fcd"
upstream:
  origin:   "https://github.com/simonlindholm/asm-processor.git"
  branch:   "master"
  commit:   "85288fcd"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"

* remove .gitmodules file

* Update REAMDE

* Update warnings</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
* remove ZAPD submodule

* git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "ca229f19"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "ca229f19"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"

* git subrepo clone https://github.com/simonlindholm/decomp-permuter.git tools/decomp-permuter

subrepo:
  subdir:   "tools/decomp-permuter"
  merged:   "1e4b85a7"
upstream:
  origin:   "https://github.com/simonlindholm/decomp-permuter.git"
  branch:   "main"
  commit:   "1e4b85a7"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"

* Remove asm-differ

* git subrepo clone https://github.com/simonlindholm/asm-differ.git tools/asm-differ

subrepo:
  subdir:   "tools/asm-differ"
  merged:   "eaf72269"
upstream:
  origin:   "https://github.com/simonlindholm/asm-differ.git"
  branch:   "master"
  commit:   "eaf72269"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"

* remove asm-processor

* git subrepo clone https://github.com/simonlindholm/asm-processor.git tools/asm-processor

subrepo:
  subdir:   "tools/asm-processor"
  merged:   "85288fcd"
upstream:
  origin:   "https://github.com/simonlindholm/asm-processor.git"
  branch:   "master"
  commit:   "85288fcd"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"

* remove .gitmodules file

* Update REAMDE

* Update warnings</pre>
</div>
</content>
</entry>
<entry>
<title>Small env fixes: git submodules &amp; python3 (#127)</title>
<updated>2021-05-18T23:53:11+00:00</updated>
<author>
<name>Zach Banks</name>
<email>zjbanks@gmail.com</email>
</author>
<published>2021-05-18T23:53:11+00:00</published>
<link rel='alternate' type='text/html' href='https://git.dog6.net/2ship2harkinian/commit/?id=091219d742adb529f0a34f985c3ce1b0e916726d'/>
<id>091219d742adb529f0a34f985c3ce1b0e916726d</id>
<content type='text'>
* Small env fixes: for git submodules &amp; python3

Using `/usr/bin/env python3` is preferred over `/usr/bin/python3`
because it is compatible with virtualenvs, etc. It picks the version of
`python3` currently on the `PATH`, rather than the system-wide default.

For the git submodules, I had two issues:

The ZAPD repo is currently pointing at a commit not on the master
branch, which has to be specifically fetched. Adding `--remote` to the
update command fixes this.

The decomp-permuter has primary branch `main` not `master` like this
repo, so this has to be specified in `.gitmodules` when using `--remote`.

* Rework `git submodule update...` part of Makefile</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
* Small env fixes: for git submodules &amp; python3

Using `/usr/bin/env python3` is preferred over `/usr/bin/python3`
because it is compatible with virtualenvs, etc. It picks the version of
`python3` currently on the `PATH`, rather than the system-wide default.

For the git submodules, I had two issues:

The ZAPD repo is currently pointing at a commit not on the master
branch, which has to be specifically fetched. Adding `--remote` to the
update command fixes this.

The decomp-permuter has primary branch `main` not `master` like this
repo, so this has to be specified in `.gitmodules` when using `--remote`.

* Rework `git submodule update...` part of Makefile</pre>
</div>
</content>
</entry>
<entry>
<title>Adds in scene support (#117)</title>
<updated>2021-04-29T22:56:18+00:00</updated>
<author>
<name>Kenix3</name>
<email>kenixwhisperwind@gmail.com</email>
</author>
<published>2021-04-29T22:56:18+00:00</published>
<link rel='alternate' type='text/html' href='https://git.dog6.net/2ship2harkinian/commit/?id=c40bb119e1f64972e6a0879110826c455a28437b'/>
<id>c40bb119e1f64972e6a0879110826c455a28437b</id>
<content type='text'>
* 1 scene done, Z2_SOUGEN OK

* All scenes OK

* Makefile improvements

* Use WIP ZAPD branch as submodule

* Add spawn rotation flag macro

* Fix bad merge

* Move scenes to be in their own subfolders

* Rename and restructure extracted baserom files

* Progress tracking for assets

* Add asset progress to csv

* Use master ZAPD

* Use distclean like in OOT

* Fix up a few things with the makefile

* Fix scenes not being dumped from ELF

Co-authored-by: Rozelette &lt;Uberpanzermensch@gmail.com&gt;</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
* 1 scene done, Z2_SOUGEN OK

* All scenes OK

* Makefile improvements

* Use WIP ZAPD branch as submodule

* Add spawn rotation flag macro

* Fix bad merge

* Move scenes to be in their own subfolders

* Rename and restructure extracted baserom files

* Progress tracking for assets

* Add asset progress to csv

* Use master ZAPD

* Use distclean like in OOT

* Fix up a few things with the makefile

* Fix scenes not being dumped from ELF

Co-authored-by: Rozelette &lt;Uberpanzermensch@gmail.com&gt;</pre>
</div>
</content>
</entry>
<entry>
<title>Update tools (#16)</title>
<updated>2020-09-14T01:09:13+00:00</updated>
<author>
<name>Rozelette</name>
<email>Rozelette@users.noreply.github.com</email>
</author>
<published>2020-09-14T01:09:13+00:00</published>
<link rel='alternate' type='text/html' href='https://git.dog6.net/2ship2harkinian/commit/?id=ec912054dab3432515c78e1b548e96183238ab55'/>
<id>ec912054dab3432515c78e1b548e96183238ab55</id>
<content type='text'>
* Clean up .gitignore

* Set exec bit on all python and shell scripts

* Delete unused files

* Add decomp-permuter repo

* Update submodules</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
* Clean up .gitignore

* Set exec bit on all python and shell scripts

* Delete unused files

* Add decomp-permuter repo

* Update submodules</pre>
</div>
</content>
</entry>
<entry>
<title>Add ZAP2 module</title>
<updated>2020-05-01T21:48:21+00:00</updated>
<author>
<name>rozlette</name>
<email>uberpanzermensch@gmail.com</email>
</author>
<published>2020-05-01T21:48:21+00:00</published>
<link rel='alternate' type='text/html' href='https://git.dog6.net/2ship2harkinian/commit/?id=a5eed624ed88421724bf7a6014e1fd3122c85c26'/>
<id>a5eed624ed88421724bf7a6014e1fd3122c85c26</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Set up diff script</title>
<updated>2020-03-02T06:21:16+00:00</updated>
<author>
<name>rozlette</name>
<email>uberpanzermensch@gmail.com</email>
</author>
<published>2020-03-02T06:21:16+00:00</published>
<link rel='alternate' type='text/html' href='https://git.dog6.net/2ship2harkinian/commit/?id=5037e2da8d1bc77a34e31b4b3692e0fb64cd4753'/>
<id>5037e2da8d1bc77a34e31b4b3692e0fb64cd4753</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Add asm-processor submodule</title>
<updated>2018-11-11T22:44:24+00:00</updated>
<author>
<name>rozlette</name>
<email>uberpanzermensch@gmail.com</email>
</author>
<published>2018-11-11T22:44:24+00:00</published>
<link rel='alternate' type='text/html' href='https://git.dog6.net/2ship2harkinian/commit/?id=325ff3875a954532b0139677ee22d511d655bd50'/>
<id>325ff3875a954532b0139677ee22d511d655bd50</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
</feed>
