Commit Graph

3708 Commits

Author SHA1 Message Date
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
JJ 6713dca1d6 Custom function scope adjustments
Some adjustments made to the function scope documentation to make it easier for people to understand. This came up in Discord where some of us understood it but others did not and I think the way I changed it will make it a little cleaner
2018-02-20 14:44:28 -05:00
danielyxie 85ccb294dd Merge pull request #187 from IChris2698I/patch-1
Typo fix in Augmentations.js
2018-02-17 21:09:59 -06:00
danielyxie 24e99ed8d9 Wraithan's changes 2018-02-17 21:08:54 -06:00
danielyxie ba6ed1f6b6 Merge pull request #193 from danielyxie/revert-190-fix-ls-txt
Revert "Fix some stuff with ls() and cat"
2018-02-16 15:03:55 -06:00
danielyxie 1f5ab50b79 Revert "Fix some stuff with ls() and cat" 2018-02-16 15:03:16 -06:00
danielyxie d37e8f1d5f Merge pull request #190 from wraithan/fix-ls-txt
Fix some stuff with ls() and cat
2018-02-16 15:03:06 -06:00
danielyxie 2e6c1b73bb Merge pull request #192 from danielyxie/dev
Dev
2018-02-14 22:42:51 -06:00
danielyxie 1808afa711 Minor bugfix in Gang.js and updating documentation for spawn() and stopAction() 2018-02-14 22:34:57 -06:00
danielyxie f82d216e10 v0.34.4 2018-02-14 22:26:43 -06:00
Wraithan (Chris McDonald) 8445edeaf0 Change terminal cat to use <pre> tag for txt files which are often data 2018-02-10 12:52:56 -08:00
Wraithan (Chris McDonald) fe4a6d90f8 Fix documentation to include grep parameter to ls() netscript function 2018-02-10 12:28:26 -08:00
Wraithan (Chris McDonald) 6a3ac7165d fix bug with ls() that prevented including .txt files 2018-02-10 12:19:08 -08:00
danielyxie dc26d831d6 Reworked Gang UI 2018-02-09 15:11:43 -06:00
IChrisI 4267e7a3a9 Typo fix in Augmentations.js 2018-02-05 20:52:03 -08:00
danielyxie 920bfb7913 Fixed bug with Advert Inc upgrade not working properly because I used Math.random instead of getRandomInt. 2018-02-05 13:56:07 -06:00