-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
6ca6f7c
commit 6af506a
Showing
3 changed files
with
21 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,10 @@ | ||
gfx | ||
.nmlcache/ | ||
gopath/ | ||
nml/ | ||
gfx/ | ||
sprites/ | ||
*.grf | ||
gopath | ||
*.png | ||
!palette.png | ||
.nmlcache | ||
nmlc | ||
custom_tags.txt | ||
cns.nml | ||
cns.nml | ||
!palette.png |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,6 +6,16 @@ export GOPATH=$PWD/gopath | |
go install github.com/ahyangyi/gorender/cmd@daeb83b4 | ||
mv gopath/bin/cmd gopath/bin/gorender | ||
|
||
# if you have grf-py installed you may want to use a venv | ||
|
||
pip3 install nml==0.7.5 | ||
# nml requires python to run | ||
# here I merge two PRs to nml, #306 and #320 | ||
git clone https://github.com/openttd/nml.git | ||
cd nml | ||
git config user.name "anonymous" | ||
git config user.email "[email protected]" | ||
git checkout 0.7.5 | ||
git remote add pr_source https://github.com/glx22/nml | ||
git fetch pr_source layout_registers | ||
git merge -X theirs pr_source/layout_registers -m "Merge layout_registers" | ||
git fetch pr_source var6B | ||
git merge -X theirs pr_source/var6B -m "Merge var6B" | ||
rm -rf .git |