Commit Graph

8016 Commits

Author SHA1 Message Date
Omsi
e0c5f9816c Merge branch 'master' of https://github.com/IvarK/HahaSlabWontGetHere 2021-08-18 16:11:30 -07:00
Omsi
00c1784e49 preliminary work on reset animation fixes 2021-08-18 16:11:17 -07:00
kajfik
38ae9b9ed1 Increased r55 effect from 1e10 to 2e10 2021-08-18 11:03:09 +02:00
L4R5W
37840e0ae1
SAM now starts with 2e130 (#1770)
* SAM now starts with 2e130

Apparently tickspeed calculation was changed.
Another problem occured (discord link: https://discord.com/channels/351476683016241162/873641688961257533/877451905029242880)
Idly : "mhm we need to start with 2e130", so here I am

Idlys comment -> https://discord.com/channels/351476683016241162/873641688961257533/877451143628853288

* Update perks.js
2021-08-18 10:43:50 +02:00
cyip92
1a388d701c
Merge pull request #1760 from IvarK/perk-tree-tweaks
Perk tree tweaks
2021-08-18 01:37:04 -05:00
SpectralFlame
46fb259f43 Revert unneeded vue method for theme switching 2021-08-18 01:35:40 -05:00
SpectralFlame
5f43a79cb1 Address PR issues 2021-08-18 01:20:45 -05:00
dan-simon
b2210aaadb
Merge pull request #1758 from IvarK/small-fixes
Fix some small issues
2021-08-17 18:05:46 -04:00
Dan Simon
1bf796eac5 Merge with master 2021-08-17 18:05:03 -04:00
Dan Simon
d5e2af26e0 Make IC5 changes 2021-08-17 18:02:23 -04:00
Dan Simon
dd743cccc9 Restore IC3, widen challenge divs 2021-08-17 16:43:10 -04:00
Dan Simon
85511792f2 Capitalize Tickspeed 2021-08-17 16:01:57 -04:00
Dan Simon
afd8093509 Change IC5 desc and IC3 reward 2021-08-17 15:38:07 -04:00
Dan Simon
b0c7314dbf Fix line length, fix IC5 desc 2021-08-17 15:27:25 -04:00
Dan Simon
617f5553b9 Fix overlong line 2021-08-17 14:50:35 -04:00
Dan Simon
437a962423 Change IC5 description 2021-08-17 14:43:32 -04:00
Dan Simon
39866f4398 Fix IC5 typo 2021-08-17 14:37:41 -04:00
IvarK
a2c2a99ef9
Merge pull request #1761 from IvarK/fix/change-tickspeed-calculation
change max tickspeed calculation
2021-08-17 21:34:48 +03:00
IvarK
7fafc569fe change max tickspeed calculation 2021-08-17 21:15:01 +03:00
SpectralFlame
87cdb43541 Fix perk tree not working after switching themes 2021-08-17 12:41:47 -05:00
Dan Simon
e2ded54c20 Add GPT-2 text to GPT-3 rickroll 2021-08-17 13:24:01 -04:00
Dan Simon
043fe49d26 Fix news, fix missing quote 2021-08-17 13:13:22 -04:00
Dan Simon
4d0f24a887 Fix TP color issue 2021-08-17 12:59:13 -04:00
Dan Simon
2d052854e8 Change transition duration 2021-08-17 12:40:34 -04:00
SpectralFlame
b0450435a2 Make ready for PR review 2021-08-17 10:27:04 -05:00
Jane Doe
67152a1c27
Merge pull request #1759 from IvarK/omsi_sidebar
Fix sidebar issues
2021-08-17 07:54:59 -07:00
Omsi
734b84564e review fixes 2021-08-17 07:54:28 -07:00
Dan Simon
dbf2158642 Address PR comments 2021-08-17 09:25:24 -04:00
SpectralFlame
b25df5d621 Add option to lay out perk tree as tangled or untangled 2021-08-17 01:38:46 -05:00
Omsi
633cbce4a5 make sidebar hover arrow pixel perfect 2021-08-16 23:19:19 -07:00
Omsi
08ac194e99 lint fix 2021-08-16 22:37:56 -07:00
Waiting Idly
8f03280d7a
Merge pull request #1753 from IvarK/away-progress-black-hole
away progress fixes
2021-08-16 22:30:42 -07:00
WaitingIdly
51880837fa revert a prior change, make visually identical entries not appear 2021-08-16 22:19:23 -07:00
Omsi
7cbca3a444 format new ui sidebar antimatter under 1k with 1 place 2021-08-16 21:56:58 -07:00
SpectralFlame
0f6497b416 More visual and theme improvements for perk tree 2021-08-16 23:45:16 -05:00
Dan Simon
88346f291a Fix some small issues 2021-08-16 22:44:25 -04:00
WaitingIdly
6f98c9fe1b clean up backend display generation, add comments, fix error 2021-08-16 17:54:48 -07:00
SpectralFlame
6bbfe369d7 Improve perk tree coloring 2021-08-16 15:49:50 -05:00
earth
dccaafe5a1
Make sac modal show decimal places under 1000
Hi blind testers
2021-08-16 11:46:44 -04:00
dan-simon
e28e16d656
Merge pull request #1754 from IvarK/fix-comparison
Fix comparison
2021-08-16 10:41:57 -04:00
Dan Simon
b002c88e37 Fix comparison 2021-08-16 10:16:04 -04:00
WaitingIdly
858d90f9e9 remove now useless mixin from away progress modal 2021-08-15 22:38:27 -07:00
WaitingIdly
0c987688b4 move mem&bh to AwayProgress, fix formatting errors 2021-08-15 22:35:37 -07:00
WaitingIdly
6ad23f55fc remove testing code 2021-08-15 22:03:53 -07:00
WaitingIdly
83ebb0e8f2 add blackhole to system and readd SA nothing happened 2021-08-15 22:03:21 -07:00
Omsi
c9c238211b fix subtab buttons in new ui sometimes being unresponsive 2021-08-15 18:55:04 -07:00
Omsi
5d4748b208 remove extra divs from currency display in sidebar 2021-08-15 17:34:27 -07:00
Omsi
6fbcde430d improve new ui sidebar 2021-08-15 17:29:37 -07:00
WaitingIdly
efbb77b82f shortcut name fix 2021-08-15 16:16:43 -07:00
cyip92
83f313aa09
Merge pull request #1751 from IvarK/auto-achievement-tweak
Improve auto-achievement behavior
2021-08-15 15:44:52 -05:00