Merge pull request #738 from Kyusung4698/develop

1.0.2 (2020-06-16)
Kyusung4698 · Jun 16, 2020 · 5461d45 · 5461d45
2 parents da948b2 + 439b6b9
commit 5461d45
Show file tree

Hide file tree

Showing 151 changed files with 5,980 additions and 792 deletions.
diff --git a/.gitignore b/.gitignore
@@ -31,6 +31,9 @@ speed-measure-plugin*.json
 !.vscode/extensions.json
 .history/*
 
+# release
+/release
+
 # misc
 /.sass-cache
 /connect.lock

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Changelog
 
+## 1.0.2 (2020-06-16)
+
+- added misc module
+  - stash highlight on `alt+f`
+- added trade module
+  - support for poe.app, poemap.live, poe.trade, official trade
+  - view incoming/ outgoing trades
+  - invite/ trade player
+  - highlight items in stash
+- added open poeprices.info url on source click
+- fixed a first time launching error occuring if the GGG API could not be reached
+
 ## 1.0.0 (2020-06-10)
 
 - added added a interactive introduction

diff --git a/FEATURES.md b/FEATURES.md
@@ -6,6 +6,12 @@ Quickly evaluate your items. Properties can be added and removed from the query
 
 ![Downloaded](img/feature_evaluate.jpg)
 
+### Trade
+
+Manage incoming and outgoing trade requests by sending messages, inviting players and initiating trades via simple clicks.
+
+![Downloaded](img/feature_trade.jpg)
+
 ### Market
 
 Filter the listings to find your perfect item on the market and finally request the item with a single click.

diff --git a/angular.json b/angular.json
@@ -24,7 +24,8 @@
             "tsConfig": "tsconfig.app.json",
             "aot": true,
             "assets": [
-              "src/assets/images"
+              "src/assets/images",
+              "src/assets/audio"
             ],
             "styles": [
               "src/styles.scss",

diff --git a/img/feature_trade.jpg b/img/feature_trade.jpg
diff --git a/manifest.json b/manifest.json
@@ -4,7 +4,7 @@
     "meta": {
         "name": "PoE Overlay",
         "author": "Kyusung4698",
-        "version": "1.0.1",
+        "version": "1.0.2",
         "minimum-overwolf-version": "0.147.0",
         "description": "Search the market and send trade offers. Get current market values for your item. View insights for maps and items.",
         "dock_button_title": "PoE Overlay",
@@ -19,7 +19,8 @@
         "GameInfo",
         "GameControl",
         "Clipboard",
-        "VideoCaptureSettings"
+        "VideoCaptureSettings",
+        "FileSystem"
     ],
     "data": {
         "start_window": "background",
@@ -104,7 +105,7 @@
                 "block_top_window_navigation": true,
                 "disable_restore_animation": true,
                 "disable_rightclick": true,
-                "transparent": true,                
+                "transparent": true,
                 "size": {
                     "width": 1212,
                     "height": 699
@@ -125,13 +126,39 @@
                     "height": 327
                 }
             },
-            "annotation": {                
+            "annotation": {
+                "file": "dist/poe-overlay-overwolf/index.html",
+                "in_game_only": true,
+                "block_top_window_navigation": true,
+                "disable_restore_animation": true,
+                "disable_rightclick": true,
+                "transparent": true,
+                "size": {
+                    "width": 1212,
+                    "height": 699
+                }
+            },
+            "trade": {
                 "file": "dist/poe-overlay-overwolf/index.html",
                 "in_game_only": true,
                 "block_top_window_navigation": true,
                 "disable_restore_animation": true,
                 "disable_rightclick": true,
                 "transparent": true,
+                "resizable": true,
+                "size": {
+                    "width": 1212,
+                    "height": 699
+                }
+            },
+            "tradehighlight": {
+                "file": "dist/poe-overlay-overwolf/index.html",
+                "in_game_only": true,
+                "block_top_window_navigation": true,
+                "disable_restore_animation": true,
+                "disable_rightclick": true,
+                "transparent": true,
+                "resizable": true,
                 "size": {
                     "width": 1212,
                     "height": 699
@@ -236,6 +263,11 @@
             "bookmark6": {
                 "title": "Open Bookmark 6",
                 "action-type": "custom"
+            },
+            "misc-stash-highlight": {
+                "title": "Highlight Item in Stash",
+                "action-type": "custom",
+                "default": "Alt+F"
             }
         },
         "externally_connectable": {