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
danielyxie
bf90b85ae0
Changed version number to v0.35.0. Disabled AST logging for Netscript Worker actions
2018-03-03 15:30:46 -06:00
danielyxie
99d774cf5a
Minor fixes in and cleaning up typoes in license
2018-03-03 15:22:50 -06:00
danielyxie
2c68d17bc3
Merge branch 'master' of https://github.com/danielyxie/bitburner
2018-03-03 15:06:47 -06:00
danielyxie
e3c435270b
V0.35.0. Adding netscript_tests in game testbench.
2018-03-03 15:05:33 -06:00
danielyxie
2701db160b
Merge pull request #195 from jjspace/patch-1
...
Custom function scope Doc adjustments
2018-02-28 12:14:07 -06:00
danielyxie
56fea3f7f3
Updating license. Updating package/package-lock.json with correct dependencies.
2018-02-27 12:39:55 -06:00
danielyxie
8d16723123
Update license.txt
2018-02-27 08:18:27 -06:00
danielyxie
271932b287
Fixed package dependencies
2018-02-26 20:06:38 -06:00
JJ
f684c42e8c
Merge branch 'master' into patch-1
2018-02-26 19:10:30 -05:00
JJ
cada0ff1d7
Merge remote-tracking branch 'upstream/master'
2018-02-26 18:42:35 -05:00
danielyxie
6c9598d111
Adding package.json
2018-02-26 10:29:16 -06:00
danielyxie
9876ac3b1d
Merge pull request #198 from danielyxie/dev
...
Fixed company bug in v0.34.5
2018-02-24 20:10:56 -06:00
danielyxie
0e6ef8b83f
Fixed company bug in v0.34.5
2018-02-24 20:10:24 -06:00
danielyxie
6dbef173c7
Update license.txt
2018-02-24 17:29:46 -06:00
danielyxie
b6120bf257
Add license
2018-02-24 17:27:16 -06:00
danielyxie
677810c640
Merge pull request #197 from danielyxie/dev
...
v0.34.5
2018-02-24 17:10:54 -06:00
danielyxie
779ce25ae5
v0.34.5. Also adding webpack config and package-lock.json
2018-02-24 16:55:06 -06:00
JJ
f99b897ac4
Update netscriptfunctions.rst
2018-02-20 14:56:18 -05:00
