Commit Graph

1543 Commits

Author SHA1 Message Date
danielyxie
0e4df90804 Merge branch 'hydroflame-loading-redirect' into dev 2018-09-10 15:01:25 -05:00
danielyxie
afd7f53132 Fixed merge conflicts with hydroflame-loading-redirect 2018-09-10 15:01:12 -05:00
danielyxie
93db9c513a
Merge pull request #455 from kopelli/lint-violations
Lint violations
2018-09-10 14:27:46 -05:00
danielyxie
d3d842cec7
Merge pull request #451 from kopelli/server-expansion
Server Randomization
2018-09-10 14:25:21 -05:00
danielyxie
c24b7bce5f Merge branch 'dev' of https://github.com/danielyxie/bitburner into dev 2018-09-10 13:52:38 -05:00
danielyxie
752e13c354 Merge branch 'Kline--numeral-updates' into dev 2018-09-10 13:51:44 -05:00
danielyxie
ba469f49c5 Fixed merge conflicts in Kline--numeral-updates 2018-09-10 13:51:21 -05:00
Steven Evans
9a4867785e [style] Fixing TSLint violations 2018-09-10 11:24:23 -04:00
Steven Evans
a681fc5577 [chore] Disabling a couple ESLint violations
These should really be refactored and fixed, but the end-to-end testing
will take a bit more effort. It can be tackled later.
2018-09-10 10:59:07 -04:00
Steven Evans
a85f956a9d [style] Cleaning up Stylelint violations 2018-09-10 10:41:48 -04:00
danielyxie
4b9b3f9002
Merge pull request #452 from danielyxie/wget
Wget
2018-09-09 17:34:52 -05:00
danielyxie
93c1d603c5 Fixed issue with prompt color 2018-09-07 21:53:10 -05:00
danielyxie
b36855fe52 Merged from dev. Fixed merge conflicts. Updated terminal documentation for wget 2018-09-07 21:21:23 -05:00
danielyxie
98598b103d Implemented wget Terminal command 2018-09-07 20:53:11 -05:00
Steven Evans
3d52ed5990 [feat] Let server RAM be a range instead of static 2018-09-07 08:39:33 -04:00
Steven Evans
babbf00029 [refactor] Server RAM is exponent instead of concrete value
This will let us randomize the value down the line.
2018-09-07 08:39:16 -04:00
Steven Evans
625734d326 [feat] Network server layers can be randomized 2018-09-07 08:39:01 -04:00
Steven Evans
319b45ead5 [refactor] Network servers are created via metadata 2018-09-07 08:37:47 -04:00
danielyxie
28b83b778f
Merge pull request #450 from danielyxie/stock-market-and-bladeburner-rebalancing
Stock market and bladeburner rebalancing
2018-09-06 17:18:47 -05:00
danielyxie
e9b6683cfb Merge branch 'dev' of https://github.com/danielyxie/bitburner into stock-market-and-bladeburner-rebalancing 2018-09-06 13:42:58 -05:00
danielyxie
ba72ad338e
Merge pull request #448 from danielyxie/v0.40.3-patch-2
V0.40.3 patch 2
2018-09-06 13:41:20 -05:00
danielyxie
053bb9fcaf Merge branch 'dev' of https://github.com/danielyxie/bitburner into stock-market-and-bladeburner-rebalancing 2018-09-06 11:54:21 -05:00
danielyxie
7906bf1478
Merge pull request #446 from mat-jaworski/dev
More UI updates
2018-09-06 11:10:42 -05:00
danielyxie
26fa9cfe82 Rebalanced Stock Market and Bladeburner. Refactored Stock class to Typescript 2018-09-06 11:07:59 -05:00
Mat Jaworski
f721e21622 More minor font colour and Infiltration details updates 2018-09-07 00:15:36 +10:00
Mat Jaworski
0cc6d81309 Updated the src/index.html as per my previous PR updates in ./index 2018-09-06 21:58:27 +10:00
Mat Jaworski
fe47df1ade
Merge branch 'dev' into dev 2018-09-06 21:44:44 +10:00
danielyxie
f0151db5d1 Merge branch 'v0.40.3-patch-2' of https://github.com/danielyxie/bitburner into stock-market-and-bladeburner-rebalancing 2018-09-05 16:38:19 -05:00
danielyxie
14e04f51ef
Merge pull request #443 from danielyxie/v0.40.3-patch-1
V0.40.3 patch 1
2018-09-05 16:11:01 -05:00
danielyxie
9f1626c0a3 Updated changelog 2018-09-05 16:10:34 -05:00
danielyxie
3c2ffc05e1
Merge pull request #442 from kopelli/html-webpack
Html Webpack
2018-09-05 16:09:11 -05:00
danielyxie
423ecea95f Finished refactoring Player code to continuously give exp when doing a working action (rather than giving it all when the action is finished) 2018-09-05 15:36:18 -05:00
Mat Jaworski
0b0a3d366c More UI updates
- infiltration: added colours, updated spacing and fixed alignment
- terminal prompt: added colour for the previous lines as well
- Active Scripts and Hacknet Nodes: money values have a gold colour now; minor spacing updates
- minor code refactoring
2018-09-03 22:10:00 +10:00
Matthew Goff
2d9f3856c7
formatNumber -> numeral in more locations 2018-09-01 08:42:56 -05:00
Matthew Goff
63188cebef
Merge pull request #5 from danielyxie/dev
Merge upstream
2018-09-01 08:15:42 -05:00
danielyxie
ab0ef6d36c Began refactoring Player work-related functions to continously give exp rather than only giving when the work "ends". Has been completed for company work so far 2018-08-30 16:51:25 -05:00
danielyxie
395fc3b9df Added tryWrite() as a native Netscript function. Updated documentation to reflect the fact that port handles no longer work in Netscript 1.0 2018-08-30 15:27:47 -05:00
danielyxie
30f8c4a6f0 Fixed merge conflicts 2018-08-30 12:01:37 -05:00
danielyxie
5ede6be8e5 Refactored functions that calculate hacking time/exp gain/chance/ etc into a separate file 2018-08-30 12:00:38 -05:00
Steven Evans
60ee4f01be [doc] Updating CONTRIBUTING 2018-08-30 11:16:32 -04:00
Steven Evans
a154d214b7 [refactor] Page title is driven by Webpack 2018-08-30 11:13:27 -04:00
Steven Evans
2deeaef349 [refactor] Google Analytics is controlled by Webpack 2018-08-30 11:08:08 -04:00
Steven Evans
552ce183c1 [chore] Introduce HTML-Webpack
This issue means that any changes to the HTML has to happen in the
`.\src\index.html` file rather than the `.\index.html`. This makes the
`index.html` in the root now a build artifact the same way that files in
`dist\` are.
2018-08-30 10:43:18 -04:00
danielyxie
e2e0bee150
Merge pull request #414 from kopelli/createProgressBar
[bug] 'createProgressBar' - actually possible to fill the entire bar
2018-08-29 22:20:30 -05:00
danielyxie
e900e9b7f5
Merge pull request #429 from kopelli/lint-violations
Fixing Lint violations
2018-08-29 22:19:13 -05:00
Steven Evans
26b1c43435 [style] Sorting properties alphabetically 2018-08-29 22:45:47 -04:00
Steven Evans
68527d6258 [style] Fixing TSLint violations 2018-08-29 22:40:23 -04:00
danielyxie
63cd269d5e b1t_flume.exe program can now be created instantly (reqd hacking level is 1 instead of 5). Fixed some linting errors 2018-08-29 15:25:01 -05:00
danielyxie
aa18420e0c
Merge pull request #441 from danielyxie/improve-interactive-tutorial
Updated Interactive Tutorial and added a few helpful links to the hac…
2018-08-29 14:11:13 -05:00
danielyxie
0fd1376760
Merge pull request #440 from mat-jaworski/dev
Dev
2018-08-29 14:07:55 -05:00