From 8cb7fa0eda3e29c169f4ae33355e0b6ec108cf6a Mon Sep 17 00:00:00 2001 From: Isaac Marovitz Date: Wed, 3 Apr 2024 08:01:15 -0400 Subject: [PATCH 01/17] Ignore .DS_Store --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index bb354950..b641e08c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ book .idea +.DS_Store \ No newline at end of file From bb6384a718ee469ea4b3f313d6a1cc5d7b8d8eb5 Mon Sep 17 00:00:00 2001 From: Isaac Marovitz Date: Wed, 3 Apr 2024 08:30:29 -0400 Subject: [PATCH 02/17] Custom index.hbs --- theme/index.hbs | 277 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 277 insertions(+) create mode 100644 theme/index.hbs diff --git a/theme/index.hbs b/theme/index.hbs new file mode 100644 index 00000000..8240c9bc --- /dev/null +++ b/theme/index.hbs @@ -0,0 +1,277 @@ + + + + + + {{ title }} + {{#if is_print }} + + {{/if}} + {{#if base_url}} + + {{/if}} + + + + {{> head}} + + + + + + {{#if favicon_svg}} + + {{/if}} + {{#if favicon_png}} + + {{/if}} + + + + {{#if print_enable}} + + {{/if}} + + + + {{#if copy_fonts}} + + {{/if}} + + + + + + + + {{#each additional_css}} + + {{/each}} + + {{#if mathjax_support}} + + + {{/if}} + + +
+ + + + + + + + + + + + + + + + + + + +
+ +
+ {{> header}} + + + + {{#if search_enabled}} + + {{/if}} + + + + +
+
+ {{{ content }}} +
+
+
+
+ + {{#if live_reload_endpoint}} + + + {{/if}} + + {{#if playground_line_numbers}} + + {{/if}} + + {{#if playground_copyable}} + + {{/if}} + + {{#if playground_js}} + + + + + + {{/if}} + + {{#if search_js}} + + + + {{/if}} + + + + + + + {{#each additional_js}} + + {{/each}} + + {{#if is_print}} + {{#if mathjax_support}} + + {{else}} + + {{/if}} + {{/if}} + +
+ + \ No newline at end of file From 4d33375d15bcb9c5ee193070f5e616a4d9016c27 Mon Sep 17 00:00:00 2001 From: Isaac Marovitz Date: Wed, 3 Apr 2024 08:33:42 -0400 Subject: [PATCH 03/17] Edit Template --- book.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/book.toml b/book.toml index ba11e5ca..dff058f3 100644 --- a/book.toml +++ b/book.toml @@ -13,6 +13,7 @@ title = "Whisky Documentation" default-theme = "dark" git-repository-url = "https://github.com/Whisky-App/Whisky" git-repository-icon = "fa-github" +edit-url-template = "https://github.com/Whisky-App/whisky-book/edit/main/{path}" input-404 = "not-found.md" [output.html.print] From 56a44734f5e241a6cc9cb8df2b21bc38f858bd2f Mon Sep 17 00:00:00 2001 From: Isaac Marovitz Date: Wed, 3 Apr 2024 09:23:19 -0400 Subject: [PATCH 04/17] Custom theme --- book.toml | 3 ++- theme/css/variables.css | 54 +++++++++++++++++++++++++++++++++++++++++ theme/index.hbs | 21 +--------------- 3 files changed, 57 insertions(+), 21 deletions(-) create mode 100644 theme/css/variables.css diff --git a/book.toml b/book.toml index dff058f3..a25f9657 100644 --- a/book.toml +++ b/book.toml @@ -10,7 +10,8 @@ title = "Whisky Documentation" [preprocessor.template] [output.html] -default-theme = "dark" +default-theme = "whisky" +preferred-dark-theme = "whisky" git-repository-url = "https://github.com/Whisky-App/Whisky" git-repository-icon = "fa-github" edit-url-template = "https://github.com/Whisky-App/whisky-book/edit/main/{path}" diff --git a/theme/css/variables.css b/theme/css/variables.css new file mode 100644 index 00000000..5ce72b52 --- /dev/null +++ b/theme/css/variables.css @@ -0,0 +1,54 @@ +:root { + --sidebar-width: 300px; + --sidebar-resize-indicator-width: 8px; + --sidebar-resize-indicator-space: 2px; + --page-padding: 15px; + --content-max-width: 750px; + --menu-bar-height: 50px; + --mono-font: "Source Code Pro", Consolas, "Ubuntu Mono", Menlo, "DejaVu Sans Mono", monospace, monospace; + --code-font-size: 0.875em /* please adjust the ace font size accordingly in editor.js */ +} + +.whisky { + --bg: rgb(17, 24, 39); + --fg: #ffffff; + + --sidebar-bg: rgb(31, 41, 55); + --sidebar-fg: rgb(255, 255, 255); + --sidebar-non-existant: #505254; + --sidebar-active: rgb(245, 158, 11); + --sidebar-spacer: #393939; + + --scrollbar: var(--sidebar-fg); + + --icons: rgb(107, 114, 128); + --icons-hover: #b3c0cc; + + --links: rgb(245, 158, 11); + + --inline-code-color: #c5c8c6; + + --theme-popup-bg: #141617; + --theme-popup-border: #43484d; + --theme-hover: #1f2124; + + --quote-bg: hsl(234, 21%, 18%); + --quote-border: hsl(234, 21%, 23%); + + --warning-border: #ff8e00; + + --table-border-color: rgba(255, 255, 255, 15%); + --table-header-bg: transparent; + --table-alternate-bg: rgba(255, 255, 255, 15%); + + --searchbar-border-color: #aaa; + --searchbar-bg: #b7b7b7; + --searchbar-fg: #000; + --searchbar-shadow-color: #aaa; + --searchresults-header-fg: #666; + --searchresults-border-color: #98a3ad; + --searchresults-li-bg: #2b2b2f; + --search-mark-bg: #355c7d; + + --color-scheme: dark; +} \ No newline at end of file diff --git a/theme/index.hbs b/theme/index.hbs index 8240c9bc..72f3a971 100644 --- a/theme/index.hbs +++ b/theme/index.hbs @@ -1,5 +1,5 @@ - + @@ -58,38 +58,19 @@ - - - From 86eae73e5782855d7e7d3d9f933058ec3164ec4f Mon Sep 17 00:00:00 2001 From: Isaac Marovitz Date: Wed, 3 Apr 2024 09:38:05 -0400 Subject: [PATCH 05/17] Fix no-js --- theme/index.hbs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/theme/index.hbs b/theme/index.hbs index 72f3a971..7c88c9a3 100644 --- a/theme/index.hbs +++ b/theme/index.hbs @@ -71,6 +71,13 @@ } catch (e) { } + + + From f00d0b2c6f3772ebc4a755f4ab81bf6a737b2868 Mon Sep 17 00:00:00 2001 From: Isaac Marovitz Date: Wed, 3 Apr 2024 09:55:18 -0400 Subject: [PATCH 06/17] More styling --- src/common-issues.md | 2 +- src/cx.md | 2 +- src/not-found.md | 3 + src/paths.md | 2 +- theme/css/general.css | 238 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 244 insertions(+), 3 deletions(-) create mode 100644 theme/css/general.css diff --git a/src/common-issues.md b/src/common-issues.md index fdf34c43..19b911fd 100644 --- a/src/common-issues.md +++ b/src/common-issues.md @@ -1,5 +1,5 @@ -## Common Issues +# Common Issues Several things can lead to a program not working. The most common reasons are listed below. diff --git a/src/cx.md b/src/cx.md index 7e0a46c0..139b2c26 100644 --- a/src/cx.md +++ b/src/cx.md @@ -1,4 +1,4 @@ -## Whisky or CrossOver? +# Whisky or CrossOver? There are a lot of questions about which is better, here's an easy chart: diff --git a/src/not-found.md b/src/not-found.md index e69de29b..22f0b640 100644 --- a/src/not-found.md +++ b/src/not-found.md @@ -0,0 +1,3 @@ +# We couldn't find that page + +Return [home](guide.md). \ No newline at end of file diff --git a/src/paths.md b/src/paths.md index 8ae1006c..4e5cfb9f 100644 --- a/src/paths.md +++ b/src/paths.md @@ -1,4 +1,4 @@ -## What's where? +# What's Where? | Item | Location | |-----------|--------------------------------------------------------------------| diff --git a/theme/css/general.css b/theme/css/general.css new file mode 100644 index 00000000..d3959c92 --- /dev/null +++ b/theme/css/general.css @@ -0,0 +1,238 @@ +/* Base styles and content styles */ + +@import 'variables.css'; + +:root { + /* Browser default font-size is 16px, this way 1 rem = 10px */ + font-size: 62.5%; + color-scheme: var(--color-scheme); +} + +html { + font-family: "Open Sans", sans-serif; + color: var(--fg); + background-color: var(--bg); + text-size-adjust: none; + -webkit-text-size-adjust: none; +} + +body { + margin: 0; + font-size: 1.6rem; + overflow-x: hidden; +} + +code { + font-family: var(--mono-font) !important; + font-size: var(--code-font-size); + direction: ltr !important; +} + +/* make long words/inline code not x overflow */ +main { + overflow-wrap: break-word; +} + +/* make wide tables scroll if they overflow */ +.table-wrapper { + overflow-x: auto; +} + +/* Don't change font size in headers. */ +h1 code, h2 code, h3 code, h4 code, h5 code, h6 code { + font-size: unset; +} + +.left { float: left; } +.right { float: right; } +.boring { opacity: 0.6; } +.hide-boring .boring { display: none; } +.hidden { display: none !important; } + +h1 > a { + background-image: linear-gradient(to right, rgb(245 158 11) 0%, rgb(239 68 68) 100%); + -webkit-background-clip: text; + background-clip: text; + color: transparent !important; +} + +.header + .header h3, +.header + .header h4, +.header + .header h5 { + margin-block-start: 1em; +} + +h1:target::before, +h2:target::before, +h3:target::before, +h4:target::before, +h5:target::before, +h6:target::before { + display: inline-block; + content: "»"; + margin-inline-start: -30px; + width: 30px; +} + +/* This is broken on Safari as of version 14, but is fixed + in Safari Technology Preview 117 which I think will be Safari 14.2. + https://bugs.webkit.org/show_bug.cgi?id=218076 +*/ +:target { + /* Safari does not support logical properties */ + scroll-margin-top: calc(var(--menu-bar-height) + 0.5em); +} + +.page { + outline: 0; + padding: 0 var(--page-padding); + margin-block-start: calc(0px - var(--menu-bar-height)); /* Compensate for the #menu-bar-hover-placeholder */ +} +.page-wrapper { + box-sizing: border-box; + background-color: var(--bg); +} +.no-js .page-wrapper, +.js:not(.sidebar-resizing) .page-wrapper { + transition: margin-left 0.3s ease, transform 0.3s ease; /* Animation: slide away */ +} +[dir=rtl] .js:not(.sidebar-resizing) .page-wrapper { + transition: margin-right 0.3s ease, transform 0.3s ease; /* Animation: slide away */ +} + +.content { + overflow-y: auto; + padding: 0 5px 50px 5px; +} +.content main { + margin-inline-start: auto; + margin-inline-end: auto; + max-width: var(--content-max-width); +} +.content p { line-height: 1.45em; } +.content ol { line-height: 1.45em; } +.content ul { line-height: 1.45em; } +.content a { text-decoration: none; } +.content a:hover { text-decoration: underline; } +.content img, .content video { max-width: 100%; } +.content .header:link, +.content .header:visited { + color: var(--fg); +} +.content .header:link, +.content .header:visited:hover { + text-decoration: none; +} + +table { + margin: 0 auto; + border-collapse: collapse; +} +table td { + padding: 3px 20px; + border: 1px var(--table-border-color) solid; +} +table thead { + background: var(--table-header-bg); +} +table thead td { + font-weight: 700; + border: none; +} +table thead th { + padding: 3px 20px; +} +table thead tr { + border: 1px var(--table-header-bg) solid; +} +/* Alternate background colors for rows */ +table tbody tr:nth-child(2n) { + background: var(--table-alternate-bg); +} + + +blockquote { + margin: 20px 0; + padding: 0 20px; + color: var(--fg); + background-color: var(--quote-bg); + border-block-start: .1em solid var(--quote-border); + border-block-end: .1em solid var(--quote-border); +} + +.warning { + margin: 20px; + padding: 0 20px; + border-inline-start: 2px solid var(--warning-border); +} + +.warning:before { + position: absolute; + width: 3rem; + height: 3rem; + margin-inline-start: calc(-1.5rem - 21px); + content: "ⓘ"; + text-align: center; + background-color: var(--bg); + color: var(--warning-border); + font-weight: bold; + font-size: 2rem; +} + +blockquote .warning:before { + background-color: var(--quote-bg); +} + +kbd { + background-color: var(--table-border-color); + border-radius: 4px; + border: solid 1px var(--theme-popup-border); + box-shadow: inset 0 -1px 0 var(--theme-hover); + display: inline-block; + font-size: var(--code-font-size); + font-family: var(--mono-font); + line-height: 10px; + padding: 4px 5px; + vertical-align: middle; +} + +:not(.footnote-definition) + .footnote-definition, +.footnote-definition + :not(.footnote-definition) { + margin-block-start: 2em; +} +.footnote-definition { + font-size: 0.9em; + margin: 0.5em 0; +} +.footnote-definition p { + display: inline; +} + +.tooltiptext { + position: absolute; + visibility: hidden; + color: #fff; + background-color: #333; + transform: translateX(-50%); /* Center by moving tooltip 50% of its width left */ + left: -8px; /* Half of the width of the icon */ + top: -35px; + font-size: 0.8em; + text-align: center; + border-radius: 6px; + padding: 5px 8px; + margin: 5px; + z-index: 1000; +} +.tooltipped .tooltiptext { + visibility: visible; +} + +.chapter li.part-title { + color: var(--sidebar-fg); + margin: 5px 0px; + font-weight: bold; +} + +.result-no-output { + font-style: italic; +} \ No newline at end of file From bc64aecdab197986e4342a0e4ed64446ed1c9205 Mon Sep 17 00:00:00 2001 From: Isaac Marovitz Date: Wed, 3 Apr 2024 10:23:17 -0400 Subject: [PATCH 07/17] Sekiro, DS3 --- src/SUMMARY.md | 2 ++ src/game-support/README.md | 2 ++ src/game-support/dark-souls-3.md | 5 +++++ src/game-support/sekiro.md | 5 +++++ 4 files changed, 14 insertions(+) create mode 100644 src/game-support/dark-souls-3.md create mode 100644 src/game-support/sekiro.md diff --git a/src/SUMMARY.md b/src/SUMMARY.md index db1782e1..5e2450eb 100644 --- a/src/SUMMARY.md +++ b/src/SUMMARY.md @@ -7,6 +7,7 @@ - [Game Support](./game-support/README.md) - [Cities: Skylines II](./game-support/cities-skylines-2.md) - [Counter-Strike 2](./game-support/counter-strike-2.md) + - [Dark Souls III](./game-support/dark-souls-3.md) - [Diablo IV (Battle.net)](./game-support/diablo-4-battle-net.md) - [Diablo IV (Steam)](./game-support/diablo-4-steam.md) - [Elden Ring](./game-support/elden-ring.md) @@ -14,5 +15,6 @@ - [Horizon Zero Dawn](./game-support/horizon-zero-dawn.md) - [Persona 3 Reload](./game-support/p3r.md) - [Palworld](./game-support/palworld.md) + - [Sekiro: Shadows Die Twice](./game-support/sekiro.md) - [Skyrim SE](./game-support/skyrim-se.md) - [Star Wars Jedi: Fallen Order](./game-support/sw-fallen-order.md) \ No newline at end of file diff --git a/src/game-support/README.md b/src/game-support/README.md index 90450a69..71463ce5 100644 --- a/src/game-support/README.md +++ b/src/game-support/README.md @@ -19,6 +19,7 @@ title is partially left to the article author, but some general guidelines apply ### Index - [Cities: Skylines II](./game-support/cities-skylines-2.md) - [Counter-Strike 2](./game-support/counter-strike-2.md) +- [Dark Souls III](./dark-souls-3.md) - [Diablo IV (Battle.net)](./game-support/diablo-4-battle-net.md) - [Diablo IV (Steam)](./game-support/diablo-4-steam.md) - [Elden Ring](./game-support/elden-ring.md) @@ -26,5 +27,6 @@ title is partially left to the article author, but some general guidelines apply - [Horizon Zero Dawn](./game-support/horizon-zero-dawn.md) - [Persona 3 Reload](./p3r.md) - [Palworld](./game-support/palworld.md) +- [Sekiro: Shadows Die Twice](./sekiro.md) - [Skyrim SE](./game-support/skyrim-se.md) - [Star Wars Jedi: Fallen Order](./game-support/sw-fallen-order.md) \ No newline at end of file diff --git a/src/game-support/dark-souls-3.md b/src/game-support/dark-souls-3.md new file mode 100644 index 00000000..101b2d07 --- /dev/null +++ b/src/game-support/dark-souls-3.md @@ -0,0 +1,5 @@ +# Dark Souls III + +{{#template ../templates/rating.md status=Gold date=04/09/23 installs=Yes opens=Yes}} + +{{#template ../templates/steam.md id=374320}} \ No newline at end of file diff --git a/src/game-support/sekiro.md b/src/game-support/sekiro.md new file mode 100644 index 00000000..80b95054 --- /dev/null +++ b/src/game-support/sekiro.md @@ -0,0 +1,5 @@ +# Sekiro: Shadows Die Twice + +{{#template ../templates/rating.md status=Gold date=05/09/23 installs=Yes opens=Yes}} + +{{#template ../templates/steam.md id=814380}} \ No newline at end of file From 55a32a3c391bddd3506e035b10b601727f43db8f Mon Sep 17 00:00:00 2001 From: Isaac Marovitz Date: Wed, 3 Apr 2024 10:28:34 -0400 Subject: [PATCH 08/17] AC6, B2 --- src/SUMMARY.md | 2 ++ src/game-support/README.md | 2 ++ src/game-support/armored-core-6.md | 8 ++++++++ src/game-support/blasphemous-2.md | 5 +++++ 4 files changed, 17 insertions(+) create mode 100644 src/game-support/armored-core-6.md create mode 100644 src/game-support/blasphemous-2.md diff --git a/src/SUMMARY.md b/src/SUMMARY.md index 5e2450eb..a7fa75a9 100644 --- a/src/SUMMARY.md +++ b/src/SUMMARY.md @@ -5,6 +5,8 @@ - [What's Where?](./paths.md) - [Whisky vs. CrossOver](./cx.md) - [Game Support](./game-support/README.md) + - [Armored Core VI: Fires of Rubicon](./game-support/armored-core-6.md) + - [Blasphemous 2](./game-support/blasphemous-2.md) - [Cities: Skylines II](./game-support/cities-skylines-2.md) - [Counter-Strike 2](./game-support/counter-strike-2.md) - [Dark Souls III](./game-support/dark-souls-3.md) diff --git a/src/game-support/README.md b/src/game-support/README.md index 71463ce5..45b75633 100644 --- a/src/game-support/README.md +++ b/src/game-support/README.md @@ -17,6 +17,8 @@ title is partially left to the article author, but some general guidelines apply | Garbage | Game does not work at all. | ### Index +- [Armored Core VI: Fires of Rubicon](./armored-core-6.md) +- [Blasphemous 2](./blasphemous-2.md) - [Cities: Skylines II](./game-support/cities-skylines-2.md) - [Counter-Strike 2](./game-support/counter-strike-2.md) - [Dark Souls III](./dark-souls-3.md) diff --git a/src/game-support/armored-core-6.md b/src/game-support/armored-core-6.md new file mode 100644 index 00000000..6c06e3c3 --- /dev/null +++ b/src/game-support/armored-core-6.md @@ -0,0 +1,8 @@ +# Armored Core VI: Fires of Rubicon + +{{#template ../templates/rating.md status=Gold date=08/09/23 installs=Yes opens=Yes}} + +## Setup +- Disable DXVK + +{{#template ../templates/steam.md id=1888160}} \ No newline at end of file diff --git a/src/game-support/blasphemous-2.md b/src/game-support/blasphemous-2.md new file mode 100644 index 00000000..1c2cc93d --- /dev/null +++ b/src/game-support/blasphemous-2.md @@ -0,0 +1,5 @@ +# Blasphemous 2 + +{{#template ../templates/rating.md status=Gold date=08/09/23 installs=Yes opens=Yes}} + +{{#template ../templates/steam.md id=2114740}} \ No newline at end of file From 3e5aced3f4e37d165741f85f98bb6c5cbca7093a Mon Sep 17 00:00:00 2001 From: Isaac Marovitz Date: Wed, 3 Apr 2024 11:54:44 -0400 Subject: [PATCH 09/17] Dorfromantik, GTA V, MGS V, MHW: I, OW2 --- src/SUMMARY.md | 5 +++++ src/game-support/README.md | 5 +++++ src/game-support/dorfromantik.md | 5 +++++ src/game-support/gta-5.md | 7 +++++++ src/game-support/mgs-5.md | 5 +++++ src/game-support/monster-hunter-world-iceborne.md | 8 ++++++++ src/game-support/overwatch-2.md | 5 +++++ 7 files changed, 40 insertions(+) create mode 100644 src/game-support/dorfromantik.md create mode 100644 src/game-support/gta-5.md create mode 100644 src/game-support/mgs-5.md create mode 100644 src/game-support/monster-hunter-world-iceborne.md create mode 100644 src/game-support/overwatch-2.md diff --git a/src/SUMMARY.md b/src/SUMMARY.md index a7fa75a9..02cec1f5 100644 --- a/src/SUMMARY.md +++ b/src/SUMMARY.md @@ -12,9 +12,14 @@ - [Dark Souls III](./game-support/dark-souls-3.md) - [Diablo IV (Battle.net)](./game-support/diablo-4-battle-net.md) - [Diablo IV (Steam)](./game-support/diablo-4-steam.md) + - [Dorfromantik](./game-support/dorfromantik.md) - [Elden Ring](./game-support/elden-ring.md) - [Elite Dangerous](./game-support/elite-dangerous.md) + - [Grand Theft Auto V](./game-support/gta-5.md) - [Horizon Zero Dawn](./game-support/horizon-zero-dawn.md) + - [Metal Gear Solid V: The Phantom Pain](./game-support/mgs-5.md) + - [Monster Hunter World: Iceborne](./game-support/monster-hunter-world-iceborne.md) + - [Overwatch 2](./game-support/overwatch-2.md) - [Persona 3 Reload](./game-support/p3r.md) - [Palworld](./game-support/palworld.md) - [Sekiro: Shadows Die Twice](./game-support/sekiro.md) diff --git a/src/game-support/README.md b/src/game-support/README.md index 45b75633..240330f1 100644 --- a/src/game-support/README.md +++ b/src/game-support/README.md @@ -24,9 +24,14 @@ title is partially left to the article author, but some general guidelines apply - [Dark Souls III](./dark-souls-3.md) - [Diablo IV (Battle.net)](./game-support/diablo-4-battle-net.md) - [Diablo IV (Steam)](./game-support/diablo-4-steam.md) +- [Dorfromantik](./dorfromantik.md) - [Elden Ring](./game-support/elden-ring.md) - [Elite Dangerous](./game-support/elite-dangerous.md) +- [Grand Theft Auto V](./gta-5.md) - [Horizon Zero Dawn](./game-support/horizon-zero-dawn.md) +- [Metal Gear Solid V: The Phantom Pain](./mgs-5.md) +- [Monster Hunter World: Iceborne](./monster-hunter-world-iceborne.md) +- [Overwatch 2](./overwatch-2.md) - [Persona 3 Reload](./p3r.md) - [Palworld](./game-support/palworld.md) - [Sekiro: Shadows Die Twice](./sekiro.md) diff --git a/src/game-support/dorfromantik.md b/src/game-support/dorfromantik.md new file mode 100644 index 00000000..adc5008d --- /dev/null +++ b/src/game-support/dorfromantik.md @@ -0,0 +1,5 @@ +# Dorfromantik + +{{#template ../templates/rating.md status=Gold date=29/09/23 installs=Yes opens=Yes}} + +{{#template ../templates/steam.md id=1455840}} \ No newline at end of file diff --git a/src/game-support/gta-5.md b/src/game-support/gta-5.md new file mode 100644 index 00000000..1aa275e2 --- /dev/null +++ b/src/game-support/gta-5.md @@ -0,0 +1,7 @@ +# Grand Theft Auto V + +{{#template ../templates/rating.md status=Garbage date=09/10/23 installs=No opens=Yes}} + +Due to an issue with the Rockstar Launcher, Grand Theft Auto V is currently **unplayable** in Whisky. + +{{#template ../templates/steam.md id=271590}} \ No newline at end of file diff --git a/src/game-support/mgs-5.md b/src/game-support/mgs-5.md new file mode 100644 index 00000000..f870ada6 --- /dev/null +++ b/src/game-support/mgs-5.md @@ -0,0 +1,5 @@ +# Metal Gear Solid V: The Phantom Pain + +{{#template ../templates/rating.md status=Gold date=29/09/23 installs=Yes opens=Yes}} + +{{#template ../templates/steam.md id=287700}} \ No newline at end of file diff --git a/src/game-support/monster-hunter-world-iceborne.md b/src/game-support/monster-hunter-world-iceborne.md new file mode 100644 index 00000000..c3cd45e0 --- /dev/null +++ b/src/game-support/monster-hunter-world-iceborne.md @@ -0,0 +1,8 @@ +# Monster Hunter World: Iceborne + +{{#template ../templates/rating.md status=Gold date=12/10/23 installs=Yes opens=Yes}} + +- Do not enable DirectX 12, it will cause the game to crash. +- A black screen may show instead of the Capcom logo. + +{{#template ../templates/steam.md id=1118010}} \ No newline at end of file diff --git a/src/game-support/overwatch-2.md b/src/game-support/overwatch-2.md new file mode 100644 index 00000000..8e242041 --- /dev/null +++ b/src/game-support/overwatch-2.md @@ -0,0 +1,5 @@ +# Overwatch 2 + +{{#template ../templates/rating.md status=Garbage date=12/10/23 installs=Yes opens=No}} + +{{#template ../templates/steam.md id=2357570}} \ No newline at end of file From 6a649b7cf6b8e95170bbfe55d6adab0303d4daab Mon Sep 17 00:00:00 2001 From: Isaac Marovitz Date: Wed, 3 Apr 2024 12:04:03 -0400 Subject: [PATCH 10/17] SW:S, Warframe, CP2077, Control --- src/SUMMARY.md | 6 +++++- src/game-support/README.md | 6 +++++- src/game-support/control.md | 5 +++++ src/game-support/cyberpunk-2077.md | 5 +++++ src/game-support/sw-squadrons.md | 5 +++++ src/game-support/warframe.md | 9 +++++++++ 6 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 src/game-support/control.md create mode 100644 src/game-support/cyberpunk-2077.md create mode 100644 src/game-support/sw-squadrons.md create mode 100644 src/game-support/warframe.md diff --git a/src/SUMMARY.md b/src/SUMMARY.md index 02cec1f5..77244ead 100644 --- a/src/SUMMARY.md +++ b/src/SUMMARY.md @@ -8,7 +8,9 @@ - [Armored Core VI: Fires of Rubicon](./game-support/armored-core-6.md) - [Blasphemous 2](./game-support/blasphemous-2.md) - [Cities: Skylines II](./game-support/cities-skylines-2.md) + - [Control](./game-support/control.md) - [Counter-Strike 2](./game-support/counter-strike-2.md) + - [Cyberpunk 2077](./game-support/cyberpunk-2077.md) - [Dark Souls III](./game-support/dark-souls-3.md) - [Diablo IV (Battle.net)](./game-support/diablo-4-battle-net.md) - [Diablo IV (Steam)](./game-support/diablo-4-steam.md) @@ -24,4 +26,6 @@ - [Palworld](./game-support/palworld.md) - [Sekiro: Shadows Die Twice](./game-support/sekiro.md) - [Skyrim SE](./game-support/skyrim-se.md) - - [Star Wars Jedi: Fallen Order](./game-support/sw-fallen-order.md) \ No newline at end of file + - [Star Wars Jedi: Fallen Order](./game-support/sw-fallen-order.md) + - [Star Wars: Squadron](./game-support/sw-squadrons.md) + - [Warframe](./game-support/warframe.md) \ No newline at end of file diff --git a/src/game-support/README.md b/src/game-support/README.md index 240330f1..9caf0c5a 100644 --- a/src/game-support/README.md +++ b/src/game-support/README.md @@ -20,7 +20,9 @@ title is partially left to the article author, but some general guidelines apply - [Armored Core VI: Fires of Rubicon](./armored-core-6.md) - [Blasphemous 2](./blasphemous-2.md) - [Cities: Skylines II](./game-support/cities-skylines-2.md) +- [Control](./control.md) - [Counter-Strike 2](./game-support/counter-strike-2.md) +- [Cyberpunk 2077](./cyberpunk-2077.md) - [Dark Souls III](./dark-souls-3.md) - [Diablo IV (Battle.net)](./game-support/diablo-4-battle-net.md) - [Diablo IV (Steam)](./game-support/diablo-4-steam.md) @@ -36,4 +38,6 @@ title is partially left to the article author, but some general guidelines apply - [Palworld](./game-support/palworld.md) - [Sekiro: Shadows Die Twice](./sekiro.md) - [Skyrim SE](./game-support/skyrim-se.md) -- [Star Wars Jedi: Fallen Order](./game-support/sw-fallen-order.md) \ No newline at end of file +- [Star Wars Jedi: Fallen Order](./game-support/sw-fallen-order.md) +- [Star Wars: Squadrons](./sw-squadrons.md) +- [Warframe](./warframe.md) \ No newline at end of file diff --git a/src/game-support/control.md b/src/game-support/control.md new file mode 100644 index 00000000..56a007aa --- /dev/null +++ b/src/game-support/control.md @@ -0,0 +1,5 @@ +# Control + +{{#template ../templates/rating.md status=Gold date=05/11/23 installs=Yes opens=Yes}} + +{{#template ../templates/steam.md id=870780}} \ No newline at end of file diff --git a/src/game-support/cyberpunk-2077.md b/src/game-support/cyberpunk-2077.md new file mode 100644 index 00000000..9bcd0413 --- /dev/null +++ b/src/game-support/cyberpunk-2077.md @@ -0,0 +1,5 @@ +# Cyberpunk 2077 + +{{#template ../templates/rating.md status=Gold date=04/11/23 installs=Yes opens=Yes}} + +{{#template ../templates/steam.md id=1091500}} \ No newline at end of file diff --git a/src/game-support/sw-squadrons.md b/src/game-support/sw-squadrons.md new file mode 100644 index 00000000..50ff006f --- /dev/null +++ b/src/game-support/sw-squadrons.md @@ -0,0 +1,5 @@ +# Star Wars: Squadrons + +{{#template ../templates/rating.md status=Gold date=05/11/23 installs=Yes opens=Yes}} + +{{#template ../templates/steam.md id=1222730}} \ No newline at end of file diff --git a/src/game-support/warframe.md b/src/game-support/warframe.md new file mode 100644 index 00000000..1e2b8b9e --- /dev/null +++ b/src/game-support/warframe.md @@ -0,0 +1,9 @@ +# Warframe + +{{#template ../templates/rating.md status=Bronze date=16/11/23 installs=Yes opens=Yes}} + +## Setup +- Go to Bottle Configuration -> Open Wine Configuration -> Libraries +- Add `dwrite` library and set it to disabled + +{{#template ../templates/steam.md id=230410}} \ No newline at end of file From e29aedb6e23ce2b854f28d15f534d08a212aec10 Mon Sep 17 00:00:00 2001 From: TavaresDylan Date: Wed, 3 Apr 2024 17:42:13 +0200 Subject: [PATCH 11/17] chore: cargo install commands correction --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 86d9385a..bec4d625 100644 --- a/README.md +++ b/README.md @@ -3,11 +3,12 @@ Documentation for Whisky. ### How to Contribute + 1. Install [rust](https://www.rust-lang.org/tools/install) 2. Install mdbook and the required preprocessors ``` cargo install mdbook cargo install mdbook-alerts - cargo isntall mdbook-template + cargo install mdbook-template ``` 3. You can preview changes to the book with `mdbook serve --open` From 319e8f53164af95e82d7e6a69cdcf66a068168cd Mon Sep 17 00:00:00 2001 From: TavaresDylan Date: Wed, 3 Apr 2024 17:49:00 +0200 Subject: [PATCH 12/17] chore: kenshi game added --- src/SUMMARY.md | 5 +++-- src/game-support/README.md | 29 +++++++++++++++-------------- src/game-support/kenshi.md | 5 +++++ 3 files changed, 23 insertions(+), 16 deletions(-) create mode 100644 src/game-support/kenshi.md diff --git a/src/SUMMARY.md b/src/SUMMARY.md index 77244ead..d6720bd6 100644 --- a/src/SUMMARY.md +++ b/src/SUMMARY.md @@ -5,7 +5,7 @@ - [What's Where?](./paths.md) - [Whisky vs. CrossOver](./cx.md) - [Game Support](./game-support/README.md) - - [Armored Core VI: Fires of Rubicon](./game-support/armored-core-6.md) + - [Armored Core VI: Fires of Rubicon](./game-support/armored-core-6.md) - [Blasphemous 2](./game-support/blasphemous-2.md) - [Cities: Skylines II](./game-support/cities-skylines-2.md) - [Control](./game-support/control.md) @@ -28,4 +28,5 @@ - [Skyrim SE](./game-support/skyrim-se.md) - [Star Wars Jedi: Fallen Order](./game-support/sw-fallen-order.md) - [Star Wars: Squadron](./game-support/sw-squadrons.md) - - [Warframe](./game-support/warframe.md) \ No newline at end of file + - [Warframe](./game-support/warframe.md) + - [Kenshi](./game-support/kenshi.md) diff --git a/src/game-support/README.md b/src/game-support/README.md index 9caf0c5a..e87605e6 100644 --- a/src/game-support/README.md +++ b/src/game-support/README.md @@ -3,41 +3,42 @@ This is by no means an exhaustive list of games that run in Whisky. Neither is it an exhaustive list of fixes for games that need them. If a game you want to play isn't working and is missing from this list, -be sure to contribute to these docs on GitHub. +be sure to contribute to these docs on GitHub. ### Categories Explained + Game support status is rated on a scale. The placement of a particular title is partially left to the article author, but some general guidelines apply. | Status | Description | -|---------|------------------------------------------------------------------------------------------------| +| ------- | ---------------------------------------------------------------------------------------------- | | Gold | Game works out-of-the-box with no issues and/or requires minimal workarounds. | | Silver | Game requires some workarounds, but they are simple and/or there are minor in-game issues | | Bronze | Game is very difficult to get working and/or has severe in-game issues that limit playability. | | Garbage | Game does not work at all. | ### Index + - [Armored Core VI: Fires of Rubicon](./armored-core-6.md) - [Blasphemous 2](./blasphemous-2.md) -- [Cities: Skylines II](./game-support/cities-skylines-2.md) +- [Cities: Skylines II](./cities-skylines-2.md) - [Control](./control.md) -- [Counter-Strike 2](./game-support/counter-strike-2.md) +- [Counter-Strike 2](./counter-strike-2.md) - [Cyberpunk 2077](./cyberpunk-2077.md) - [Dark Souls III](./dark-souls-3.md) -- [Diablo IV (Battle.net)](./game-support/diablo-4-battle-net.md) -- [Diablo IV (Steam)](./game-support/diablo-4-steam.md) +- [Diablo IV (Battle.net)](./diablo-4-battle-net.md) +- [Diablo IV (Steam)](./diablo-4-steam.md) - [Dorfromantik](./dorfromantik.md) -- [Elden Ring](./game-support/elden-ring.md) -- [Elite Dangerous](./game-support/elite-dangerous.md) +- [Elden Ring](./elden-ring.md) +- [Elite Dangerous](./elite-dangerous.md) - [Grand Theft Auto V](./gta-5.md) -- [Horizon Zero Dawn](./game-support/horizon-zero-dawn.md) +- [Horizon Zero Dawn](./horizon-zero-dawn.md) - [Metal Gear Solid V: The Phantom Pain](./mgs-5.md) - [Monster Hunter World: Iceborne](./monster-hunter-world-iceborne.md) - [Overwatch 2](./overwatch-2.md) - [Persona 3 Reload](./p3r.md) -- [Palworld](./game-support/palworld.md) +- [Palworld](./palworld.md) - [Sekiro: Shadows Die Twice](./sekiro.md) -- [Skyrim SE](./game-support/skyrim-se.md) -- [Star Wars Jedi: Fallen Order](./game-support/sw-fallen-order.md) -- [Star Wars: Squadrons](./sw-squadrons.md) -- [Warframe](./warframe.md) \ No newline at end of file +- [Skyrim SE](./skyrim-se.md) +- [Star Wars Jedi: Fallen Order](./sw-fallen-order.md) +- [Kenshi](./kenshi.md) diff --git a/src/game-support/kenshi.md b/src/game-support/kenshi.md new file mode 100644 index 00000000..a43d61c9 --- /dev/null +++ b/src/game-support/kenshi.md @@ -0,0 +1,5 @@ +# Kenshi + +{{#template ../templates/rating.md status=Gold date=03/04/24 installs=Yes opens=Yes}} + +{{#template ../templates/steam.md id=233860}} From f6ad9ced65ebefdf6d03546a9a3fc8c91fef43c9 Mon Sep 17 00:00:00 2001 From: Isaac Marovitz Date: Wed, 3 Apr 2024 12:15:09 -0400 Subject: [PATCH 13/17] Fix alphabetical order --- src/SUMMARY.md | 2 +- src/game-support/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/SUMMARY.md b/src/SUMMARY.md index d6720bd6..60d9042f 100644 --- a/src/SUMMARY.md +++ b/src/SUMMARY.md @@ -19,6 +19,7 @@ - [Elite Dangerous](./game-support/elite-dangerous.md) - [Grand Theft Auto V](./game-support/gta-5.md) - [Horizon Zero Dawn](./game-support/horizon-zero-dawn.md) + - [Kenshi](./game-support/kenshi.md) - [Metal Gear Solid V: The Phantom Pain](./game-support/mgs-5.md) - [Monster Hunter World: Iceborne](./game-support/monster-hunter-world-iceborne.md) - [Overwatch 2](./game-support/overwatch-2.md) @@ -29,4 +30,3 @@ - [Star Wars Jedi: Fallen Order](./game-support/sw-fallen-order.md) - [Star Wars: Squadron](./game-support/sw-squadrons.md) - [Warframe](./game-support/warframe.md) - - [Kenshi](./game-support/kenshi.md) diff --git a/src/game-support/README.md b/src/game-support/README.md index e87605e6..e57327e9 100644 --- a/src/game-support/README.md +++ b/src/game-support/README.md @@ -33,6 +33,7 @@ title is partially left to the article author, but some general guidelines apply - [Elite Dangerous](./elite-dangerous.md) - [Grand Theft Auto V](./gta-5.md) - [Horizon Zero Dawn](./horizon-zero-dawn.md) +- [Kenshi](./kenshi.md) - [Metal Gear Solid V: The Phantom Pain](./mgs-5.md) - [Monster Hunter World: Iceborne](./monster-hunter-world-iceborne.md) - [Overwatch 2](./overwatch-2.md) @@ -41,4 +42,3 @@ title is partially left to the article author, but some general guidelines apply - [Sekiro: Shadows Die Twice](./sekiro.md) - [Skyrim SE](./skyrim-se.md) - [Star Wars Jedi: Fallen Order](./sw-fallen-order.md) -- [Kenshi](./kenshi.md) From e352d426ef455e1a96100a6ee995c1109e7c03f9 Mon Sep 17 00:00:00 2001 From: Isaac Marovitz Date: Wed, 3 Apr 2024 12:32:19 -0400 Subject: [PATCH 14/17] Uninstalling Whisky --- src/paths.md | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/src/paths.md b/src/paths.md index 4e5cfb9f..3689a852 100644 --- a/src/paths.md +++ b/src/paths.md @@ -1,8 +1,25 @@ # What's Where? +Whisky installs files to the following locations: + | Item | Location | |-----------|--------------------------------------------------------------------| | GPTK | `~/Library/Application Support/com.isaacmarovitz.Whisky/Libraries` | | Bottles | `~/Library/Containers/com.isaacmarovitz.Whisky/Bottles` | | Logs | `~/Library/Logs/com.isaacmarovitz.Whisky` | -| WhiskyCMD | `/usr/local/bin/whisky` | \ No newline at end of file +| WhiskyCMD | `/usr/local/bin/whisky` | + +# Uninstalling Whisky + +If you're looking to do a complete uninstall, remove the following files and folders: +- `~/Library/Application Support/com.isaacmarovitz.Whisky` +- `~/Library/Containers/com.isaacmarovitz.Whisky` +- `~/Library/Logs/com.isaacmarovitz.Whisky` +- `/usr/local/bin/whisky` (if it exists) +- `/Applications/Whisky.app` (or wherever you have it installed) + +> [!NOTE] +> This will not delete any bottles that have been created outside the default folder. +> Make sure you delete those in app by `Right Clicking > Remove...` and selecting `Delete files from disk`. +> If you forget to do this before deleting Whisky, or some of your bottles have become orphaned, +> you can remove them manually in Finder. \ No newline at end of file From c3efedb8965de245fab92a7b9ccb12f269a9615e Mon Sep 17 00:00:00 2001 From: Isaac Marovitz Date: Wed, 3 Apr 2024 12:51:39 -0400 Subject: [PATCH 15/17] Start WhiskyCmd docs --- src/SUMMARY.md | 1 + src/paths.md | 2 +- src/whiskycmd.md | 85 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 87 insertions(+), 1 deletion(-) create mode 100644 src/whiskycmd.md diff --git a/src/SUMMARY.md b/src/SUMMARY.md index 60d9042f..961f7b0f 100644 --- a/src/SUMMARY.md +++ b/src/SUMMARY.md @@ -3,6 +3,7 @@ - [Guide](./guide.md) - [Common Issues](./common-issues.md) - [What's Where?](./paths.md) +- [WhiskyCmd](./whiskycmd.md) - [Whisky vs. CrossOver](./cx.md) - [Game Support](./game-support/README.md) - [Armored Core VI: Fires of Rubicon](./game-support/armored-core-6.md) diff --git a/src/paths.md b/src/paths.md index 3689a852..9c692bee 100644 --- a/src/paths.md +++ b/src/paths.md @@ -7,7 +7,7 @@ Whisky installs files to the following locations: | GPTK | `~/Library/Application Support/com.isaacmarovitz.Whisky/Libraries` | | Bottles | `~/Library/Containers/com.isaacmarovitz.Whisky/Bottles` | | Logs | `~/Library/Logs/com.isaacmarovitz.Whisky` | -| WhiskyCMD | `/usr/local/bin/whisky` | +| WhiskyCmd | `/usr/local/bin/whisky` | # Uninstalling Whisky diff --git a/src/whiskycmd.md b/src/whiskycmd.md new file mode 100644 index 00000000..b5e10e25 --- /dev/null +++ b/src/whiskycmd.md @@ -0,0 +1,85 @@ +# WhiskyCmd + +WhiskyCmd is an optional CLI tool that allows you to list, create, and delete bottles, +as well as run programs directly from the command line. +This can be helpful if you're trying to automate certain tasks in Whisky, +or want to use Whisky bottles from another app. + +## Installation + +WhiskyCmd can be installed through the app by clicking `Whisky > Install Whisky CLI...`. +This will create a symlink between `/Applications/Whisky.app/Contents/Resources/WhiskyCmd` and `/usr/local/bin/whisky`. +When you update the main Whisky app, the CLI tool will automatically link to the updated binary. + +## Running Commands + +After installing WhiskyCmd, it will be available on PATH. In a new terminal session, +verify that the installation is working by typing `whisky`, you should see the following or similar output: + +```shell +$ whisky + +OVERVIEW: A CLI interface for Whisky. + +USAGE: whisky + +OPTIONS: + -h, --help Show help information. + +SUBCOMMANDS: + list List existing bottles. + create Create a new bottle. + add Add an existing bottle. + delete Delete an existing bottle from disk. + remove Remove an existing bottle from Whisky. + run Run a program with Whisky. + + See 'whisky help ' for detailed help. +``` + +## List + +List takes no arguments, and returns an ASCII table of all bottles registered to `BottleVM.plist`, +located at `~/Library/Containers/com.isaacmarovitz.Whisky/BottleVM.plist`. + +**Example Output:** + +```shell +$ whisky list + ++-------+-----------------+--------------------------------------------------------------------------+ +| Name | Windows Version | Path | ++-------+-----------------+--------------------------------------------------------------------------+ +| Steam | Windows 10 | ~/Library/Containers/Whisky/Bottles/72DC05EA-4D0C-47E5-8A16-9A5DAE62A118 | ++-------+-----------------+--------------------------------------------------------------------------+ +``` + +## Create + +Create takes a name for a new bottle to be made at your default bottle creation directory, +as specified in the UI. It is currently not possible to specify a desired Windows version, +it will always default to Windows 10. + +> [!CAUTION] +> This command currently does not actually initialise the bottle with Wine. +> This will be resolved in a future version of WhiskyCmd. + +```shell +$ whisky create Example + +Created new bottle "Example". +``` + +## Add + +Takes a path to an existing `Metadata.plist` and adds it to your `BottleVM.plist`. + +> [!CAUTION] +> This path is not sanitised as a valid Whisky bottle. +> Specifying the wrong path may have unintended consequences. + +```shell +$ whisky add ~/Library/Containers/Whisky/Bottles/Example/Metadata.plist + +Bottle "Example" added. +``` \ No newline at end of file From 589ffc539a9a9f4396967caa775aa7d2d8b0633a Mon Sep 17 00:00:00 2001 From: Isaac Marovitz Date: Wed, 3 Apr 2024 12:55:24 -0400 Subject: [PATCH 16/17] Update Common Issues --- src/common-issues.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/common-issues.md b/src/common-issues.md index 19b911fd..6df44d80 100644 --- a/src/common-issues.md +++ b/src/common-issues.md @@ -3,9 +3,9 @@ Several things can lead to a program not working. The most common reasons are listed below. -|Problem|Solution| -|-------|---------| -|My game crashes due to "invalid instruction".|Your game is likely using [AVX](https://en.wikipedia.org/wiki/Advanced_Vector_Extensions) instructions. These are more common in console ports. AVX instructions are x86 specific, and Rosetta doesn't translate them. Unless you can find a way to disable or bypass them (check online), then your game won't work.| -|I want to play a competitive multiplayer game, but it won't load.|Competitive multiplayer games, especially battle royales and other FPS games (like PUBG, Fortnite, Apex Legends, Valorant), often have some form of driver-level anti-cheat. These won't work under Wine.| -|My DirectX 9 game has graphical issues, or doesn't work at all.|DirectX 9 games are handled through Wine's own `wined3d`. Whisky focuses on modern titles using DX11 or 12, and you may run into issues with DX9 games. CrossOver is a better choice in this scenario, as it runs on Wine 8 instead of Wine 7, and has a more up-to-date version of `wined3d`. If you're not sure what Graphics API your game is using, you can check on the [PCGamingWiki](https://www.pcgamingwiki.com/wiki/Home).| -|My game crashes out of the box, or complains about missing dependencies.|Make sure to check Wine's [AppDB](https://appdb.winehq.org/) and [ProtonDB](https://www.protondb.com/), which can often provide information on the necessary workarounds or Winetricks you need to use to get your game running. If you can't find anything or you are unable to make it work, make an issue.| \ No newline at end of file +| Problem | Solution | +|--------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| My game crashes due to "invalid instruction". | Your game is likely using [AVX](https://en.wikipedia.org/wiki/Advanced_Vector_Extensions) instructions. These are more common in console ports. AVX instructions are x86 specific, and Rosetta doesn't translate them. Unless you can find a way to disable or bypass them (check online), then your game won't work. | +| I want to play a competitive multiplayer game, but it won't load. | Competitive multiplayer games, especially battle royales and other FPS games (like PUBG, Fortnite, Apex Legends, Valorant), often have some form of driver-level anti-cheat. These won't work under Wine. | +| My DirectX 9 game has graphical issues, or doesn't work at all. | DirectX 9 games are handled through Wine's own `wined3d`. Whisky focuses on modern titles using DX11 or 12, and you may run into issues with DX9 games. CrossOver is a better choice in this scenario, as it runs on Wine 9 instead of Wine 7, and has a more up-to-date version of `wined3d`. If you're not sure what Graphics API your game is using, you can check on the [PCGamingWiki](https://www.pcgamingwiki.com/wiki/Home). | +| My game crashes out of the box, or complains about missing dependencies. | Make sure to check Wine's [AppDB](https://appdb.winehq.org/) and [ProtonDB](https://www.protondb.com/), which can often provide information on the necessary workarounds or Winetricks you need to use to get your game running. If you can't find anything or you are unable to make it work, make an issue. | \ No newline at end of file From dfa5b1bc87a611a0ea786920c4c77ae35621c135 Mon Sep 17 00:00:00 2001 From: Isaac Marovitz Date: Wed, 3 Apr 2024 12:59:28 -0400 Subject: [PATCH 17/17] Guide improvements --- src/guide.md | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/src/guide.md b/src/guide.md index 0fe90c19..f95280b9 100644 --- a/src/guide.md +++ b/src/guide.md @@ -2,8 +2,7 @@ Glad you're here. Here's how to get up and running in a breeze. -1. Download Whisky - - Download the latest release [here](https://github.com/IsaacMarovitz/Whisky/releases) +1. [Download Whisky](https://github.com/IsaacMarovitz/Whisky/releases) 2. Move Whisky to your Applications folder 3. Open Whisky 4. Follow on-screen instructions @@ -12,7 +11,9 @@ Glad you're here. Here's how to get up and running in a breeze. ## Making your first bottle -Bottles are the bread and butter of Wine. Bottles are like little Windows filesystems, and they appear on your computer as a normal folder. In a bottle, you'll find programs, registry files, and everything else you need to install and configure your Windows 'machine'. Each bottle is self-contained and will only have the programs you installed in that bottle. +Bottles are the bread and butter of Wine. Bottles are like little Windows filesystems, and they appear on your computer as a normal folder. +In a bottle, you'll find programs, registry files, and everything else you need to install and configure your Windows 'machine'. +Each bottle is self-contained and will only have the programs you installed in that bottle. 1. Press the plus button in the top right-hand corner 2. Give your bottle a name, and select the Windows version you want @@ -22,7 +23,8 @@ Bottles are the bread and butter of Wine. Bottles are like little Windows filesy Programs are installed much like you would on a regular Windows machine. -1. Download the program you want to run. It should be the *Windows* version (`.exe` or `.msi`); 64-bit programs are preferable +1. Download the program you want to run. It should be the *Windows* version (`.exe` or `.msi`); + > 64-bit programs are preferable. 2. Click on the bottle you want to install your program into 3. Press the `Run...` button in the bottom right 4. Navigate to where you downloaded your `.exe` or `.msi` file in Finder @@ -32,8 +34,16 @@ Whisky will then open and run the program. It may take a few seconds for the win ## Configuring your bottle -In the `Config` menu of your bottle, you can adjust a number of parameters, including the Windows version and build the number of your bottle, enable and disable the Metal HUD, configure ESync, and open Wine's many configuration tools like the Control Panel, Registry Editor, and Wine Configuration dialogues. +In the `Config` menu of your bottle, you can adjust a number of parameters, +including the Windows version and build the number of your bottle, enable and disable the Metal HUD, +configure ESync, and open Wine's many configuration tools like the Control Panel, Registry Editor, and Wine Configuration dialogues. ## When should I make a new bottle? -The usual convention is to limit a bottle to one game, as dependencies and such can get messy with more installed in one place. If a game requires more extensive configuration to get working, it's usually a good idea to keep it contained. Overal, trust your judgment and separate where it feels right. \ No newline at end of file +The usual convention is to limit a bottle to one game, as dependencies and such can get messy with more installed in one place. +If a game requires more extensive configuration to get working, it's usually a good idea to keep it contained. +Overall, trust your judgment and separate where it feels right. + +For Steam games, you can create one shared Windows game library that you use between all of your bottles. +This helps keep your game installations detached from your bottle instances, +so you won't have to re-download everything if your bottle mucks up. \ No newline at end of file