hydroflame
|
27603e7a66
|
Merge pull request #2739 from surdaft/bugfix/2734-theme-apply-fails
WIP: 2734: Fix regex to enable alpha transparency hex codes (8 digits)
|
2022-03-20 21:14:50 -04:00 |
|
hydroflame
|
251aa6d862
|
Merge pull request #2848 from SagePtr/share-change
[Balance] Add CalculateShareMult to Field Work and Security Work
|
2022-03-20 21:14:03 -04:00 |
|
BB
|
9c9550ad42
|
Removed unreachable code
|
2022-03-20 19:33:10 +01:00 |
|
hydroflame
|
7b075f31ee
|
Merge pull request #2868 from zeddrak/patch-4
(Not Tested) Show current task on gang management screen
|
2022-03-20 14:28:52 -04:00 |
|
hydroflame
|
b295dd084d
|
Merge pull request #2878 from phyzical/bugfix/fix-ui-gang-member-task
Fix for ui of gang members current task when set via api
|
2022-03-20 14:25:23 -04:00 |
|
hydroflame
|
a980cb495f
|
Merge pull request #3150 from Master-Guy/issues/3080
Fixed number formatting and added tests
|
2022-03-20 14:23:16 -04:00 |
|
hydroflame
|
1a339a9611
|
Merge pull request #3156 from Master-Guy/issues/2308
Changed .keyCode to .key for files in "src"
|
2022-03-20 14:22:38 -04:00 |
|
hydroflame
|
9922ffb3c2
|
Merge branch 'dev' into issues/2308
|
2022-03-20 14:22:32 -04:00 |
|
hydroflame
|
d2dedace2e
|
Merge pull request #3152 from Master-Guy/issues/1944
Issues/1944
|
2022-03-20 14:21:28 -04:00 |
|
hydroflame
|
8faacfc4ef
|
Merge pull request #3158 from Master-Guy/features/2462
Tabelize linked output of `ls`
|
2022-03-20 14:20:53 -04:00 |
|
Olivier Gagnon
|
0fbcc30555
|
rm unused improt
|
2022-03-20 14:20:17 -04:00 |
|
hydroflame
|
a88b7fbaa1
|
Merge pull request #3204 from danielyxie/revert-3195-issue-3194
Revert "Fix #3194: include all division employees in small town achievement calc"
|
2022-03-20 14:16:10 -04:00 |
|
hydroflame
|
7a2bf64fce
|
Revert "Fix #3194: include all division employees in small town achievement calc"
|
2022-03-20 14:16:03 -04:00 |
|
hydroflame
|
21cab81ba6
|
Merge pull request #3195 from BrianLDev/issue-3194
Fix #3194: include all division employees in small town achievement calc
|
2022-03-20 14:15:37 -04:00 |
|
hydroflame
|
7e3a5e76c3
|
Merge pull request #3193 from t-wolfeadam/feature/corp-api-bonustime
Implement getBonusTime in Corporation API
|
2022-03-20 14:13:35 -04:00 |
|
hydroflame
|
629707dc32
|
Merge pull request #3199 from phyzical/bugfix/fix-sleeve-shock-check
purchaseSleeveAug
|
2022-03-20 14:13:17 -04:00 |
|
hydroflame
|
97685ac7b4
|
Merge pull request #3200 from phyzical/bugfix/combine-no-faction-check
combine !faction check modals
|
2022-03-20 14:11:30 -04:00 |
|
hydroflame
|
add2320b98
|
Merge pull request #3201 from Ornedan/issue-3198
Fix #3198: give player code a copy of Division.upgrades instead of the live object
|
2022-03-20 14:11:03 -04:00 |
|
Heikki Aitakangas
|
f6a9bd1de7
|
Fix #3198: give player code a copy of Division.upgrades instead of the live object
|
2022-03-20 15:12:21 +02:00 |
|
phyzical
|
dc5f709223
|
combine !faction check modals
|
2022-03-20 20:58:42 +08:00 |
|
phyzical
|
7fdbc81594
|
used the getSleeveStats as it seems to be a miss connection between whats displayed and whats used
i.e sleeve.shock of 100 is actually a shock value of 0 for the use
|
2022-03-20 20:56:33 +08:00 |
|
phyzical
|
58e3ecbf69
|
added inital augs
|
2022-03-20 20:47:59 +08:00 |
|
Brian Leip
|
07a3f3b753
|
Fix #3194: include all division employees in small town achievement calc
|
2022-03-19 15:28:37 -07:00 |
|
t.wolfeadam
|
5702cb04b6
|
Implement getBonusTime in Corporation
Used documentation from other 'getBonusTime' methods
|
2022-03-19 15:22:29 -05:00 |
|
Gian P
|
8be65faf9f
|
Check before unlocking corp upgrade
|
2022-03-19 16:53:28 -03:00 |
|
nickofolas
|
3aa0b6b948
|
Merge branch 'dev' of github.com:danielyxie/bitburner into feature/grafting
|
2022-03-19 14:16:20 -05:00 |
|
nickofolas
|
1f4f13c8ef
|
Main grafting exposition
|
2022-03-19 14:12:58 -05:00 |
|
nickofolas
|
4c422347d4
|
Polish entropy
- Also adds DevMenu entry
|
2022-03-19 13:59:34 -05:00 |
|
phyzical
|
a25fdb9f75
|
updated factionInfo
|
2022-03-20 02:41:13 +08:00 |
|
phyzical
|
b8556c34fb
|
Merge branch 'feature/aug-simplification' into feature/add-infiltration-faction
|
2022-03-20 02:40:15 +08:00 |
|
phyzical
|
7008919724
|
augment simplification
|
2022-03-20 02:29:20 +08:00 |
|
nickofolas
|
c92b159580
|
Implement entropy accumulation system
|
2022-03-19 13:15:31 -05:00 |
|
Master-Guy
|
7ec1ced729
|
dialogBox+stop on NS1 async function throw
|
2022-03-19 18:21:18 +01:00 |
|
Olivier Gagnon
|
f801dc6d8a
|
allbuild commit /usr/bin/git
|
2022-03-19 12:58:18 -04:00 |
|
nickofolas
|
c33c23700e
|
Remove resleeving from code
|
2022-03-19 11:43:58 -05:00 |
|
Master-Guy
|
91841836c9
|
One more IP reference
|
2022-03-19 17:35:55 +01:00 |
|
nickofolas
|
a70969df14
|
Add back button to GraftingRoot
|
2022-03-19 11:17:28 -05:00 |
|
nickofolas
|
d2dd88c5ca
|
Polish some UI
|
2022-03-19 11:04:15 -05:00 |
|
nickofolas
|
fef5ab31b2
|
Implement CraftableAugmentation
|
2022-03-19 11:03:18 -05: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 |
|
hydroflame
|
15badafd37
|
Merge pull request #3184 from nickofolas/improvement/sleeve-and-clash-ui
Sleeve and Territory UI refresh
|
2022-03-19 11:23:28 -04:00 |
|
Master-Guy
|
bcb44c6a02
|
Removed un-used imports from tests
|
2022-03-19 16:23:10 +01:00 |
|
Olivier Gagnon
|
bdb4d96f43
|
fix tooltip not dissapearing.
|
2022-03-19 11:19:59 -04:00 |
|
hydroflame
|
e3bf2d4d42
|
Merge pull request #3181 from incubusnb/WseAndTix
Wse and tix
|
2022-03-19 11:13:28 -04:00 |
|
hydroflame
|
9c3c07f786
|
Merge pull request #3183 from phyzical/feature/update-constants
Update constants
|
2022-03-19 11:12:43 -04:00 |
|
nickofolas
|
4789455b9c
|
Implement basic crafting functionality
|
2022-03-19 09:31:48 -05:00 |
|