Skip to content

Commit

Permalink
Merge branch 'release/0.13.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
Kruptein committed Jan 13, 2019
2 parents 0480336 + 092e30e commit 1b4617c
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 7 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion client/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion server/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.13.1
0.13.2
13 changes: 9 additions & 4 deletions server/api/socket/location.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
Binary file added server/static/img/login_background.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 1b4617c

Please sign in to comment.