Commit Graph

10407 Commits

Author SHA1 Message Date
Dys
0f7a3e5180 Widen the taskbar and cleanup class names 2022-05-26 23:00:42 +08:00
Dys
f948b39826
Merge pull request #2633 from IvarK/modal-priority-v3
Fix modal priorities acting up with immediate modal closures
2022-05-26 21:35:46 +08:00
Dys
1ade1feddf
Merge pull request #2646 from IvarK/make-infinity-upgrade-buy-order-indicator
Make infinity upgrade buy order indicator
2022-05-26 21:34:47 +08:00
earth
f60c8534d8
Merge pull request #2619 from IvarK/earth/cleanup-info-modal 2022-05-26 08:08:55 -05:00
Dys
cfa561ba6e Fix reactivity issue 2022-05-26 20:56:22 +08:00
Dys
9dd8667f91
Merge pull request #2647 from IvarK/cap-AP-50
cap reality AP at 50 because you only need 100 AP
2022-05-26 19:44:50 +08:00
Dys
a5ffc1839a cap reality AP at 50 because you only need 100 AP 2022-05-26 16:28:22 +08:00
Dys
f9fb1374a1 Simplify column display code 2022-05-26 16:25:52 +08:00
Dys
dc5bda02dc Retain the inf upgrade col bg since some people liked it 2022-05-26 16:11:20 +08:00
Dys
7d9ccfa5be
Merge pull request #2643 from IvarK/make-infinity-upgrade-buy-order-indicator
Make inf upg buy order a bit more obvious
2022-05-26 15:03:48 +08:00
Waiting Idly
27c9209710
Merge pull request #2606 from IvarK/reset-reality-button-adjustment 2022-05-25 20:49:14 -07:00
earth
040b2a3165 Address review comments 2022-05-25 21:23:12 -05:00
Waiting Idly
8476fe924e
Merge pull request #2599 from IvarK/move-ts-33 2022-05-25 15:44:37 -07:00
dan-simon
7ab2dbca47
Merge pull request #2553 from IvarK/pelle-singularity-milestone-fixes
Change all singularity milestone isUnlocked checks
2022-05-25 16:52:26 -04:00
WaitingIdly
141bfe70cf resolve #2443 2022-05-25 13:42:39 -07:00
Dys
233d2c9e16
Merge pull request #2512 from IvarK/an-alchemy-mode-glyph-filter
Remove reference to "Alchemy mode" in the instructions
2022-05-25 20:09:54 +08:00
Dys
4f66e11e74 Remove useless UI for indicating inf upg buy order 2022-05-25 19:57:01 +08:00
Dys
3a344b4a9b
Merge pull request #2641 from IvarK/resolve-galaxy-modal-oopsie
Fix vue type error on galaxy modal
2022-05-25 17:59:04 +08:00
Dys
7789cf5834 Make inf upg buy order a bit more obvious 2022-05-25 17:58:23 +08:00
Dys
d9a1a801f7 Fix vue type error on galaxy modal 2022-05-25 16:15:32 +08:00
Dys
70c0d2e71d
Merge pull request #2629 from IvarK/fix-eternity-animation-dilate
Fix eternity animation being played on undilate
2022-05-25 15:45:02 +08:00
Dys
e732a8c375
Merge pull request #2557 from IvarK/use-2-2-3-adnotations
Use v2.2.3 of ADNotations to avoid formatting issue
2022-05-25 15:17:01 +08:00
Dys
0443b5d7a8 Use 3-0-3-adnotations 2022-05-25 15:15:36 +08:00
Dys
01860fa3d0 Use v2.2.3 of ADNotations to avoid formatting issue 2022-05-25 15:03:40 +08:00
Dys
54b5269e92
Move static method in Modal to the bottom 2022-05-25 14:25:01 +08:00
Dys
af3c294a76
Merge pull request #2634 from IvarK/buff-the-upgrade-more
Give an even heavier boost to charged ipgen
2022-05-25 14:19:28 +08:00
Dys
95f75f7e90
Forgot to include a local variable after moving to a separate method - Shitshitfixthis by Scar 2022-05-25 14:19:16 +08:00
Dys
6aad108a1b
Address PR feedback
- use math.pow
- change wording
2022-05-25 07:14:24 +08:00
Dan Simon
b4a7a39d1b Merge branch 'master' into pelle-singularity-milestone-fixes 2022-05-24 14:57:38 -04:00
Dan Simon
987159b242 Fix package-lock.json version 2022-05-24 14:33:00 -04:00
IvarK
3ba6a6a60b
Merge pull request #2627 from IvarK/revert-alchemy-back-to-circle
convert alchemy nodes back to circles
2022-05-24 21:12:50 +03:00
IvarK
7041bad56b
Merge pull request #2622 from IvarK/glyph-fixes
Glyph fixes
2022-05-24 21:09:44 +03:00
Dys
da906e5e94 Give an even heavier boost to charged ipgen 2022-05-24 16:50:54 +08:00
Dys
3f44a9f56f
Merge pull request #2632 from IvarK/fix-tickspeed-alignment
Fix tickspeed btn and tickspeed max btn not being aligned
2022-05-24 16:46:28 +08:00
earth
a4514b819c Add prio to credits modal 2022-05-23 21:09:32 -05:00
earth
54a8c69718 Merge branch 'master' into earth/cleanup-info-modal 2022-05-23 21:07:32 -05:00
Waiting Idly
04ba133f13
Merge pull request #2604 from IvarK/remaining-secret-achievements 2022-05-23 18:56:26 -07:00
Omsi
493e7ec208 final secret ach images, minor changes to names/wording 2022-05-23 18:52:03 -07:00
Dan Simon
819d990813 Merge branch 'master' into pelle-singularity-milestone-fixes 2022-05-23 15:07:27 -04:00
Dan Simon
5139ddde7e Fix package lock 2022-05-23 15:01:15 -04:00
Dys
f9d76df2b0 Fix modal priorities acting up with immediate modal closures 2022-05-23 22:43:39 +08:00
Dys
179e788fdc
Merge pull request #2631 from IvarK/fix-ra-pet
Fix ra pet container being weird
2022-05-23 22:14:24 +08:00
Dys
143aa433c7
Merge pull request #2618 from IvarK/buff-charged-passive
Buff charged upgrade that gives passive RM
2022-05-23 22:08:28 +08:00
Dys
4ad3d2591c Fix ra pet container being weird 2022-05-23 22:02:51 +08:00
Dys
68c8781405 Fix tickspeed btn and tickspeed max btn not being aligned 2022-05-23 21:54:37 +08:00
Dys
de2458f190 Fix eternity animation being played on undilate 2022-05-23 21:50:57 +08:00
Dys
6e6460bd0d
Merge pull request #2446 from IvarK/make-all-fixed-elements-into-one-container
Move all fixed elements into one container
2022-05-23 21:35:15 +08:00
Dys
f6d7d0e74d
Merge pull request #2615 from IvarK/add-more-information-about-that-button
Followup #2511 on format study string and sets behaviours
2022-05-23 21:26:30 +08:00
Dys
a40a7f11a1
Merge pull request #2628 from IvarK/2608-whoopsie
Fix mato always showing "Has errors can't view in blocks" despite in text mode
2022-05-23 21:25:46 +08:00
Dys
e04feda3e9 Fix mato always showing "Has errors can't view in blocks" despite in text mode 2022-05-23 20:55:25 +08:00