Daniël van Noord
|
392c473839
|
Merge pull request #573 from Aktanusa/master
Publish hot fix
|
2021-02-17 22:47:35 +01:00 |
|
Daniël van Noord
|
f5ea276a63
|
Merge pull request #572 from DanielNoord/hotfix/missingupgrades
Fix crash with no upgrades #528
|
2021-02-17 22:47:08 +01:00 |
|
Daniël van Noord
|
9357e16dec
|
Fix crash with no upgrades #528
|
2021-02-17 22:45:39 +01:00 |
|
Daniël van Noord
|
84502bff4a
|
Merge pull request #566 from Aktanusa/master
Master
|
2021-02-11 23:09:54 +01:00 |
|
Daniël van Noord
|
cfa32ef295
|
Merge pull request #565 from DanielNoord/hotfixmain
Fix #563
|
2021-02-11 23:09:31 +01:00 |
|
Daniël van Noord
|
1de5dd27dd
|
Fix #563
|
2021-02-11 23:08:52 +01:00 |
|
DanielNoord
|
b42daead36
|
Merge pull request #537 from Aktanusa/master
Master
|
2021-01-30 01:17:57 +01:00 |
|
DanielNoord
|
6ed19f23e6
|
Merge pull request #536 from Aktanusa/jscolor
Hot fix for jscolor
|
2021-01-30 01:17:33 +01:00 |
|
Daniel van Noord
|
13e1233e0f
|
Hot fix for jscolor
|
2021-01-30 01:16:18 +01:00 |
|
DanielNoord
|
314efc87f6
|
Merge pull request #534 from Aktanusa/master
Publish JSColor update
|
2021-01-30 01:12:45 +01:00 |
|
DanielNoord
|
b628d20363
|
Merge pull request #533 from Aktanusa/jscolor
Update JSColor and integrate it
|
2021-01-30 01:12:15 +01:00 |
|
Daniel van Noord
|
63139933ce
|
Clean up
|
2021-01-30 01:10:08 +01:00 |
|
Daniel van Noord
|
0547381845
|
Changed the settings for colours
|
2021-01-30 01:07:09 +01:00 |
|
Daniel van Noord
|
455e99e2ab
|
Updated jscolor to 2.4.5
|
2021-01-29 20:53:04 +01:00 |
|
DanielNoord
|
3f20fac752
|
Merge pull request #521 from Aktanusa/master
Master
|
2021-01-26 13:56:09 +01:00 |
|
DanielNoord
|
2f12f9839a
|
Merge pull request #520 from DanielNoord/hotfix
Fix tooltips
|
2021-01-26 13:55:43 +01:00 |
|
Daniel van Noord
|
c62b514f0a
|
Fix tooltips
|
2021-01-26 13:55:14 +01:00 |
|
DanielNoord
|
f916008a3b
|
Merge pull request #517 from Aktanusa/master
Master
|
2021-01-26 13:36:18 +01:00 |
|
DanielNoord
|
fda6e65176
|
Merge pull request #516 from DanielNoord/fixes
Fix building sorting #515
|
2021-01-26 13:35:53 +01:00 |
|
Daniel van Noord
|
7795aa79a5
|
Fix building sorting #515
|
2021-01-26 13:31:01 +01:00 |
|
DanielNoord
|
1a94c4cb7c
|
Merge pull request #513 from Aktanusa/master
Master
|
2021-01-25 23:43:58 +01:00 |
|
DanielNoord
|
b6069e2358
|
Merge pull request #512 from Aktanusa/dev
Merge pull request #511 from Aktanusa/master
|
2021-01-25 23:43:36 +01:00 |
|
DanielNoord
|
a7af602aa3
|
Merge pull request #511 from Aktanusa/master
Merge dev and master
|
2021-01-25 23:43:10 +01:00 |
|
DanielNoord
|
937fa23569
|
Merge pull request #510 from Aktanusa/master
Publish hot fixes to GitHub Pages
|
2021-01-25 23:42:18 +01:00 |
|
DanielNoord
|
f36dcf012a
|
Merge pull request #509 from Aktanusa/dev
Publish hotfixes
|
2021-01-25 23:41:46 +01:00 |
|
DanielNoord
|
5a64ed45be
|
Merge pull request #508 from DanielNoord/fixes
A number of hot fixes for 2.031.3
|
2021-01-25 23:40:41 +01:00 |
|
Daniel van Noord
|
e5b24b393e
|
Fixed decimal notation #500
|
2021-01-25 23:37:41 +01:00 |
|
Daniel van Noord
|
92c28b092b
|
Timer bar now adjusts height correctly #499
|
2021-01-25 23:29:21 +01:00 |
|
Daniel van Noord
|
d5c5a5f62e
|
Show tooltip warnings when extra info is off #496
|
2021-01-25 23:24:25 +01:00 |
|
Daniel van Noord
|
867249e8cb
|
Missing upgrades no longer shows debug #497
|
2021-01-25 23:00:30 +01:00 |
|
Daniel van Noord
|
28e28fd5a0
|
Single fattest wrinkler now excludes shiny #498
|
2021-01-25 22:55:57 +01:00 |
|
Daniel van Noord
|
5f93186e7d
|
Fixed bug with display of missing upgrades
|
2021-01-25 22:46:08 +01:00 |
|
Daniel van Noord
|
0a57450815
|
Fix colour settings not displaying #504
|
2021-01-25 22:39:03 +01:00 |
|
Zohnannor
|
51ab15f2ec
|
Fix in Disp.js and combine
|
2021-01-25 20:31:32 +01:00 |
|
Zohnannor
|
8505b1621d
|
Update CM.Disp.FormatTime
Add years to date formatting, fixes #502
|
2021-01-25 20:31:32 +01:00 |
|
DanielNoord
|
be1ecf306a
|
Merge pull request #505 from Aktanusa/master (Hotfix for #502)
Push hotfix to Github Pages
|
2021-01-25 20:30:14 +01:00 |
|
DanielNoord
|
901bc7c61f
|
Merge pull request #503 from Zohnannor/patch-1
Update CM.Disp.FormatTime
|
2021-01-25 20:29:05 +01:00 |
|
Zohnannor
|
192c5d105c
|
Fix in Disp.js and combine
|
2021-01-25 22:20:59 +03:00 |
|
DanielNoord
|
519e67dce9
|
Create CONTRIBUTING.md
|
2021-01-25 18:07:55 +01:00 |
|
Zohnannor
|
c184d8b7a7
|
Update CM.Disp.FormatTime
Add years to date formatting, fixes #502
|
2021-01-25 19:02:24 +03:00 |
|
DanielNoord
|
6df4abf945
|
Merge pull request #493 from Aktanusa/master
Rebase dev to incorporate hot fix for #490
|
2021-01-23 23:02:21 +01:00 |
|
DanielNoord
|
8ebb2f85ed
|
Merge pull request #492 from Aktanusa/master
Publish hot fix for #490 to GH-Pages
|
2021-01-23 23:01:01 +01:00 |
|
DanielNoord
|
242c6ba754
|
Merge pull request #491 from Aktanusa/fix/hasGod
Fixed hasGod #490
|
2021-01-23 23:00:21 +01:00 |
|
Daniel van Noord
|
00f79cb073
|
Fixed hasGod #490
|
2021-01-23 22:59:46 +01:00 |
|
DanielNoord
|
1875423a7b
|
Merge pull request #489 from DanielNoord/enhance/warnings
Some new functions related to warnings
|
2021-01-23 22:11:21 +01:00 |
|
Daniel van Noord
|
62f8e1fe82
|
Base warnings on new income instead of curr #488
|
2021-01-23 22:10:06 +01:00 |
|
Daniel van Noord
|
f257243b38
|
Optional warning for Conjure with Frenzy (#487)
|
2021-01-23 22:02:21 +01:00 |
|
Daniel van Noord
|
d71c197ec9
|
Added Conjure Frenzy to stats
|
2021-01-23 21:53:36 +01:00 |
|
DanielNoord
|
116679a5c9
|
Merge pull request #484 from Aktanusa/master (Release version 2.031.3)
Push master branch to GitHub Pages for version 2.031.3
|
2021-01-23 21:35:38 +01:00 |
|
DanielNoord
|
0ccd16577f
|
Merge pull request #436 from Aktanusa/dev (Version 2.031.3)
Merge dev-branch for v2.031.3 into master-branch
2.031.3
|
2020-12-28 14:10:06 +01:00 |
|