Skip to content

Commit 541eb1b

Browse files
kyleshaykyleshay
committed
Merge branch 'dev'
2 parents b91b462 + 9dbf70e commit 541eb1b

10 files changed

+64
-67
lines changed

‎app/index.html‎

Lines changed: 53 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<head>
55
<meta charset="utf-8">
66
<meta http-equiv="X-UA-Compatible" content="IE=edge">
7-
<title>DIM v3.1.12.1</title>
7+
<title>DIM v3.1.12.2</title>
88
<meta name="description" content="">
99
<meta name="viewport" content="width=device-width, initial-scale=1">
1010
<link href='https://fonts.googleapis.com/css?family=Open+Sans' rel='stylesheet' type='text/css'>
@@ -40,65 +40,65 @@
4040
<div id="content" ui-view></div>
4141
</div>
4242

43-
<script src="scripts/google.js?v=3.1.12.1"></script>
43+
<script src="scripts/google.js?v=3.1.12.2"></script>
4444

4545
<!-- begin vendor scripts -->
46-
<script src="vendor/jquery/dist/jquery.min.js?v=3.1.12.1"></script>
47-
<script src="vendor/angular/angular.min.js?v=3.1.12.1"></script>
48-
<script src="vendor/angular-ui-router/release/angular-ui-router.min.js?v=3.1.12.1"></script>
49-
<script src="vendor/angular-animate/angular-animate.min.js?v=3.1.12.1"></script>
50-
<script src="scripts/toaster.js?v=3.1.12.1"></script>
51-
<script src="vendor/angular-native-dragdrop/draganddrop.js?v=3.1.12.1"></script>
52-
<script src="vendor/ngDialog/js/ngDialog.min.js?v=3.1.12.1"></script>
53-
<script src="vendor/Angular.uuid2/dist/angular-uuid2.min.js?v=3.1.12.1"></script>
54-
<script src="vendor/underscore/underscore-min.js?v=3.1.12.1"></script>
55-
<script src="vendor/lz-string/libs/lz-string.min.js?v=3.1.12.1"></script>
56-
<script src="vendor/angular-chrome-storage/angular-chrome-storage.js?v=3.1.12.1"></script>
57-
<script src="vendor/angular-messages/angular-messages.min.js?v=3.1.12.1"></script>
58-
<script src="vendor/angular-promise-tracker/promise-tracker.js?v=3.1.12.1"></script>
59-
<script src="vendor/verge/verge.js?v=3.1.12.1"></script>
46+
<script src="vendor/jquery/dist/jquery.min.js?v=3.1.12.2"></script>
47+
<script src="vendor/angular/angular.min.js?v=3.1.12.2"></script>
48+
<script src="vendor/angular-ui-router/release/angular-ui-router.min.js?v=3.1.12.2"></script>
49+
<script src="vendor/angular-animate/angular-animate.min.js?v=3.1.12.2"></script>
50+
<script src="scripts/toaster.js?v=3.1.12.2"></script>
51+
<script src="vendor/angular-native-dragdrop/draganddrop.js?v=3.1.12.2"></script>
52+
<script src="vendor/ngDialog/js/ngDialog.min.js?v=3.1.12.2"></script>
53+
<script src="vendor/Angular.uuid2/dist/angular-uuid2.min.js?v=3.1.12.2"></script>
54+
<script src="vendor/underscore/underscore-min.js?v=3.1.12.2"></script>
55+
<script src="vendor/lz-string/libs/lz-string.min.js?v=3.1.12.2"></script>
56+
<script src="vendor/angular-chrome-storage/angular-chrome-storage.js?v=3.1.12.2"></script>
57+
<script src="vendor/angular-messages/angular-messages.min.js?v=3.1.12.2"></script>
58+
<script src="vendor/angular-promise-tracker/promise-tracker.js?v=3.1.12.2"></script>
59+
<script src="vendor/verge/verge.js?v=3.1.12.2"></script>
6060
<!-- end vendor scripts -->
6161

