Merge branch 'master' into '147_new_level_generator' (a530cf2a) · Commits · yoogottamk / Flatland · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Flatland
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

a530cf2a

Commit a530cf2a authored 5 years ago by adrian_egli

Downloads
- Plain Diff

Merge branch 'master' into '147_new_level_generator'

# Conflicts:
#   flatland/utils/rendertools.py

parents d3542199 25991ab8

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

docs/flatland.rst 10 additions, 10 deletions

docs/flatland.rst
docs/flatland_2.0.md 150 additions, 0 deletions

docs/flatland_2.0.md
docs/intro_observationbuilder.rst 73 additions, 3 deletions

docs/intro_observationbuilder.rst
flatland/utils/graphics_pil.py 21 additions, 5 deletions

flatland/utils/graphics_pil.py
flatland/utils/rendertools.py 11 additions, 6 deletions

flatland/utils/rendertools.py
tests/test_multi_speed.py 3 additions, 4 deletions

tests/test_multi_speed.py

with 268 additions and 28 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment