Commit Graph

6383 Commits

Author SHA1 Message Date
hydroflame
9fcbf83b3f
Merge pull request #3237 from danielyxie/dependabot/npm_and_yarn/electron-14.2.4
Bump electron from 14.0.2 to 14.2.4
2022-04-08 00:06:23 -04:00
hydroflame
14762be646
Merge pull request #3267 from danielyxie/dependabot/npm_and_yarn/minimist-1.2.6
Bump minimist from 1.2.5 to 1.2.6
2022-04-08 00:05:49 -04:00
hydroflame
0cfe8b760d
Merge pull request #3268 from danielyxie/dependabot/npm_and_yarn/plist-3.0.5
Bump plist from 3.0.4 to 3.0.5
2022-04-08 00:05:42 -04:00
Olivier Gagnon
092a3b15cf allbuild commit 4aa012f9 2022-04-07 23:51:31 -04:00
hydroflame
4aa012f9c0
Merge pull request #3372 from nickofolas/feature/unique-aug
[Feature] Add special Augmentation for Grafting
2022-04-07 23:35:05 -04:00
nickofolas
9dea381536 Fix SF levels and tweak spacing 2022-04-07 20:44:29 -05:00
nickofolas
960dc354c1 Further tweaks/fixes 2022-04-07 19:06:42 -05:00
TheMas3212
b2e7817a0b
format 2022-04-08 10:02:59 +10:00
TheMas3212
9b53896732
slight change on how wrapping work based on discussion in #development 2022-04-08 09:57:16 +10:00
nickofolas
d728648bfa Stats tweaks 2022-04-07 18:32:11 -05:00
nickofolas
c94b4f4fd3 Initial aug page overhaul work 2022-04-07 17:53:58 -05:00
nickofolas
a9a31662ce Tweak style for stats page 2022-04-07 13:17:27 -05:00
nickofolas
3651a8d379 Add employers modal to stats page 2022-04-07 11:50:23 -05:00
nickofolas
57f04d3911 Fix prettier 2022-04-07 11:45:21 -05:00
nickofolas
ed8e1537d6 Initial overhaul work 2022-04-07 11:31:06 -05:00
nickofolas
78463ed1c0 Tweaks and improvements 2022-04-07 11:25:12 -05:00
Olivier Gagnon
51dcdc3cb6 allbuild commit dca1ceaf 2022-04-07 10:41:08 -04:00
Olivier Gagnon
dca1ceaf20 fix aug cost 2022-04-07 10:39:13 -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
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
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