62-
<!-- <script src="scripts/vendor.min.js?v=3.1.12.1"></script> -->
63-
<script src="scripts/ScrollToFixed.js?v=3.1.12.1"></script>
64-
<script src="vendor/angular-chrome-storage/angular-chrome-storage.js?v=3.1.12.1"></script>
65-
<script src="vendor/angular-cookies/angular-cookies.js?v=3.1.12.1"></script>
66-
<script src="vendor/angular-hotkeys/build/hotkeys.js?v=3.1.12.1"></script>
62+
<!-- <script src="scripts/vendor.min.js?v=3.1.12.2"></script> -->
63+
<script src="scripts/ScrollToFixed.js?v=3.1.12.2"></script>
64+
<script src="vendor/angular-chrome-storage/angular-chrome-storage.js?v=3.1.12.2"></script>
65+
<script src="vendor/angular-cookies/angular-cookies.js?v=3.1.12.2"></script>
66+
<script src="vendor/angular-hotkeys/build/hotkeys.js?v=3.1.12.2"></script>
6767

6868
<!-- begin app scripts -->
69-
<script src="scripts/dimApp.module.js?v=3.1.12.1"></script>
70-
<script src="scripts/dimApp.config.js?v=3.1.12.1"></script>
71-
<script src="scripts/services/dimRateLimit.factory.js?v=3.1.12.1"></script>
72-
<script src="scripts/services/dimBungieService.factory.js?v=3.1.12.1"></script>
73-
<script src="scripts/services/dimItemDefinitions.factory.js?v=3.1.12.1"></script>
74-
<script src="scripts/services/dimItemBucketDefinitions.factory.js?v=3.1.12.1"></script>
75-
<script src="scripts/services/dimObjectiveDefinitions.factory.js?v=3.1.12.1"></script>
76-
<script src="scripts/services/dimSandboxPerkDefinitions.factory.js?v=3.1.12.1"></script>
77-
<script src="scripts/services/dimTalentDefinitions.factory.js?v=3.1.12.1"></script>
78-
<script src="scripts/services/dimPlatformService.factory.js?v=3.1.12.1"></script>
79-
<script src="scripts/services/dimLoadoutService.factory.js?v=3.1.12.1"></script>
80-
<script src="scripts/services/dimSettingsService.factory.js?v=3.1.12.1"></script>
81-
<script src="scripts/services/dimStoreService.factory.js?v=3.1.12.1"></script>
82-
<script src="scripts/services/dimItemService.factory.js?v=3.1.12.1"></script>
83-
<script src="scripts/loadout/dimLoadout.directive.js?v=3.1.12.1"></script>
84-
<script src="scripts/loadout/dimLoadoutPopup.directive.js?v=3.1.12.1"></script>
85-
<script src="scripts/shell/dimAppCtrl.controller.js?v=3.1.12.1"></script>
86-
<script src="scripts/shell/dimSettingsCtrl.controller.js?v=3.1.12.1"></script>
87-
<script src="scripts/shell/dimPlatformChoice.directive.js?v=3.1.12.1"></script>
88-
<script src="scripts/shell/dimSearchFilter.directive.js?v=3.1.12.1"></script>
89-
<script src="scripts/shell/dimClickAnywhereButHere.directive.js?v=3.1.12.1"></script>
90-
<script src="scripts/store/dimStores.directive.js?v=3.1.12.1"></script>
91-
<script src="scripts/store/dimStoreItems.directive.js?v=3.1.12.1"></script>
92-
<script src="scripts/store/dimStoreItem.directive.js?v=3.1.12.1"></script>
93-
<script src="scripts/store/dimStoreHeading.directive.js?v=3.1.12.1"></script>
94-
<script src="scripts/move-popup/dimMovePopup.directive.js?v=3.1.12.1"></script>
95-
<script src="scripts/move-popup/dimMoveItemProperties.directive.js?v=3.1.12.1"></script>
96-
<script src="scripts/infuse/dimInfuse.factory.js?v=3.1.12.1"></script>
97-
<script src="scripts/infuse/dimInfuseItem.directive.js?v=3.1.12.1"></script>
98-
<script src="scripts/infuse/dimShareData.factory.js?v=3.1.12.1"></script>
99-
<script src="scripts/infuse/dimInfuse.controller.js?v=3.1.12.1"></script>
69+
<script src="scripts/dimApp.module.js?v=3.1.12.2"></script>
70+
<script src="scripts/dimApp.config.js?v=3.1.12.2"></script>
71+
<script src="scripts/services/dimRateLimit.factory.js?v=3.1.12.2"></script>
72+
<script src="scripts/services/dimBungieService.factory.js?v=3.1.12.2"></script>
73+
<script src="scripts/services/dimItemDefinitions.factory.js?v=3.1.12.2"></script>
74+
<script src="scripts/services/dimItemBucketDefinitions.factory.js?v=3.1.12.2"></script>
75+
<script src="scripts/services/dimObjectiveDefinitions.factory.js?v=3.1.12.2"></script>
76+
<script src="scripts/services/dimSandboxPerkDefinitions.factory.js?v=3.1.12.2"></script>
77+
<script src="scripts/services/dimTalentDefinitions.factory.js?v=3.1.12.2"></script>
78+
<script src="scripts/services/dimPlatformService.factory.js?v=3.1.12.2"></script>
79+
<script src="scripts/services/dimLoadoutService.factory.js?v=3.1.12.2"></script>
80+
<script src="scripts/services/dimSettingsService.factory.js?v=3.1.12.2"></script>
81+
<script src="scripts/services/dimStoreService.factory.js?v=3.1.12.2"></script>
82+
<script src="scripts/services/dimItemService.factory.js?v=3.1.12.2"></script>
83+
<script src="scripts/loadout/dimLoadout.directive.js?v=3.1.12.2"></script>
84+
<script src="scripts/loadout/dimLoadoutPopup.directive.js?v=3.1.12.2"></script>
85+
<script src="scripts/shell/dimAppCtrl.controller.js?v=3.1.12.2"></script>
86+
<script src="scripts/shell/dimSettingsCtrl.controller.js?v=3.1.12.2"></script>
87+
<script src="scripts/shell/dimPlatformChoice.directive.js?v=3.1.12.2"></script>
88+
<script src="scripts/shell/dimSearchFilter.directive.js?v=3.1.12.2"></script>
89+
<script src="scripts/shell/dimClickAnywhereButHere.directive.js?v=3.1.12.2"></script>
90+
<script src="scripts/store/dimStores.directive.js?v=3.1.12.2"></script>
91+
<script src="scripts/store/dimStoreItems.directive.js?v=3.1.12.2"></script>
92+
<script src="scripts/store/dimStoreItem.directive.js?v=3.1.12.2"></script>
93+
<script src="scripts/store/dimStoreHeading.directive.js?v=3.1.12.2"></script>
94+
<script src="scripts/move-popup/dimMovePopup.directive.js?v=3.1.12.2"></script>
95+
<script src="scripts/move-popup/dimMoveItemProperties.directive.js?v=3.1.12.2"></script>
96+
<script src="scripts/infuse/dimInfuse.factory.js?v=3.1.12.2"></script>
97+
<script src="scripts/infuse/dimInfuseItem.directive.js?v=3.1.12.2"></script>
98+
<script src="scripts/infuse/dimShareData.factory.js?v=3.1.12.2"></script>
99+
<script src="scripts/infuse/dimInfuse.controller.js?v=3.1.12.2"></script>
100100
<!-- end app scripts -->
101-
<!-- <script src="scripts/scripts.min.js?v=3.1.12.1"></script> -->
101+
<!-- <script src="scripts/scripts.min.js?v=3.1.12.2"></script> -->
102102
</body>
103103

