Commit Graph

5807 Commits

Author SHA1 Message Date
nickofolas
81f971b52e Add coloring to NFG display 2022-04-08 09:43:21 -05:00
nickofolas
5dea27bc28 Fix NFG appearing in installed list 2022-04-08 09:43:09 -05:00
Olivier Gagnon
758b0e1127 fix home ram tooltip 2022-04-08 01:02:36 -04:00
nickofolas
fbf9bc521f Merge branch 'dev' of github.com:danielyxie/bitburner into improvement/stats-augs-ui 2022-04-07 23:55:46 -05:00
Olivier Gagnon
2b994f244d fmtlint 2022-04-08 00:54:54 -04:00
hydroflame
386106f574
Merge pull request #3378 from nickofolas/fix/congruity-availability
[Fix] Removed nickofolas Congruity Implant Augmentation from gangs
2022-04-08 00:53:57 -04:00
Olivier Gagnon
2b2af797a7 fmt and lint 2022-04-08 00:39:45 -04:00
nickofolas
251cdcd6dc Fix nickofolas Congruity Implant being available in gangs 2022-04-07 23:39:11 -05:00
hydroflame
d956e47246
Merge pull request #3331 from Ornedan/shortest-path-cct
New coding contract: Shortest Path in a Grid
2022-04-08 00:38:19 -04:00
hydroflame
1b7abbffaf
Merge pull request #3371 from Hedrauta/Hamming-Coding-Contracts
2 new Coding Contracts
2022-04-08 00:35:19 -04:00
nickofolas
e7ad5c5f9e Remove unnecessary code 2022-04-07 23:33:47 -05:00
Olivier Gagnon
690f9df7ba allbuild commit a2dddb0e 2022-04-08 00:31:17 -04:00
nickofolas
e720930f04 Improve sizing of some list-based menus 2022-04-07 23:29:24 -05:00
Olivier Gagnon
a2dddb0e5a Fix soft reset not installing augs anymore 2022-04-08 00:28:37 -04:00
nickofolas
3d296e2bf0 Consistently respect SF5 BN mult unlock 2022-04-07 23:19:05 -05:00
Olivier Gagnon
39d17986ff allbuild commit 589e61c5 2022-04-08 00:12:39 -04:00
Olivier Gagnon
589e61c5d1 fix lint 2022-04-08 00:07:48 -04:00
nickofolas
e3e77ea2cc Merge branch 'dev' of github.com:danielyxie/bitburner into improvement/stats-augs-ui 2022-04-07 23:07:43 -05:00
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
hydroflame
6ca2bcb3fc
Merge pull request #3375 from danielyxie/dev
fix aug main
2022-04-07 10:44:13 -04: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
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
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