Skip to content

Commit fc49bcf

Browse files
authored
πŸ”€ Merge pull request #93 from AssistantNMS/develop
πŸ”– 0.48.0
2 parents f7f64a2 + 4f483f0 commit fc49bcf

File tree

426 files changed

+200824
-290741
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

426 files changed

+200824
-290741
lines changed

β€Žpackage-lock.jsonβ€Ž

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

β€Žpackage.jsonβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "nms-web-app",
3-
"version": "0.47.0",
3+
"version": "0.48.0",
44
"private": true,
55
"scripts": {
66
"start": "env-cmd --file ./.env.development react-scripts start",

β€Žpublic/assets/config.jsonβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
"assistantAppsUrl": "https://api.assistantapps.com",
77
"assistantAppsImgRoot": "https://webcomp.assistantapps.com",
88
"assistantAppsAppGuid": "4f66c40e-07d7-4fba-973c-c514bf1e57c6",
9-
"currentWhatIsNewGuid": "4ad2bf5a-0003-4a2c-8116-0fae1d780663",
9+
"currentWhatIsNewGuid": "75274cb0-829d-437c-b757-49cc2b7dcf98",
1010
"googleClientId": "539483681905-d4ak563l825o8i0b47inn1c7gu30abvs.apps.googleusercontent.com"
1111
}

β€Žpublic/assets/config.production.jsonβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
"assistantAppsUrl": "https://api.assistantapps.com",
77
"assistantAppsImgRoot": "https://webcomp.assistantapps.com",
88
"assistantAppsAppGuid": "589405b4-e40f-4cd9-b793-6bf37944ee09",
9-
"currentWhatIsNewGuid": "4ad2bf5a-0003-4a2c-8116-0fae1d780663",
9+
"currentWhatIsNewGuid": "75274cb0-829d-437c-b757-49cc2b7dcf98",
1010
"googleClientId": "539483681905-cg6d6d3m29kdepmv73efcehr2dia7cfq.apps.googleusercontent.com"
1111
}

β€Žpublic/assets/config.staging.jsonβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
"assistantAppsUrl": "https://api.assistantapps.com",
77
"assistantAppsImgRoot": "https://webcomp.assistantapps.com",
88
"assistantAppsAppGuid": "589405b4-e40f-4cd9-b793-6bf37944ee09",
9-
"currentWhatIsNewGuid": "4ad2bf5a-0003-4a2c-8116-0fae1d780663",
9+
"currentWhatIsNewGuid": "75274cb0-829d-437c-b757-49cc2b7dcf98",
1010
"googleClientId": "539483681905-d4ak563l825o8i0b47inn1c7gu30abvs.apps.googleusercontent.com"
1111
}

β€Žpublic/assets/data/Recharge.jsonβ€Ž

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,10 @@
9999
"Id": "raw23",
100100
"Value": 2
101101
},
102+
{
103+
"Id": "cook40",
104+
"Value": 4
105+
},
102106
{
103107
"Id": "raw54",
104108
"Value": 1

β€Žpublic/assets/data/alphabetTranslations.jsonβ€Ž

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -286,5 +286,17 @@
286286
{
287287
"AppId": "build1170",
288288
"Text": "The Cursed"
289+
},
290+
{
291+
"AppId": "build1171",
292+
"Text": "Gas giant"
293+
},
294+
{
295+
"AppId": "build1172",
296+
"Text": "Titans"
297+
},
298+
{
299+
"AppId": "build1173",
300+
"Text": "Danger very deep water"
289301
}
290302
]

