Skip to content

Commit

Permalink
Merge pull request #1 from Bazek/development
Browse files Browse the repository at this point in the history
Fine tuning and pixel-perfect graphics
  • Loading branch information
audigex authored Jul 6, 2021
2 parents 8a8cdd8 + 32531ad commit ad4e9d3
Show file tree
Hide file tree
Showing 34 changed files with 611 additions and 828 deletions.
37 changes: 37 additions & 0 deletions .github/workflows/OpenTTE.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: OpenTTE

on: [push, pull_request]

jobs:
Build:
runs-on: ubuntu-latest
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Dependencies
run: python3 --version && pip3 install setuptools pip && pip3 install nml
- name: Build
run: python3 build.py --compile OpenTTE
- name: Artifact
uses: actions/upload-artifact@v2
with:
name: OpenTTE
path: build/OpenTTE.*
if-no-files-found: error
- name: Release Create
id: release_create
uses: actions/create-release@v1
with:
tag_name: development.${{ github.run_id }}
release_name: PreRelease development.${{ github.run_id }}
prerelease: true
- name: Release Upload
id: release_upload
uses: actions/upload-release-asset@v1
with:
upload_url: ${{ steps.release_create.outputs.upload_url }}
asset_path: build/OpenTTE.grf
asset_name: OpenTTE-development.grf
asset_content_type: application/grf
16 changes: 5 additions & 11 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,18 +1,12 @@
# Build files
build/
build.json
conf.ps1
*.grf
*.tar
build/**

# NML cache
.nmlcache/
*.cache
*.cacheindex
.nmlcache/**

# Test files
*test*

# No clue
master-gfx/
list_ids.py
# Development and IDE
.vscode/**
.idea/**
14 changes: 0 additions & 14 deletions .vscode/extensions.json

This file was deleted.

16 changes: 9 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,22 +1,21 @@
# OpenTTE - The Thomas The Tank Engine set for OpenTTD
![Thomas and Friends](banner.png)

OpenTTE is a train set for OpenTTD, including vehicles from the Thomas The Tank Engine universe

Drawn by DanMacK and others, coded by Audigex, and based on the MUTS (Modern UK Train Set) build scripts and some code stolen (but not really) from BRTrains
Drawn by DanMacK and others, coded by Audigex and Bazek, and based on the MUTS (Modern UK Train Set) build scripts and some code stolen (but not really) from BRTrains

### Train List



![Thomas and Friends](vehicles.png)

### Installation
Grab the latest release from the in-game content downloader.

Alternatively get it from the releases page and copy it into your `OpenTTD/newGRF` folder.
Alternatively get it from the ![Releases](../../releases/) page and copy it into your `OpenTTD/newGRF` folder.

### Building from Source
Building from the source should be mostly automated using the `build.py` script, but it has a few requirements:
- Python3.8 (may work on earlier versions but untested)
- Python3.* (Tested on Python3.6, Python3.7, Python3.8, Python3.9)
- `nml` Python package (available through `pip`)

To build the grf completely, just run the following command in your terminal:
Expand All @@ -38,14 +37,17 @@ This will also perform the --compile function, and will not start the game if an
#### Developers

- Audigex
- Bazek

#### Artists

- DanMacK (Original art)
- Audigex (Modifications for release)
- Bazek

### Contributing
Fork the project, make your changes, submit a pull request.
- Fork the project, make your changes, submit a pull request
- Or just send me sprite sheet with your new vehicles and I will add it (use ![Template](gfx/Template/) Directory)

### License
This project is licensed under the GPLv2 license
Expand Down
Binary file modified banner.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 0 additions & 2 deletions build.bat

This file was deleted.

241 changes: 0 additions & 241 deletions build.ps1

This file was deleted.

Loading

0 comments on commit ad4e9d3

Please sign in to comment.