Commit Graph

6577 Commits

Author SHA1 Message Date
Olivier Gagnon
dca1ceaf20 fix aug cost 2022-04-07 10:39:13 -04:00
hydroflame
3f82190859
Merge pull request #3374 from danielyxie/dev
update main
2022-04-07 10:33:30 -04:00
Martin Fournier
078a62cb0d Add npm version support to build releases
Replaces the `npm run allbuild` script with the `npm version` command.
It creates a new commit with a standardized message & includes the built
app.

Usage: `npm version [patch | minor | version | 10.0.0 | etc]`

Will update the package.json & perform a bunch of steps in a row:

- Runs `npm install` in:
  - The root directory
  - The ./electron/ directory
  - The ./tools/bump-version/ directory
- Runs `npm run test`
- Update the version string in:
  - ./electron/package.json (version)
  - ./src/Constants.ts (VersionString)
  - ./doc/source/conf.py (version & release)
- Runs `npm run doc` (build the markdown documentation)
- Runs `npm run build` (production build)
- Runs `npm run electron` (electron build)
- Runs `git add --all`
- Runs `git push -u origin dev && git push --tags`
2022-04-07 07:50:47 -04:00
Martin Fournier
cec5f1ce29 Move electron build script to /tools/
Also enables bash strict mode flags for the build script
2022-04-07 07:48:44 -04:00
Martin Fournier
452ee3da7f Move main bundle output to ./dist subfolder
Excludes the index.html so that the github page can still work as is.
This will declutter the root of the repo a fair bit.
2022-04-07 07:48:44 -04:00
phyzical
afa2210aa6 Merge branch 'dev' into bugfix/2843 2022-04-07 16:38:48 +08:00
phyzical
d24a26a208 merge dev 2022-04-07 16:37:57 +08:00
phyzical
2b0c618222 fix build error with fix for augmentations not being static 2022-04-07 16:31:31 +08:00
phyzical
c70f59ac54 merge dev 2022-04-07 16:27:23 +08:00
phyzical
43248bbc42 merge dev 2022-04-07 16:25:33 +08:00
phyzical
7cc3b85083 linting 2022-04-07 16:23:31 +08:00
phyzical
a4d221f709 missed a conflict opps 2022-04-07 16:23:26 +08:00
phyzical
85e65195e5 merg dev 2022-04-07 16:22:07 +08:00
phyzical
a4e1b73b19 Merge branch 'dev' into bugfix/3348
# Conflicts:
#	src/Faction/FactionInfo.tsx
#	src/NetscriptFunctions/Singularity.ts
2022-04-07 16:17:28 +08:00
nickofolas
314e37430d Add Augmentation unique to Grafting 2022-04-07 00:48:39 -05:00
Hedrauta
e286ee1de5 2 new Coding Contracts
also run format and lint on it this time 😉
2022-04-07 06:16:14 +02:00
TheMas3212
f0cfc8700a run formater 2022-04-07 10:23:52 +10:00
TheMas3212
8c58f0676d Improve Typesafety on API Wrapper 2022-04-07 10:23:52 +10:00
TheMas3212
40f74e4a98 add wrapped helpers to ctx
add ramcheck into wrapper
2022-04-07 10:23:52 +10:00
TheMas3212
ea2b444b87 Initial API Wrapper Work
onlying wrapping Stanek api currently as test sample
(Rebased onto upstream/dev)
2022-04-07 10:23:46 +10:00
Olivier Gagnon
7d4bf90b40 fmtlinttest 2022-04-06 20:18:25 -04:00
hydroflame
371de216ea
Merge pull request #3308 from phyzical/bugfix/fix-tests
Fix tests
2022-04-06 20:16:55 -04:00
hydroflame
b6d68f7353
Merge branch 'dev' into bugfix/fix-tests 2022-04-06 20:16:51 -04:00
Olivier Gagnon
4fc352a792 fix a few test 2022-04-06 20:12:54 -04:00
Olivier Gagnon
f05b533af5 fix a few test 2022-04-06 20:08:03 -04:00
Olivier Gagnon
8ae23937fb fix a few test 2022-04-06 19:58:06 -04:00
hydroflame
c94f31fc2a
Merge pull request #3369 from danielyxie/dev
fmt / fix sleep
2022-04-06 19:43:57 -04:00
Olivier Gagnon
9ce2023873 allbuild commit 724c0669 2022-04-06 19:40:04 -04:00
Olivier Gagnon
724c0669da sleep/asleep return promise true 2022-04-06 19:38:30 -04:00
Olivier Gagnon
e07a223d77 Added fmt and lint warnings to github pr template 2022-04-06 19:36:35 -04:00
Olivier Gagnon
48f80f25d6 fmt and lint 2022-04-06 19:30:08 -04:00
hydroflame
ddf0ee6d0c
Merge pull request #3367 from danielyxie/dev
Few bugfix
2022-04-06 15:21:20 -04:00
Olivier Gagnon
5a25faf9fa allbuild commit ba6304fb 2022-04-06 15:06:15 -04:00
hydroflame
ba6304fbd1
Merge pull request #3351 from phyzical/bugfix/augmentations-not-reseting-correctly
changes static arrays to functions to force new creation of augmentations when called
2022-04-06 15:03:45 -04:00
hydroflame
d8b2c003c2
Merge pull request #3307 from steven-r/fix-3281
Fix 3281 - ns.goToLocation is expecting the wrong minimum RAM
2022-04-05 20:03:42 -04:00
hydroflame
d683fa5eda
Merge pull request #3337 from phyzical/feature/3332
added apr1 terminal command
2022-04-05 20:02:26 -04:00
hydroflame
8e2f9a513b
Merge pull request #3335 from ApamNapat/eslint_warnings_fixes
Fixed eslint warnings for unused vars
2022-04-05 20:01:58 -04:00
hydroflame
4cdef2d898
Merge pull request #3349 from phyzical/bugfix/3347
add logic to block sleeve working for gang faction
2022-04-05 20:01:02 -04:00
hydroflame
b5005cd480
Merge pull request #3352 from phyzical/feature/3258
add app id for notifications and other magic
2022-04-05 19:53:35 -04:00
hydroflame
cd33b833d5
Merge pull request #3363 from Seancheey/patch-1
Fix workForFaction invalid worktype case
2022-04-05 19:48:56 -04:00
Qiyi Shan
b9caddeeef
Fix workForFaction invalid worktype case
When invalid work type, the function should return false instead of true
2022-04-05 11:22:02 -04:00
phyzical
ee6c13d33b add app id for notifications and other magic 2022-04-04 22:15:46 +08:00
phyzical
42276db351 add fix for augmentations not reseting 2022-04-04 19:50:01 +08:00
phyzical
4a5edb9f3c changes static arrays to functions to force new creation when called 2022-04-04 19:44:25 +08:00
phyzical
2ee73cc8d6 missing space 2022-04-04 18:34:07 +08:00
phyzical
dfe9e98c77 move route to terminal to the inside of the common fucntion
* tested without bandaid still works correctly
* fix default script with installAugmentations
2022-04-04 18:29:43 +08:00
phyzical
8eccdf16e1 add logic to block working for gang faction 2022-04-04 18:10:21 +08:00
Heikki Aitakangas
a7d200f7c6 Strip trailing spaces 2022-04-02 23:28:23 +03:00
Heikki Aitakangas
a6710eb3e5 No need to return WorkerScript from startNetscript*Script promises, their only calling function already has the correct object in a variable 2022-04-02 23:28:23 +03:00
Heikki Aitakangas
cbd59975d4 makeRuntimeRejectMsg expects the 'msg' to be string-like 2022-04-02 23:28:23 +03:00