Commit Graph

6831 Commits

Author SHA1 Message Date
WaitingIdly
12960287ac glyph-remove fixes and whitespace and formatting and cleanup 2021-08-02 23:38:29 -07:00
SpectralFlame
cca23ecc8a Prevent screen jitter in certain situations, fixes #1363, fixes #1565 2021-08-03 01:06:01 -05:00
SpectralFlame
a5bdfbcddb Fix unintended IC completion on entry, fixes #1654 2021-08-03 00:33:48 -05:00
SpectralFlame
83a4b86c2c Add modal explaining RM softcap at e6k EP on first reality, closes #1662 2021-08-02 21:48:15 -05:00
SpectralFlame
05282bbc81 Move automator buttons around, fix minor bugs 2021-08-02 18:06:16 -05:00
SpectralFlame
71412554fb Implement automator script import/export, fixes #1323 2021-08-02 16:47:40 -05:00
earth
d4f4c889dd Sorry spec
remove comment because earth forgets a lot of things
2021-08-02 14:22:33 -05:00
earth
4a2f1f88b0 Address review comments 2021-08-02 14:17:27 -05:00
SpectralFlame
12857d441b Improve automator line highlighting, fixes #1374 2021-08-02 12:15:36 -05:00
SpectralFlame
63e550a508 Add blob command easter egg, fix #1644 2021-08-02 02:34:21 -05:00
SpectralFlame
1cb22cf94a Implement automator error panel, error fixing tips, and fix minor blockify bugs 2021-08-02 01:41:43 -05:00
earth
6af60b4f36 Merge branch 'earth/add-new-cool-modals' of https://github.com/IvarK/IToughtAboutCurseWordsButThatWouldBeMeanToOmsi into earth/add-new-cool-modals 2021-08-01 20:30:57 -05:00
earth
031bac7976 Add exit celestial reality modal 2021-08-01 20:30:45 -05:00
earth
8f575e6853
Merge pull request #1733 from IvarK/earth/improve-edit-tree-modal-2-electric-boogaloo
Improve edit tree modal 2: electric boogaloo
2021-08-01 16:01:24 -05:00
SpectralFlame
3cc8442283 Fix text/block translation for define and comments, fixes #1320 2021-08-01 15:47:06 -05:00
earth
5e72bc50f1 Add glyph refine modal 2021-08-01 14:40:50 -05:00
earth
ab6768baf8 Fix glyph replace modal, add new ones 2021-08-01 13:38:47 -05:00
SpectralFlame
d3348a3666 Adjust Suspicion of Interference requirement/cost 2021-08-01 12:38:01 -05:00
Waiting Idly
1dfa4b0d4a
Merge pull request #1732 from IvarK/offline-progress-tweak
Rework offline progress backend to not be hardcoded
2021-08-01 08:11:30 -07:00
WaitingIdly
1aef53c083 Tweak S36 to only be rewarded on startup 2021-07-31 21:41:39 -07:00
WaitingIdly
0ce111c310 Remove gte and >= testing code (again) 2021-07-31 21:32:25 -07:00
WaitingIdly
c2bb7552ab renamed prioritySlot to checkboxSlot 2021-07-31 21:29:58 -07:00
earth
e81b9bec56 Add glyph replace modal
Few bugs with it still, but at the time of committing I've got a nasty headache so I'm calling it there. No console errors, just funky things left.
2021-07-31 21:16:15 -05:00
Omsi
f6bd556612 fix button spacing in option modals 2021-07-31 19:01:46 -07:00
Waiting Idly
03fa1190f1
Add comment 2021-07-31 18:06:58 -07:00
SpectralFlame
80d96d7db2 Add some automator commands, fixes #1450 2021-07-31 19:54:10 -05:00
WaitingIdly
8619f0a7f2 Remove priority 2021-07-31 17:42:53 -07:00
earth
ee20744e61 Glyph undo modal 2021-07-31 10:55:51 -05:00
WaitingIdly
12430b468f Added AwayProgress class and converted to it, added stats 2021-07-30 21:12:32 -07:00
SpectralFlame
739410e9b7 Merge automator pause/play and add toggle for following execution, fix #1577 2021-07-30 23:00:56 -05:00
SpectralFlame
14c3ba8831 Add option to force-restart scripts in certain conditions, fixes #1442 2021-07-30 20:52:51 -05:00
SpectralFlame
cd5ef057e5 Fix infinite glyph filter score bug, fixes #1700 2021-07-30 19:51:05 -05:00
SpectralFlame
0c52ddac5c Make reality glyph level boost display properly 2021-07-30 19:38:57 -05:00
SpectralFlame
f68740a7f0 Force glyph tooltip re-render for altered glyph effects, fixes #1587 2021-07-30 18:35:32 -05:00
SpectralFlame
b7437963f5 Fix console error spam on glyph-drag sacrifice, fixes #1697 2021-07-30 16:55:48 -05:00
SpectralFlame
3a91b747b5 Fix infinite recursion when moving glyphs sometimes, fixes #1346, fixes #1612 2021-07-30 16:47:59 -05:00
WaitingIdly
6731e22fb4 fix css error, add comments 2021-07-30 12:52:15 -07:00
earth
46fea6f1d8 Copy code from elsewhere to improve edit tree modal 2021-07-30 10:22:37 -05:00
WaitingIdly
0cdd39c381 Merge branch 'master' into offline-progress-tweak 2021-07-29 20:16:11 -07:00
WaitingIdly
f36bb349e6 Removed testing code 2021-07-29 20:12:07 -07:00
WaitingIdly
d8d3bc2eb4 Rework offline progress backend to not be hardcoded 2021-07-29 20:09:54 -07:00
cyip92
225024a64a
Merge pull request #1682 from IvarK/imaginary-machines
Imaginary machines
2021-07-29 21:43:52 -05:00
SpectralFlame
6402a56250 Make multFromInfinitied always at least 1x 2021-07-29 21:43:17 -05:00
SpectralFlame
fa4db8fe10 Fix boost UI in Ra 2021-07-29 12:09:17 -05:00
SpectralFlame
acd808d289 Address more PR comments 2021-07-29 01:23:38 -05:00
SpectralFlame
a12f71a418 Address more PR comments, change iM 34 requirement 2021-07-28 02:04:08 -05:00
WaitingIdly
f33f39408c fix discord comment 2021-07-27 19:21:52 -07:00
WaitingIdly
13fed9780c extract long switch statement into its own function 2021-07-27 12:43:38 -07:00
SpectralFlame
6907930ce5 Resolve PR comments 2021-07-27 14:30:34 -05:00
IvarK
0b8b307751 fixing cloud saving problems with infinities 2021-07-27 20:16:16 +03:00
WaitingIdly
68b1630635 Fixed whitespace issue, made same as old-ui 2021-07-27 09:05:25 -07:00
WaitingIdly
f3b36d8409 fix comulative typo in replicanti.js 2021-07-27 08:09:30 -07:00
IvarK
ccef212d33
Merge pull request #1728 from IvarK/feature/cloud-saving
Implement cloud saving lmao
2021-07-27 00:09:37 +03:00
IvarK
70c0522b69 one more place where reality was missing in cloud save check 2021-07-26 23:40:18 +03:00
IvarK
d367c25b5b add realities to newestsave check 2021-07-26 23:37:13 +03:00
IvarK
b8651cc2df separate cloud saving in options tab to be its own section and reword things around 2021-07-26 23:34:24 +03:00
IvarK
32b85cea00 add realities check to cloud save and add not logged in text 2021-07-26 23:21:30 +03:00
IvarK
ef444f001d add realities check to cloud save 2021-07-26 23:17:06 +03:00
IvarK
c49759b524 revert line change that appeared from somewhere 2021-07-26 23:14:00 +03:00
WaitingIdly
46bab4d42d reduce complexity for newui header update, fix bug from prior poor migration 2021-07-26 12:56:53 -07:00
IvarK
38723bfec6 eslint fixes 2021-07-26 22:28:19 +03:00
IvarK
bb8d4b9430 Implement cloud saving lmao 2021-07-26 22:10:45 +03:00
SpectralFlame
4a19847d49 Address idly comments 2021-07-26 13:47:03 -05:00
WaitingIdly
d9a1ef5156 update laitela navigation 2021-07-25 19:27:48 -07:00
SpectralFlame
67a096f8f9 Merge master into imaginary-machines 2021-07-24 19:41:00 -05:00
SpectralFlame
8f733b3fb0 Clean up issues before PR review 2021-07-24 19:36:42 -05:00
SpectralFlame
ee42f2409b Add iM names 2021-07-23 15:01:57 -05:00
SpectralFlame
66b14a9e08 Update lategame h2p and fix Ascension display bugs 2021-07-20 00:34:14 -05:00
WaitingIdly
3a363de856 remove laitela requirements from Ra tab, fix unlock Laitela 2021-07-18 15:21:55 -07:00
WaitingIdly
3695532bbe Add Bought Tesseracts + Bonus to ID tab 2021-07-18 14:50:34 -07:00
WaitingIdly
0291d0256d Explain colors and unlock of iUs (same as RUPGs) 2021-07-18 14:32:42 -07:00
WaitingIdly
3eca89e916 Add confirmation to glyph set saves 2021-07-18 11:47:21 -07:00
WaitingIdly
92fd0763f1 add iMCapSet, reduce statistics tab update load 2021-07-18 11:11:51 -07:00
WaitingIdly
419e72ef51 added baseRMCap for 1e1000, switched ** for Math.pow 2021-07-18 10:11:30 -07:00
SpectralFlame
ae77439828 Add iM unlock and Pelle unlock conditions 2021-07-18 11:53:32 -05:00
WaitingIdly
baf4291f16 fix perk point dev migration error 2021-07-16 07:23:16 -07:00
SpectralFlame
d4f097a199 Add FDB upgrades/balancing, refactor Dimboosts and Tesseracts 2021-07-16 00:31:13 -05:00
SpectralFlame
69f3484c2c Add some iM upgrades, adjust/add caps to prevent e9e15 AM runaway 2021-07-15 16:07:34 -05:00
kajfik
d88584b545 Fixed a bug where the 5e9 IP break upgrade was not purchased after importing a save that had it purchased 2021-07-15 17:42:28 +02:00
kajfik
086802c3e4 RGs reset Dimboosts/Antimatter/Dimensions/Tickspeed/Sacrifice by default
Added a new Milestone that makes RGs no longer reset the above stuff, and reordered the Milestones.
2021-07-15 17:22:16 +02:00
kajfik
ac989f5131 Removed bulk Dimboost and made 5e9 IP upgrade unlock buy max Dimboost 2021-07-14 16:26:18 +02:00
SpectralFlame
ef370af8e2 Slight milestone refactor, implement increased milestone scaling 2021-07-14 00:21:44 -05:00
Waiting Idly
741e2d099e
Merge pull request #1717 from IvarK/Remove-SAM2
Perk Tweaks - SAM2+SAM1->SAM, DBNR description improvement
2021-07-13 07:23:53 -07:00
Waiting Idly
c038f2e6a1
Merge pull request #1719 from IvarK/glyph-set-effect-softmatching
Add >= matching for glyph set saves
2021-07-12 21:59:27 -07:00
Waiting Idly
3b2bfec50a switched the two elements in the array, as requested 2021-07-12 21:58:13 -07:00
Waiting Idly
bcf2b2ba3d
Merge pull request #1722 from IvarK/rupg10-purchase-infinity-upgrades
run playerInfinityUpgradesOnReset on rupg10 purchase
2021-07-12 21:55:08 -07:00
Waiting Idly
79106735d4 added hasAtLeastGlyphEffects as a function, simplified code 2021-07-12 21:52:28 -07:00
Waiting Idly
40e09b00bc
Merge pull request #1718 from IvarK/small-automator-tt-bug
Small automator TT bug
2021-07-12 20:53:22 -07:00
Waiting Idly
3923b7b415
Merge pull request #1720 from IvarK/resolve-#1713
resolve #1713
2021-07-12 20:52:30 -07:00
SpectralFlame
500cdd5326 Local post-annihilation attempted changes 2021-07-12 11:09:12 -05:00
Waiting Idly
a1b038824f run playerInfinityUpgradesOnReset on rupg10 2021-07-11 22:17:57 -07:00
Waiting Idly
ca8dfe2117 change opacity, possibleFill now includes already poured 2021-07-11 22:17:01 -07:00
Waiting Idly
c93919e834 implement 2021-07-11 22:01:33 -07:00
Waiting Idly
4e4e1c5d1a resolve #1713 2021-07-11 20:12:01 -07:00
Waiting Idly
e9d02f4476 add >= effect matching for glyph sets 2021-07-11 19:07:21 -07:00
Waiting Idly
f198bf5417 Was missed when this was refactored 2021-07-11 03:58:33 -07:00
Waiting Idly
050794bcd2 renamed dimboostNonReset to antimatterNoReset 2021-07-11 03:50:42 -07:00
Waiting Idly
41c62040e5 Remove SAM2, change SAM1 into SAM, migrate 2021-07-11 03:28:48 -07:00
SpectralFlame
b9cae82ab6 Nerf iM upgrade 14, rebalance up to Annihilation unlock 2021-07-08 21:10:13 -05:00
SpectralFlame
d65a65b762 Tentative balance up to DMD4 unlock 2021-07-06 12:58:04 -05:00
SpectralFlame
7c430ae700 Rebalance start of Lai'tela (up to singularity unlock) 2021-07-04 20:30:59 -05:00
SpectralFlame
baca790b99 Add rest of r3 2021-07-03 16:54:03 -05:00
SpectralFlame
4dafcb45f9 Implement r3 1-3, Tickspeed refactor 2021-07-03 09:55:54 -05:00
SpectralFlame
6669375049 Nerf T4 2021-07-02 15:57:21 -05:00
SpectralFlame
a0d7156a20 Visual cleanup 2021-07-02 12:17:26 -05:00
SpectralFlame
0176181b01 Fix iM clamped down to zero 2021-06-30 18:26:42 -05:00
SpectralFlame
9615bc91c9 Minor balance changes and cleanup 2021-06-30 17:17:25 -05:00
SpectralFlame
3d1b97d20c Change Ra-Enslaved to multiplier instead of power, implement some iM upgrades 2021-06-28 19:19:12 -05:00
SpectralFlame
5a8c638e91 Initial iM balance changes 2021-06-27 17:11:06 -05:00
SpectralFlame
d4cfd09bd8 Change iM to number, implement Chroma-like iM system 2021-06-24 17:08:22 -05:00
SpectralFlame
9eaef1eae7 Fix minor bugs 2021-06-23 14:16:41 -05:00
Waiting Idly
533875fd3c Implement the first 7 iUs 2021-06-23 14:16:41 -05:00
Waiting Idly
5e3575e3ce Add Repeatable Imaginary Upgrade autobuyers 2021-06-23 14:16:41 -05:00
Waiting Idly
385c56b5b1 Removed unused imaginary machine upgrade code
This is to avoid confusion about whats been done already or not.
2021-06-23 14:16:40 -05:00
SpectralFlame
fc972956f6 Implement imaginary machine upgrades (placeholders) 2021-06-23 14:16:40 -05:00
SpectralFlame
509f258264 Hardcap RM, initial iM implementation 2021-06-23 14:05:54 -05:00
SpectralFlame
a173db2567 Initial refactor for RM code into machines.js 2021-06-23 14:05:23 -05:00
Dan Simon
79f20498cb Fix #1711 2021-06-22 18:31:10 -04:00
SpectralFlame
cb90a10eae PR comments go brrrr 2021-06-21 11:38:56 -05:00
SpectralFlame
fcb09e1ae4 More comments 2021-06-21 11:30:29 -05:00
SpectralFlame
fa634d25be Address more PR comments 2021-06-21 10:02:18 -05:00
SpectralFlame
1cd6f18c76 Add Challenge exit button to header, slight refactor, Fixes #1565 2021-06-18 19:16:50 -05:00
SpectralFlame
86f3d2e625 Some PR comment fixes 2021-06-18 13:17:58 -05:00
SpectralFlame
593a17362c Offline eternity milestone tweaks (fixes #1691, fixed #1692) 2021-06-17 13:26:05 -05:00
SpectralFlame
579710b29a Change reality upgrade unlocks to bitmask, closes #310 2021-06-17 13:12:43 -05:00
SpectralFlame
179230522d Shorten auto-EC path, closes #1628 2021-06-17 13:11:17 -05:00
SpectralFlame
0a9587547a Add more h2p pages, fix #1528 2021-06-17 13:11:17 -05:00
SpectralFlame
0e00b23fd9 Fix #1573, fix #1624, fix #1655 2021-06-17 13:11:17 -05:00
SpectralFlame
a3044eca90 Fix infinity count display bug on import modal 2021-06-17 10:31:07 -05:00
SpectralFlame
74c9bc3270 Fix #1574, fix #1600 2021-06-17 10:31:07 -05:00
Waiting Idly
a0a4363c20 Merge branch 'master' into storing-time-automator-fix 2021-06-16 12:33:14 -07:00
Waiting Idly
1365f793da Merge branch 'master' into Improve-alteration-description 2021-06-16 12:31:39 -07:00
Waiting Idly
6aa8e5404a
Merge pull request #1704 from IvarK/rework-hotkey-storage-and-display
rework-hotkey-storage-and-display
2021-06-16 12:28:58 -07:00
Waiting Idly
0eef80afb5
Merge pull request #1703 from IvarK/fix-#1699
fix #1699
2021-06-16 12:28:44 -07:00
Waiting Idly
62f73ad8e5 Merge branch 'master' into codefactor-fixes 2021-06-16 12:26:56 -07:00
Waiting Idly
20f7b509b9 Correct spacing on {{ brackets }} 2021-06-16 12:20:20 -07:00
Waiting Idly
b38ed1376b Remove format use discrepancies
format(x, 0, 0) = format(x); format(new Decimal("x")) = format("x"); prefer second in each case
2021-06-16 00:12:54 -07:00
Waiting Idly
beb368e324 Resolve codefactor 2021-06-16 00:04:11 -07:00
Waiting Idly
d43daf4bb4 Finally do components/common 2021-06-15 20:25:06 -07:00
Waiting Idly
8c4b3778c5 Resolve comments P2 2021-06-15 19:53:58 -07:00
Waiting Idly
a0fc8ebfe4 Resolve comments P1 2021-06-15 19:39:44 -07:00
Waiting Idly
3b54c8d6c2 Whitespace & cosmetic missed codefactor 2021-06-14 23:48:30 -07:00
Waiting Idly
d3af475d83 Hides black hole documentation pre-black hole 1 2021-06-12 17:25:44 -07:00
Waiting Idly
c6f4f2e646 Hide the Store Time command before Enslaved 2021-06-12 17:22:38 -07:00
Waiting Idly
debebed508 alter wording and move above Boosts 2021-06-12 16:43:46 -07:00
Waiting Idly
24005fec18 initial commit 2021-06-12 15:21:46 -07:00
Waiting Idly
9aceeac848 fix #1699 2021-06-10 16:44:03 -07:00
Waiting Idly
8f0366a931 Vue order and whitespace changes for components 2021-06-08 20:47:25 -07:00
Waiting Idly
8c5c678e5f
Removed setTimeout for last commit 2021-06-08 12:07:49 -07:00
Waiting Idly
e78567b5d1
Fix unable to eternity 2021-06-08 10:23:26 -07:00