Commit Graph

5149 Commits

Author SHA1 Message Date
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 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
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 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 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
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
phyzical de0b0f9fa9 added logic to show a sorry page when augmenting with faction screen open 2022-03-09 22:02:34 +08:00
mbrannen 9602dbda2e Update src/Terminal/commands/expr.ts
Updated to ApamNapat's suggestion

Co-authored-by: ApamNapat <ApamNapat@users.noreply.github.com>
2022-03-08 18:02:54 -07:00
TheRealMaxion 02f231af2e Fixes #3098 missing space in Smart Supply
Quick fix to stop this from erroring due to the missing space in the upgrade name.
2022-03-09 01:05:00 +01:00
BB 0eced1b9f2 Simplified some booleans and if elses 2022-03-08 22:52:26 +01:00
BB 6e9990aead Removed redundant repetitions of | in alias regex 2022-03-08 22:51:41 +01:00
BB 2f4d879c16 Trailing whitespace and files not ending with \n are now illegal 2022-03-08 22:51:02 +01:00
hydroflame 570b8caf78 Merge pull request #2873 from SagePtr/purchaseserver-args
Add user-friendly invalid argument number message to purchaseServer
2022-03-08 16:39:54 -05:00
hydroflame 92909689b3 Merge pull request #2891 from tigercat2000/autocomplete_documentation
Terminal: There is now an interface definition for the autocomplete() 'data' argument.
2022-03-08 16:34:57 -05:00
hydroflame 1c1b696853 Merge pull request #3046 from jjayeon/nicer-factions-page
add box showing remaining augments per faction
2022-03-08 16:33:02 -05:00
hydroflame 1ceb8b24f6 Merge pull request #3067 from phyzical/hotfix/2951
added CorporationSoftCap to NetscriptDefinitions
2022-03-08 16:32:28 -05:00
hydroflame 4518b3a7cb Merge pull request #3070 from phyzical/bugfix/2832-2
Sleeve fix for when faction isnt found
2022-03-08 16:32:10 -05:00
hydroflame 8136407b1d Merge pull request #3091 from nickofolas/fix/editor-tab-width
Fix extra space on editor tabs
2022-03-08 16:31:47 -05:00
hydroflame e06a3e6578 Merge pull request #3074 from DSteve595/offline-message-list
Present offline message as list
2022-03-08 16:31:32 -05:00
hydroflame 6ed4268173 Merge pull request #3075 from ApamNapat/simplified_imports
Simplified some relative imports
2022-03-08 16:30:37 -05:00
Jack a2fae480f3 Update src/PersonObjects/Player/PlayerObjectGeneralMethods.tsx 2022-03-08 17:32:03 +08:00
phyzical ec927fe1f4 added ram charge for stanek width and height 2022-03-08 17:28:45 +08:00
mbrannen bb6d90fb41 updated expression.
-removed escaping and reverted back for /
2022-03-07 23:50:05 -07:00
ChrissiQ 44c4529d90 🐛 (Bug: Corp) Fixes sufficient player money check to buy back shares.
`BuyBackShares()` checks the corp for sufficient funds, but since shares are purchased with player money, it should be checking the player's money instead.
2022-03-07 23:18:51 -07:00
mbrannen 31ea56084e updated regex sanitization
-allows %
-updated escape characters to \
2022-03-07 23:15:55 -07:00
nickofolas 472503814b Remove 200px min width of script editor tabs 2022-03-07 17:33:56 -06:00
hydroflame 8358e62fb0 Merge pull request #3089 from danielyxie/dev
allbuild commit `git rev-parse --short HEAD`
2022-03-07 18:09:23 -05:00
Olivier Gagnon 192a037dfa allbuild commit git rev-parse --short HEAD 2022-03-07 18:07:21 -05:00
hydroflame ef167046eb Merge pull request #3088 from danielyxie/dev
v1.5.0
2022-03-07 17:51:40 -05:00
Olivier Gagnon bc952147fd v1.5.0 2022-03-07 17:51:02 -05:00
hydroflame 4921cdea24 Merge branch 'dev' into phyzical/Corp-Api-Updates 2022-03-07 17:44:43 -05:00
hydroflame e10571c0e8 Merge branch 'dev' into bugfix/corp-api-fixes 2022-03-07 17:43:29 -05:00
hydroflame b226b3d872 Merge pull request #3087 from nickofolas/improvement/tabs
#2710 Addendum
2022-03-07 17:42:54 -05:00
nickofolas e9033914e1 Update corp tabs to account for excessively long names 2022-03-07 16:40:22 -06:00
hydroflame 46628cb636 Merge pull request #3052 from ApamNapat/remove_unused_eslint_disable
Removed unnecessary eslint-disable lines
2022-03-07 17:31:59 -05:00
hydroflame 59aa0df456 Merge pull request #3078 from CrafterKolyan/patch-1
Fix error message for scp
2022-03-07 17:30:44 -05:00
hydroflame 5e558ffc5d Merge pull request #3081 from CrafterKolyan/patch-2
Add closing quote in description of sanitize parentheses coding contract
2022-03-07 17:30:05 -05:00