Merge branch 'release/0.16.0'

.circleci/config.yml

@@ -0,0 +1,89 @@
+version: 2
+jobs:
+  windows:
+    docker:
+      - image: cdrx/pyinstaller-windows:python3
+
+    working_directory: ~/PlanarAlly/server
+
+    steps:
+      - checkout:
+          path: ~/PlanarAlly
+
+      # - restore_cache:
+      #     key: pip-{{ checksum "requirements.txt" }}
+      #     name: Restoring pip cache
+
+      - run:
+          name: install sqlite3
+          command: apt update && apt install --no-install-recommends -y sqlite3
+
+      - run:
+          name: pip install
+          command: pip install -U setuptools && pip install -r requirements.txt
+
+      - save_cache:
+          key: pip-{{ checksum "requirements.txt" }}
+          paths:
+            - /wine/drive_c/users/root/Local\ Settings/Application\ Data/pip/Cache
+
+      - run:
+          name: Build Windows executable
+          command: pyinstaller --clean -y --dist ./dist/windows --workpath /tmp *.spec
+
+      - store_artifacts:
+          path: ./dist/windows
+
+      - persist_to_workspace:
+          root: ./
+          paths:
+            - VERSION
+            - ./dist/windows
+
+  release:
+    docker:
+      - image: cibuilds/github:0.12.1
+
+    working_directory: /tmp/workspace
+
+    steps:
+      - attach_workspace:
+          at: /tmp/workspace
+
+      - run:
+          name: Zip artifacts
+          command: |
+            VERSION=$(cat VERSION)
+            cd dist/windows
+            zip -r windows-${VERSION}.zip *
+            cd -
+      
+      - run:
+          name: "Publish release on github"
+          command: |
+            VERSION=$(cat VERSION)
+            ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -replace ${VERSION} ./dist/windows/windows-${VERSION}.zip
+
+workflows:
+  version: 2
+  build:
+    jobs:
+      - windows:
+          filters:
+            branches:
+              ignore: /.*/
+            #   only:
+            #     - dev
+            #     - bugfix/windows-build
+            # tags:
+            #   only: /^\d+\.\d+\.\d+[-a-zA-Z0-9]*$/
+      - release:
+          requires:
+            - windows
+          filters:
+            branches:
+              ignore: /.*/
+            #   only:
+            #     - bugfix/windows-build
+            # tags:
+            #   only: /^\d+\.\d+\.\d+[-a-zA-Z0-9]*$/

.env

@@ -0,0 +1 @@
+PYTHONPATH=./server/

CHANGELOG.md

@@ -7,6 +7,34 @@ All notable changes to this project will be documented in this file.
 
 ## Unreleased
 
+## [0.16.0] - 2019-05-19
+
+### Added
+
+- Option to listen on a socket instead of HOST:PORT.
+- Vision tool to change active tokens.
+- Vision lock button to initiative to only show vision of current actor.
+    - This only applies to tokens the player owns for other tokens the normal vision is restored.
+    - This is purely client side and can thus be chosen by player/DM separately.
+- Camera lock button to initiative to automatically center on current actor.
+    - It will center when an actor begins its turn and the client is owner of that actor.
+    - It does not prevent camera movement after the initial center action.
+- Automatic build of windows executables on azure pipelines for all tags
+    - These will also create a github release automatically
+- Fake player button to DM Settings to disable all DM functions except DM settings.
+    - You can control which player(s) you want to emulate with the vision tool.
+
+### Changed
+
+- Filter tool is only visible if there are labels defined.
+
+### Fixed
+
+- Fix a bug causing labels without category to throw errors.
+- CSS bug with menu.
+- Bug making it impossible to remove trackers/auras.
+- Windows build being completely broken.
+
 ## [0.15.1] - 2019-05-15
 
 ### Fixed

Dockerfiles/server_config_docker.cfg

@@ -1,10 +1,15 @@
 [Webserver]
+# You can choose to use a HOST:PORT connection or a socket file to listen on
+# If you specifiy a socket, it will be used instead of the HTTP:PORT connection
 host = 0.0.0.0
 port = 8000
+# socket = /tmp/planarally.sock
+
 ssl = false
 # the ssl_ options are only required if ssl is set
 # modify these to your actual keys!
 ssl_fullchain = cert/fullchain.pem
 ssl_privkey = cert/privkey.pem
+
 [General]
-save_file = data/planar.save
+save_file = data/planar.sqlite

azure-pipelines.yml

@@ -0,0 +1,46 @@
+# Python package
+# Create and test a Python package on multiple Python versions.
+# Add steps that analyze code, save the dist with the build record, publish to a PyPI-compatible index, and more:
+# https://docs.microsoft.com/azure/devops/pipelines/languages/python
+
+trigger:
+  tags:
+    include:
+      - '*'
+
+jobs:
+  - job: "Pyinstaller_Windows"
+    pool:
+      vmImage: "vs2017-win2016"
+
+    steps:
+      - task: UsePythonVersion@0
+        inputs:
+          versionSpec: "3.7"
+          architecture: "x64"
+
+      - script: python -m pip install --upgrade pip && pip install -r requirements.txt
+        displayName: "Install dependencies"
+        workingDirectory: "server"
+
+      - script: pip install pyinstaller
+        displayName: "Install pyinstaller"
+
+      - script: pyinstaller --clean -y --dist $(Build.ArtifactStagingDirectory)\windows --workpath D:\ PA.spec
+        displayName: "Run pyinstaller"
+        workingDirectory: "server"
+
+      - task: ArchiveFiles@2
+        inputs:
+          rootFolderOrFile: $(Build.ArtifactStagingDirectory)\windows\planarserver
+          includeRootFolder: false
+          archiveType: 'zip'
+          archiveFile: '$(Build.ArtifactStagingDirectory)\planarally-windows.zip'
+
+      - task: GitHubRelease@0
+        inputs:
+          gitHubConnection: Kruptein
+          action: 'create'
+          assets: '$(Build.ArtifactStagingDirectory)\planarally-windows.zip'
+          assetsUploadMode: 'replace'
+          addChangeLog: false