Commit Graph

6563 Commits

Author SHA1 Message Date
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
hydroflame
bffa166fc3
Merge pull request #3577 from phyzical/feature/WEB-3567
FEATURE: added logic to allow quitJob to be called from singularity
2022-05-04 11:57:39 -04:00
hydroflame
70ae38360f
Merge pull request #3578 from phyzical/bugfix/3527
BUGFIX: make bonustime for gang in miliseconds
2022-05-04 11:56:15 -04:00
Olivier Gagnon
100e81c8ab Update documentation for employee 2022-05-04 11:56:04 -04:00
hydroflame
7e5ab8d9a6
Merge pull request #3581 from stalefishies/compression-contract-fix
BUGFIX: Handle edge case in LZ compression code and fix docs
2022-05-04 11:53:29 -04:00
hydroflame
375a537344
Merge pull request #3584 from notacompsciguy/patch-1
MISC: Fixed typos in game options
2022-05-04 11:53:12 -04:00
hydroflame
8b0ab7842d
Merge pull request #3587 from nickofolas/improvement/infiltration-ui
INFILTRATION: Update gameplay UI
2022-05-04 11:52:02 -04:00
hydroflame
3f3e6a6261
Merge pull request #3590 from nzdjb/dev
MISC: Correct typos in getScriptRam docs.
2022-05-04 11:51:17 -04:00
Olivier Gagnon
4056956c2a fix documentation for getDarkwebPrograms 2022-05-04 11:51:03 -04:00
hydroflame
8705199714
Merge pull request #3601 from phyzical/bugfix/3598
BUGFIX: sleeve stale object refence during augmentation
2022-05-04 11:49:53 -04:00
hydroflame
be9f67b38a
Merge pull request #3605 from Hoekstraa/key-to-keycode
UI: FIX #3592 Sidebar and bash shortcuts now work on MacOS with US-like layouts
2022-05-04 11:49:17 -04:00
hydroflame
55392a4db7
Merge pull request #3607 from Hoekstraa/killall-safeguard
API: Add safeguard to ns.killall(), preventing killing itself by default
2022-05-04 11:48:14 -04:00
Olivier Gagnon
84564100e9 increase donation counter 2022-05-04 11:47:11 -04:00
hydroflame
9f18e114d6
Merge pull request #3586 from danielyxie/better-ns-tutorial
MISC: Make tutorial explain ns1 vs ns2 better
2022-05-04 11:46:49 -04:00
Zoë Hoekstra
5dee4980e0
Add safeguard toggle to ns.killall() 2022-05-04 17:11:08 +02:00
nickofolas
b8cb5f0991 Remove elapsed from crime WIP 2022-05-03 15:27:41 -05:00
Zoë Hoekstra
016a9a873f
Add keycode table and switch to event.code in select places 2022-05-03 15:59:46 +02:00
phyzical
0767043166 added logic to avoid stale object reference on sleeve during augmentation 2022-05-03 19:22:05 +08:00
nickofolas
e8a08424af Fix typo 2022-05-02 17:57:50 -05:00
nickofolas
73d08973f9 Render faction money gain conditionally 2022-05-02 17:56:02 -05:00
nickofolas
d942d27a85 Reduce component usage in sleeve element 2022-05-02 17:49:10 -05:00
nickofolas
57673ae281 Add new progress bar to sleeve UI 2022-05-02 17:48:49 -05:00
nickofolas
e859759ebd First pass on work in progress root 2022-05-02 17:31:40 -05:00
nickofolas
4c15b77d21 Update StatsRow 2022-05-02 17:05:25 -05:00
nickofolas
35fa6dcca1 Basic WorkInfo implementation 2022-05-02 16:34:17 -05:00
nickofolas
05078ffb08 Move ProgressBar component 2022-05-02 15:36:21 -05:00
nickofolas
762acfb7b5 Simplify conditionals 2022-05-02 11:38:20 -05:00
nzdjb
a3162eec0e
docs: Correct typos in getScriptRam docs. 2022-05-01 12:57:38 +12:00
nickofolas
d4f3128829 Adjust infil root height so it isn't scrollable 2022-04-30 15:59:31 -05:00