Commit Graph

579 Commits

Author SHA1 Message Date
phyzical
2bebb4e228 reroute to terminal instead 2022-03-24 23:20:11 +08:00
phyzical
6ad2f156d7 recovery screen fix for when augmenting and working 2022-03-24 23:13:54 +08:00
nickofolas
5416038fd7 Merge branch 'dev' of github.com:danielyxie/bitburner into feature/grafting 2022-03-23 11:10:18 -05:00
nickofolas
3df3e04f9c Formulas 2022-03-22 17:53:57 -05:00
hydroflame
1c801c5651
Merge pull request #3217 from phyzical/bugfix/dom-nesting-error-with-ul
fix for dom nesting with elements like ul
2022-03-22 10:46:35 -04:00
nickofolas
dfca624e35 Merge branch 'dev' of github.com:danielyxie/bitburner into feature/grafting 2022-03-21 11:08:48 -05:00
phyzical
54e8f701a1 change to 100 ms 2022-03-21 20:02:59 +08:00
phyzical
7271f37ec5 added logic to pick up log when its closed via event emotter 2022-03-21 19:56:54 +08:00
phyzical
14b4b08294 fix for dom nesting with elements like ul 2022-03-21 19:17:12 +08:00
Olivier Gagnon
699ae2e967 with SLEEVE_8, fix workForFaction 2022-03-20 23:27:53 -04:00
Olivier Gagnon
10f7d0ebbc fix react error 2022-03-20 21:26:10 -04:00
hydroflame
a980cb495f
Merge pull request #3150 from Master-Guy/issues/3080
Fixed number formatting and added tests
2022-03-20 14:23:16 -04:00
hydroflame
9922ffb3c2
Merge branch 'dev' into issues/2308 2022-03-20 14:22:32 -04:00
phyzical
dc5f709223 combine !faction check modals 2022-03-20 20:58:42 +08:00
nickofolas
d2dd88c5ca Polish some UI 2022-03-19 11:04:15 -05:00
nickofolas
c5d86fba4d Merge branch 'dev' of github.com:danielyxie/bitburner into feature/grafting 2022-03-19 10:27:49 -05:00
hydroflame
15badafd37
Merge pull request #3184 from nickofolas/improvement/sleeve-and-clash-ui
Sleeve and Territory UI refresh
2022-03-19 11:23:28 -04:00
nickofolas
4789455b9c Implement basic crafting functionality 2022-03-19 09:31:48 -05:00
nickofolas
5918e12f01 Merge branch 'dev' of github.com:danielyxie/bitburner into feature/grafting 2022-03-18 23:23:11 -05:00
nickofolas
919f8480dd Grafting UI framework 2022-03-18 23:22:21 -05:00
Jack Haden-Enneking
a8064f739e
re-add pre tags to support \n in prompt
#2880 was merged after #2968, causing a regression of #2520. This reapplies the small change from #2968 (thank you @phyzical).
2022-03-18 14:13:21 -07:00
Master-Guy
3f1f275581
Renamed new function to largestAbsoluteNumber() 2022-03-18 13:03:13 +01:00
Master-Guy
8bf0641d28 Recently changed file 2022-03-18 11:15:51 +01:00
Master-Guy
9373d65a16
Merge branch 'danielyxie:dev' into issues/2308 2022-03-18 11:12:21 +01:00
Master-Guy
9dd933ecee Changed .keyCode to .key for files in "src" 2022-03-18 10:43:56 +01:00
Master-Guy
1d07bf049f Changed the furthestFrom0() function + added tests 2022-03-18 09:30:25 +01:00
Olivier Gagnon
bfa30dcdbb allbuild commit /usr/bin/git 2022-03-17 18:17:19 -04:00
Olivier Gagnon
3cdf0452a4 fix up the new prompt UI 2022-03-17 16:44:44 -04:00
hydroflame
83ef5a940b
Merge branch 'dev' into prompt-additions 2022-03-17 15:38:13 -04:00
hydroflame
561219a0ab
Merge branch 'dev' into bugfix/2877-2 2022-03-17 12:05:38 -04:00
phyzical
9949cc9a1e removed ip references 2022-03-17 21:50:23 +08:00
Master-Guy
90fd496a24 Fixed number formatting and added tests 2022-03-17 12:47:27 +01:00
nickofolas
2524b429ec Merge branch 'dev' of github.com:danielyxie/bitburner into improvement/sleeve-ui 2022-03-16 16:48:13 -05:00
Olivier Gagnon
3aabbb7aaa dont hide int anymore 2022-03-16 15:42:25 -04:00
nickofolas
230d68aab2 Implement common stats row element 2022-03-12 15:49:07 -06:00
Olivier Gagnon
30776e5aca added arcade 2022-03-11 15:19:10 -05:00
Olivier Gagnon
81d3246cb8 fix not being able to work on program 2022-03-10 23:05:35 -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
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
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
c13ff7ea52
Merge branch 'dev' into improvement/aug-page-link 2022-03-10 21:40:58 -05:00
nickofolas
e39817cb57 Very slightly adjust router.toFaction
- Faction argument is now required
- Added augPage argument
2022-03-10 18:37:57 -06: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
Jack
a3555d101e
Update src/ui/WorkInProgressRoot.tsx 2022-03-09 22:50:41 +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
BB
2f4d879c16 Trailing whitespace and files not ending with \n are now illegal 2022-03-08 22:51:02 +01:00
hydroflame
6ed4268173
Merge pull request #3075 from ApamNapat/simplified_imports
Simplified some relative imports
2022-03-08 16:30:37 -05: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
3310928598
Merge pull request #2710 from nickofolas/improvement/tabs
Update `<Tabs>` sizing and style
2022-03-07 17:22:06 -05:00
Jack
d4f5f54fb6
Update src/ui/WorkInProgressRoot.tsx
Co-authored-by: ApamNapat <ApamNapat@users.noreply.github.com>
2022-03-06 12:42:35 +08:00
BB
2c3e0985c4 Simplified some relative imports 2022-03-06 05:05:55 +01:00
phyzical
a389b515df fix for work in progress modal when augmenting
* added an early out to turns a basic error for the work modal when the current work faction to show the faction or faction not found
2022-03-05 13:05:37 +08:00
BB
7212cc2f1c Removed unnecessary eslint-disable lines 2022-03-01 17:33:27 +01:00
hydroflame
d721c1e65a
Merge pull request #2968 from phyzical/bugfix/2520
added pre tags to support \n
2022-03-01 10:56:32 -05:00
citrusmunch
6e09241ff4 FIX: tutorial typo
"connect so it" -> "connect to it"
2022-02-13 16:46:13 -05:00
phyzical
1931734694 added pre tags to support \n 2022-02-13 18:49:24 +08:00
Phil
378f67097c Amending NetscriptDefinitions 2022-01-31 18:15:13 +00:00
Phil
af43e63415 Blanking Prompt value on close 2022-01-30 14:21:46 +00:00
Phil
08d0b4cbae Adding support for text/select options in Prompt command 2022-01-30 14:06:18 +00:00
smolgumball
2add4e9112 Merge branch 'dev' into add-ns-getRecentScripts 2022-01-26 19:07:02 -07:00
Martin Fournier
a47eae8b25 Add function to enable/disable routing
Wraps the toX() functions of the Router to add a check to only run the
function when it is allowed.

