diff --git a/examples/README.md b/examples/README.md index 78a186e..e84e40f 100644 --- a/examples/README.md +++ b/examples/README.md @@ -4,4 +4,4 @@ This directory contains examples of *VASL Templates* in action, with the `.json` The online versions contain images that will be loaded from the internet, which looks much better, but there will be a short delay when you open the scenario in VASSAL as the images are downloaded. -These scenarios were taken from Multi-Man Publishing's [*ASL Classic* scenario pack](http://www.multimanpublishing.com/Support/ASLASLSK/ASLOfficialDownloads/tabid/109/Default.aspx). +These scenarios were taken from Multi-Man Publishing's [*ASL Classic* scenario pack](https://mmpgamers.com/asl-downloads-ezp-3#scenarios). diff --git a/vasl_templates/webapp/static/help/images/add-ssr.png b/vasl_templates/webapp/static/help/images/add-ssr.png index 5e95d25..e83af32 100644 Binary files a/vasl_templates/webapp/static/help/images/add-ssr.png and b/vasl_templates/webapp/static/help/images/add-ssr.png differ diff --git a/vasl_templates/webapp/static/help/images/add-ssr.small.png b/vasl_templates/webapp/static/help/images/add-ssr.small.png index 8a34140..96e6d25 100644 Binary files a/vasl_templates/webapp/static/help/images/add-ssr.small.png and b/vasl_templates/webapp/static/help/images/add-ssr.small.png differ diff --git a/vasl_templates/webapp/static/help/images/asa-search.png b/vasl_templates/webapp/static/help/images/asa-search.png index ff5d4db..2a7ea9b 100644 Binary files a/vasl_templates/webapp/static/help/images/asa-search.png and b/vasl_templates/webapp/static/help/images/asa-search.png differ diff --git a/vasl_templates/webapp/static/help/images/asa-search.small.png b/vasl_templates/webapp/static/help/images/asa-search.small.png index 81db7e2..3968826 100644 Binary files a/vasl_templates/webapp/static/help/images/asa-search.small.png and b/vasl_templates/webapp/static/help/images/asa-search.small.png differ diff --git a/vasl_templates/webapp/static/help/images/asa-upload.png b/vasl_templates/webapp/static/help/images/asa-upload.png index 86a036c..be2e8ac 100644 Binary files a/vasl_templates/webapp/static/help/images/asa-upload.png and b/vasl_templates/webapp/static/help/images/asa-upload.png differ diff --git a/vasl_templates/webapp/static/help/images/asa-upload.small.png b/vasl_templates/webapp/static/help/images/asa-upload.small.png index 7ec6304..c542d81 100644 Binary files a/vasl_templates/webapp/static/help/images/asa-upload.small.png and b/vasl_templates/webapp/static/help/images/asa-upload.small.png differ diff --git a/vasl_templates/webapp/static/help/images/chapter-h/ui.png b/vasl_templates/webapp/static/help/images/chapter-h/ui.png index 00d05f9..c43fd24 100644 Binary files a/vasl_templates/webapp/static/help/images/chapter-h/ui.png and b/vasl_templates/webapp/static/help/images/chapter-h/ui.png differ diff --git a/vasl_templates/webapp/static/help/images/chapter-h/ui.small.png b/vasl_templates/webapp/static/help/images/chapter-h/ui.small.png index 083093e..9022d75 100644 Binary files a/vasl_templates/webapp/static/help/images/chapter-h/ui.small.png and b/vasl_templates/webapp/static/help/images/chapter-h/ui.small.png differ diff --git a/vasl_templates/webapp/static/help/images/edit-template.png b/vasl_templates/webapp/static/help/images/edit-template.png index 095403d..29dab58 100644 Binary files a/vasl_templates/webapp/static/help/images/edit-template.png and b/vasl_templates/webapp/static/help/images/edit-template.png differ diff --git a/vasl_templates/webapp/static/help/images/edit-template.small.png b/vasl_templates/webapp/static/help/images/edit-template.small.png index 6c2661f..428a924 100644 Binary files a/vasl_templates/webapp/static/help/images/edit-template.small.png and b/vasl_templates/webapp/static/help/images/edit-template.small.png differ diff --git a/vasl_templates/webapp/static/help/images/edit-vehicle.png b/vasl_templates/webapp/static/help/images/edit-vehicle.png index 807bdef..ac4bf26 100644 Binary files a/vasl_templates/webapp/static/help/images/edit-vehicle.png and b/vasl_templates/webapp/static/help/images/edit-vehicle.png differ diff --git a/vasl_templates/webapp/static/help/images/edit-vehicle.small.png b/vasl_templates/webapp/static/help/images/edit-vehicle.small.png index 0990cb7..845609e 100644 Binary files a/vasl_templates/webapp/static/help/images/edit-vehicle.small.png and b/vasl_templates/webapp/static/help/images/edit-vehicle.small.png differ diff --git a/vasl_templates/webapp/static/help/images/extras-templates.png b/vasl_templates/webapp/static/help/images/extras-templates.png index ed7a301..c31fcb2 100644 Binary files a/vasl_templates/webapp/static/help/images/extras-templates.png and b/vasl_templates/webapp/static/help/images/extras-templates.png differ diff --git a/vasl_templates/webapp/static/help/images/extras-templates.small.png b/vasl_templates/webapp/static/help/images/extras-templates.small.png index 31472a7..9e989c9 100644 Binary files a/vasl_templates/webapp/static/help/images/extras-templates.small.png and b/vasl_templates/webapp/static/help/images/extras-templates.small.png differ diff --git a/vasl_templates/webapp/static/help/images/hill-621.png b/vasl_templates/webapp/static/help/images/hill-621.png index 82dd09c..30890b3 100644 Binary files a/vasl_templates/webapp/static/help/images/hill-621.png and b/vasl_templates/webapp/static/help/images/hill-621.png differ diff --git a/vasl_templates/webapp/static/help/images/hill-621.small.png b/vasl_templates/webapp/static/help/images/hill-621.small.png index 18c0afa..0e4e07c 100644 Binary files a/vasl_templates/webapp/static/help/images/hill-621.small.png and b/vasl_templates/webapp/static/help/images/hill-621.small.png differ diff --git a/vasl_templates/webapp/static/help/images/load-template-pack.png b/vasl_templates/webapp/static/help/images/load-template-pack.png index 578fc0f..29515a4 100644 Binary files a/vasl_templates/webapp/static/help/images/load-template-pack.png and b/vasl_templates/webapp/static/help/images/load-template-pack.png differ diff --git a/vasl_templates/webapp/static/help/images/load-template-pack.small.png b/vasl_templates/webapp/static/help/images/load-template-pack.small.png index 42d8d00..8b7cb76 100644 Binary files a/vasl_templates/webapp/static/help/images/load-template-pack.small.png and b/vasl_templates/webapp/static/help/images/load-template-pack.small.png differ diff --git a/vasl_templates/webapp/static/help/images/ob_setup.png b/vasl_templates/webapp/static/help/images/ob_setup.png index c315b23..99a9e52 100644 Binary files a/vasl_templates/webapp/static/help/images/ob_setup.png and b/vasl_templates/webapp/static/help/images/ob_setup.png differ diff --git a/vasl_templates/webapp/static/help/images/ob_setup.small.png b/vasl_templates/webapp/static/help/images/ob_setup.small.png index 6f151bc..ef36919 100644 Binary files a/vasl_templates/webapp/static/help/images/ob_setup.small.png and b/vasl_templates/webapp/static/help/images/ob_setup.small.png differ diff --git a/vasl_templates/webapp/static/help/images/ob_vehicles.png b/vasl_templates/webapp/static/help/images/ob_vehicles.png index e0e5b60..93343ea 100644 Binary files a/vasl_templates/webapp/static/help/images/ob_vehicles.png and b/vasl_templates/webapp/static/help/images/ob_vehicles.png differ diff --git a/vasl_templates/webapp/static/help/images/ob_vehicles.small.png b/vasl_templates/webapp/static/help/images/ob_vehicles.small.png index ae4deae..0451c6e 100644 Binary files a/vasl_templates/webapp/static/help/images/ob_vehicles.small.png and b/vasl_templates/webapp/static/help/images/ob_vehicles.small.png differ diff --git a/vasl_templates/webapp/static/help/images/pf.png b/vasl_templates/webapp/static/help/images/pf.png index aaee329..3e6ecae 100644 Binary files a/vasl_templates/webapp/static/help/images/pf.png and b/vasl_templates/webapp/static/help/images/pf.png differ diff --git a/vasl_templates/webapp/static/help/images/pf.small.png b/vasl_templates/webapp/static/help/images/pf.small.png index 2074d9d..17392df 100644 Binary files a/vasl_templates/webapp/static/help/images/pf.small.png and b/vasl_templates/webapp/static/help/images/pf.small.png differ diff --git a/vasl_templates/webapp/static/help/images/quick-start/load-scenario.png b/vasl_templates/webapp/static/help/images/quick-start/load-scenario.png index 2c59e39..cbf7eb1 100644 Binary files a/vasl_templates/webapp/static/help/images/quick-start/load-scenario.png and b/vasl_templates/webapp/static/help/images/quick-start/load-scenario.png differ diff --git a/vasl_templates/webapp/static/help/images/quick-start/load-scenario.small.png b/vasl_templates/webapp/static/help/images/quick-start/load-scenario.small.png index 84358b2..5151a70 100644 Binary files a/vasl_templates/webapp/static/help/images/quick-start/load-scenario.small.png and b/vasl_templates/webapp/static/help/images/quick-start/load-scenario.small.png differ diff --git a/vasl_templates/webapp/static/help/images/quick-start/settings.png b/vasl_templates/webapp/static/help/images/quick-start/settings.png index d401461..b7089e0 100644 Binary files a/vasl_templates/webapp/static/help/images/quick-start/settings.png and b/vasl_templates/webapp/static/help/images/quick-start/settings.png differ diff --git a/vasl_templates/webapp/static/help/images/quick-start/settings.small.png b/vasl_templates/webapp/static/help/images/quick-start/settings.small.png index 2d557e8..01d08a5 100644 Binary files a/vasl_templates/webapp/static/help/images/quick-start/settings.small.png and b/vasl_templates/webapp/static/help/images/quick-start/settings.small.png differ diff --git a/vasl_templates/webapp/static/help/images/quick-start/update-scenario.png b/vasl_templates/webapp/static/help/images/quick-start/update-scenario.png index 9f2abf5..9675074 100644 Binary files a/vasl_templates/webapp/static/help/images/quick-start/update-scenario.png and b/vasl_templates/webapp/static/help/images/quick-start/update-scenario.png differ diff --git a/vasl_templates/webapp/static/help/images/quick-start/update-scenario.small.png b/vasl_templates/webapp/static/help/images/quick-start/update-scenario.small.png index 77940db..3ec1efa 100644 Binary files a/vasl_templates/webapp/static/help/images/quick-start/update-scenario.small.png and b/vasl_templates/webapp/static/help/images/quick-start/update-scenario.small.png differ diff --git a/vasl_templates/webapp/static/help/images/quick-start/updated-scenario.png b/vasl_templates/webapp/static/help/images/quick-start/updated-scenario.png index 0b6b4ec..050ec6d 100644 Binary files a/vasl_templates/webapp/static/help/images/quick-start/updated-scenario.png and b/vasl_templates/webapp/static/help/images/quick-start/updated-scenario.png differ diff --git a/vasl_templates/webapp/static/help/images/quick-start/updated-scenario.small.png b/vasl_templates/webapp/static/help/images/quick-start/updated-scenario.small.png index 7880589..02426b0 100644 Binary files a/vasl_templates/webapp/static/help/images/quick-start/updated-scenario.small.png and b/vasl_templates/webapp/static/help/images/quick-start/updated-scenario.small.png differ diff --git a/vasl_templates/webapp/static/help/images/scenario-vasl.png b/vasl_templates/webapp/static/help/images/scenario-vasl.png index bff5e8a..7ed3a6b 100644 Binary files a/vasl_templates/webapp/static/help/images/scenario-vasl.png and b/vasl_templates/webapp/static/help/images/scenario-vasl.png differ diff --git a/vasl_templates/webapp/static/help/images/scenario-vasl.small.png b/vasl_templates/webapp/static/help/images/scenario-vasl.small.png index 4b8b0be..b0979f1 100644 Binary files a/vasl_templates/webapp/static/help/images/scenario-vasl.small.png and b/vasl_templates/webapp/static/help/images/scenario-vasl.small.png differ diff --git a/vasl_templates/webapp/static/help/images/snippet.png b/vasl_templates/webapp/static/help/images/snippet.png new file mode 100644 index 0000000..50a313b Binary files /dev/null and b/vasl_templates/webapp/static/help/images/snippet.png differ diff --git a/vasl_templates/webapp/static/help/images/ssr-template.png b/vasl_templates/webapp/static/help/images/ssr-template.png index 13505fa..9610d00 100644 Binary files a/vasl_templates/webapp/static/help/images/ssr-template.png and b/vasl_templates/webapp/static/help/images/ssr-template.png differ diff --git a/vasl_templates/webapp/static/help/images/ssr-template.small.png b/vasl_templates/webapp/static/help/images/ssr-template.small.png index 63766c2..5056849 100644 Binary files a/vasl_templates/webapp/static/help/images/ssr-template.small.png and b/vasl_templates/webapp/static/help/images/ssr-template.small.png differ diff --git a/vasl_templates/webapp/static/help/images/ssr-template2.png b/vasl_templates/webapp/static/help/images/ssr-template2.png index 9136a2f..9018718 100644 Binary files a/vasl_templates/webapp/static/help/images/ssr-template2.png and b/vasl_templates/webapp/static/help/images/ssr-template2.png differ diff --git a/vasl_templates/webapp/static/help/images/ssr-template2.small.png b/vasl_templates/webapp/static/help/images/ssr-template2.small.png index c185512..85a1ec4 100644 Binary files a/vasl_templates/webapp/static/help/images/ssr-template2.small.png and b/vasl_templates/webapp/static/help/images/ssr-template2.small.png differ diff --git a/vasl_templates/webapp/static/help/images/ssr.png b/vasl_templates/webapp/static/help/images/ssr.png index 484036b..b9fc83a 100644 Binary files a/vasl_templates/webapp/static/help/images/ssr.png and b/vasl_templates/webapp/static/help/images/ssr.png differ diff --git a/vasl_templates/webapp/static/help/images/ssr.small.png b/vasl_templates/webapp/static/help/images/ssr.small.png index da8efe7..d683131 100644 Binary files a/vasl_templates/webapp/static/help/images/ssr.small.png and b/vasl_templates/webapp/static/help/images/ssr.small.png differ diff --git a/vasl_templates/webapp/static/help/images/user-file.png b/vasl_templates/webapp/static/help/images/user-file.png index 4fdc414..595e55e 100644 Binary files a/vasl_templates/webapp/static/help/images/user-file.png and b/vasl_templates/webapp/static/help/images/user-file.png differ diff --git a/vasl_templates/webapp/static/help/images/user-file.small.png b/vasl_templates/webapp/static/help/images/user-file.small.png index 86c5bad..dd6542d 100644 Binary files a/vasl_templates/webapp/static/help/images/user-file.small.png and b/vasl_templates/webapp/static/help/images/user-file.small.png differ diff --git a/vasl_templates/webapp/static/help/images/user-settings.png b/vasl_templates/webapp/static/help/images/user-settings.png index ca1e7d7..e02fdcc 100644 Binary files a/vasl_templates/webapp/static/help/images/user-settings.png and b/vasl_templates/webapp/static/help/images/user-settings.png differ diff --git a/vasl_templates/webapp/static/help/images/user-settings.small.png b/vasl_templates/webapp/static/help/images/user-settings.small.png index 82be76a..b8fcf64 100644 Binary files a/vasl_templates/webapp/static/help/images/user-settings.small.png and b/vasl_templates/webapp/static/help/images/user-settings.small.png differ diff --git a/vasl_templates/webapp/static/help/images/vc-vasl.png b/vasl_templates/webapp/static/help/images/vc-vasl.png index 9a9a3bc..23c90fa 100644 Binary files a/vasl_templates/webapp/static/help/images/vc-vasl.png and b/vasl_templates/webapp/static/help/images/vc-vasl.png differ diff --git a/vasl_templates/webapp/static/help/images/vc-vasl.small.png b/vasl_templates/webapp/static/help/images/vc-vasl.small.png deleted file mode 100644 index d9fb7f3..0000000 Binary files a/vasl_templates/webapp/static/help/images/vc-vasl.small.png and /dev/null differ diff --git a/vasl_templates/webapp/static/help/images/vc.png b/vasl_templates/webapp/static/help/images/vc.png index 23a1465..db7ae7e 100644 Binary files a/vasl_templates/webapp/static/help/images/vc.png and b/vasl_templates/webapp/static/help/images/vc.png differ diff --git a/vasl_templates/webapp/static/help/images/vc.small.png b/vasl_templates/webapp/static/help/images/vc.small.png index d30cba0..e4ade67 100644 Binary files a/vasl_templates/webapp/static/help/images/vc.small.png and b/vasl_templates/webapp/static/help/images/vc.small.png differ diff --git a/vasl_templates/webapp/static/help/index.html b/vasl_templates/webapp/static/help/index.html index 4853b67..7b13a2c 100644 --- a/vasl_templates/webapp/static/help/index.html +++ b/vasl_templates/webapp/static/help/index.html @@ -43,7 +43,7 @@

Running on Windows

If you're using Windows, you should get the pre-built version from Github, unpack it somewhere, then run vasl-templates.exe. Note that it can be a bit slow to start, so please give it a few seconds. -

If the program won't start because a DLL is missing from your computer, install the VC2015 runtime (get the 32-bit version, vc_redist.x86.exe, even if you are running 64-bit Windows). +

If the program won't start because a DLL is missing from your computer, install the VC2015 runtime (get the 32-bit version, vc_redist.x86.exe, even if you are running 64-bit Windows).

If you don't see anything in the main window, check the notes below about configuring OpenGL. @@ -73,14 +73,14 @@ If you have Docker installed, the webapp can be run in a container e.g.

You can also run the program directly from the source code. Get a copy from Github in the usual way, by git clone'ing it, or downloading a ZIP and unpacking it somewhere. -

The web server was written and tested using Python 3.8.7, but it doesn't do anything particularly funky, so any recent version of Python should work. +

The web server was written and tested using Python 3.10.4, but it doesn't do anything particularly funky, so any recent version of Python should work. -

While not essential, it is strongly recommended that you set up a virtual environment first. Then, install the requirements: +

While not essential, it is strongly recommended that you set up a virtual environment first. Then cd into the project's root directory, and install the requirements (note the trailing period):

-pip install .[gui] +pip install --editable .
-

Running the web server

+

Running the web server

The simplest option is to run the web server:

@@ -88,11 +88,14 @@ python vasl_templates/webapp/run_server.py
and then connect to it in a browser at http://localhost:5010. -

Running the desktop application

+

Running the desktop application

-

If you want to run the desktop application, you will need to have the Qt runtime installed. +

If you want to run the desktop application, you must install the GUI dependencies: +

+pip install --editable .[gui] +
-

If you're on Linux, you may need to install Qt 5.15.4. On Fedora 35, running the "gui" install above should install everything you need. +

You will also need to have the Qt 5.15.4 runtime installed. If you're on Linux, you may need to manually install this.

If you're on Windows, the Qt runtime will have been installed as part of PyQt5 (when you did the pip install above), but if you're in a virtual environment and you're getting "DLL load failed" errors, this is due to a problem with the way Python sets up the virtualenv. In the virtualenv's scripts/ sub-directory, there should be two Python DLL's, so if you're missing python3.dll, copy it over from the Python installation the virtualenv was created from, and you should be good to go. @@ -101,10 +104,11 @@ and then connect to it in a browser at http://localhost:5010.

Installing a webdriver

-

-
The webdriver is tightly coupled with the browser, so make sure that the webdriver you use supports the version of the browser you have.
-
Since browsers usually automatically update themselves as new versions are released, this means that the webdriver you use will eventually become out-of-date, and may stop working. In this case, simply get a new version of the webdriver that supports the version of the browser you have.
-
+

+The webdriver is tightly coupled with the browser, so make sure that the webdriver you use supports the version of the browser you have. +

You must also make sure to get the correct type (32- or 64-bit) for your browser (check the About box). +

Since browsers usually automatically update themselves as new versions are released, this means that the webdriver you use will eventually become out-of-date, and may stop working. In this case, simply get a new version of the webdriver that supports the version of the browser you have. +

Some features require a webdriver to be installed. You can use either: