Commit Graph

5888 Commits

Author SHA1 Message Date
phyzical
8e1300d69d Merge branch 'dev' into feature/add-infiltration-faction
# Conflicts:
#	src/Netscript/RamCostGenerator.ts
2022-04-20 20:10:05 +08:00
hydroflame
4ea7a4d7a8
Merge pull request #3517 from taralx/patch-1
MISC: make jQuery use explicit
2022-04-19 22:31:30 -04:00
hydroflame
ee5a3ea52c
Merge pull request #3521 from taralx/patch-4
MISC: update @types/numeral and fix type errors
2022-04-19 22:29:56 -04:00
hydroflame
db15744f5f
Merge pull request #3513 from Undeemiss/join-stanek-api
STANEK: FIX #3282 Added NS function stanek.acceptGift
2022-04-19 22:29:10 -04:00
JP Sugarbroad
d5be70e886 update @types/numeral and fix type errors 2022-04-19 17:07:51 -07:00
Olivier Gagnon
2922eb4923 Added bitnode difficulty descriptions on the bitverse. 2022-04-19 19:24:37 -04:00
JP Sugarbroad
01d7ac6967 make jQuery use explicit 2022-04-19 16:14:16 -07:00
Olivier Gagnon
7674c7f693 rm console log 2022-04-19 17:21:22 -04:00
Olivier Gagnon
eb778aafa9 refactor bitnode multiplier code to have less side effect. 2022-04-19 17:17:08 -04:00
Undeemiss
6d55bfe795 Removed redundant check for whether the player is in CotMG 2022-04-19 13:39:56 -05:00
Undeemiss
707e643c7d Merge branch 'dev' of https://github.com/Undeemiss/bitburner into join-stanek-api 2022-04-19 13:38:14 -05:00
Undeemiss
b3e83dd976 Added check for aug status to stanek.acceptGift
Added a check to stanek.acceptGift for aug status. It's not
particularly elegant, but I copied the checks from the ui. Also
changed the way CotMG status is checked to be more robust.
2022-04-19 13:33:07 -05:00
Undeemiss
46a90e6271 Added ns function stanek.acceptGift
Added a new ns function stanek.acceptGift to the game, with a ram
cost of 2gb. The function attempts to join the CotMG and install
the gift, then returns true iff the player is in the CotMG and has
the gift installed.
2022-04-19 12:08:38 -05:00
hydroflame
657a9a9a96
Merge pull request #3511 from nickofolas/improvement/backup-color
UI: Change text color of Augmentations page backup button
2022-04-19 11:10:05 -04:00
hydroflame
d37a4eea38
Merge pull request #3510 from Risenafis/fix-covenant-icon
UI: Fix the achievement covenant icon was not shown
2022-04-19 11:09:52 -04:00
hydroflame
81a4f42bf0
Merge pull request #3512 from nickofolas/fix/stats-page-bn-level
MISC: Update logic for stats page BitNode level
2022-04-19 11:09:31 -04:00
nickofolas
75ce3f2346 Use same BN level logic as save name generator 2022-04-19 09:57:26 -05:00
nickofolas
aee413e2e3 Change text color of backup save button 2022-04-19 09:50:25 -05:00
Risenafis
bb978b9420
fix covenant achievement icon path 2022-04-19 22:03:20 +09:00
hydroflame
40febcf22e
Merge pull request #3488 from Snarling/touchScreenTailFix
UI: FIX #3341 Enable touch-clicks in react-draggable
2022-04-18 20:52:09 -04:00
hydroflame
ae3c6194f1
Merge pull request #3505 from nickofolas/improvement/settings-ui
UI: Overhaul GameOptions UI
2022-04-18 20:51:50 -04:00
hydroflame
534d535c09
Merge pull request #3507 from Snarling/multipleJobsFix
WORK: FIX #3435 Quitting the active job now sets first remaining job as active
2022-04-18 20:51:41 -04:00
Snarling
bd07dea516 Fix quitting active job
When quitting active job, if there is another job, set the first remaining job as active.
2022-04-18 19:55:37 -04:00
nickofolas
af461d5e45 Merge branch 'dev' of github.com:danielyxie/bitburner into improvement/settings-ui 2022-04-18 12:04:46 -05:00
Olivier Gagnon
bc10d30d43 allbuild commit 00628a8c 2022-04-18 12:48:17 -04:00
hydroflame
00628a8c1c
Merge pull request #3503 from nickofolas/fix/editor-theme-migration
EDITOR: FIX #3502 Editor theme migration crash
2022-04-18 12:45:49 -04:00
nickofolas
7054c9daef Fix editor theme migration 2022-04-18 11:44:00 -05:00
Olivier Gagnon
cae1a9a92c allbuild commit 3a467b94 2022-04-18 12:03:33 -04:00
hydroflame
3a467b945f
Merge pull request #3500 from danielyxie/revert-3479-patch-1
Revert "MISC: HammingCodingContracts need rework"
2022-04-18 12:01:17 -04:00
hydroflame
b49b5ba269
Revert "MISC: HammingCodingContracts need rework" 2022-04-18 12:01:10 -04:00
Olivier Gagnon
0d7276b76f allbuild commit d5b296dd 2022-04-18 11:06:45 -04:00
Olivier Gagnon
d5b296ddc3 update donations 2022-04-18 11:04:40 -04:00
Olivier Gagnon
3286d85744 Merge branch 'dev' of github.com:danielyxie/bitburner into dev 2022-04-18 11:04:19 -04:00
hydroflame
2333630635
Merge pull request #3471 from MartinFournier/tools/validate-pr
TOOLING: Add GitHub action to validate PR titles
2022-04-18 11:03:52 -04:00
hydroflame
5d23926556
Merge pull request #3479 from Hedrauta/patch-1
MISC: HammingCodingContracts need rework
2022-04-18 11:03:41 -04:00
hydroflame
69feb790cb
Merge pull request #3490 from DavidGrinberg/bugfix/3489
Singularity: Fix #3489 Disable checkTixApiAccess for purchase4SMarketData
2022-04-18 11:03:08 -04:00
hydroflame
30920bec09
Merge pull request #3483 from TheMas3212/fix/employee-leak
API: Fix leak of real Employee object in hireEmployee
2022-04-18 11:02:13 -04:00
hydroflame
4ef5f3a585
Merge pull request #3493 from Snarling/autocompleteFix
UI: FIX #3457 autocomplete suggestions no longer require hovering terminal input
2022-04-18 11:01:19 -04:00
Snarling
f466a880eb Fix style + Format/Lint 2022-04-18 07:55:59 -04:00
Snarling
02ccda197c WIP 2022-04-18 07:41:09 -04:00
David Grinberg
d934bb88ad Disable checkTixApiAccess for purchase4SMarketData
This restriction doesn't apply on UI. It doesn't make sense to apply it to singularity api
2022-04-17 22:35:31 -04:00
Snarling
425afc17dd Merge branch 'touchScreenTailFix' of https://github.com/Snarling/bitburner into touchScreenTailFix 2022-04-17 17:49:12 -04:00
Snarling
5c53b39edc Try to fix formatting? 2022-04-17 17:40:37 -04:00
Snarling
9850b56711
Update LogBoxManager.tsx
Fix prettier failure?
2022-04-17 17:23:14 -04:00
nickofolas
bb0a0148f7 Rearrange some settings 2022-04-17 15:36:19 -05:00
nickofolas
2d4251ca9b Sidebar dev links tweaks 2022-04-17 15:29:37 -05:00
nickofolas
359c967087 Doc 2022-04-17 15:27:42 -05:00
nickofolas
7f2ab4f27a Revert noList prop 2022-04-17 15:26:43 -05:00
nickofolas
4073050333 Rename enum 2022-04-17 15:09:47 -05:00
nickofolas
f222dc5277 Some polish 2022-04-17 15:08:58 -05:00