The check is used in the import page to prevent user scripts from
redirecting away to a crime or something else.
2022-01-26 03:56:19 -05:00
Martin Fournier
855a4e622d Add Electron preload script to allow communication
Adds a channel to communicate between the main process & the renderer
process, so that the game can easily ship data back to the main process.

It uses the Electron contextBridge & ipcRenderer/ipcMain.

Connects those events to various save functions. Adds triggered events
on game save, game load, and imported game. Adds way for the Electron
app to ask for certain actions or data.

Hook handlers to disable automatic restore

Allows to temporarily disable restore when the game just did an import
or deleted a save game. Prevents looping screens.
2022-01-26 03:56:19 -05:00
Martin Fournier
26432082e2 Add an import save comparison page
This adds a new page reachable from the import save file
options menu. It shows the difference between the current save
and the data that is being imported, for confirmation.

Includes an "automatic" variant, which has different wording for when
Electron decides it has access to a newer version of the game.

While in this screen, the autosave is disabled.

This also adds a new BypassWrapper component around the game's tree.
It allows for content to be displayed without rendering the nested
pages (import, recovery). This prevents player scripts from messing
with the screen.
2022-01-26 03:56:17 -05:00
Martin Fournier
974344545d Move import save functionality into SaveObject
Adds a lot of metadata to be able to easily compare the new save to the
current player.

