Omsi
b111d56cf5
Merge branch 'master' of https://github.com/IvarK/IToughtAboutCurseWordsButThatWouldBeMeanToOmsi
2022-05-23 08:29:14 -07:00
Omsi
d4e3441db6
basis for currently unachievable secret achievement display
2022-05-23 08:27:22 -07: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
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
Dys
eba608fe83
Remove unneeded ternary
2022-05-23 20:47:49 +08:00
Dys
74006d53d9
Merge branch 'master' into make-all-fixed-elements-into-one-container
2022-05-23 20:41:30 +08:00
Dys
b897d2184e
Use x formatting above 100% for charged passive RM upg
2022-05-23 20:37:21 +08:00
Dys
ac813a2fe9
Prevent switching to script with errors while in block mode
2022-05-23 07:26:43 -05:00
SpectralFlame
8aebc53660
Move full-screen automator button to corner
2022-05-23 07:26:43 -05:00
Dys
0915e31d9d
Fix ESLint errors
...
SwitchAutomatorEditorModal.vue: Missing semicolon in data: () {}, order of vue props
modals.js: Fix import order after renaming
2022-05-23 07:26:43 -05:00
Dys
6b792b018b
Add a switch automator editor mode confirm modal
...
Confirmation notifies user that their running script will stop
2022-05-23 07:26:43 -05:00
SpectralFlame
6de2fb580c
Fix css linting
2022-05-23 07:26:43 -05:00
Hirame1
286204fcdf
Fix Resumes on Line 0
...
It happens when the script has exactly 10^n lines (n = 1, 2, 3...)
2022-05-23 07:26:43 -05:00
Hirame1
a11419a7c6
Fix margin of tomato mode switch
2022-05-23 07:26:43 -05:00
Hirame1
ada8dc36bf
Fix disclaimer text overflaw
2022-05-23 07:26:43 -05:00
SpectralFlame
ed9b995573
Fix automator bugs related to script indexing, add more debug text for player
2022-05-23 07:26:43 -05:00
SpectralFlame
b8b4a762b3
Cleanup automator backend and fix crash when deleting scripts while automator is running
2022-05-23 07:26:43 -05:00
SpectralFlame
a7e1bf3a9e
Adjust automator layout to accomodate debug and info text, fixes #2206
2022-05-23 07:26:43 -05:00
Dys
a5023342f5
Merge pull request #2571 from IvarK/better-modal-priority-system
...
Modal priority system updates
2022-05-23 18:04:03 +08:00
Dys
139d666836
Fix faulty sort statement leading to not sorting by Modal priority
2022-05-22 10:36:19 +08:00
Phoenix51505
3a751a12ab
[Cel 7] Properly Show Disabled Achievements As Disabled ( #2595 )
...
* [Cel 7] Show R87 As Disabled When It Should Be
Doomed disables all forms of Infinity/Eternity gain multipliers, yet Ach r87 is improperly shown as active within Doomed. Now it Properly shows as disabled and nonfunctioning within Doomed.
* Now-Reverse-Numerical
* Found-Another-One
* Even-More
* Apply-Lars-Suggestions
Error be gone
Co-authored-by: L4R5W <66326188+L4R5W@users.noreply.github.com>
* No More Multipliers
* Begone Codefactor
Co-authored-by: L4R5W <66326188+L4R5W@users.noreply.github.com>
2022-05-21 19:36:02 -04:00
WaitingIdly
42a2144f90
simplify code
2022-05-21 09:42:43 -07:00
Dys
088c41eb59
Fix modal bug with showing first property
...
Let two Modals a and b with same priority and both showing first
Trigger a -> Trigger b -> Trigger a
Shows up as Modal a -> Modal b -> Modal b
2022-05-21 23:05:03 +08:00
Dys
2fa6bd9c13
Address PR feedback
...
Confirmation Modals now show on top of other confirmation modals with same priority
2022-05-21 23:01:46 +08:00
Waiting Idly
4a046ee3c1
Merge pull request #2611 from IvarK/fix-no-prototype-builtins
2022-05-21 07:00:03 -07:00
Waiting Idly
d53210a13f
Merge pull request #2612 from IvarK/some-gamedatabase-cleanup
2022-05-21 06:59:32 -07:00
Waiting Idly
714063e03b
Merge pull request #2603 from IvarK/change-tab-color
2022-05-21 06:55:38 -07:00
Dys
8099013e44
Merge pull request #2617 from IvarK/fix-ugly-bottom-right
...
Fix the white bottom corner on scrollbars
2022-05-20 06:38:54 +08:00
Dys
63df293dbe
Fix the white bottom corner on scrollbars
...
Resolve #2613
2022-05-19 23:31:28 +08:00
Dys
9279ec0aa3
Add triad studies to TST.sets
2022-05-19 23:07:25 +08:00
Dys
b1f895b303
Remove the auto conversion of shorthands
2022-05-19 22:43:48 +08:00
Dys
26c03dc84c
Remove .setPriority, move to param in constructor
2022-05-19 22:37:25 +08:00
Waiting Idly
cc08c9f84f
Merge pull request #2598 from IvarK/modal-props
2022-05-19 07:20:20 -07:00
Dys
c0877fb308
Add info to tell users what "collapse shorthands" does, subject to change by future tweaks to its functionality
2022-05-19 22:18:37 +08:00
WaitingIdly
94ce35f5a1
remove excess $viewModel and convert rest to props
2022-05-19 06:27:31 -07:00
WaitingIdly
aad85bd743
convert modalConfig to v-bind
2022-05-19 06:27:29 -07:00
Waiting Idly
ac7a1287b8
Merge pull request #2602 from IvarK/somewhat-standardize-keyframe-names
2022-05-19 06:15:50 -07:00
Hirame1
be1a7de3bf
Adjust layout for consistency
2022-05-19 20:05:16 +07:00
Hirame1
94c4014e7a
Improve design of Reality Glyph creation modal
2022-05-19 20:05:16 +07:00
Hirame1
049113c2d9
Address PR feedbacks
2022-05-19 20:03:30 +07:00
Dys
50600e7c5e
Remove $forceUpdate, implement better-ish solution
2022-05-19 20:03:30 +07:00
Hirame1
6f80704e42
Force re-render alchemy chart on toggle all
2022-05-19 20:03:30 +07:00
Dys
13cb930b19
Merge pull request #2511 from IvarK/fix-format-study-list-shorthand
...
Fix some TimeStudyTree bug (see desc)
2022-05-19 20:14:19 +08:00
Dys
eb4b7acca1
Codefactor likes my import statements now
2022-05-19 18:26:19 +08:00
L4R5W
957c7b1243
keep infinity broken on eternity in doomed ( #2607 )
2022-05-19 12:14:51 +02:00
