Skip to content

Commit

Permalink
updated manifest; version bump
Browse files Browse the repository at this point in the history
  • Loading branch information
kyleshay committed Oct 13, 2015
1 parent 1b6180a commit 7ea81de
Show file tree
Hide file tree
Showing 147 changed files with 70 additions and 69 deletions.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file added app/img/destiny_content/items/glimmer.png
Binary file added app/img/destiny_content/items/legendarymark.png
Binary file added app/img/destiny_content/items/silver.png
108 changes: 54 additions & 54 deletions app/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<title>DIM v3.1.13.2</title>
<title>DIM v3.1.14</title>
<meta name="description" content="">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link href='https://fonts.googleapis.com/css?family=Open+Sans' rel='stylesheet' type='text/css'>
Expand Down Expand Up @@ -40,66 +40,66 @@
<div id="content" ui-view></div>
</div>

<script src="scripts/google.js?v=3.1.13.2"></script>
<script src="scripts/google.js?v=3.1.14"></script>

<!-- begin vendor scripts -->
<script src="vendor/jquery/dist/jquery.min.js?v=3.1.13.2"></script>
<script src="vendor/angular/angular.min.js?v=3.1.13.2"></script>
<script src="vendor/angular-ui-router/release/angular-ui-router.min.js?v=3.1.13.2"></script>
<script src="vendor/angular-animate/angular-animate.min.js?v=3.1.13.2"></script>
<script src="scripts/toaster.js?v=3.1.13.2"></script>
<script src="vendor/angular-native-dragdrop/draganddrop.js?v=3.1.13.2"></script>
<script src="vendor/ngDialog/js/ngDialog.min.js?v=3.1.13.2"></script>
<script src="vendor/Angular.uuid2/dist/angular-uuid2.min.js?v=3.1.13.2"></script>
<script src="vendor/underscore/underscore-min.js?v=3.1.13.2"></script>
<script src="vendor/lz-string/libs/lz-string.min.js?v=3.1.13.2"></script>
<script src="vendor/angular-chrome-storage/angular-chrome-storage.js?v=3.1.13.2"></script>
<script src="vendor/angular-messages/angular-messages.min.js?v=3.1.13.2"></script>
<script src="vendor/angular-promise-tracker/promise-tracker.js?v=3.1.13.2"></script>
<script src="vendor/verge/verge.js?v=3.1.13.2"></script>
<script src="vendor/jquery/dist/jquery.min.js?v=3.1.14"></script>
<script src="vendor/angular/angular.min.js?v=3.1.14"></script>
<script src="vendor/angular-ui-router/release/angular-ui-router.min.js?v=3.1.14"></script>
<script src="vendor/angular-animate/angular-animate.min.js?v=3.1.14"></script>
<script src="scripts/toaster.js?v=3.1.14"></script>
<script src="vendor/angular-native-dragdrop/draganddrop.js?v=3.1.14"></script>
<script src="vendor/ngDialog/js/ngDialog.min.js?v=3.1.14"></script>
<script src="vendor/Angular.uuid2/dist/angular-uuid2.min.js?v=3.1.14"></script>
<script src="vendor/underscore/underscore-min.js?v=3.1.14"></script>
<script src="vendor/lz-string/libs/lz-string.min.js?v=3.1.14"></script>
<script src="vendor/angular-chrome-storage/angular-chrome-storage.js?v=3.1.14"></script>
<script src="vendor/angular-messages/angular-messages.min.js?v=3.1.14"></script>
<script src="vendor/angular-promise-tracker/promise-tracker.js?v=3.1.14"></script>
<script src="vendor/verge/verge.js?v=3.1.14"></script>
<!-- end vendor scripts -->

<!-- <script src="scripts/vendor.min.js?v=3.1.13.2"></script> -->
<script src="scripts/ScrollToFixed.js?v=3.1.13.2"></script>
<script src="vendor/angular-chrome-storage/angular-chrome-storage.js?v=3.1.13.2"></script>
<script src="vendor/angular-cookies/angular-cookies.js?v=3.1.13.2"></script>
<script src="vendor/angular-hotkeys/build/hotkeys.js?v=3.1.13.2"></script>
<!-- <script src="scripts/vendor.min.js?v=3.1.14"></script> -->
<script src="scripts/ScrollToFixed.js?v=3.1.14"></script>
<script src="vendor/angular-chrome-storage/angular-chrome-storage.js?v=3.1.14"></script>
<script src="vendor/angular-cookies/angular-cookies.js?v=3.1.14"></script>
<script src="vendor/angular-hotkeys/build/hotkeys.js?v=3.1.14"></script>

