Commit Graph

447 Commits

Author SHA1 Message Date
Omsi
ef7e83e2f1 theme cleanup part 2 2019-09-04 13:52:36 -07:00
Omsi
40ba09442f theme and style cleanup part 1 2019-09-04 01:18:50 -07:00
Omsi
c4a1473c3d improve ttshop theming and sizing 2019-09-03 23:57:19 -07:00
IvarK
58b2a35fcc fix compression reactivity and add current bonus to be visible 2019-09-01 13:42:46 +03:00
IvarK
dc69a4a21c
Merge pull request #796 from IvarK/g420/simplified-achievements
G420/simplified achievements
2019-08-28 22:24:14 +03:00
IvarK
cdaa2739e5
Merge pull request #797 from IvarK/ra-issues
Ra issues
2019-08-28 20:53:55 +03:00
IvarK
a564fd9ace Merge branch 'master' of github.com:IvarK/ADtestrepo into g420/simplified-achievements 2019-08-28 16:09:27 +03:00
IvarK
ede18d6c0b fix some PR requests 2019-08-28 09:39:03 +03:00
garnet420
f8254692a0 automatic achievement timer, set for 30 minutes 2019-08-27 23:04:04 -04:00
garnet420
96ed421b22 remove old achievement locking system 2019-08-27 23:04:03 -04:00
Ikerstreamer
ddbf484b2c fix reality button getting stuck 2019-08-27 15:03:10 -07:00
IvarK
f2427acb53
Merge pull request #729 from IvarK/new_ui_updates
New ui updates
2019-08-27 19:26:16 +03:00
IvarK
32523fd6aa hide reality and laitela before they should be visible, add memory gain header to tab 2019-08-27 19:20:28 +03:00
IvarK
6d2281be94 Merge branch 'master' of github.com:IvarK/ADtestrepo into ra-issues 2019-08-27 17:43:20 +03:00
Jane Doe
36ae06e26f
make glyph alchemy icons bigger 2019-08-26 19:29:48 -07:00
IvarK
03a31b3e11
Merge pull request #728 from IvarK/additional_milestones
Additional milestones
2019-08-27 00:32:16 +03:00
IvarK
b6b9b8208f Merge branch 'g420_automator_work' of github.com:IvarK/ADtestrepo 2019-08-26 23:34:21 +03:00
IvarK
0dde7621ab some readability improving 2019-08-26 16:38:09 +03:00
IvarK
d5e91dee8c better readability on pets, always show current/required and memories/min, add decimal points to Ra reality button 2019-08-26 13:47:22 +03:00
IvarK
c81c1937ce fix merge conflicts and prepare to move the new UI reset buttons back to the resource things 2019-08-26 12:36:49 +03:00
IvarK
3ec010f589 Merge branch 'master' of github.com:IvarK/ADtestrepo into additional_milestones 2019-08-26 11:40:16 +03:00
IvarK
4d98c314cc fix omsi review stuff 2019-08-26 10:36:06 +03:00
garnet420
cc583ab471
G420/enslaved standardize glyph level (#789)
* in enslaved reality, set all glyph levels to 5000

* make the 5000 be a floor, instead of a hard fix

So higher glyph levels are possible for enslaved, but not lower

* alter hint text in glyphs tab during enslaved

* update enslaved reality run box content, widen it
2019-08-25 21:40:36 -04:00
IvarK
7061cec73c fix merge conflicts and conditional target to uppercase 2019-08-23 17:28:28 +03:00
IvarK
77c435c96f merge master into branch 2019-08-18 21:43:14 +03:00
SpectralFlame
815bea645a Merge master into spec-branch, resolve migration conflicts/bugs 2019-08-15 11:32:47 -05:00
SpectralFlame
ad6f263105 Sacrifice refactor, minor display adjustments
Fixes #673

Fixes #722

Fixes #736

Resolves #362
2019-08-14 00:07:23 -05:00
SpectralFlame
12e36f0495 Fix minor bugs, make charged upgrade effect visible on mouseover
Fixes #574
2019-08-11 13:28:49 -05:00
IvarK
4b0d702522 Merge branch 'master' of github.com:IvarK/ADtestrepo into new_ui_updates 2019-08-11 17:01:45 +03:00
Andrei Andreev
fa9c8e8bd5 Add better kong emulation 2019-08-11 12:54:34 +03:00
SpectralFlame
d3b0137d50 Fix various display issues
Fixes #718

Fixes #733

Fixes #670
2019-08-10 15:29:13 -05:00
IvarK
ae68020d7b color changing reset buttons 2019-08-06 13:43:57 +03:00
IvarK
4f4957b54c add the infinity upgrade offline thingie 2019-08-05 15:53:46 +03:00
SpectralFlame
b21646487f Implement compression upgrade respec 2019-08-03 16:19:04 -05:00
SpectralFlame
57e641aa50 More Compression UI work, fix some text bugs
Fixes #695
2019-07-30 19:09:15 -05:00
SpectralFlame
5854c2b5b7 Implement time compression tab UI, fix minor compression bugs 2019-07-29 20:41:29 -07:00
IvarK
1b10718824 active automator, fix updating and fix block ghost styles 2019-07-27 00:29:51 +03:00
Andrei Andreev
26aa604c83 Reduce DOM allocations by optimizing challenge display in game header 2019-07-25 23:40:54 +03:00
Andrei Andreev
334d663ccd Is this heck 2019-07-25 16:20:48 +03:00
Andrei Andreev
75b24f428d Port perk network to vue tab 2019-07-25 16:18:30 +03:00
Andrei Andreev
c971d66780
Ra UI Rework (#639)
Ra UI Rework

Co-authored-by: Andrei Andreev <Razenpok@outlook.com>
2019-07-25 16:15:35 +03:00
Andrei Andreev
dcc120efd9
Unfuck autobuyers (#654)
Unfuck autobuyers
2019-07-23 17:38:16 +03:00
Ikerstreamer
07dc259952 Merge -master into -branch to fix conflicts 2019-07-21 23:44:55 -07:00
Ikerstreamer
5ef84634b2 More fixes 2019-07-21 23:40:03 -07:00
Omsi
04da289b98 razen review fixes 2019-07-21 10:45:36 -07:00
Andrei Andreev
4ca3afca2f The Great Autobuyer Unfuckening II: Vue Interlude 2019-07-21 11:18:18 +03:00
Ikerstreamer
31c4fd350c gainsboro isnt white 2019-07-19 21:02:50 -07:00
Ikerstreamer
811bb70621 some codefactor issues 2019-07-19 20:57:28 -07:00
Ikerstreamer
4aa4119697 All done except Reality button restyling 2019-07-19 20:55:19 -07:00
Omsi
c6cf882052 fancy import modal for study tree imports 2019-07-19 19:05:12 -07:00