Commit graph

7 commits

Author SHA1 Message Date
Tyler Renelle
76565384d3 Merge branch 'classes' into develop
Conflicts:
	public/js/controllers/tasksCtrl.js
	views/shared/modals/settings.jade
2013-12-08 18:17:53 -07:00
Tyler Renelle
8803df46c0 classes & grunt-spritesmith: death, paws, gems-cleanup 2013-12-04 16:02:08 -07:00
Sabe Jones
45b87288f0 Change "reroll" to "Fortify" in Gems popover text 2013-12-01 15:03:03 -06:00
Tyler Renelle
890e8bf8b3 gems: can click main gem button, doens't require [+] 2013-10-12 20:08:06 -07:00
Tyler Renelle
5de0c928fe paypal: conslidate buy gems modals 2013-10-12 16:51:01 -07:00
Tyler Renelle
e568a5ba31 api & rewrite: buy gems, reroll, fully converted server to JS, bug fixes 2013-08-29 01:45:54 -04:00
Tyler Renelle
f37c7b434a rewrite2 fix avatar, reroll, tooltips, etc 2013-08-25 20:39:47 -04:00