Commit Graph

1694 Commits

Author SHA1 Message Date
Matthew Goff
4b87616aad
Merge upstream 2018-08-04 13:22:27 -05:00
Daniel Xie
44e45af2fe Removed console.log statement 2018-08-03 16:54:11 -05:00
Daniel Xie
1ce9a5308d Fixed bug in Changelog text. Properly credited kopelli for Active Server UI Ram usage change 2018-08-03 10:50:20 -05:00
Daniel Xie
4a56076ba9 Merge branch 'dev' of https://github.com/danielyxie/bitburner into dev 2018-08-03 10:41:56 -05:00
Daniel Xie
5ba1433898 Updated changelog for merged PRs 2018-08-03 10:41:52 -05:00
danielyxie
2f9897255e
Merge pull request #416 from kopelli/active-scripts-ram-usage
Servers on Active Scripts now show a ram usage bar
2018-08-03 11:41:16 -04:00
danielyxie
9b0db28d00
Merge pull request #415 from kopelli/active-scripts
Active Scripts list no longer jumps down on first update
2018-08-03 11:38:50 -04:00
danielyxie
3bc76f10d1
Merge pull request #417 from Kline-/patch-6
Remove extraneous logging
2018-08-03 11:36:13 -04:00
danielyxie
f972d9458f
Merge pull request #418 from kopelli/patch-1
[style] Consistent quotes & spacing in index.html
2018-08-03 11:35:11 -04:00
danielyxie
dd03444873
Merge pull request #419 from hydroflame/overview-gc-relief
Character overview gc relief
2018-08-03 11:34:42 -04:00
Steven Evans
933e8952d7
[style] Consistent quotes & spacing in index.html
Less changes introduced when Webpack is generating this file.
2018-08-03 10:57:57 -04:00
Olivier Gagnon
ddca5ae987 character overview element reuse 2018-08-03 10:54:13 -04:00
Matthew Goff
b581bacee4
Merge pull request #2 from danielyxie/dev
Merge upstream
2018-08-02 18:59:54 -05:00
Matthew Goff
aa8fdae2df
Remove extraneous logging
This is already logged [here](b00d2acc00/src/Bladeburner.js (L1185))
2018-08-02 18:45:49 -05:00
Steven Evans
530ae48e79 [feat] Servers on Active Scripts now show a ram usage bar 2018-08-02 16:14:48 -04:00
Steven Evans
ba3f637eb1 [feat] Active Scripts list no longer jumps on first update 2018-08-02 15:53:53 -04:00
Steven Evans
e0a193c7ca [bug] 'createProgressBar' - actually possible to fill the entire bar 2018-08-02 15:49:16 -04:00
Steven Evans
edcfe71eed [refactor] Moving BitNodeMultipliers to its own file to break cyclical
module references.
2018-08-02 14:33:08 -04:00
Steven Evans
974bc3c002 [refactor] Moved Settings to TypeScript
Moved the UI binding to a separate file as there is still a circular
dependency with 'engine'. But every other file that depends on Settings
is no longer part of a larger dependency cycle.
2018-08-02 14:33:08 -04:00
Steven Evans
826a8799fa [refactor] Extracting Locations to its own file to remove circular dependency 2018-08-02 14:33:08 -04:00
Steven Evans
26b0840f26 [refactor] Breaking out page tracking from 'engine' 2018-08-02 14:33:07 -04:00
Steven Evans
56da0f9214 [refactor] Pulling out createStatusText from Engine 2018-08-02 14:33:06 -04:00
Steven Evans
7313d551f1 [refactor] Pulling out post to terminal to its own file. 2018-08-02 14:26:24 -04:00
Steven Evans
0bea4e0430 [refactor] Breaking out key codes
Trying to start breaking apart the large circular dependencies between
modules. Most of the dependencies are similar to this pattern where
there is one stand-alone member that is needed, so the entire module
gets brought along with.
2018-08-02 14:23:50 -04:00
Steven Evans
1412b01be5 [style] Fixing TSLint violations 2018-08-02 14:23:49 -04:00
Daniel Xie
357e600cf2 Merge branch 'dev' of https://github.com/danielyxie/bitburner into dev 2018-08-02 10:08:27 -05:00
Daniel Xie
702fdf307a Merge branch 'master' of https://github.com/danielyxie/bitburner into dev 2018-08-02 10:08:19 -05:00
Daniel Xie
2c3af9c86e Updated changelog for merged PRS 2018-08-02 10:06:29 -05:00
Olivier Gagnon
ce13c1bb2f
Merge branch 'dev' into semicolon 2018-08-02 11:04:21 -04:00
danielyxie
b5e8d61ad6
Merge pull request #407 from kopelli/refactor-programs-from-terminal
Refactor - Determine program execution from terminal via hashmap instead switch statement
2018-08-02 10:57:26 -04:00
danielyxie
c2be5df1f5
Merge pull request #406 from kopelli/fix-dev-programs
Fixing Program list in dev menu
2018-08-02 10:55:27 -04:00
danielyxie
81c97aefb9
Merge pull request #397 from hydroflame/smooth-bitnode-hacking-level
made hacking level calculation smoother with regards to bitnode multi…
2018-08-02 10:54:52 -04:00
danielyxie
508e016859
Merge pull request #391 from hydroflame/patch-3
Made BN12 difficulty scale faster
2018-08-02 10:52:47 -04:00
danielyxie
d38cf88c50
Merge pull request #405 from hydroflame/detect-main
fixed nsjs script with no main causing unkillable zombie scripts
2018-08-02 10:43:43 -04:00
danielyxie
93bada0119
Merge pull request #396 from hydroflame/favor-gain
added favor related funtions
2018-08-02 10:40:48 -04:00
danielyxie
1c927c53cd
Merge pull request #395 from hydroflame/prevent-raid-fail
Prevent doing blade raids when commsEst is zero
2018-08-02 10:36:10 -04:00
danielyxie
27ac2a911a
Merge pull request #393 from Kline-/patch-3
Add CranialSignalProcessor prereqs
2018-08-02 10:33:41 -04:00
danielyxie
e45c875006
Merge pull request #401 from hydroflame/patch-5
rst syntax error in getOwnedSourceFiles
2018-08-02 10:30:48 -04:00
danielyxie
cf372cd9c8
Merge pull request #394 from Kline-/patch-4
Fix formatting
2018-08-02 10:30:02 -04:00
danielyxie
b00d2acc00
Merge pull request #409 from hydroflame/nuke-unused
Nuke unused
2018-08-02 10:29:14 -04:00
danielyxie
923c69943f
Merge pull request #412 from kopelli/fix-timestamp
Fix timestamp
2018-08-02 10:27:43 -04:00
danielyxie
dcbdac0c1b
Merge pull request #388 from hydroflame/buy-rp-negative
cna buy the red pill with negative money
2018-08-02 10:24:27 -04:00
danielyxie
f54f9a0cca
Merge pull request #385 from hydroflame/bonus-time
Display bonus time in bladeburner
2018-08-02 10:22:48 -04:00
danielyxie
4ea6c4840c
Merge pull request #360 from kopelli/scss
Incorporate SCSS for styling/bundling
2018-08-02 10:18:36 -04:00
danielyxie
1c9b54c0a3
Merge pull request #317 from kopelli/get-server-cost
Add "getPurchasedServerCost" NS function
2018-08-02 10:17:19 -04:00
Olivier Gagnon
fcabaf1365
Update BitNode.js 2018-08-01 17:10:19 -04:00
Steven Evans
3130b410e2 [refactor] pulling getTimestamp off Terminal 2018-08-01 13:38:54 -04:00
Steven Evans
0345daf359 [bug] Fixing the timestamp
getMonth() is 0-based, so changing the offset.

getDay() is the day of week, not day of the month.

Ensuring hours & minutes are always two digits.
2018-08-01 12:55:01 -04:00
Olivier Gagnon
1cf276fa99 deleted the file 2018-07-31 01:21:29 -04:00
Olivier Gagnon
873114d52f nuke unused code 2018-07-31 01:20:06 -04:00