Commit Graph

5414 Commits

Author SHA1 Message Date
danielyxie
f52d7d2f8b Merge branch 'dev' of https://github.com/danielyxie/bitburner into dev 2018-05-10 12:18:37 -05:00
danielyxie
7fe704de1e
Merge pull request #220 from hydroflame/crime-commit-log
FIX #207 commitCrime now takes enable/disable log into account
2018-05-10 12:15:01 -05:00
danielyxie
024138eabd Rebalancing Gyms and training in Bladeburner. Updated Active Scripts UI page to update once per second. Updated changelog 2018-05-10 12:14:45 -05:00
danielyxie
dfb5cbf02d Merging changes from pull requests. Re-adding package lock.json 2018-05-09 02:21:47 -05:00
danielyxie
b0a825e0bc Merge branch 'dev' of https://github.com/danielyxie/bitburner into dev 2018-05-09 02:16:30 -05:00
danielyxie
2c4c5ce6a3
Merge pull request #228 from hydroflame/ns-hacknet-multiplier
NS function to get player's hacknet multipliers
2018-05-09 02:16:14 -05:00
danielyxie
7c3bd93170
Merge pull request #232 from jaguilar/die-when-sleepy
NetscriptJS: Die when sleepy
2018-05-09 02:10:19 -05:00
danielyxie
2bd18e4e61
Merge pull request #233 from hydroflame/incomplete-program-precision
incomplete programs are more precise
2018-05-09 02:09:58 -05:00
danielyxie
f38fb58760
Merge pull request #235 from hydroflame/improve-get-script-ram
getScriptRam now optionally take hostname/ip or default to localhost
2018-05-09 02:09:28 -05:00
danielyxie
a849288900 Updated changelog for Bladeburner balance changes 2018-05-09 01:47:23 -05:00
James Aguilar
529e3fb39a Can't return promise sleep, nobody is awaiting it! 2018-05-08 21:40:07 -04:00
danielyxie
a5602e3d6a Slight rebalancing to Bladeburner 2018-05-08 09:06:47 -05:00
Olivier Gagnon
dcc09d561e
Merge branch 'dev' into improve-get-script-ram 2018-05-07 16:00:24 -04:00
Olivier Gagnon
577f73dce7 getScriptRam now optionally take hostname/ip or default to localhost 2018-05-07 15:56:55 -04:00
danielyxie
96b12f7f68 Added ENABLE_TIMESTAMPS Fconf Setting. Put a soft-cap on stock price. Cleaned up a number rounding display issue for Gang UI (100.03% territory, etc.). Refactored ActiveSCriptsUI code to use a queue to sequentially run 'tasks' that handle the adding/deleting of items and server panels 2018-05-07 12:25:44 -05:00
Olivier Gagnon
a483268f3c incomplete programs are more precise 2018-05-06 22:21:36 -04:00
James Aguilar
f259a5c17d More permanent fix for infinite sleeps. 2018-05-06 22:16:28 -04:00
James Aguilar
7045f5d74e Fix a bug where a JS script would never exit if killed in a sleep loop. 2018-05-06 22:07:14 -04:00
danielyxie
9d1bcd989b Merge branch 'dev' of https://github.com/danielyxie/bitburner into dev 2018-05-06 16:34:07 -05:00
danielyxie
c305a91c4a
Merge pull request #225 from hydroflame/hacknetnode-doc
added some documentation for hacknetnode api
2018-05-06 16:33:40 -05:00
danielyxie
c3663af14e
Merge pull request #222 from hydroflame/script-name
added getScriptName
2018-05-06 16:31:33 -05:00
danielyxie
dbaa5e0012
Merge pull request #224 from hydroflame/base-ram-constant
make script base cost a constant
2018-05-06 16:31:18 -05:00
danielyxie
3147f9edeb Updated Server instantiation with new Server constructor. Minor rebalances to BN6 2018-05-06 16:20:00 -05:00
danielyxie
4429e4621d
Merge pull request #226 from jaguilar/fix-server-purchasing
Fix server purchasing
2018-05-06 15:37:54 -05:00
danielyxie
4c52cfc6f2
Merge pull request #216 from jaguilar/dev
Move the runningFn var to a higher level.
2018-05-06 15:31:47 -05:00
danielyxie
9372236a6e
Merge branch 'dev' into dev 2018-05-06 15:31:37 -05:00
danielyxie
4ea365da02 Refactored Active Scripts UI. Can no longer gain Bladeburner faction rep from infiltration. Added Disable Hotkeys setting 2018-05-06 15:27:47 -05:00
Olivier Gagnon
92b1050a68 fixed integer form typo 2018-05-06 16:27:10 -04:00
Olivier Gagnon
39ed2c40dd added hacknet multiplier netscript function 2018-05-06 14:22:29 -04:00
James Aguilar
3f5398f8dc Fix purchaseServer's use of new Server() 2018-05-06 09:23:07 -04:00
Olivier Gagnon
96f0f14a95 commitCrime now takes enable/disable log into account 2018-05-06 04:01:43 -04:00
Olivier Gagnon
e7b6150062 added some documentation for hacknetnode api 2018-05-06 03:53:34 -04:00
Olivier Gagnon
579a0aec55 make script base cost a constant 2018-05-06 03:49:11 -04:00
Olivier Gagnon
60cc6e15d5 added getScriptName 2018-05-06 03:27:16 -04:00
James Aguilar
edca9a64ed Move the runningFn var to a higher level. 2018-05-05 20:39:34 -04:00
danielyxie
8dba456b65 Merge jaguilar's changes to incorporate Netscript JS (PR #212) 2018-05-05 17:13:35 -05:00
danielyxie
b6e49c1a82 Updating package.json to remove comma that was causing errors. Adding new dist files 2018-05-05 16:35:53 -05:00
danielyxie
ddcf6f3455
Merge pull request #213 from jaguilar/patch-1
Remove a bunch of scripts that don't actually work
2018-05-05 16:18:06 -05:00
J
9479bd7001
Merge branch 'dev' into patch-1 2018-05-05 17:14:44 -04:00
danielyxie
ce012a3fae
Merge pull request #209 from jaguilar/dev
Add NetscriptJS evaluation
2018-05-05 15:59:49 -05:00
J
9b6f10ece4
Remove a bunch of scripts that don't actually work 2018-05-05 16:51:18 -04:00
James Aguilar
7ce070e0aa Resolve merge conflicts. 2018-05-05 16:43:04 -04:00
danielyxie
6ae5faba71 Merge branch 'dev' of https://github.com/danielyxie/bitburner into dev 2018-05-05 15:25:43 -05:00
danielyxie
a5dab582f2
Merge pull request #210 from jaguilar/pl3
Remove package-lock.json from the repo
2018-05-05 15:25:30 -05:00
danielyxie
2a87aa16f6 Added metakey + b hotkey compatibility for script editor close and save. Refactored Server constructor and initialization 2018-05-05 15:23:57 -05:00
James Aguilar
0fa0c7a45c package-lock.json -> gitignore; merge minefield 2018-05-04 23:56:25 -04:00
James Aguilar
412671ade2 erase package-lock.json 2018-05-04 23:55:57 -04:00
J
07f1978c0f
Merge branch 'dev' into dev 2018-05-04 23:43:30 -04:00
James Aguilar
653d9d8b6f Add package-lock.json to gitignore. 2018-05-04 23:40:08 -04:00
James Aguilar
44935e1b4d Drop the package lock from the diffs 2018-05-04 23:39:01 -04:00