104104
</html>

‎app/manifest.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"manifest_version": 2,
33
"name": "Destiny Item Manager",
4-
"version": "3.1.12.1",
4+
"version": "3.1.12.2",
55
"description": "Robust interface to manage gear, weapons, and items in Destiny.",
66
"icons": {
77
"16": "icon16.png",

‎app/scripts/dimApp.config.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ if (typeof window.onerror == "object") {
160160

161161
_gaq.push([
162162
'errorTracker._trackEvent',
163-
'DIM - Chrome Extension - v3.1.12.1',
163+
'DIM - Chrome Extension - v3.1.12.2',
164164
exceptionDescription,
165165
' @ ' + url + ':' + lineNumber + ':' + columnNumber,
166166
0,

‎app/scripts/infuse/dimInfuse.factory.js‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,11 @@
4545
if (result > 0) {
4646
var source = result;
4747
}
48-
// rares and legendaries that are within 6 points infuse at 100%
48+
// compute threshold
4949
if (target - source <= _data.getThreshold(_data.targets[i], _data.source)) {
5050
result = target;
51-
}
52-
else {
53-
// result = Math.round((target - source) * multiplier + source);
54-
// Some says...that numbers are Ceiling...not rounded
55-
result = Math.ceil((target - source) * multiplier + source);
51+
} else {
52+
result = Math.round((target - source) * multiplier + source);
5653
}
5754
}
5855
return result;

‎app/scripts/services/dimItemBucketDefinitions.factory.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
function ItemBucketDefinitions($q, $timeout, $http) {
1010
var deferred = $q.defer();
1111

12-
$http.get('scripts/api-manifest/buckets.json?v=3.1.12.1')
12+
$http.get('scripts/api-manifest/buckets.json?v=3.1.12.2')
1313
.success(function(data) {
1414
deferred.resolve(data);
1515
})

‎app/scripts/services/dimItemDefinitions.factory.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
function ItemDefinitions($q, $timeout, $http) {
1010
var deferred = $q.defer();
1111

12-
$http.get('scripts/api-manifest/items.json?v=3.1.12.1')
12+
$http.get('scripts/api-manifest/items.json?v=3.1.12.2')
1313
.success(function(data) {
1414
deferred.resolve(data);
1515
})

‎app/scripts/services/dimObjectiveDefinitions.factory.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
function ObjectiveDefinitions($q, $timeout, $http) {
1010
var deferred = $q.defer();
1111

12-
$http.get('scripts/api-manifest/objectives.json?v=3.1.12.1')
12+
$http.get('scripts/api-manifest/objectives.json?v=3.1.12.2')
1313
.success(function(data) {
1414
deferred.resolve(data);
1515
})

‎app/scripts/services/dimSandboxPerkDefinitions.factory.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
function dimSandboxPerkDefinitions($q, $http) {
1010
var deferred = $q.defer();
1111

12-
$http.get('scripts/api-manifest/perks.json?v=3.1.12.1')
12+
$http.get('scripts/api-manifest/perks.json?v=3.1.12.2')
1313
.then(function(data) {
1414
deferred.resolve(data);
1515
},

‎app/scripts/services/dimTalentDefinitions.factory.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
function TalentDefinitions($q, $timeout, $http) {
1010
var deferred = $q.defer();
1111

12-
$http.get('scripts/api-manifest/talent.json?v=3.1.12.1')
12+
$http.get('scripts/api-manifest/talent.json?v=3.1.12.2')
1313
.then(function(data) {
1414
deferred.resolve(data);
1515
},

‎app/views/about.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div dim-about dim-click-anywhere-but-here="app.closeLoadoutPopup()">
22
<h1 class="orange">About Destiny Item Manager (DIM)</h1>
3-
<h3>Version 3.1.12.1</h3>
3+
<h3>Version 3.1.12.2</h3>
44
<p>
55
DIM is built upon the same services used by Bungie.net and the Destiny Companion App. DIM can access the items within your Guardians inventory and the Vault for both PlayStation and Xbox, if you have played on either platforms.
66
</p>

0 commit comments

Comments
 (0)