Merge branch 'master' into tooomm-qt5

.github/CONTRIBUTING.md

@@ -209,6 +209,16 @@ nowadays and clean it up for you.
 Lines should be 120 characters or less. Please break up lines that are too long
 into smaller parts, for example at spaces or after opening a brace.
 
+### Documentation Comments ###
+
+Use [Doxygen](https://www.doxygen.nl/) for code documentation:
+
+- **Doc blocks**: Use `/** @brief Description */` (Javadoc-style), not `///`
+- **Member comments**: Use trailing `///<` for inline member documentation
+- **TODOs**: Use `//! \todo Description` (Qt-style), Doxygen collects them into a Todo List
+  (uses [Qt-style comments](https://www.doxygen.nl/manual/docblocks.html) with
+  Doxygen's [\todo command](https://www.doxygen.nl/manual/commands.html#cmdtodo))
+
 ### Memory Management ###
 
 New code should be written using references over pointers and stack allocation

.github/workflows/documentation-build.yml

@@ -1,9 +1,9 @@
 name: Generate Docs
 
 on:
-  push:
-    tags:
-      - '*'   # Only re-generate docs when a new tagged version is pushed
+  release:
+    types:
+      - published    # publishing of stable releases and pre-releases
   pull_request:
     paths:
       - 'doc/doxygen/**'
@@ -53,11 +53,11 @@ jobs:
         run: doxygen Doxyfile
 
       - name: Deploy to cockatrice.github.io
-        if: github.event_name != 'pull_request'
+        if: github.event_name == 'release' || github.event_name == 'workflow_dispatch'
         uses: peaceiris/actions-gh-pages@v4
         with:
           deploy_key: ${{ secrets.DOCS_DEPLOY_KEY }}
           external_repository: Cockatrice/cockatrice.github.io
           publish_branch: master
           publish_dir: ./docs/html
-          destination_dir: docs   # Docs will live under https://cockatrice.github.io/docs/
+          destination_dir: docs    # Docs will live under https://cockatrice.github.io/docs/