Commit Graph

8016 Commits

Author SHA1 Message Date
SpectralFlame
c3afc5ea93 Reword auto-achievement text 2021-08-15 15:44:28 -05:00
SpectralFlame
d6f93572ae Change auto-achievement to only hold one extra achievement 2021-08-15 15:31:51 -05:00
SpectralFlame
62a2175d89 Make auto-achievement behave like in Hex 2021-08-15 15:11:50 -05:00
WaitingIdly
06a860d6af Merge branch 'master' of https://github.com/IvarK/IToughtAboutCurseWordsButThatWouldBeMeanToOmsi 2021-08-15 12:06:41 -07:00
WaitingIdly
4f699f9619 revert Perks tab unlock to reality study 2021-08-15 12:06:32 -07:00
SpectralFlame
68e765fad3 Fix button 2021-08-15 14:06:20 -05:00
WaitingIdly
6f5d622d2c h2p backend reality study standardization 2021-08-15 12:06:10 -07:00
cyip92
5ea44e65e2
Merge pull request #1750 from IvarK/initial-wave-3-fixes
Fix various visual issues found in the first couple hours of testing
2021-08-15 13:56:29 -05:00
SpectralFlame
396cb5f298 CSS adjustment for button text 2021-08-15 13:55:16 -05:00
SpectralFlame
62641b2439 Fix... lots of things 2021-08-15 13:49:06 -05:00
WaitingIdly
5c8a5b1ae0 remove incorrect rewarding of c1 on save load 2021-08-15 11:41:36 -07:00
WaitingIdly
8e54ab75c0 readd ? keybind 2021-08-15 11:16:45 -07:00
dan-simon
09a7744c40
Merge pull request #1749 from IvarK/quick-fix
Create quick fix
2021-08-15 10:56:43 -04:00
Dan Simon
eedb0bfc42 Create quick fix 2021-08-15 10:54:03 -04:00
cyip92
e265ded2b8
Merge pull request #1747 from IvarK/achievement-cancer-whitespace-and-backend
rework backend, removes whitespace gap
2021-08-15 01:36:24 -05:00
WaitingIdly
29bceff12b rework backend, removes whitespace gap 2021-08-14 23:26:05 -07:00
WaitingIdly
acea286cb2 fix DB autobuyer bug after recent changes 2021-08-14 23:01:09 -07:00
Waiting Idly
58baa28d13
Merge pull request #1744 from IvarK/autobuyer-tab-ui
Autobuyer tab UI
2021-08-14 21:15:06 -07:00
WaitingIdly
52b7f05aa2 fix incorrect merge from #1724 2021-08-14 19:09:45 -07:00
WaitingIdly
71a32f2723 Merge branch 'master' into autobuyer-tab-ui 2021-08-14 13:07:03 -07:00
Waiting Idly
fb8f7be33b
Merge pull request #1737 from IvarK/remove-automator-priority
Remove autobuyer priority
2021-08-14 11:40:50 -07:00
WaitingIdly
50aa24ce08 Merge branch 'master' into remove-automator-priority 2021-08-14 11:38:26 -07:00
Waiting Idly
40555985c3
Merge pull request #1724 from IvarK/kajfix-1723
Resolve #1723
2021-08-14 11:14:50 -07:00
WaitingIdly
5ff3b73351 Merge branch 'master' into kajfix-1723 2021-08-14 11:13:52 -07:00
WaitingIdly
889fe10229 resolve comments 2021-08-14 11:02:11 -07:00
WaitingIdly
f2838606be fix dumb unrelated codefactor issue 2021-08-11 01:24:31 -07:00
WaitingIdly
49a67ed958 Fixed whitespace between boxes inconsistency 2021-08-11 01:17:52 -07:00
WaitingIdly
c3c7c3ac96 AD Continuum and display consistency 2021-08-11 01:14:17 -07:00
WaitingIdly
e59d2452d3 Merge branch 'master' into autobuyer-tab-ui 2021-08-11 00:20:25 -07:00
WaitingIdly
fec5239aa6 break out into separate files 2021-08-11 00:19:39 -07:00
WaitingIdly
9d4d261982 move mode-button to be internal to single-autobuyer-in-row 2021-08-11 00:06:39 -07:00
WaitingIdly
796b27ea16 cleanup 2021-08-11 00:03:44 -07:00
WaitingIdly
1b5480a81e rename components and display storage 2021-08-10 23:31:18 -07:00
SpectralFlame
93de5c5c13 Fix reality and imaginary upgrade requirements being unlockable before the upgrades 2021-08-10 09:14:30 -05:00
WaitingIdly
91b4069080 comments and minor cleanup 2021-08-10 01:03:07 -07:00
WaitingIdly
5a7e8f83f5 fix bulk error earlier 2021-08-09 22:37:13 -07:00
WaitingIdly
3ff6fd4499 Add line break between name and Autobuyers 2021-08-09 20:50:40 -07:00
WaitingIdly
2e26616448 Make bulk work correctly 2021-08-09 19:11:34 -07:00
SpectralFlame
0e403e5e06 Fix odd interaction between distant and remote galaxy scaling when distant > remote 2021-08-09 20:44:35 -05:00
WaitingIdly
fe04c01ada initial commit 2021-08-08 23:33:28 -07:00
WaitingIdly
92a1f508ab Fix #1741 2021-08-07 21:25:06 -07:00
SpectralFlame
c81878147b Fix automator script overwriting 2021-08-07 11:26:37 -05:00
WaitingIdly
c82c514bb4 made challenge tab being visible not required to enter challenges 2021-08-06 10:08:48 -07:00
Waiting Idly
d2ef46b723
Merge pull request #1740 from IvarK/secret-ach-36-description
Resolve #1730
2021-08-05 22:23:57 -07:00
WaitingIdly
c75bceba12 Resolve #1730 2021-08-05 22:22:40 -07:00
cyip92
08cb59486a
Merge pull request #1735 from IvarK/wave-3-automator-issues
Wave 3 Automator issues
2021-08-05 19:52:21 -05:00
earth
21f1c904e2
Merge pull request #1736 from IvarK/earth/add-new-cool-modals 2021-08-05 19:45:33 -05:00
WaitingIdly
490acc3c6d Close Glyph Undo Modal on Reality 2021-08-05 17:25:54 -07:00
WaitingIdly
a6d0e8ae00 move modal-automator-script-import to its own file 2021-08-05 16:28:02 -07:00
WaitingIdly
77e110ab1c made jump to active line a function in AutomatorBackend, call it 2021-08-05 16:20:38 -07:00