Commit Graph

1041 Commits

Author SHA1 Message Date
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
James Aguilar
96a8e084e9 Make the devserver serve from the proper location. 2018-05-04 23:36:39 -04:00
James Aguilar
3fe254494e Add tests for NetscriptJS 2018-05-04 23:29:22 -04:00
James Aguilar
ebd5aacb89 add the NSJS evaluator 2018-05-04 23:20:19 -04:00
James Aguilar
0fa9c26529 Add preamble function for NSJS programs. 2018-05-04 23:06:22 -04:00
danielyxie
283a1948e5
Merge pull request #208 from danielyxie/dev
v0.36.0
2018-05-02 12:58:56 -05:00
danielyxie
9acc422f05 v0.36.0 - Bladeburner BitNode (BN-6) 2018-05-02 12:38:11 -05:00
danielyxie
8a0277d631 Merge branch 'kopelli-master' into dev 2018-03-28 11:50:47 -05:00
danielyxie
1c7ae7bc8f Fixed merge conflicts 2018-03-28 11:50:10 -05:00
danielyxie
d29797ce1e Update Faction info for Fulcrum and NWO 2018-03-28 11:35:34 -05:00
danielyxie
3590d3405a
Merge pull request #206 from danielyxie/dev
v0.35.2
2018-03-26 20:15:08 -05:00
danielyxie
521b81aec0 v0.35.2 2018-03-26 19:46:21 -05:00
Steven Evans
fafab158a5 Merge in changes to successfully run webpack 2018-03-21 11:58:46 -04:00
Steven Evans
3ad6cfd8bb Can successfully run Webpack to create dist/bundle.js
The bundled output is noticeably different; likely due to Webpack 4
vs. 2/3. The order of dependencies also appears to have changed.
The overall output *seems* to be the same. Unsure how to full test
that everything is getting bundled appropriately.

This also allows the project to be built without having to manually
copy files into node_modules.
2018-03-21 11:56:30 -04:00
Steven Evans
04eeba5a24 Updating package.json to reflect true values for the repo.
Keeping all the dependencies and additional scripts, as some of them
could come in useful for future work. A number of the dependencies were
based on Webpack rather than what is really used.
2018-03-20 21:32:30 -04:00
Steven Evans
3aea9a107c Adding .gitattributes for consistent line endings 2018-03-20 16:19:26 -04:00
danielyxie
f042490151
Merge pull request #203 from danielyxie/dev
v0.35.1
2018-03-12 15:10:28 -05:00
danielyxie
6255971e96 Fixed a bug with Introductory Tutorial in v0.35.1 2018-03-12 14:53:07 -05:00
danielyxie
d3e45f746b Updated .fconf comment for ENABLE_BASH_HOTKEYS to link to propert documentation page 2018-03-12 14:43:10 -05:00
danielyxie
f33d81b1a5 v0.35.1 2018-03-12 14:39:04 -05:00
danielyxie
d294ba6180
Merge pull request #201 from danielyxie/dev
Fixed various bugs in v0.35.0 with prestiging
2018-03-03 17:59:30 -06:00
danielyxie
629e2eb425 Removed dev/debugging parameters 2018-03-03 17:58:05 -06:00
danielyxie
f8c987a2c0 Fixed various bugs in v0.35.0 with prestiging 2018-03-03 17:55:58 -06:00
danielyxie
45d80a6661
Merge pull request #200 from danielyxie/dev
Changed version number to v0.35.0. Disabled AST logging for Netscript…
2018-03-03 15:32:27 -06:00