Merge changes from gh-pages into master#158

Open

Icehawk78 wants to merge 180 commits intomainfrom

Commits on Apr 8, 2014

Merge changes from branch master
Nicholas Laux
committed
Fix for checking the price discount value of Santa upgrades
Nicholas
committed

Commits on Apr 9, 2014

Initial fix for new version
Nicholas Laux
committed
Award anti-vanilla achievement on load
Nicholas Laux
committed
Add new upgrade prereqs
Nicholas Laux
committed

Commits on Apr 10, 2014

Commits on Apr 12, 2014

Fix final form error
Nicholas
committed

Commits on Apr 18, 2014

Bigger numbers, merge from branch/master
Nicholas
committed

Commits on Apr 22, 2014

Update fcReset to pop wrinklers and clear stats
Nicholas
committed
Make FC aware of wrinkler cookies as well.
Nicholas
committed
Wrinkler HC in graphs
Nicholas
committed

Commits on Apr 25, 2014

Add wrinkler info window and condense keydown listeners
Nicholas
committed
Frenzy/Blood Frenzy should be more accurate in payouts
Nicholas
committed

Commits on Apr 28, 2014

Remove wrinkler saving, add toggleable wrinkler valuation
Nicholas
committed
Remove wrinkler saving, add toggleable wrinkler valuation
Nicholas
committed
Fix huge wrinkler bug
Nicholas
committed
Version Tick
Nicholas
committed

Commits on Apr 30, 2014

Remove precalculated golden/reindeer probability lists
Nicholas
committed
Frenzy/Clot probabilities don't include chain effects
Nicholas
committed

Commits on May 1, 2014

Allow seasons to change as soon as you have all related cookies
Nicholas
committed

Commits on May 12, 2014

Create test.json
Nicholas
committed

Commits on May 18, 2014

Initial Easter Fix - not complete
Nicholas
committed
Century Egg fix? Maybe?
Nicholas
committed
Update fc_main.js
Nicholas
committed
Update fc_main.js
Nicholas
committed
Update fc_main.js
Nicholas
committed
Update fc_main.js
Nicholas
committed
Redraw every 10 purchases for funsies
Nicholas
committed
Update fc_main.js
Nicholas
committed

Commits on May 19, 2014

Add 'e' for export save popup
Nicholas
committed
Add easter to holiday cookies
Nicholas
committed
Protect keyboard shortcuts from activating during prompts
Nicholas
committed

Commits on May 20, 2014

Add wrinklerspawn to calculations
Nicholas
committed
Change 'Season' blacklist to 'Pledging Only'
Nicholas
committed
Change 'Season' blacklist to 'No Buildings'
Nicholas
committed
Remove Grandmapocalypse ending state, since nobody uses it for that anymore
Nicholas
committed
Fix for building blacklist
Nicholas
committed
Add extra sorting to the recommendation list
Nicholas
committed
Efficiency should sort smallest to largest, and don't buy Infinite efficiency purchases
Nicholas
committed
Update fc_main.js
Nicholas
committed
Change frenzy and HC gain console logging
Nicholas
committed
Change frenzy and HC gain console logging
Nicholas
committed
Update fc_main.js
Nicholas
committed
HC logging
Nicholas
committed
Update fc_main.js
Nicholas
committed
Display more detailed rate info
Nicholas
committed
Update fc_button.js
Nicholas
committed
Default to valid gc state
Nicholas
committed
Pop wrinklers if in Easter and don't have all eggs, add 'pastemode'
Nicholas
committed
Add pastemode because it's silly
Nicholas
committed
Remove 'includeWrinklers' option
Nicholas
committed
Allow pastemode to buy even worse things
Nicholas
committed
Pastemode should only reverse when recalculating the cache
Nicholas
committed
Cumulative Building Cost is using wrong discount
Nicholas
committed
;
Nicholas
committed
Alter how GC probabilities are stored/calculated
Nicholas
committed
Alter how GC probabilities are stored/calculated
Nicholas
committed
Update cc_upgrade_prerequisites.js
Nicholas
committed
Update fc_main.js
Nicholas
committed
Move polyfill
Nicholas
committed
Update fc_main.js
Nicholas
committed
Update fc_main.js
Nicholas
committed
Update wrinkler calcs everywhere
Nicholas
committed
Version Tick
Nicholas
committed

Commits on May 22, 2014

Add 'defaultPurchase' for completely empty recommendation lists
Nicholas
committed
Add default purchases that do nothing if recommendation list is empty(ish)
Nicholas
committed
Update fc_main.js
Nicholas
committed
Add infobox to FC Reset code
Nicholas
committed
Prettify reset prompt
Nicholas
committed
Also make it a real number, that'd be great.
Nicholas
committed
Update fc_main.js
Nicholas
committed
Update fc_main.js
Nicholas
committed
Update fc_main.js
Nicholas
committed

Commits on May 27, 2014

Add some new info
Nicholas
committed
Make Choc Recoup include (effective) time to buy
Nicholas
committed
Typo
Nicholas
committed

Commits on May 28, 2014

