rderfler
77073836cb
Merge remote-tracking branch 'upstream/dev' into dev
2022-05-06 22:44:24 -04:00
nickofolas
3e9bcea9e4
Fix modal z-index
2022-05-06 11:35:23 -05:00
Snarling
fe1dd11269
Only mention number of threads if != 1
...
Fixes confusion mentioned here: https://discord.com/channels/415207508303544321/921120989000114257/971233305020231722
2022-05-06 09:15:48 -04:00
Snarling
99a0337a14
Dirty fix for available ram float errors
...
1MB added to available ram when checking if available is sufficient. All actual ram values in game are a multiple of 50MB so an extra 1MB can't ever allow additional script load to be ran.
2022-05-06 08:56:19 -04:00
Zoë Hoekstra
65889079b6
Add log entry when ui.clearTerminal() is ran
2022-05-06 12:41:02 +02:00
Zoë Hoekstra
472c9778df
Add ns.ui.clearTerminal for 0.2 GB
2022-05-06 12:29:21 +02:00
phyzical
10c67ab363
refactor resulted in it being backwards
2022-05-06 16:35:07 +08:00
Olivier Gagnon
b46718d188
allbuild commit 22b6d0d5
2022-05-06 01:59:04 -04:00
hydroflame
22b6d0d5a0
Merge pull request #3613 from nickofolas/fix/nfg-level-application
...
AUGMENTATIONS: Fix NeuroFlux being applied improperly and migrate broken saves
2022-05-06 01:56:13 -04:00
jaype87
1a8e31ed09
fix formating
2022-05-06 01:06:53 +02:00
jaype87
5378e8cc38
sort and color grafting list
2022-05-06 00:44:05 +02:00
hydroflame
4ba7df8d72
Merge pull request #3614 from nickofolas/improvement/purchased-aug-color
...
AUGMENTATIONS: Tweak a couple small UI elements
2022-05-05 14:45:14 -04:00
nickofolas
449ec4dee2
Add faction name to top of augs page
2022-05-05 09:23:10 -05:00
nickofolas
6d9dcfe81f
Merge branch 'dev' of github.com:danielyxie/bitburner into fix/nfg-level-application
2022-05-05 08:34:26 -05:00
nickofolas
73f26e2ae3
Reapply boosts in migration
2022-05-05 01:02:05 -05:00
nickofolas
0d72c363b5
Make it more obvious when augmentations are owned
2022-05-04 20:26:55 -05:00
nickofolas
965d5c7c20
Add migration for broken saves
2022-05-04 20:16:23 -05:00
nickofolas
78104b40ad
Fix missing logic for applying NFG
2022-05-04 20:07:12 -05:00
hydroflame
2db2b78745
Merge pull request #3612 from nickofolas/improvement/refactor-work-type
...
WORK: Refactor work types to use `enum`s instead of constants
2022-05-04 20:20:26 -04:00
nickofolas
30d1fe29d7
Format
2022-05-04 15:04:01 -05:00
nickofolas
7d75093989
Init work types with new None member
2022-05-04 15:03:02 -05:00
nickofolas
59982370cb
Implement CrimeType enum
2022-05-04 14:48:49 -05:00
nickofolas
13ca783647
Merge branch 'dev' of github.com:danielyxie/bitburner into improvement/refactor-work-type
2022-05-04 14:19:58 -05:00
nickofolas
f45200b25e
Implement ClassType and FactionWorkType enums
2022-05-04 14:18:12 -05:00
Olivier Gagnon
032c440eae
allbuild commit bcbda22a
2022-05-04 15:06:58 -04:00
hydroflame
bcbda22acc
Merge pull request #3611 from nickofolas/improvement/work-in-progress-ui
...
UI: Refactor and redesign WorkInProgress interface
2022-05-04 15:04:52 -04:00
nickofolas
4a8e99b170
Refactor WorkType to an enum
2022-05-04 13:42:48 -05:00
nickofolas
cc5e89208e
Convert WIP root to use switch statement
2022-05-04 12:44:48 -05:00
nickofolas
bcb6176952
Merge branch 'dev' into improvement/work-in-progress-ui
2022-05-04 12:28:33 -05:00
Olivier Gagnon
791c19c4fe
allbuild commit 7f9e3775
2022-05-04 13:16:41 -04:00
hydroflame
7f9e37752a
Merge pull request #3609 from nickofolas/fix/faction-aug-rep-check
...
AUGMENTATIONS: Fix reputation check for faction augs
2022-05-04 13:14:44 -04:00
nickofolas
2379233351
Fix faction augs cost check
2022-05-04 11:59:51 -05:00
Olivier Gagnon
d0ebf5e14e
allbuild commit 36c7ef1a
2022-05-04 12:25:03 -04:00
Olivier Gagnon
36c7ef1ad7
support ASNI
2022-05-04 12:21:16 -04:00
hydroflame
f6e689eead
Merge pull request #3608 from danielyxie/revert-3518-patch-2
...
Revert "MISC: fix typing conflict between jest and cypress"
2022-05-04 12:14:38 -04:00
hydroflame
c5bc47abf0
Revert "MISC: fix typing conflict between jest and cypress"
2022-05-04 12:14:31 -04:00
hydroflame
9818a397bc
Merge pull request #2989 from phyzical/bugfix/2958
...
UI: FIX #2228,#2958 Fix tab highlights and highlight files not on home.
2022-05-04 12:10:43 -04:00
hydroflame
a88d79ef0a
Merge pull request #3486 from phyzical/bugfix/3485
...
UI FIX #3485 - Allow bulk purchasing when smart supply is enabled
2022-05-04 12:10:00 -04:00
hydroflame
3d13735730
Merge pull request #3518 from taralx/patch-2
...
MISC: fix typing conflict between jest and cypress
2022-05-04 12:09:41 -04:00
hydroflame
d43904ff5c
Merge pull request #3532 from borisflagell/UI-FIX-#2256-
...
UI: FIX #2256 Hacknet server's upgrade tooltip were not handling RAM…
2022-05-04 12:09:27 -04:00
hydroflame
44641fee07
Merge pull request #3544 from phyzical/feature/refactor-augmentation
...
REFACTOR: augmentation cost, rep cost and level to be calculated in place
2022-05-04 12:08:24 -04:00
hydroflame
fc3d89e51f
Merge pull request #3552 from Snarling/jobSwitchFix
...
COMPANY: Fix #3551 Applying for a new job will not change active employer if player is performing company work
2022-05-04 12:08:03 -04:00
hydroflame
d96faf7225
Merge pull request #3565 from nickofolas/fix/isSpecial-filter
...
AUGMENTATIONS: Fix `isSpecial` filter in helper (Removes NeuroFlux, Stanek's Gift, etc from gangs)
2022-05-04 12:02:47 -04:00
hydroflame
5d4241b120
Merge pull request #3568 from nickofolas/fix/grafting-stop-work
...
GRAFTING: Fix Grafting not being handled in singularity stop work
2022-05-04 12:02:29 -04:00
hydroflame
6ffeb9c78d
Merge pull request #3569 from Undeemiss/aug-names-cleanup
...
MISC: Remove comments that describe nonexistent augs
2022-05-04 12:02:08 -04:00
hydroflame
105ced26bf
Merge pull request #3570 from DavidGrinberg/dev
...
CORPORATIONS: Expose makeProducts on NSDivision interface
2022-05-04 12:01:33 -04:00
hydroflame
103befe209
Merge pull request #3571 from Undeemiss/bb-point-achvmnt-name
...
MISC: Correct BB Skill point achievement name
2022-05-04 12:00:20 -04:00
hydroflame
a3fe965771
Merge pull request #3572 from Undeemiss/exception-typo
...
MISC: Fixed typo in exceptionAlert.ts
2022-05-04 11:58:27 -04:00
hydroflame
b0c9475b57
Merge pull request #3574 from DavidGrinberg/expose-material-sell-cost
...
CORPORATIONS: Expose sales cost on NSMaterial interface
2022-05-04 11:58:12 -04:00
Olivier Gagnon
5e9b3b0c4f
Merge branch 'dev' of github.com:danielyxie/bitburner into dev
2022-05-04 11:57:44 -04:00