<!-- begin app scripts -->
<script src="scripts/dimApp.module.js?v=3.1.13.2"></script>
<script src="scripts/dimApp.config.js?v=3.1.13.2"></script>
<script src="scripts/services/dimRateLimit.factory.js?v=3.1.13.2"></script>
<script src="scripts/services/dimBungieService.factory.js?v=3.1.13.2"></script>
<script src="scripts/services/dimItemDefinitions.factory.js?v=3.1.13.2"></script>
<script src="scripts/services/dimItemBucketDefinitions.factory.js?v=3.1.13.2"></script>
<script src="scripts/services/dimStatDefinitions.factory.js?v=3.1.13.2"></script>
<script src="scripts/services/dimObjectiveDefinitions.factory.js?v=3.1.13.2"></script>
<script src="scripts/services/dimSandboxPerkDefinitions.factory.js?v=3.1.13.2"></script>
<script src="scripts/services/dimTalentDefinitions.factory.js?v=3.1.13.2"></script>
<script src="scripts/services/dimPlatformService.factory.js?v=3.1.13.2"></script>
<script src="scripts/services/dimLoadoutService.factory.js?v=3.1.13.2"></script>
<script src="scripts/services/dimSettingsService.factory.js?v=3.1.13.2"></script>
<script src="scripts/services/dimStoreService.factory.js?v=3.1.13.2"></script>
<script src="scripts/services/dimItemService.factory.js?v=3.1.13.2"></script>
<script src="scripts/loadout/dimLoadout.directive.js?v=3.1.13.2"></script>
<script src="scripts/loadout/dimLoadoutPopup.directive.js?v=3.1.13.2"></script>
<script src="scripts/shell/dimAppCtrl.controller.js?v=3.1.13.2"></script>
<script src="scripts/shell/dimSettingsCtrl.controller.js?v=3.1.13.2"></script>
<script src="scripts/shell/dimPlatformChoice.directive.js?v=3.1.13.2"></script>
<script src="scripts/shell/dimSearchFilter.directive.js?v=3.1.13.2"></script>
<script src="scripts/shell/dimClickAnywhereButHere.directive.js?v=3.1.13.2"></script>
<script src="scripts/store/dimStores.directive.js?v=3.1.13.2"></script>
<script src="scripts/store/dimStoreItems.directive.js?v=3.1.13.2"></script>
<script src="scripts/store/dimStoreItem.directive.js?v=3.1.13.2"></script>
<script src="scripts/store/dimStoreHeading.directive.js?v=3.1.13.2"></script>
<script src="scripts/move-popup/dimMovePopup.directive.js?v=3.1.13.2"></script>
<script src="scripts/move-popup/dimMoveItemProperties.directive.js?v=3.1.13.2"></script>
<script src="scripts/infuse/dimInfuse.factory.js?v=3.1.13.2"></script>
<script src="scripts/infuse/dimInfuseItem.directive.js?v=3.1.13.2"></script>
<script src="scripts/infuse/dimShareData.factory.js?v=3.1.13.2"></script>
<script src="scripts/infuse/dimInfuse.controller.js?v=3.1.13.2"></script>
<script src="scripts/dimApp.module.js?v=3.1.14"></script>
<script src="scripts/dimApp.config.js?v=3.1.14"></script>
<script src="scripts/services/dimRateLimit.factory.js?v=3.1.14"></script>
<script src="scripts/services/dimBungieService.factory.js?v=3.1.14"></script>
<script src="scripts/services/dimItemDefinitions.factory.js?v=3.1.14"></script>
<script src="scripts/services/dimItemBucketDefinitions.factory.js?v=3.1.14"></script>
<script src="scripts/services/dimStatDefinitions.factory.js?v=3.1.14"></script>
<script src="scripts/services/dimObjectiveDefinitions.factory.js?v=3.1.14"></script>
<script src="scripts/services/dimSandboxPerkDefinitions.factory.js?v=3.1.14"></script>
<script src="scripts/services/dimTalentDefinitions.factory.js?v=3.1.14"></script>
<script src="scripts/services/dimPlatformService.factory.js?v=3.1.14"></script>
<script src="scripts/services/dimLoadoutService.factory.js?v=3.1.14"></script>
<script src="scripts/services/dimSettingsService.factory.js?v=3.1.14"></script>
<script src="scripts/services/dimStoreService.factory.js?v=3.1.14"></script>
<script src="scripts/services/dimItemService.factory.js?v=3.1.14"></script>
<script src="scripts/loadout/dimLoadout.directive.js?v=3.1.14"></script>
<script src="scripts/loadout/dimLoadoutPopup.directive.js?v=3.1.14"></script>
<script src="scripts/shell/dimAppCtrl.controller.js?v=3.1.14"></script>
<script src="scripts/shell/dimSettingsCtrl.controller.js?v=3.1.14"></script>
<script src="scripts/shell/dimPlatformChoice.directive.js?v=3.1.14"></script>
<script src="scripts/shell/dimSearchFilter.directive.js?v=3.1.14"></script>
<script src="scripts/shell/dimClickAnywhereButHere.directive.js?v=3.1.14"></script>
<script src="scripts/store/dimStores.directive.js?v=3.1.14"></script>
<script src="scripts/store/dimStoreItems.directive.js?v=3.1.14"></script>
<script src="scripts/store/dimStoreItem.directive.js?v=3.1.14"></script>
<script src="scripts/store/dimStoreHeading.directive.js?v=3.1.14"></script>
<script src="scripts/move-popup/dimMovePopup.directive.js?v=3.1.14"></script>
<script src="scripts/move-popup/dimMoveItemProperties.directive.js?v=3.1.14"></script>
<script src="scripts/infuse/dimInfuse.factory.js?v=3.1.14"></script>
<script src="scripts/infuse/dimInfuseItem.directive.js?v=3.1.14"></script>
<script src="scripts/infuse/dimShareData.factory.js?v=3.1.14"></script>
<script src="scripts/infuse/dimInfuse.controller.js?v=3.1.14"></script>
<!-- end app scripts -->
<!-- <script src="scripts/scripts.min.js?v=3.1.13.2"></script> -->
<!-- <script src="scripts/scripts.min.js?v=3.1.14"></script> -->
</body>