Add chocolateValue()
Nicholas
committed
Include wrinklers/chocolate in HC values
Nicholas
committed
Add new keyboard shortcuts (Reset, Manual Save)
Nicholas
committed
Update fc_button.js
Nicholas
committed
Update fc_button.js
Nicholas
committed
Update fc_button.js
Nicholas
committed
Update fc_button.js
Nicholas
committed
Update fc_button.js
Nicholas
committed
Update fc_button.js
Nicholas
committed
Update fc_button.js
Nicholas
committed
Update fc_button.js
Nicholas
committed
Update fc_button.js
Nicholas
committed
Update fc_button.js
Nicholas
committed
Update bank drawing and add markers for current
Nicholas
committed
Update fc_button.js
Nicholas
committed
Fix Chocolate Recoup to be more accurate
Nicholas
committed
Simplify Chocolate Recoup, Change Separator Color
Nicholas
committed
Add helper methods for behind the scenes
Nicholas
committed
Rename Method
Nicholas
committed

Commits on Jun 6, 2014

Attempt to fix autobuy delay forever and ever
Nicholas
committed
Version tick
Nicholas
committed

Commits on Jun 11, 2014

Comments
Nicholas
committed

Commits on Dec 23, 2015

Add v1.9 branching folders/files
Nicholas
committed
Create cc_upgrade_prerequisites.js
Nicholas
committed
Create fc_button.js
Nicholas
committed
Old Beta version folder
Nicholas
committed
Create cc_upgrade_prerequisites.js
Nicholas
committed
Create fc_button.js
Nicholas
committed
Rename fc_main.js to 1.0466/fc_main.js
Nicholas
committed
Rename fc_button.js to 1.0466/fc_button.js
Nicholas
committed
Rename cc_upgrade_prerequisites.js to 1.0466/cc_upgrade_prerequisites.js
Nicholas
committed
Add version detection
Nicholas
committed
Update frozen_cookies.js
Nicholas
committed
Update frozen_cookies.js
Nicholas
committed
Update frozen_cookies.js
Nicholas
committed
Potential fix for Golden Switch issues
Nicholas
committed

Commits on Dec 24, 2015

Re-allow ascending
Nicholas
committed
Allow dragonflight time to appear in stats
Nicholas
committed
Remove HC circle and push whole circle right
Nicholas
committed
Track HC gains at different frenzy levels
Nicholas
committed
Display frenzy gains
Nicholas
committed
)
Nicholas
committed
Update fc_main.js
Nicholas
committed
Update fc_main.js
Nicholas
committed
Update fc_button.js
Nicholas
committed
Update fc_main.js
Nicholas
committed
Remove logging, fix typo
Nicholas
committed
Fix frenzy HC gain tracking
Nicholas
committed

Commits on Dec 28, 2015

Make golden cookie time more flexible
Nicholas
committed
Make GC possibly more flexible
Nicholas
committed
Version tick
Nicholas
committed

Commits on Feb 5, 2016

Create 1.903 Branch
Nicholas
committed
Create fc_button.js
Nicholas
committed
Create cc_upgrade_prerequisites.js
Nicholas
committed
Fix a change in Season Change buyFunctions
Nicholas
committed
Make header/tabs persistent
Nicholas
committed
Add multibuilding buy
Nicholas
committed
Update fc_main.js
Nicholas
committed

Commits on Feb 6, 2016

Commits on Feb 7, 2016

Reuse new tiered logic for building prereq list
Nicholas
committed
Add widths to the internal info section's columns
Nicholas
committed

Commits on Feb 9, 2016

Update cc_upgrade_prerequisites.js
Nicholas
committed
Clean up JSON and add Easter prereqs
Nicholas
committed

Commits on Feb 10, 2016

Add findIndex polyfill
Nicholas
committed
Update GC Bank calculations
Nicholas
committed
Make the bank actually right this time.
Nicholas
committed
Maybe... fix some more of the GC calculations?
Nicholas
committed
Update cookie bank value
Nicholas
committed

Commits on Feb 11, 2016

Delete test.json
Nicholas
committed
First pass at fixing achievements
Nicholas
committed
.
Nicholas
committed
Update fc_main.js
Nicholas
committed

Commits on Feb 12, 2016

Add no bank to the bank section
Nicholas
committed
Update GC bank section to be more accurate
Nicholas
committed
Update GC Banks to be more accurate
Nicholas
committed
Update buy function to work with toggleInto upgrades
Nicholas
committed

Commits on Feb 16, 2016

Change overlap definitions
Nicholas
committed
Use new overlap definitions
Nicholas
committed

Commits on Feb 17, 2016

Change polyfill to see if it works better
Nicholas
committed
Fix reset
Nicholas
committed
Rewrite the ascension logic to be more flexible
Nicholas
committed
Update fc_main.js
Nicholas
committed
Update fc_main.js
Nicholas
committed
Update fc_main.js
Nicholas
committed
Update fc_main.js
Nicholas
committed
Update next HC calcs to use Math.floor
Nicholas
committed
Prevent chain cookies from screwing up GC time valuation
Nicholas
committed
Update fc_main.js
Nicholas
committed

Commits on Feb 19, 2016

Add comments
Nicholas
committed

Commits on Feb 22, 2016

Possibly fix wrinkler bug during reset
Nicholas
committed

Commits on Feb 23, 2016

Add effective vs average function
Nicholas
committed
Add eCPS/Average CPS to FC Tab
Nicholas
committed
Alter compareCps function to use seconds
Nicholas
committed
Update fc_main.js
Nicholas
committed