Commit Graph

218 Commits

Author SHA1 Message Date
phyzical
3eb9c4a2e2 regression fix 2022-04-13 18:52:01 +08:00
phyzical
6b48ff8f21 merge base 2022-04-13 18:50:42 +08:00
Olivier Gagnon
de8b38b299 few stanek improvements. 2022-04-12 17:18:36 -04:00
hydroflame
3f4d00a8c2
Merge pull request #3350 from phyzical/bugfix/3348
Fix for install augmentation stale objects bug
2022-04-11 20:05:46 -04:00
nickofolas
251cdcd6dc Fix nickofolas Congruity Implant being available in gangs 2022-04-07 23:39:11 -05:00
phyzical
c70f59ac54 merge dev 2022-04-07 16:27:23 +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
Olivier Gagnon
48f80f25d6 fmt and lint 2022-04-06 19:30:08 -04:00
phyzical
2ee73cc8d6 missing space 2022-04-04 18:34:07 +08:00
BB
c7a95ccb2d Fixed eslint warning for unused vars 2022-04-02 13:11:55 +02:00
phyzical
2edfb6e35d merge base 2022-03-31 22:36:47 +08:00
phyzical
5831409418 move augmentationsCreator to data
* only show multiple on purchase augmentation for non infiltrators
2022-03-31 19:00:15 +08:00
Olivier Gagnon
c511fa644d Re-add augs in gangs but randomly based on BNx.y 2022-03-30 20:58:09 -04:00
nickofolas
83a386584c Make compiler happy 2022-03-30 14:37:34 -04:00
nickofolas
73af73fdb4 Merge branch 'dev' of github.com:danielyxie/bitburner into improvement/filter-helper-func 2022-03-30 14:35:27 -04:00
phyzical
a4cd3ad38d minor adjustments to where getNerufluxGenerator is after merge base 2022-03-30 19:13:44 +08:00
phyzical
be24562d34 merge dev 2022-03-30 19:11:34 +08:00
phyzical
07c6051004 merge dev 2022-03-30 19:00:57 +08:00
nickofolas
5d27ce7aa3 Impl faction augs filter helper function 2022-03-29 21:10:07 -04:00
phyzical
b3a52c6224 one minor compile issue 2022-03-30 08:36:27 +08:00
phyzical
cee53ee1a7 merge base 2022-03-30 08:18:16 +08:00
Olivier Gagnon
48e73a9131 allbuild commit /usr/bin/git 2022-03-29 18:00:57 -04:00
Olivier Gagnon
ac34829649 pre-1.6 2022-03-29 15:30:22 -04:00
phyzical
fd64746ff8 various fixes and adjustments 2022-03-29 22:43:28 +08:00
phyzical
aa3b692aac Merge branch 'feature/add-infiltration-faction' of github.com:phyzical/bitburner into feature/add-infiltration-faction 2022-03-27 12:27:56 +08:00
phyzical
7f28158005 moved over to player stats
* added new augmentations
2022-03-27 12:26:43 +08:00
Jack
557f0d8bff
Merge branch 'dev' into feature/add-infiltration-faction 2022-03-26 10:59:24 +08:00
phyzical
a0d845ffae mini game fixes 2022-03-25 23:39:14 +08:00
phyzical
a65c82ff22 slice out refactor of augmenation realted stuff from new faction pr
* moved some of augmentation helper stuff to new file augmentation creator
* simplified init augmenations
* converted augmentation names to enum
2022-03-24 22:33:38 +08:00
nickofolas
6a8426abd2 Allow every aug in gangs in BN2 2022-03-23 11:17:03 -05:00
nickofolas
5416038fd7 Merge branch 'dev' of github.com:danielyxie/bitburner into feature/grafting 2022-03-23 11:10:18 -05:00
phyzical
4e73e489ed more refactors 2022-03-22 23:02:15 +08:00
phyzical
78c0cac50b reafactored augmentations helpers to have another file it was getting tooooo big
reused duplicated code
2022-03-22 19:24:32 +08:00
nickofolas
dfca624e35 Merge branch 'dev' of github.com:danielyxie/bitburner into feature/grafting 2022-03-21 11:08:48 -05:00
phyzical
dc9c05b345 another multipler based on purchases 2022-03-21 23:17:52 +08:00
Jack
4c862ef313
Update src/Faction/ui/FactionsRoot.tsx 2022-03-21 23:11:04 +08:00
phyzical
796881f35d fix the correct base point for sorting 2022-03-21 21:23:34 +08:00
phyzical
c6accf1eaf merge base 2022-03-21 21:00:51 +08:00
phyzical
5532b81285 add similar sort to the faction invite list 2022-03-21 20:13:28 +08:00
phyzical
b4260173e7 more intial infil aug changes 2022-03-21 10:53:36 +08:00
hydroflame
9922ffb3c2
Merge branch 'dev' into issues/2308 2022-03-20 14:22:32 -04:00
phyzical
58e3ecbf69 added inital augs 2022-03-20 20:47:59 +08:00
phyzical
a25fdb9f75 updated factionInfo 2022-03-20 02:41:13 +08:00
phyzical
8d83c27077 Merge branch 'dev' into feature/add-infiltration-faction 2022-03-19 23:56:46 +08:00
phyzical
e5f5ea413b added inital factions for infiltrators 2022-03-19 23:56:29 +08:00
nickofolas
dc5b925f65 Merge branch 'dev' of github.com:danielyxie/bitburner into feature/grafting 2022-03-19 10:38:21 -05:00
Olivier Gagnon
cbeb6d13d3 fix misnamed factions 2022-03-19 11:37:13 -04:00
nickofolas
c5d86fba4d Merge branch 'dev' of github.com:danielyxie/bitburner into feature/grafting 2022-03-19 10:27:49 -05:00
nickofolas
06425d6d63 Implement new aug filtering for gangs 2022-03-19 08:43:30 -05:00
phyzical
44ea479043 update constants
* added OperationNames
* added faction names
* used citynames where appropriate
2022-03-19 16:09:59 +08:00