</html>
2 changes: 1 addition & 1 deletion app/manifest.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"manifest_version": 2,
"name": "Destiny Item Manager",
"version": "3.1.13.2",
"version": "3.1.14",
"description": "Robust interface to manage gear, weapons, and items in Destiny.",
"icons": {
"16": "icon16.png",
Expand Down
2 changes: 1 addition & 1 deletion app/scripts/api-manifest/buckets.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/scripts/api-manifest/items.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions app/scripts/api-manifest/itemsnew.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/scripts/api-manifest/objectives.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/scripts/api-manifest/perks.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/scripts/api-manifest/stats.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/scripts/api-manifest/talent.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/scripts/dimApp.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ if (typeof window.onerror == "object") {

_gaq.push([
'errorTracker._trackEvent',
'DIM - Chrome Extension - v3.1.13.3',
'DIM - Chrome Extension - v3.1.14',
exceptionDescription,
' @ ' + url + ':' + lineNumber + ':' + columnNumber,
0,
Expand Down
2 changes: 1 addition & 1 deletion app/scripts/services/dimItemBucketDefinitions.factory.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
function ItemBucketDefinitions($q, $timeout, $http) {
var deferred = $q.defer();

$http.get('scripts/api-manifest/buckets.json?v=3.1.13.3')
$http.get('scripts/api-manifest/buckets.json?v=3.1.14')
.success(function(data) {
deferred.resolve(data);
})
Expand Down
2 changes: 1 addition & 1 deletion app/scripts/services/dimItemDefinitions.factory.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
function ItemDefinitions($q, $timeout, $http) {
var deferred = $q.defer();

$http.get('scripts/api-manifest/items.json?v=3.1.13.3')
$http.get('scripts/api-manifest/items.json?v=3.1.14')
.success(function(data) {
deferred.resolve(data);
})
Expand Down
2 changes: 1 addition & 1 deletion app/scripts/services/dimObjectiveDefinitions.factory.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
function ObjectiveDefinitions($q, $timeout, $http) {
var deferred = $q.defer();

$http.get('scripts/api-manifest/objectives.json?v=3.1.13.3')
$http.get('scripts/api-manifest/objectives.json?v=3.1.14')
.success(function(data) {
deferred.resolve(data);
})
Expand Down
2 changes: 1 addition & 1 deletion app/scripts/services/dimSandboxPerkDefinitions.factory.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
function dimSandboxPerkDefinitions($q, $http) {
var deferred = $q.defer();

$http.get('scripts/api-manifest/perks.json?v=3.1.13.3')
$http.get('scripts/api-manifest/perks.json?v=3.1.14')
.then(function(data) {
deferred.resolve(data);
},
Expand Down
2 changes: 1 addition & 1 deletion app/scripts/services/dimStatDefinitions.factory.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
function StatDefinitions($q, $timeout, $http) {
var deferred = $q.defer();

$http.get('scripts/api-manifest/stats.json?v=3.1.13.3')
$http.get('scripts/api-manifest/stats.json?v=3.1.14')
.success(function(data) {
deferred.resolve(data);
})
Expand Down
2 changes: 1 addition & 1 deletion app/scripts/services/dimTalentDefinitions.factory.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
function TalentDefinitions($q, $timeout, $http) {
var deferred = $q.defer();

$http.get('scripts/api-manifest/talent.json?v=3.1.13.3')
$http.get('scripts/api-manifest/talent.json?v=3.1.14')
.then(function(data) {
deferred.resolve(data);
},
Expand Down
2 changes: 1 addition & 1 deletion app/views/about.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div dim-about dim-click-anywhere-but-here="app.closeLoadoutPopup()">
<h1 class="orange">About Destiny Item Manager (DIM)</h1>
<h3>Version 3.1.13.3</h3>
<h3>Version 3.1.14</h3>
<p>
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.
</p>
Expand Down

0 comments on commit 7ea81de

Please sign in to comment.