diff --git a/binaries/data/config/default.cfg b/binaries/data/config/default.cfg
index 78681f4b11..1f8c1f8dad 100644
--- a/binaries/data/config/default.cfg
+++ b/binaries/data/config/default.cfg
@@ -527,6 +527,11 @@ icons.sizescale = 1.0
entityradiusscale = 1.0
blinkduration = 1.7 ; The blink duration while pinging
pingduration = 50.0 ; The duration for which an entity will be pinged after an attack notification
+position = panel-left ; Set minimap position (panel-left, screen-left)
+size = 1 ; Size of the minimap. 1 (small) to 5 (huge). Each value is 15% bigger
+shape = square ; Shape of the minimap
+expand.toggle = "Alt+C" ; Expand minimap
+
[gui.session.notifications]
attack = true ; Show a chat notification if you are attacked by another player
diff --git a/binaries/data/mods/public/art/textures/ui/session/minimap-round-diplomacy-off-highlight.png b/binaries/data/mods/public/art/textures/ui/session/minimap-round-diplomacy-off-highlight.png
new file mode 100644
index 0000000000..18e6079f1c
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/session/minimap-round-diplomacy-off-highlight.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5460d4fe38fc4f4d0ab8532cfb63e4b53c574c2e14e08d572f101a843c72a398
+size 6709
diff --git a/binaries/data/mods/public/art/textures/ui/session/minimap-round-diplomacy-off.png b/binaries/data/mods/public/art/textures/ui/session/minimap-round-diplomacy-off.png
new file mode 100644
index 0000000000..b25a9517b2
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/session/minimap-round-diplomacy-off.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:90d1cba3ebcf5683baf022d1a21be361840c5a7c7203d622583770ae16fe1914
+size 6270
diff --git a/binaries/data/mods/public/art/textures/ui/session/minimap-round-diplomacy-on-highlight.png b/binaries/data/mods/public/art/textures/ui/session/minimap-round-diplomacy-on-highlight.png
new file mode 100644
index 0000000000..dc4d383e78
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/session/minimap-round-diplomacy-on-highlight.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7f58a4a6e3a45eaa8ad7056640a22ab46fd2a820cc55f59435910a7048e38f0c
+size 6677
diff --git a/binaries/data/mods/public/art/textures/ui/session/minimap-round-diplomacy-on.png b/binaries/data/mods/public/art/textures/ui/session/minimap-round-diplomacy-on.png
new file mode 100644
index 0000000000..ac302c383e
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/session/minimap-round-diplomacy-on.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2ef0fc7b741ae84795a64b95bdc85e2d2cda4f3a3cd2ef9e3c0341fa1aa3f964
+size 6298
diff --git a/binaries/data/mods/public/art/textures/ui/session/minimap-round-flare-disabled.png b/binaries/data/mods/public/art/textures/ui/session/minimap-round-flare-disabled.png
new file mode 100644
index 0000000000..5298dd9c22
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/session/minimap-round-flare-disabled.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8e5aa1c6e722029cb1115e3d7b35dd5e51af56c20d2470f3b7a2c9d8c42a2d85
+size 4364
diff --git a/binaries/data/mods/public/art/textures/ui/session/minimap-round-flare-highlight.png b/binaries/data/mods/public/art/textures/ui/session/minimap-round-flare-highlight.png
new file mode 100644
index 0000000000..6d1c9e50e8
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/session/minimap-round-flare-highlight.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b3aaf6a3a4a3debe1a41e9a1b829161a0f0011a42efc2454046d8928c687a1cb
+size 6038
diff --git a/binaries/data/mods/public/art/textures/ui/session/minimap-round-flare.png b/binaries/data/mods/public/art/textures/ui/session/minimap-round-flare.png
new file mode 100644
index 0000000000..c673701f84
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/session/minimap-round-flare.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:08f6bb87c4da438a0d9f0ee3940c95a042e8171adfdaa57fdadcb05dd617a023
+size 5563
diff --git a/binaries/data/mods/public/art/textures/ui/session/minimap-round-idle-disabled.png b/binaries/data/mods/public/art/textures/ui/session/minimap-round-idle-disabled.png
new file mode 100644
index 0000000000..5019a53f5b
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/session/minimap-round-idle-disabled.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:682c4075d5bf1fafa96b0a22a5ec56781fbdbc0e6ed8231ed1ab6d110cc08c3d
+size 4252
diff --git a/binaries/data/mods/public/art/textures/ui/session/minimap-round-idle-highlight.png b/binaries/data/mods/public/art/textures/ui/session/minimap-round-idle-highlight.png
new file mode 100644
index 0000000000..d4fae7ad3f
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/session/minimap-round-idle-highlight.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8b8a44793a609b25c9d2f8e295d58e7cda7662fcb402e196bc3f64ff130b4fa8
+size 6305
diff --git a/binaries/data/mods/public/art/textures/ui/session/minimap-round-idle.png b/binaries/data/mods/public/art/textures/ui/session/minimap-round-idle.png
new file mode 100644
index 0000000000..d0a35d9378
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/session/minimap-round-idle.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:679fbf447256c7046b29bffe6c5ea140b9bcaa0e43369fe393a6dcc12151697b
+size 6144
diff --git a/binaries/data/mods/public/art/textures/ui/session/minimap-round-observer-flare-highlight.png b/binaries/data/mods/public/art/textures/ui/session/minimap-round-observer-flare-highlight.png
new file mode 100644
index 0000000000..f172ad2fc4
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/session/minimap-round-observer-flare-highlight.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:436878aaa7be80c0846a133337af7a0c86371edaf3d4acd5397a8fa20ff0853e
+size 18266
diff --git a/binaries/data/mods/public/art/textures/ui/session/minimap-round-observer-flare.png b/binaries/data/mods/public/art/textures/ui/session/minimap-round-observer-flare.png
new file mode 100644
index 0000000000..752046a22f
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/session/minimap-round-observer-flare.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b9b2bbdec7c2586c7ac2fc86769f305e43656dacd76985253ad2326496180eeb
+size 16981
diff --git a/binaries/data/mods/public/art/textures/ui/session/minimap_expanded_circle.png b/binaries/data/mods/public/art/textures/ui/session/minimap_expanded_circle.png
new file mode 100644
index 0000000000..0dce77c95c
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/session/minimap_expanded_circle.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:582b6b10793ae3bcf286d1db8ee46192d79cb475c0847916994921f8ecbc200a
+size 51092
diff --git a/binaries/data/mods/public/gui/hotkeys/spec/ingame.json b/binaries/data/mods/public/gui/hotkeys/spec/ingame.json
index faf01cc182..0172488edf 100644
--- a/binaries/data/mods/public/gui/hotkeys/spec/ingame.json
+++ b/binaries/data/mods/public/gui/hotkeys/spec/ingame.json
@@ -179,6 +179,10 @@
"name": "Flare (toggle)",
"desc": "Set the cursor to Flare. The hotkey can be released."
},
+ "session.minimap.expand.toggle": {
+ "name": "Expand minimap",
+ "desc": "Toggle minimap expand."
+ },
"session.calltoarms": {
"name": "Call to arms",
"desc": "Send the selected units on attack move to the specified location after dropping resources."
diff --git a/binaries/data/mods/public/gui/options/options.json b/binaries/data/mods/public/gui/options/options.json
index af21c39ba8..4189c3207c 100644
--- a/binaries/data/mods/public/gui/options/options.json
+++ b/binaries/data/mods/public/gui/options/options.json
@@ -729,6 +729,50 @@
"tooltip": "Show special icons for some entities on the minimap.",
"config": "gui.session.minimap.icons.enabled"
},
+ {
+ "type": "dropdown",
+ "label": "Minimap position",
+ "tooltip": "Choose where the minimap is displayed.",
+ "config": "gui.session.minimap.position",
+ "list": [
+ {
+ "value": "panel-left",
+ "label": "Panel Left",
+ "tooltip": "Display the minimap attached to the bottom panel."
+ },
+ {
+ "value": "screen-left",
+ "label": "Screen Left",
+ "tooltip": "Display the minimap in the bottom-left corner of the screen."
+ }
+ ]
+ },
+ {
+ "type": "dropdown",
+ "label": "Minimap layout",
+ "tooltip": "Choose between square and round layout",
+ "config": "gui.session.minimap.shape",
+ "list": [
+ {
+ "value": "square",
+ "label": "Square",
+ "tooltip": "Original 0.A.D minimap"
+ },
+ {
+ "value": "round",
+ "label": "Round",
+ "tooltip": "Round version"
+ }
+ ]
+ },
+ {
+ "type": "slider",
+ "label": "Minimap size",
+ "tooltip": "Choose the size of the minimap.",
+ "config": "gui.session.minimap.size",
+ "min": 1,
+ "max": 2
+ },
{
"type": "boolean",
"label": "Rank icon above status bar",
diff --git a/binaries/data/mods/public/gui/session/minimap/MiniMap.xml b/binaries/data/mods/public/gui/session/minimap/MiniMap.xml
index 90ff11751d..63f0780fa0 100644
--- a/binaries/data/mods/public/gui/session/minimap/MiniMap.xml
+++ b/binaries/data/mods/public/gui/session/minimap/MiniMap.xml
@@ -21,6 +21,16 @@
ghost="true"
/>
+
+
+