Merge branch 'master' of gitlab.aicrowd.com:flatland/flatland (eb67f664) · Commits · sfwatergit / 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

eb67f664

Commit eb67f664 authored 5 years ago by Erik Nygren

Downloads
- Plain Diff

Merge branch 'master' of gitlab.aicrowd.com:flatland/flatland

# Conflicts:
#	flatland/envs/observations.py

parents 6d7fbf29 31f105ce

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

flatland/envs/env_utils.py 1 addition, 0 deletions

flatland/envs/env_utils.py
flatland/envs/observations.py 6 additions, 1 deletion

flatland/envs/observations.py
flatland/utils/graphics_layer.py 1 addition, 2 deletions

flatland/utils/graphics_layer.py
flatland/utils/graphics_pil.py 46 additions, 27 deletions

flatland/utils/graphics_pil.py
flatland/utils/rendertools.py 13 additions, 14 deletions

flatland/utils/rendertools.py
notebooks/Scene_Editor.ipynb 1 addition, 1 deletion

notebooks/Scene_Editor.ipynb
svg/Background_Light_green.svg 57 additions, 0 deletions

svg/Background_Light_green.svg
svg/Background_city.svg 57 additions, 0 deletions

svg/Background_city.svg
svg/Background_rail.svg 57 additions, 0 deletions

svg/Background_rail.svg
svg/Background_white_filter.svg 57 additions, 0 deletions

svg/Background_white_filter.svg

with 296 additions and 45 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