Commit Graph

934 Commits

Author SHA1 Message Date
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
danielyxie
ff3f6da2d4
Merge pull request #186 from danielyxie/dev
0.34.3 Multiple Corporation Management bug fixes and balance changes
2018-01-31 17:43:06 -06:00
danielyxie
d89b804b00 0.34.3 Multiple Corporation Management bug fixes and balance changes 2018-01-31 17:41:02 -06:00
danielyxie
8a96ffa0ee
Merge pull request #184 from danielyxie/dev
Fixed load error due to missing plus operator in update log
2018-01-30 09:37:22 -06:00
danielyxie
36952ef8b4 Fixed load error due to missing plus operator in update log 2018-01-30 09:36:41 -06:00
danielyxie
9e20856b5f
Update Constants.js 2018-01-30 08:28:56 -06:00
danielyxie
49eeeeec52
Merge pull request #180 from danielyxie/dev
Bugfixes for Corporations. hacknetnodes now accounts for RAM usage. S…
2018-01-29 23:21:00 -06:00
danielyxie
470b66e304 Bugfixes for Corporations. hacknetnodes now accounts for RAM usage. Start of v0.34.3 2018-01-29 23:14:17 -06:00
danielyxie
2ca7439ff2
Merge pull request #179 from danielyxie/dev
Fixed a serious bug with Corporation profit (forgot to multiple by se…
2018-01-27 12:43:32 -06:00
danielyxie
be17cff29e Fixed a serious bug with Corporation profit (forgot to multiple by secsperCycle 2018-01-27 12:42:53 -06:00
danielyxie
b564c0c275
Merge pull request #178 from danielyxie/dev
Fixed Corporation bug with businessFactor for Products
2018-01-27 12:30:08 -06:00
danielyxie
f60fe597fb Fixed Corporation bug with businessFactor for Products 2018-01-27 12:29:21 -06:00
danielyxie
8ae6579991
Merge pull request #177 from danielyxie/dev
Dev
2018-01-27 01:02:14 -06:00
danielyxie
19c8972fb4 Commented out logging debug code 2018-01-27 01:00:56 -06:00
danielyxie
1ae1a1a5a9 Resolved merge conflicts for v0.34.2 2018-01-27 00:53:56 -06:00
danielyxie
5f817c8016 V 0.34.2 Changes 2018-01-27 00:52:39 -06:00
danielyxie
3fab52971c
Merge pull request #175 from danielyxie/bugfixes
Using BitFlume program now opens a confirmation window first
2018-01-21 15:25:32 -06:00
danielyxie
97ca8121be Using BitFlume program now opens a confirmation window first 2018-01-21 15:24:51 -06:00
danielyxie
8d72dd0f4e fileExists() now works on text files. Starting redoing Company mgmt employee UI 2018-01-21 14:53:16 -06:00
danielyxie
8ad28908e8
Merge pull request #170 from devoidfury/fileExists-txt
fileExists netscript function now works with txt files
2018-01-19 23:40:29 -06:00
danielyxie
73bca9099f
Merge pull request #174 from danielyxie/dev
v0.34.1
2018-01-19 23:17:38 -06:00
danielyxie
e88a3936f3 v0.34.1 2018-01-19 22:47:57 -06:00
danielyxie
b8ce5481bc
Merge pull request #173 from danielyxie/dev
Error calculating hacknet node earnings sets to 0 instead of throwing…
2018-01-10 09:51:18 -06:00
danielyxie
281aad993f Error calculating hacknet node earnings sets to 0 instead of throwing error 2018-01-10 09:50:31 -06:00
danielyxie
ae053f3f57
Merge pull request #172 from danielyxie/dev
Minor bug fixes, adding spotify music player, and adding sphinx docum…
2018-01-09 14:58:34 -06:00