Commit Graph

5471 Commits

Author SHA1 Message Date
Heikki Aitakangas
c6ff982b1d Remove stopFlag checks made redundant by the netscriptDelay change 2022-01-09 02:42:36 +02:00
Heikki Aitakangas
59da79a427 Refactor netscriptDelay and script kill interaction
Store the Promise reject function instead of resolve in WorkerScript, since
it's only used when killing a script that's blocked in delay. And when killing
a script, reject the delay Promise with the WorkerScript as cause.
2022-01-09 02:36:54 +02:00
philarmstead
43d31c409c Removing errant apostrophe 2022-01-08 23:56:57 +00:00
hydroflame
0de588ee17
Merge pull request #2481 from nickofolas/fix-terminal-exp
Fix terminal grow/weaken EXP gain
2022-01-08 18:15:03 -05:00
nickofolas
474ab69301 Fix terminal grow/weaken EXP gain 2022-01-08 15:57:44 -06:00
hydroflame
2b10c11913
Merge pull request #2478 from nickofolas/update-toast-signature
Update toast signature
2022-01-08 16:42:36 -05:00
nickofolas
357258261a Use codeblocks for null 2022-01-08 14:59:28 -06:00
nickofolas
a971921417 Document null duration for toasts 2022-01-08 14:56:29 -06:00
nickofolas
01efd372e9 Logs button reopens log window 2022-01-08 14:31:58 -06:00
hydroflame
d74efd6a4a
Merge pull request #2475 from TheMas3212/refactor-gameroot-v2
Refactor GameRoot.tsx to use a switch case statement instead of 20 nested ternarys
2022-01-08 15:29:47 -05:00
hydroflame
4b130a88fa
Merge pull request #2473 from JustAnOkapi/patch-1
fix two typos in HelpText
2022-01-08 15:29:11 -05:00
TheMas3212
2e31dda75e
make Popups use variable like Sidebar does 2022-01-09 07:25:41 +11:00
JustAnOkapi
00b838dab2
fix two typos in HelpText
mem -tab
scp +tab
2022-01-08 14:15:40 -06:00
TheMas3212
84845ff9a2
Refactor GameRoot.tsc to use a switch case statement instead of 20
nested ternarys
2022-01-09 07:15:28 +11:00
Olivier Gagnon
ea5e142fa1 increase achievment counter 2022-01-08 15:03:36 -05:00
hydroflame
bff3c51a68
Merge pull request #2460 from MartinFournier/feature/convert-extra-hashes-to-cash
Use wasted hashes on "Sell for Money"
2022-01-08 14:55:19 -05:00
Olivier Gagnon
fe2270dc27 re-add achievemnets fix 2022-01-08 14:54:21 -05:00
hydroflame
af50560a47
Merge pull request #2409 from MartinFournier/feature/achievements
Add achievements to base game
2022-01-08 14:53:01 -05:00
hydroflame
b8eb07dda5
Merge branch 'dev' into feature/achievements 2022-01-08 14:51:36 -05:00
hydroflame
f52fc9fa7b
Merge pull request #2454 from zeddrak/patch-1
Apply bitnode multiplier before capping at 1 in calculatePercentMoneyHacked in hacking.ts
2022-01-08 14:33:41 -05:00
hydroflame
f39524b77a
Merge pull request #2167 from Hedrauta/fix#1921
workaround? fix for #1921
2022-01-08 14:28:09 -05:00
hydroflame
ec7481b391
Merge pull request #2310 from theit8514/import-via-acorn
Replace regex import with acorn AST parser
2022-01-08 14:27:40 -05:00
hydroflame
bc1c5346f5
Merge pull request #2465 from kittycat2002/dev
Optimized favor calculations.
2022-01-08 14:22:52 -05:00
hydroflame
6a00501d94
Merge pull request #2472 from TheMas3212/fix-2245
Fix toLowercase in fileExists check for literature and message files
2022-01-08 14:14:24 -05:00
hydroflame
20ca1239df
Merge pull request #2229 from FaintSpeaker/update-theme-engine-missing-elements
Update theme engine to cover some themeless elements
2022-01-08 14:13:53 -05:00
TheMas3212
446810d98f
Fix toLowercase in fileExists check for literature and message files
fixes #2245
2022-01-09 06:11:42 +11:00
hydroflame
7633f271db
Merge pull request #2265 from TheMas3212/fix-2119
Fix 2119
2022-01-08 13:56:05 -05:00
hydroflame
ff15d2d730
Merge pull request #2451 from neuralsim/fixSyntaxHighlighting
fixed syntax highlighting (don't highlight partial tokens/keywords)
2022-01-08 13:30:35 -05:00
Olivier Gagnon
f4ac7344c4 doc 2022-01-08 13:25:06 -05:00
Olivier Gagnon
fb90e21a31 Merge branch 'dev' of github.com:danielyxie/bitburner into dev 2022-01-08 13:19:44 -05:00
Olivier Gagnon
5a1cabdb34 typo 2022-01-08 13:19:35 -05:00
hydroflame
8d7bc1755c
Merge pull request #2429 from MartinFournier/fix/export-bonus
Fix export bonus not being applied when using options menu
2022-01-08 12:43:28 -05:00
hydroflame
30f5559bdf
Merge pull request #2441 from Feodoric/fix-duplicate-messages
fix #2174 - icarus message will no longer stack infinitely
2022-01-08 12:42:19 -05:00
hydroflame
1df5e5a2aa
Merge pull request #2447 from Feodoric/fix-gang-augments
Fix #2446 - ns.purchaseAugment() can no longer buy NF from gang
2022-01-08 12:41:25 -05:00
hydroflame
dbc1bae7ff
Merge pull request #2464 from MartinFournier/fix/local-mathjax
Change better-react-mathjax to use a local version
2022-01-08 12:40:37 -05:00
hydroflame
8cb7c9b460
Merge pull request #2459 from MartinFournier/fix/max-cache-achievement
Add check for hash capacity > 0 for MAX_CACHE
2022-01-08 12:37:49 -05:00
hydroflame
3c047d170f
Merge pull request #2467 from MartinFournier/fix/load-running-scripts
Check if running script is null before offlineProd
2022-01-08 12:37:39 -05:00
hydroflame
9855916b2e
Merge pull request #2468 from Ornedan/fix-small-town
Fix 'Small town' achievement condition to match description text
2022-01-08 12:36:16 -05:00
hydroflame
b373e5dddc
Merge pull request #2469 from MartinFournier/fix/snackbar-zindex
Make toasts appear above tail popups
2022-01-08 12:36:05 -05:00
hydroflame
67899a4901
Merge pull request #2470 from MartinFournier/fix/terminal-finishaction-server
Pass server to terminal actions that end later
2022-01-08 12:35:33 -05:00
Martin Fournier
f9ed45a895 Pass server to terminal actions that end later
Adds the current server object to the finishAction handler so that if
the player changes during the progress he'll hit the original server
with the command.
2022-01-08 11:29:00 -05:00
Martin Fournier
2b0a248673 Make toasts appear above tail popups 2022-01-08 10:07:35 -05:00
Heikki Aitakangas
b1b9d0862b Fix 'Small town' achievement condition to match description text 2022-01-08 16:37:35 +02:00
Martin Fournier
71487337cb Check if running script is null before offlineProd 2022-01-08 09:13:25 -05:00
kittycat2002
4fd95a322e Optimized favor calculations. 2022-01-08 08:14:13 -05:00
Martin Fournier
bf133689a4 Include local version of mathjax 2022-01-08 07:49:35 -05:00
Martin Fournier
78a91d9997 Add local reference to mathjax context 2022-01-08 07:48:10 -05:00
Martin Fournier
7ddb66c601 Use wasted hashes on "Sell for Money" 2022-01-08 06:51:25 -05:00
Martin Fournier
4f42c920b0 Add grayscale achievement SVG icons in /dist/
They are generated using the script in the steam achievement folder.
2022-01-08 05:45:38 -05:00
Martin Fournier
38e10e193e Add achievements dev menu 2022-01-08 05:45:38 -05:00