Resolve "Merge the best from 7.40 branch"

2025-10-13 22:34:53 +02:00 · 2022-04-06 14:58:52 +00:00
parent 3bd1a6f07e
commit 155da3573c
928 changed files with 43723 additions and 1221 deletions
--- a/SabrehavenOTClient/modules/game_playerdeath/deathwindow.otui
+++ b/SabrehavenOTClient/modules/game_playerdeath/deathwindow.otui
@@ -0,0 +1,30 @@
+DeathWindow < MainWindow
+  id: deathWindow
+  !text: tr('You are dead')
+  &baseWidth: 350
+  &baseHeight: 15
+
+  Label
+    id: labelText
+    width: 550
+    height: 140
+    anchors.left: parent.left
+    anchors.top: parent.top
+    margin-left: 10
+    margin-top: 2
+
+  Button
+    id: buttonOk
+    !text: tr('Ok')
+    width: 64
+    anchors.left: parent.left
+    anchors.bottom: parent.bottom
+    margin-left: 160
+
+  Button
+    id: buttonCancel
+    !text: tr('Cancel')
+    width: 64
+    anchors.left: prev.right
+    anchors.bottom: parent.bottom
+    margin-left: 5