diff --git a/README.md b/README.md index a932ac7c2..a03af72a0 100644 --- a/README.md +++ b/README.md @@ -117,6 +117,7 @@ Highlight | Highlight the currently selected room Triggers | Toggle trigger visibility Geometry | Toggle geometry mode Water | Toggle water in water rooms +Rooms | Toggle rendering of room geometry Depth | Toggle depth mode. This will show the currently selected depth of neighbours of the current room. Depth Selector | Choose the depth of neighbours to show Wireframe | Enable wireframe rendering mode @@ -267,7 +268,9 @@ Z|Z position of the camera in level space| ## Context Menu -![Context Menu](doc/context_menu.png) +Normal | Copy | Triggered By +---|--- +![Context Menu](doc/context_menu.png) | ![Context Menu](doc/context_menu_copy.png) | ![Context Menu](doc/context_menu_triggered_by.png) The context menu is opened by right clicking in the 3D view. @@ -278,6 +281,8 @@ Add Mid Waypoint|Add a new route waypoint at the centre of the square that was c Remove Waypoint|Remove the clicked waypoint from the route. This is only available when a waypoint was clicked. Orbit Here|Switch the camera to orbit mode and orbit around the position that was right clicked when the context menu was opened. Hide|Hide the clicked entity or trigger. This can be unhidden from the view menu or the items or triggers window. This is only available if an item or trigger was clicked. +Copy|Copy the position of the click or the entity number to the clipboard. +Triggered By|Shows the triggers that trigger an entity. Clicking an entry will select the trigger. ## Menus @@ -523,9 +528,11 @@ Shows the list of waypoints in the current route and allows them to be edited an ![Route Window](doc/route.png) -## Route Colour +## Settings + +![Route Window Settings](doc/route_settings.png) -Clicking on the coloured square will show a colour picker dialog. The colour you choose will be used for the waypoints in the 3D view. +Clicking on the settings button will allow you to change route and waypoint colours. Clicking on each coloured square will show a colour picker dialog. The colours you choose will be used in the 3D view. ## Import @@ -662,8 +669,9 @@ Different comparison operators are available depending on the data type of the s | Between | ✗ | ✓ | ✗ | 2 | | Between inclusive | ✗ | ✓ | ✗ | 2 | | Is Present* | ✓ | ✓ | ✓ | 0 | +| Is not Present | ✓ | ✓ | ✓ | 0 | -If the value is a multi value property such as `Triggered By` on an `Item` then an additional operation `is present` is available. This will return true if there are any values for that property on the item being tested. +If the value is a multi value property such as `Triggered By` on an `Item` then two additional operations: `is present` and `is not present` are available. This will return whether there are any values for that property on the item being tested. ## Combining Filters diff --git a/doc/context_menu.png b/doc/context_menu.png index ee1c9dcdf..c87edba8d 100644 Binary files a/doc/context_menu.png and b/doc/context_menu.png differ diff --git a/doc/context_menu_copy.png b/doc/context_menu_copy.png new file mode 100644 index 000000000..3773f2549 Binary files /dev/null and b/doc/context_menu_copy.png differ diff --git a/doc/context_menu_triggered_by.png b/doc/context_menu_triggered_by.png new file mode 100644 index 000000000..05a6029d6 Binary files /dev/null and b/doc/context_menu_triggered_by.png differ diff --git a/doc/route.png b/doc/route.png index cc482b045..28017f3f6 100644 Binary files a/doc/route.png and b/doc/route.png differ diff --git a/doc/route_settings.png b/doc/route_settings.png new file mode 100644 index 000000000..d35b8897d Binary files /dev/null and b/doc/route_settings.png differ diff --git a/doc/settings_camera.png b/doc/settings_camera.png index 629d3ecc1..511829c8d 100644 Binary files a/doc/settings_camera.png and b/doc/settings_camera.png differ diff --git a/doc/settings_general.png b/doc/settings_general.png index afa9783fb..f05283d7e 100644 Binary files a/doc/settings_general.png and b/doc/settings_general.png differ diff --git a/doc/view_options/tr1-3.png b/doc/view_options/tr1-3.png index 0426226bf..fd6f9ad49 100644 Binary files a/doc/view_options/tr1-3.png and b/doc/view_options/tr1-3.png differ diff --git a/doc/view_options/tr4.png b/doc/view_options/tr4.png index 4679c9a23..09146f9d2 100644 Binary files a/doc/view_options/tr4.png and b/doc/view_options/tr4.png differ diff --git a/trview.app/Resources/trview.app.rc b/trview.app/Resources/trview.app.rc index 2dfa66cf6..c3c3bd02e 100644 --- a/trview.app/Resources/trview.app.rc +++ b/trview.app/Resources/trview.app.rc @@ -106,7 +106,7 @@ CAPTION "About trview" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN ICON IDI_TRVIEW,IDC_STATIC,14,14,21,20 - LTEXT "trview, Version 2.2.0",IDC_STATIC,42,14,114,8,SS_NOPREFIX + LTEXT "trview, Version 2.3.0",IDC_STATIC,42,14,114,8,SS_NOPREFIX LTEXT "Copyright (C) 2022 trview team",IDC_STATIC,42,26,127,17 LTEXT "Licensed under the MIT license\r\n\ Uses DirectXTK (MIT)\r\n\ @@ -197,8 +197,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,2,0,0 - PRODUCTVERSION 2,2,0,0 + FILEVERSION 2,3,0,0 + PRODUCTVERSION 2,3,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -214,12 +214,12 @@ BEGIN BLOCK "080904b0" BEGIN VALUE "FileDescription", "TRView" - VALUE "FileVersion", "2.2.0.0" + VALUE "FileVersion", "2.3.0.0" VALUE "InternalName", "trview.exe" VALUE "LegalCopyright", "Copyright (C) chreden 2022" VALUE "OriginalFilename", "trview.exe" VALUE "ProductName", "TRView" - VALUE "ProductVersion", "2.2.0.0" + VALUE "ProductVersion", "2.3.0.0" END END BLOCK "VarFileInfo"