Jack
6f10d5f8bf
Merge branch 'dev' into bugfix/2958
2022-03-11 17:49:35 +08:00
nickofolas
6db267ff76
Fix trailing whitespace
2022-03-10 23:23:51 -06:00
nickofolas
0236bdc73d
Merge branch 'dev' into feature/monaco-theme-editor
2022-03-10 23:16:44 -06:00
nickofolas
c7e228807b
Resolve conflict
2022-03-10 23:11:09 -06:00
nickofolas
07a61c38a4
Clean up imports
2022-03-10 23:02:32 -06:00
nickofolas
7b309c2624
Refactor sleeve stats row to JSX element
2022-03-10 22:47:18 -06:00
nickofolas
62331af141
Properly expand gang equipment cards to fill entire screen
2022-03-10 22:43:01 -06:00
nickofolas
8ce1660f8a
Fix missing newline at EOL
2022-03-10 22:21:02 -06:00
nickofolas
5d6952dbac
First iteration of sleeves UI improvements
2022-03-10 22:14:11 -06:00
Olivier Gagnon
372776c94e
allbuild commit /usr/bin/git
2022-03-10 23:06:47 -05:00
Olivier Gagnon
ca19e15168
Merge branch 'dev' of github.com:danielyxie/bitburner into dev
2022-03-10 23:05:40 -05:00
Olivier Gagnon
81d3246cb8
fix not being able to work on program
2022-03-10 23:05:35 -05:00
hydroflame
0e526853bd
Merge pull request #3108 from nickofolas/patch-1
...
Initialize `purchasingAugs` state to correct value
2022-03-10 22:45:11 -05:00
Olivier Gagnon
a35b95a58b
allbuild commit /usr/bin/git
2022-03-10 22:40:46 -05:00
Olivier Gagnon
9c3c83dcd5
fix lint
2022-03-10 22:34:54 -05:00
Olivier Gagnon
9b12da4eb7
allbuild commit "$(git rev-parse --short HEAD)"
2022-03-10 22:33:11 -05:00
nickofolas
beebcefb18
Initialize purchasingAugs state to correct value
...
Overwritten in merge commit, just fixing before I forget haha
2022-03-10 21:21:08 -06:00
Olivier Gagnon
79c8784ed0
allbuild commit git rev-parse --short HEAD
2022-03-10 22:18:09 -05:00
Olivier Gagnon
dfb29626f3
fix mc
2022-03-10 22:17:01 -05:00
hydroflame
d955398a68
Merge pull request #2757 from ltoni90/bugfix/2719_Corporation_Expressions
...
Bug fix corporation expressions
2022-03-10 22:15:39 -05:00
hydroflame
f117cc8a74
Merge pull request #2912 from phyzical/bugfix/2899
...
Added a check for exisiting industry type before expanding
2022-03-10 22:14:18 -05:00
hydroflame
6a09cbd2ce
Merge pull request #2933 from phyzical/bugfix/1954
...
added filter for possibleFactions to filter factions without tasks
2022-03-10 22:13:24 -05:00
hydroflame
b7ffdeb5e2
Merge pull request #3076 from ApamNapat/turned_two_eslint_rules_on
...
Trailing whitespace and files not ending with \n are now illegal
2022-03-10 22:12:17 -05:00
hydroflame
f802b95b30
Merge pull request #3054 from ApamNapat/simplified_redundant_regex
...
Removed redundant repetitions of | in alias regex
2022-03-10 22:11:35 -05:00
hydroflame
31a26a31ad
Merge pull request #3055 from ApamNapat/simplified_some_boolean_logic
...
Simplified some booleans and if elses
2022-03-10 22:11:26 -05:00
hydroflame
1ed27bb88a
Merge pull request #3104 from MartinFournier/fix/bladeburner-early-routing
...
Attempt to fix `bladeburner.process()` early routing issue
2022-03-10 22:10:06 -05:00
hydroflame
f5ca700476
Merge pull request #2864 from SagePtr/corp-material-fix
...
Don't hide irrelevant materials if their stock is not empty and hide irrelevant divisions from Export
2022-03-10 21:46:13 -05:00
hydroflame
69f7f4896e
Merge pull request #2874 from smolgumball/add-zoom-reset
...
electron ui: add `Zoom -> Reset Zoom` command
2022-03-10 21:45:45 -05:00
hydroflame
9372eef691
Merge pull request #2930 from JParisFerrer/vim_tab_switching
...
Add tab switching support to vim mode
2022-03-10 21:45:14 -05:00
hydroflame
9d080c9901
Merge pull request #2934 from phyzical/bugfix/1955
...
added check for NS interface with user defined guard
2022-03-10 21:44:37 -05:00
Olivier Gagnon
731b620ac1
typo
2022-03-10 21:42:29 -05:00
hydroflame
459296c160
Merge pull request #3068 from phyzical/hotfix/2902
...
Fix for work in progress modal when augmenting
2022-03-10 21:41:48 -05:00
hydroflame
e5c488e533
Merge pull request #3066 from phyzical/hotfix/2961-2
...
Fix editor "close" naming
2022-03-10 21:41:22 -05:00
hydroflame
c8e5b8a6e2
Merge pull request #3107 from nickofolas/improvement/aug-page-link
...
Add shortcut to Faction augmentations page from FactionsRoot
2022-03-10 21:41:02 -05:00
hydroflame
c13ff7ea52
Merge branch 'dev' into improvement/aug-page-link
2022-03-10 21:40:58 -05:00
hydroflame
fdcbc4c508
Merge pull request #3095 from phyzical/bugfix/add-charge-for-stanek-width-height
...
added ram charge for stanek width and height
2022-03-10 21:40:28 -05:00
hydroflame
2dfecc8ad0
Merge pull request #3093 from mbrannen/expr-remainder-fix
...
updated regex sanitization
2022-03-10 21:39:59 -05:00
hydroflame
8bad7d68c3
Merge pull request #3096 from danielyxie/new-license
...
Change license to Apache 2 with Commons Clause
2022-03-10 21:39:33 -05:00
hydroflame
64223d2f4e
Merge pull request #3100 from phyzical/bugfix/early-out-fix-for-play-faction-issue
...
added logic to show a sorry page when augmenting with faction screen open
2022-03-10 21:39:24 -05:00
hydroflame
1a9b3bd113
Merge pull request #3101 from phyzical/bugfix/work-in-progress-augment-fix
...
work in progress augment fix
2022-03-10 21:38:45 -05:00
nickofolas
e960fbfa28
Implement faction augs page shortcut
2022-03-10 18:39:54 -06:00
nickofolas
e39817cb57
Very slightly adjust router.toFaction
...
- Faction argument is now required
- Added augPage argument
2022-03-10 18:37:57 -06:00
hydroflame
668e43c5de
Merge pull request #3102 from phyzical/bugfix/typo-on-ops-page
...
fix typo on ops page
2022-03-10 13:11:56 -05:00
Nikolai Korolev
20e3924c6a
Merge branch 'dev' into patch-3
2022-03-10 12:06:19 +03:00
Martin Fournier
6588bbb8b1
Attempt to fix bladeburner.process() issue
...
For a certain user, it appears that the engine attempts to route to the
bitverse screen before the router is properly initialized. I could not
reproduce the problem on my side and we were not able to extract his
save game, so this is a blind shot if it'll work or not.
2022-03-09 15:44:19 -05:00
phyzical
0ba66ad2f4
fix typo on ops page
2022-03-09 22:58:34 +08:00
Jack
a3555d101e
Update src/ui/WorkInProgressRoot.tsx
2022-03-09 22:50:41 +08:00
Jack
2f40906d4b
Update src/Faction/ui/FactionRoot.tsx
...
Co-authored-by: ApamNapat <ApamNapat@users.noreply.github.com>
2022-03-09 22:49:50 +08:00
phyzical
e5acd10c86
moved to only apply when working for faction
2022-03-09 22:14:42 +08:00
phyzical
f7dcf5ca97
add early out to say "sorry not part of faction when working and augmenting"
2022-03-09 22:09:14 +08:00