- Adds lastSaved & identifier to the PlayerObject
- Includes a hash method used to generate an identifier
2022-01-26 03:42:52 -05:00
nickofolas
c0a27e7d66 Active scripts tab sizing 2022-01-26 00:53:16 -06:00
hydroflame
2f36fb107f
Merge pull request #2803 from MartinFournier/feat/github-actions
Adds GitHub workflows to fetch a changelog & to bump the app's version
2022-01-26 00:52:06 -05:00
hydroflame
3654a238ae
Merge pull request #2726 from SagePtr/recheck-achievements
Force achievements recalculation on bitnode completion
2022-01-26 00:50:06 -05:00
hydroflame
7a5dfd0e72
Merge pull request #2707 from MartinFournier/feature/theme-browser
Add Theme Browser accessible from GameOptions
2022-01-26 00:46:17 -05:00
Martin Fournier
8a2cad6c4a Reset styles for html changelogs in getUpdateText
Adds an optional sxProps to the DialogBox component.
2022-01-25 10:20:36 -05:00
nickofolas
259071e3d5 Align slider endpoints in settings 2022-01-21 16:32:32 -06:00
smolgumball
90e855053d Merge branch 'dev' into add-ns-getRecentScripts 2022-01-21 13:13:18 -07:00
Martin Fournier
a26b9c8dcf Add theme browser page accessible from game options
Removed the themes buttons that were in the ThemeEditorModal and only
left a "Revert to Default" button along with a link to the ThemeBrowser
page.

Split off the buttons into reusable components since they are now used
in two pages.

Display the themes in big cards with a zoomable screenshot. Applying the
theme now shows a toast with an option to undo the action.

The snackbar now allows ReactNode instead of only strings.

- Add link with details on how to create a new theme in the game.
- Add link to the theme-sharing discord channel.
- Add icons to the theme & style buttons in GameOptions
- Add "Theme Editor" button to ThemeBrowser
- Add "Style Editor" button to ThemeBrowser
- Move Styles related files into Themes folder
- Includes a modal that shows a bigger version of the screenshot.
- Change Snackbar to allow for ReactNode as the message
2022-01-20 18:41:49 -05:00
Martin Fournier
a9e2e35446 Move theme related things into its own subfolder
This will make contributions easier and less prone to conflicts.
2022-01-20 18:41:48 -05:00
SagePtr
32ba81883f Force achievements recalculation on bitnode completion 2022-01-21 00:04:47 +02:00
Olivier Gagnon
f7d18efaf6 Merge branch 'dev' of github.com:danielyxie/bitburner into dev 2022-01-20 16:14:35 -05:00
Olivier Gagnon
77f525c98c rm blob caching 2022-01-20 16:11:48 -05:00
Martin Fournier
6e908814db Add game version in document.title
Also add [dev] prefix when in development mode.
2022-01-20 09:26:07 -05:00
smolgumball
74e2acfa6f Add ns.getRecentScripts() 2022-01-19 00:04:48 -07:00
Olivier Gagnon
53727f6222 typo 2022-01-18 19:20:16 -05:00
nickofolas
eb7a0ebace Use background primary before #000000 for body 2022-01-18 16:15:36 -06:00
hydroflame
c5089ab82a Merge pull request #2664 from MartinFournier/feature/recovery
Add information to the recovery page
2022-01-17 16:05:00 -05:00
hydroflame
1d83247f8d
Merge pull request #2671 from gianfun/fix_ns_tail_behavior
Fix ns.tail() behaviour for multiple calls
2022-01-17 16:01:34 -05:00
hydroflame
25112acefb
Merge pull request #2654 from SlyCedix/bounded-logs
Bound log windows to screen
2022-01-17 16:01:16 -05:00
Martin Fournier
f9daf5df64 Keep the sidebar opened or closed on reload
Previously, going to a full-width page and heading back to the terminal would default the sidebar to its opened state regardless of what it was before.

