phyzical
|
7d647c0b1b
|
added startinRepRequirement for multiplying
added logic to increase ost based on amount of infiltators augmentations purchased
removed some copyright issues
|
2022-03-21 23:17:36 +08:00 |
|
phyzical
|
e7e52663bc
|
merge dev
|
2022-03-21 21:01:31 +08:00 |
|
phyzical
|
c6accf1eaf
|
merge base
|
2022-03-21 21:00:51 +08:00 |
|
Olivier Gagnon
|
ca02bdefd1
|
allbuild commit /usr/bin/git
|
2022-03-21 00:32:06 -04:00 |
|
Olivier Gagnon
|
0171fc236c
|
Fix some augs not getting added.
|
2022-03-21 00:30:11 -04:00 |
|
Olivier Gagnon
|
9104c54d96
|
allbuild commit /usr/bin/git
|
2022-03-20 23:29:48 -04:00 |
|
Olivier Gagnon
|
699ae2e967
|
with SLEEVE_8, fix workForFaction
|
2022-03-20 23:27:53 -04:00 |
|
Olivier Gagnon
|
05fe14a5ed
|
Fix some key not working
|
2022-03-20 23:11:26 -04:00 |
|
phyzical
|
b4260173e7
|
more intial infil aug changes
|
2022-03-21 10:53:36 +08:00 |
|
hydroflame
|
81d1c02fdf
|
Merge pull request #3210 from danielyxie/prettier-ci
Added dark web functions to ns api
|
2022-03-20 22:50:42 -04:00 |
|
Olivier Gagnon
|
fb7c65957d
|
Added dark web functions to ns api
|
2022-03-20 22:49:46 -04:00 |
|
hydroflame
|
e56f7356cd
|
Merge pull request #2883 from chrisrabe/fix/hackanalyzethreads-infinity
fix: fixed hackAnalyzeThreads returning infinity
|
2022-03-20 22:23:15 -04:00 |
|
hydroflame
|
ecffc8655a
|
Merge pull request #3209 from danielyxie/prettier-ci
prettier ci
|
2022-03-20 22:21:00 -04:00 |
|
Olivier Gagnon
|
00d1d294ed
|
fix lint errors
|
2022-03-20 22:14:32 -04:00 |
|
Olivier Gagnon
|
fb93d97493
|
change name of ci step
|
2022-03-20 22:03:11 -04:00 |
|
Olivier Gagnon
|
901ee92fe9
|
prettier ci
|
2022-03-20 22:02:36 -04:00 |
|
hydroflame
|
8506dcfed5
|
Merge pull request #3115 from ApamNapat/remove_unreachable_code
Removed unreachable code
|
2022-03-20 21:46:23 -04:00 |
|
hydroflame
|
290f36b600
|
Merge pull request #2881 from dwRchyngqxs/reverse_grow_newton
growthAnalyze (choice 2 / documented math) - only merge one of these
|
2022-03-20 21:40:02 -04:00 |
|
hydroflame
|
9eee30170f
|
Merge pull request #3189 from Master-Guy/issues/2725
dialogBox+stop on NS1 async function throw
|
2022-03-20 21:27:57 -04:00 |
|
hydroflame
|
04d45a1f0e
|
Merge pull request #3192 from gianfun/check-corp-upgrade-before-purchase
Check before unlocking corp upgrade
|
2022-03-20 21:27:21 -04:00 |
|
Olivier Gagnon
|
10f7d0ebbc
|
fix react error
|
2022-03-20 21:26:10 -04:00 |
|
Olivier Gagnon
|
edb347e566
|
rm current task from gang
|
2022-03-20 21:22:21 -04:00 |
|
hydroflame
|
2ad1016df8
|
Merge pull request #3191 from phyzical/feature/aug-simplification
augment simplification
|
2022-03-20 21:18:35 -04:00 |
|
hydroflame
|
15fae213ab
|
Merge pull request #2872 from SagePtr/getserver-hasownproperty
Add hasOwnProperty check to GetServer
|
2022-03-20 21:16:04 -04:00 |
|
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 |
|
phyzical
|
a25fdb9f75
|
updated factionInfo
|
2022-03-20 02:41:13 +08:00 |
|