β€Žpublic/assets/data/catalogue.jsonβ€Ž

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,20 @@
2828
"raw20",
2929
"raw21",
3030
"raw22",
31+
"raw75",
3132
"raw38",
3233
"raw39",
3334
"raw40",
3435
"raw41",
36+
"raw80",
3537
"raw23",
3638
"raw32",
3739
"raw33",
3840
"raw34",
3941
"raw35",
4042
"raw36",
4143
"raw37",
44+
"raw79",
4245
"raw69",
4346
"raw24",
4447
"raw25",
@@ -47,6 +50,8 @@
4750
"raw28",
4851
"raw29",
4952
"raw61",
53+
"raw77",
54+
"raw78",
5055
"raw30",
5156
"raw50",
5257
"raw31",
@@ -174,7 +179,9 @@
174179
"cur22",
175180
"cur25",
176181
"cur15",
182+
"raw76",
177183
"cur21",
184+
"cur292",
178185
"cur17",
179186
"cur32",
180187
"cur19",
@@ -192,6 +199,7 @@
192199
"cur97",
193200
"cur81",
194201
"cur2",
202+
"cur291",
195203
"cur98",
196204
"cur101",
197205
"cur100"
@@ -317,9 +325,6 @@
317325
{
318326
"Id": "UI_PORTAL_CAT_MAT_COOK",
319327
"AppIds": [
320-
"cook28",
321-
"cook50",
322-
"cook29",
323328
"cook48",
324329
"cook76",
325330
"cook43",
@@ -335,6 +340,9 @@
335340
"cook41",
336341
"cook309",
337342
"cook310",
343+
"cook50",
344+
"cook28",
345+
"cook29",
338346
"cook151",
339347
"cook39",
340348
"cook38",

β€Žpublic/assets/data/controllerLookup.jsonβ€Ž

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,6 @@
4444
"Key": "CYCLEWEAPON",
4545
"Icon": "KEYBOARD/KEY.G.png"
4646
},
47-
{
48-
"Key": "DECONSTRUCT",
49-
"Icon": "KEYBOARD/KEY.T.png"
50-
},
5147
{
5248
"Key": "EXOBOOST",
5349
"Icon": "KEYBOARD/KEYWIDE.LSHIFT.png"
@@ -92,10 +88,6 @@
9288
"Key": "PIN_BUILD",
9389
"Icon": "KEYBOARD/KEY.L.png"
9490
},
95-
{
96-
"Key": "PLAYER_DECONSTRUCT",
97-
"Icon": "KEYBOARD/KEY.T.png"
98-
},
9991
{
10092
"Key": "PLAYER_JUMP",
10193
"Icon": "KEYBOARD/KEYWIDE.SPACE.png"
@@ -242,10 +234,6 @@
242234
"Key": "CYCLEWEAPON",
243235
"Icon": "DS4/PS.WHITE.TRIANGLE.png"
244236
},
245-
{
246-
"Key": "DECONSTRUCT",
247-
"Icon": "DS4/PS64.WHITE.R3.png"
248-
},
249237
{
250238
"Key": "EXOBOOST",
251239
"Icon": "DS4/PS64.WHITE.L1.png"
@@ -286,10 +274,6 @@
286274
"Key": "PIN_BUILD",
287275
"Icon": "DS4/PS64.WHITE.R3.png"
288276
},
289-
{
290-
"Key": "PLAYER_DECONSTRUCT",
291-
"Icon": "DS4/PS64.WHITE.R3.png"
292-
},
293277
{
294278
"Key": "PLAYER_JUMP",
295279
"Icon": "DS4/PS.WHITE.CROSS.png"
@@ -444,10 +428,6 @@
444428
"Key": "CYCLEWEAPON",
445429
"Icon": "XBOX/XBOX.WHITE.Y.png"
446430
},
447-
{
448-
"Key": "DECONSTRUCT",
449-
"Icon": "XBOX/XBOX.WHITE.RSPUSH.png"
450-
},
451431
{
452432
"Key": "EXOBOOST",
453433
"Icon": "XBOX/XBOX.WHITE.LB.png"
@@ -488,10 +468,6 @@
488468
"Key": "PIN_BUILD",
489469
"Icon": "XBOX/XBOX.WHITE.RSPUSH.png"
490470
},
491-
{
492-
"Key": "PLAYER_DECONSTRUCT",
493-
"Icon": "XBOX/XBOX.WHITE.RSPUSH.png"
494-
},
495471
{
496472
"Key": "PLAYER_JUMP",
497473
"Icon": "XBOX/XBOX.WHITE.A.png"
@@ -646,10 +622,6 @@
646622
"Key": "CYCLEWEAPON",
647623
"Icon": "SWITCH/SWITCH.WHITE.Y.png"
648624
},
649-
{
650-
"Key": "DECONSTRUCT",
651-
"Icon": "SWITCH/SWITCH.WHITE.PADRIGHTPRESS.png"
652-
},
653625
{
654626
"Key": "EXOBOOST",
655627
"Icon": "SWITCH/SWITCH.WHITE.LEFTTRIGGER.png"
@@ -690,10 +662,6 @@
690662
"Key": "PIN_BUILD",
691663
"Icon": "SWITCH/SWITCH.WHITE.PADRIGHTPRESS.png"
692664
},
693-
{
694-
"Key": "PLAYER_DECONSTRUCT",
695-
"Icon": "SWITCH/SWITCH.WHITE.PADRIGHTPRESS.png"
696-
},
697665
{
698666
"Key": "PLAYER_JUMP",
699667
"Icon": "SWITCH/SWITCH.WHITE.A.png"

0 commit comments

Comments
Β (0)