Now it stores it in the GameRoot's state and also in the Settings so
that it persists over reloads.
2022-01-16 17:00:06 -05:00
Gian P
e38010a9a4 Revert "Logs button reopens log window"
This reverts commit 01efd372e95628d419575ade0e6536a458fd61d2.
2022-01-16 18:21:02 -03:00
Martin Fournier
65964c84b2 Add information to the recovery page
Adds error & environment information to the recovery page when
available. The info will be displayed when the error boundary catches an error only.

Otherwise, does a few minor tweaks to the UI of the page.

- Add DevPage button to throw an uncaught error to go into recovery
- Add "Delete Save" button in recovery from Game Options (refactored into its own
component)
- Use "Soft Reset" button from Game Options (refactored into its own
component)
- The "Soft Reset" & "Delete Save" buttons now have confirmations
- Add tooltip on "Disable Recovery Mode" button
- Add timestamp to the RECOVERY.json filename
- Add textarea containing markdown with the current error details, if
available
  - Error
  - Page
  - Version
  - Environment
  - Platform
  - UserAgent
  - Features
  - Source
  - Stack Trace
- Change GitHub new issue link to contain default body & title, if possible
- Change links to not take the full width (they were clickable by mistake)
- Fix "Disable Recovery Mode" not resetting the ErrorBoundary's state,
making going back to terminal impossible
2022-01-16 09:07:53 -05:00
Cyn
8d7b71c5aa Prevent dragging log window off screen & reset log window position if resized off screen 2022-01-15 20:52:02 -05:00
SlyCedix
c25067c062 bound log box to parent div 2022-01-15 20:52:02 -05:00
Olivier Gagnon
d5c3d89613 fix bug 2022-01-15 18:13:35 -05:00
hydroflame
a454e21977
Merge branch 'dev' into feature-catch-errors-and-softreset-recovery 2022-01-15 18:00:33 -05:00
hydroflame
0db08c3477
Merge pull request #2476 from nickofolas/reopen-log-windows
Logs button reopens log window
2022-01-15 17:18:59 -05:00
nickofolas
0359229af6 Grid-align buttons in location UIs (and options) 2022-01-15 10:21:45 -06:00
Olivier Gagnon
5126d72742 rm some stuff from netdef to make it work in-game 2022-01-13 14:26:05 -05:00
Martin Fournier
6633c00f5d Clear timers when unmounting CorruptableText
The interval was cleared, but not the setTimeout to replace the character
2022-01-13 09:34:08 -05:00
hydroflame
d274e21a10
Merge pull request #2596 from MartinFournier/feature/ns-ui-styles
Add ns.ui.[getStyles, setStyles, resetStyles]
2022-01-12 19:18:54 -05:00
Martin Fournier
0a2187bdf5 Revert "Add toPreviousPage in router"
This reverts commit b0bc3236fdcd2c9f6cfb9c540010e9520c2cbe01.
2022-01-12 18:49:53 -05:00
Martin Fournier
9033640c0c Revert "Fix duplicate previous pages"
This reverts commit 16f7058e536648ddce8f9949b276071ae6baa854.
2022-01-12 18:46:01 -05:00
Martin Fournier
9b638b911f Add ns.ui.[getStyles, setStyles, resetStyles]
Adds three Netscript functions to manipulate the user's styles like the
player can with theme.
2022-01-12 18:34:05 -05:00
hydroflame
3e7a9ac896
Merge pull request #2578 from MartinFournier/feature/work-overview
Add details to work in overview
2022-01-12 11:16:20 -05:00