Commit Graph

861 Commits

Author SHA1 Message Date
nickofolas 58c4861c56 lint 2022-04-13 14:45:26 -05:00
nickofolas 567fcf8fb6 prettier 2022-04-13 14:42:07 -05:00
nickofolas 1f9414fd0e Resolve conflict 2022-04-13 14:32:30 -05:00
nickofolas 137539c1db Add missing newline at end of file 2022-04-13 14:32:30 -05:00
nickofolas d1edbe9a43 Save data sanitization
- Run in `Editor.beforeMount`, as well as when the
options modal is closed
- Recursively validates all token colors and
replaces them with bright red if they're invalid
2022-04-13 14:32:30 -05:00
nickofolas 739ca27ab9 Add Paper styling to modal 2022-04-13 14:32:30 -05:00
nickofolas 6f60589779 Tie up loose ends
- Ensure that customTheme is redefined whenever the options modal
is closed, regardless of saved or not
- Reset the pending value for the theme editor whenever modal is clsoed
2022-04-13 14:32:30 -05:00
nickofolas 10513ba5bc Update label for common.accent 2022-04-13 14:32:30 -05:00
nickofolas 16cf227498 Implement Monaco theme editor 2022-04-13 14:32:30 -05:00
nickofolas b3f37b2583 Add types token 2022-04-13 14:32:30 -05:00
nickofolas 881d4816cc Theme attribute cleanup 2022-04-13 14:32:30 -05:00
nickofolas ec0f20b14f Framework for custom theme 2022-04-13 14:32:30 -05:00
hydroflame cca8aa45d6 Merge pull request #3425 from Chris380/bugfix/3111_growthAnalyzeSecurity_thread_limit
Bugfix/3111 growthAnalyzeSecurity thread limit
2022-04-13 11:26:22 -04:00
Olivier Gagnon a029aee404 fmtlint 2022-04-13 11:18:22 -04:00
nickofolas 51e5d38c7b Add grafting API function to get graftable augs 2022-04-13 09:43:27 -05:00
Chris380 baa14f7b4d Update src/ScriptEditor/NetscriptDefinitions.d.ts
Co-authored-by: Nikolai Korolev <CrafterKolyan@mail.ru>
2022-04-13 15:48:44 +02:00
Chris380 04abb60708 Update src/ScriptEditor/NetscriptDefinitions.d.ts
Co-authored-by: Nikolai Korolev <CrafterKolyan@mail.ru>
2022-04-13 15:48:29 +02:00
phyzical 6b48ff8f21 merge base 2022-04-13 18:50:42 +08:00
Jack 2f9ab67cd2 Merge branch 'dev' into bugfix/corp-updates 2022-04-13 16:35:18 +08:00
chris380 4c113c19eb take into account max threads needed 2022-04-13 09:16:59 +02:00
Olivier Gagnon e1a56f9270 typos 2022-04-13 02:04:51 -04:00
Alexander Jarman dd6d4ec104 Merge branch 'dev' into htugboat/toast-part-deux 2022-04-13 01:55:13 -04:00
Heinous Tugboat 492c7012ea Renames SnackbarVariant to ToastVariant, adds enum to ns 2022-04-13 01:54:13 -04:00
Olivier Gagnon f555c4567b update doc 2022-04-13 01:35:35 -04:00
hydroflame 03b05f53fe Revert "[Feature] Script Editor Theme Customization" 2022-04-13 01:12:56 -04:00
hydroflame 413576100a Merge pull request #2876 from nickofolas/feature/monaco-theme-editor
[Feature] Script Editor Theme Customization
2022-04-13 01:12:15 -04:00
Olivier Gagnon 729fdf7510 fk it 2022-04-13 01:00:00 -04:00
hydroflame eee8d3e283 Merge pull request #3381 from HeinousTugboat/htugboat/toast-enum
Adds SnackbarVariant enum
2022-04-13 00:34:09 -04:00
Olivier Gagnon eaf0098cc7 move singularity to its own namespace but still support the old. 2022-04-12 20:55:28 -04:00
hydroflame b017fd2300 Merge pull request #3000 from JonathanBeverley/corp-expose-things-in-ui
Expose product and material details in API match UI
2022-04-12 17:49:29 -04:00
Olivier Gagnon 52e01fc026 fix a few things about getRecentScritps 2022-04-12 14:45:48 -04:00
hydroflame 68abd27d2c Merge branch 'dev' into add-ns-getRecentScripts 2022-04-12 14:21:18 -04:00
hydroflame aa1ab030a3 Merge pull request #3404 from Chris380/bugfix/3057_hashCost_example_code
Fixed hashCost() example code
2022-04-12 13:37:32 -04:00
chris380 fa29d2d9a8 take into account max thread needed 2022-04-12 17:42:49 +02:00
chris380 a49f68b0de Fixed hashCost() example code 2022-04-12 16:23:05 +02:00
hydroflame 674f3b0c9f Merge pull request #3318 from smmalis37/empjobs
Fix docs for employeeProd and add employeeJobs.
2022-04-11 20:48:17 -04:00
phyzical a66b5bfb69 fixes and pr comments 2022-04-11 21:54:50 +08:00
Heinous Tugboat 5b96cedd0c Adds SnackbarVariant enum 2022-04-08 23:46:19 -04:00
phyzical d24a26a208 merge dev 2022-04-07 16:37:57 +08:00
phyzical c70f59ac54 merge dev 2022-04-07 16:27:23 +08:00
phyzical 43248bbc42 merge dev 2022-04-07 16:25:33 +08:00
Olivier Gagnon 724c0669da sleep/asleep return promise true 2022-04-06 19:38:30 -04:00
Olivier Gagnon 48f80f25d6 fmt and lint 2022-04-06 19:30:08 -04:00
phyzical 8eccdf16e1 add logic to block working for gang faction 2022-04-04 18:10:21 +08:00
phyzical a8689cb28b Merge branch 'dev' into bugfix/corp-updates 2022-04-02 20:12:19 +08:00
Olivier Gagnon cd09589f25 stanek-formula-rework 2022-04-01 15:45:12 -04:00
phyzical b73570e2f7 added the ability to mass upgrade warehouse 2022-04-01 23:19:08 +08:00
phyzical e5bb695f6f expose material cost
closes #3173
2022-04-01 22:32:48 +08:00
phyzical 13c486d639 added logic to support material production limit
* added ns functions for limit production and limit material
closes #3180
2022-04-01 22:28:48 +08:00
Steven Malis bb62973905 Fix docs for employeeProd and add employeeJobs. 2022-04-01 01:37:27 -04:00