diff --git a/.gitignore b/.gitignore index 1ed8a6894..089b7a92e 100644 --- a/.gitignore +++ b/.gitignore @@ -22,8 +22,9 @@ server/planarallyserver.log server/planar.save* server/planar.sqlite server/server_config.cfg -server/static/img/** +# server/static/img/** server/static/assets/** +server/static/img/assets/** # docs docs/_build diff --git a/CHANGELOG.md b/CHANGELOG.md index 9af3d4fb7..25025ce99 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,13 @@ All notable changes to this project will be documented in this file. ## Unreleased +## [0.13.2] - 2019-01-13 + +### Fixed + +- Static images were accidently no longer checked into the repository. +- DM layer was not being sent by the server. + ## [0.13.0] - 2019-01-13 ### Added diff --git a/client/package.json b/client/package.json index 6a5a4fbeb..1267a919c 100644 --- a/client/package.json +++ b/client/package.json @@ -1,6 +1,6 @@ { "name": "planarally-client", - "version": "0.13.1", + "version": "0.13.2", "description": "A companion tool for when you travel into the planes.", "scripts": { "serve": "vue-cli-service serve", diff --git a/server/VERSION b/server/VERSION index ed0d9e990..3f8dcd03d 100644 --- a/server/VERSION +++ b/server/VERSION @@ -1 +1 @@ -0.13.1 \ No newline at end of file +0.13.2 \ No newline at end of file diff --git a/server/api/socket/location.py b/server/api/socket/location.py index 3ede97d54..56536a256 100644 --- a/server/api/socket/location.py +++ b/server/api/socket/location.py @@ -24,10 +24,15 @@ async def load_location(sid, location): data = {} data["locations"] = [l.name for l in room.locations] - data["layers"] = [ - l.as_dict(user, user == room.creator) - for l in location.layers.order_by(Layer.index).where(Layer.player_visible) - ] + if user == room.creator: + data["layers"] = [ + l.as_dict(user, True) for l in location.layers.order_by(Layer.index) + ] + else: + data["layers"] = [ + l.as_dict(user, False) + for l in location.layers.order_by(Layer.index).where(Layer.player_visible) + ] client_options = user.as_dict() client_options.update( **LocationUserOption.get(user=user, location=location).as_dict() diff --git a/server/static/img/login_background.png b/server/static/img/login_background.png new file mode 100644 index 000000000..35dbab009 Binary files /dev/null and b/server/static/img/login_background.png differ