Skip to content

Commit

Permalink
Merge pull request #207 from Kyusung4698/develop
Browse files Browse the repository at this point in the history 
Develop
  • Loading branch information
@Kyusung4698
Kyusung4698 authored Feb 10, 2020
2 parents 26b1288 + 47f1c21 commit 3b60504
Show file tree
Hide file tree
Showing 74 changed files with 14,608 additions and 13,768 deletions.
11 changes: 11 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
## 0.5.15 (2020-02-10)

* add version toggle (#205)
* add result view select (Graph, List) (#204)
* add poe db (ALT + G) (#199)
* add poe ninja by clicking the exchange rate (#206)
* update angular to 9.0.0
* update electron to 8.0.0
* fix local mod used as pseudo (#201)
* fix xml tags in copied item info

## 0.5.14 (2020-02-08)

* add account listing count threshold (#196)
Expand Down
10 changes: 6 additions & 4 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# PoE Overlay 0.5.14
# PoE Overlay 0.5.15

An Overlay for Path of Exile. The ***core aspect*** is to blend in with the game. Built with Electron and Angular.

Expand Down Expand Up @@ -79,9 +79,9 @@ These instructions will set you up to run and enjoy the overlay.

1. Head over to [Releases](https://github.com/Kyusung4698/PoE-Overlay/releases) and download the latest zip
2. Extract zip
3. Run `poe-overlay 0.5.14.exe`
3. Run `poe-overlay 0.5.15.exe`
4. Start Path of Exile
5. Wait until you can see `POE Overlay 0.5.14` in the bottom left corner
5. Wait until you can see `POE Overlay 0.5.15` in the bottom left corner
6. Hit `f7` and set `Language` and `League` to meet your game settings

#### Shortcuts
Expand All @@ -94,6 +94,8 @@ You can change these shortcuts in the user settings menu.
| `ctrl+t` | As above - displays the item translated
| `alt+w` | Opens item in wiki
| `ctrl+alt+w` | As above - but in external browser
| `alt+g` | Opens item in poedb
| `ctrl+alt+g` | As above - but in external browser
| `alt+q` | Shows map info (layout, bosses)
| `ctrl+f` | Highlights item in stash
| `ctrl+wheel` | Navigates through stash tabs
Expand Down Expand Up @@ -124,7 +126,7 @@ npm install --global --production windows-build-tools
1. Clone the repository.
2. Open up the folder with your editor.
3. Run ```npm install``` to install all required npm packages.
4. Run ```npm run robotjs:rebuild``` to generate a executable [robotjs](https://github.com/octalmage/robotjs) version.
4. Run ```npm run electron:rebuild``` to generate a executable [robotjs](https://github.com/octalmage/robotjs) version.

That's it. Your Project should now be ready to run:
```
Expand Down
7 changes: 3 additions & 4 deletions angular.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
"main": "src/main.ts",
"polyfills": "src/polyfills.ts",
"tsConfig": "tsconfig.app.json",
"aot": false,
"aot": true,
"assets": [
"src/favicon.ico",
"src/assets"
"src/assets/i18n"
],
"styles": [
"src/styles.scss",
Expand All @@ -46,7 +46,6 @@
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true,
Expand Down Expand Up @@ -91,7 +90,7 @@
"karmaConfig": "karma.conf.js",
"assets": [
"src/favicon.ico",
"src/assets"
"src/assets/i18n"
],
"styles": [
"src/styles.scss",
Expand Down
49 changes: 49 additions & 0 deletions doc/poe/game_ctlr_c_item.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -983,3 +983,52 @@ Can be combined with other Oils at Cassia to Enchant Rings or Amulets, or to mod
Shift click to unstack.
--------
Note: ~price 1 jew

Rarity: Unique
Sallazzang's Brain
--------
Uses: Iguana Blades
--------
Item Level: 76
--------
Drops a Map Item
Drops a Rare Weapon
Drops additional Rare Jewellery
Drops additional Perandus Coins
Drops additional Rare Armour
--------
Combine this with four other different samples in Tane's Laboratory.
--------
Note: ~price 1 alt

Rarity: Unique
<<set:MS>><<set:M>><<set:S>>The Saviour
Legion Sword
--------
One Handed Sword
Quality: +20% (augmented)
Physical Damage: 124-232 (augmented)
Critical Strike Chance: 5.40% (augmented)
Attacks per Second: 1.35 (augmented)
Weapon Range: 11
--------
Requirements:
Level: 62
Str: 122
Dex: 104
--------
Sockets: R-R-G
Item Level: 86
--------
40% increased Global Accuracy Rating (implicit)
--------
Triggers Level 20 Reflection when Equipped
48% increased Physical Damage
Adds 21 to 40 Physical Damage
12% increased Attack Speed
8% increased Critical Strike Chance
--------
On the mirrored edge of infinity,
one man sinks forever into darkness,
one man rises into light.
But which one am I?
10 changes: 9 additions & 1 deletion electron-builder.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,15 @@
},
"files": [
"main.js",
"dist/**/*"
"dist/**/*",
"!node_modules/@angular/**/*",
"!node_modules/@swimlane/**/*",
"!node_modules/rxjs/**/*",
"!node_modules/moment/**/*",
"!node_modules/zone.js/**/*",
"!node_modules/localforage/**/*",
"!node_modules/@ngx-translate/**/*",
"!node_modules/d3-*/**/*"
],
"win": {
"icon": "dist/favicon.ico",
Expand Down
2 changes: 2 additions & 0 deletions main.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ if (!app.requestSingleInstanceLock()) {
app.quit();
}

app.allowRendererProcessReuse = true;

const args = process.argv.slice(1),
serve = args.some(val => val === '--serve');

Expand Down
207 changes: 206 additions & 1 deletion overlay.babel
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<babeledit_project version="1.2" be_version="2.6.1">
<babeledit_project be_version="2.6.1" version="1.2">
<!--

BabelEdit project file
Expand Down Expand Up @@ -520,6 +520,47 @@
</translation>
</translations>
</concept_node>
<concept_node>
<name>result-view</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>de-DE</language>
<approved>false</approved>
</translation>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-ES</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-FR</language>
<approved>false</approved>
</translation>
<translation>
<language>ko-KR</language>
<approved>false</approved>
</translation>
<translation>
<language>pt-BR</language>
<approved>false</approved>
</translation>
<translation>
<language>ru-RU</language>
<approved>false</approved>
</translation>
<translation>
<language>th-TH</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<folder_node>
<name>search</name>
<children>
Expand Down Expand Up @@ -3230,6 +3271,88 @@
</translation>
</translations>
</concept_node>
<concept_node>
<name>open-poedb</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>de-DE</language>
<approved>false</approved>
</translation>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-ES</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-FR</language>
<approved>false</approved>
</translation>
<translation>
<language>ko-KR</language>
<approved>false</approved>
</translation>
<translation>
<language>pt-BR</language>
<approved>false</approved>
</translation>
<translation>
<language>ru-RU</language>
<approved>false</approved>
</translation>
<translation>
<language>th-TH</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>open-poedb-external</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>de-DE</language>
<approved>false</approved>
</translation>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-ES</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-FR</language>
<approved>false</approved>
</translation>
<translation>
<language>ko-KR</language>
<approved>false</approved>
</translation>
<translation>
<language>pt-BR</language>
<approved>false</approved>
</translation>
<translation>
<language>ru-RU</language>
<approved>false</approved>
</translation>
<translation>
<language>th-TH</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>open-wiki</name>
<definition_loaded>false</definition_loaded>
Expand Down Expand Up @@ -3353,6 +3476,47 @@
</translation>
</translations>
</concept_node>
<concept_node>
<name>poedb</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>de-DE</language>
<approved>false</approved>
</translation>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-ES</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-FR</language>
<approved>false</approved>
</translation>
<translation>
<language>ko-KR</language>
<approved>false</approved>
</translation>
<translation>
<language>pt-BR</language>
<approved>false</approved>
</translation>
<translation>
<language>ru-RU</language>
<approved>false</approved>
</translation>
<translation>
<language>th-TH</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>stash</name>
<definition_loaded>false</definition_loaded>
Expand Down Expand Up @@ -3481,6 +3645,47 @@
</translation>
</translations>
</concept_node>
<concept_node>
<name>display-version</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>de-DE</language>
<approved>false</approved>
</translation>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-ES</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-FR</language>
<approved>false</approved>
</translation>
<translation>
<language>ko-KR</language>
<approved>false</approved>
</translation>
<translation>
<language>pt-BR</language>
<approved>false</approved>
</translation>
<translation>
<language>ru-RU</language>
<approved>false</approved>
</translation>
<translation>
<language>th-TH</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>exit-app</name>
<definition_loaded>false</definition_loaded>
Expand Down
Loading

0 comments on commit 3b60504

Please sign in to comment.