7a5a4819e6
pets: bug fix - user.remove(path, idx, count) was wiping the whole
...
eggs/food arrays on page refresh, using array.splice &
user.set('items.food', splicedFood), etc
2013-03-25 09:42:30 -06:00
f34df36152
pets: alert & return if they already own that pet
2013-03-25 09:31:12 -06:00
68bc02af72
pets: fix bug that food not getting added to
2013-03-23 00:09:05 -06:00
3c75caffd8
Merge branch 'develop' into pets
2013-03-22 23:50:41 -06:00
a6f4e01de7
move random-drop inside batch operations
2013-03-22 22:35:51 -06:00
6fd9bfbab4
pets: use pet.name for unique identifier, not pet.text. general cleanup
2013-03-22 22:17:25 -06:00
ccb6f9bd32
fix bootstrap-tour element bind with new herobox system
2013-03-22 19:11:29 -06:00
a862e21e8e
Merge branch 'develop' into pets
2013-03-22 19:06:48 -06:00
b286b95153
add charts back in, temporary style
2013-03-21 16:31:23 -06:00
a1a85241d5
add "hatching powder" (as temporary pet food), clean up some dialogs,
...
fix eggs using their actual animal sprites
2013-03-21 14:56:25 -06:00
0f8b50c806
remove 'veteran' pet
2013-03-21 13:58:23 -06:00
3fbb1b9135
only drop on 'up' scores
2013-03-21 13:57:22 -06:00
cebe7fce7b
rename randomProp to randomVal
2013-03-21 13:55:31 -06:00
3ce2686662
Merge branch 'develop' into switz-inventory
...
Conflicts:
src/app/helpers.coffee
styles/app/avatar.styl
styles/app/index.styl
views/app/avatar.html
views/app/tasks.html
Merge branch 'develop' into switz-inventory
Conflicts:
src/app/helpers.coffee
styles/app/avatar.styl
styles/app/index.styl
views/app/avatar.html
views/app/tasks.html
2013-03-21 13:51:38 -06:00
fa89b20dd5
Merge branch 'develop' into zakkain-ui-tweaks
...
Conflicts:
styles/app/index.styl
styles/app/tasks.styl
views/app/alerts.html
views/app/avatar.html
views/app/header.html
views/app/index.html
Merge branch 'develop' into zakkain-ui-tweaks
Conflicts:
styles/app/index.styl
styles/app/tasks.styl
views/app/alerts.html
views/app/avatar.html
views/app/header.html
views/app/index.html
by popular demand, we're dropping the crosshatched square and going blank
Conflicts:
styles/app/tasks.styl
2013-03-21 12:36:05 -06:00
7529601dcc
add general "new stuff" notification, linking to changelog
2013-03-21 10:31:23 -06:00
507a0fc3c9
MASSIVE HEADER CHANGES OH SHIT
2013-03-18 23:42:03 -04:00
411c614408
fix the 1px gap
2013-03-18 19:33:30 -04:00
8284693d0f
rebuilt header boiiii. Tested FF, Safari, Chrome
2013-03-18 18:29:53 -04:00
e18c53f97f
middle of wrasslin the new header
2013-03-18 16:48:47 -04:00
49db610602
fix to "editing profile" bug. move {#with _user.preferences as :p}
...
into minimum allowable depth in HTML hierachy at which it's required.
Still trying to put my finger on it, but I'm getting close
2013-03-18 15:43:02 -04:00
5799a155af
set timeout interval on undo (disappear after 10s)
2013-03-17 23:16:05 -04:00
de1eca084e
bugfix to "can't delete task"
2013-03-17 22:09:33 -04:00
07a3a3c3b6
fix to reward issue in undo
2013-03-17 22:02:06 -04:00
903745f7c9
pass in whole task object to taskClasses
2013-03-17 21:50:02 -04:00
10e9d3eb40
fixed undo on checkboxed items
2013-03-17 21:43:03 -04:00
2f3d0fa86a
start adding undo functionality
2013-03-17 21:30:24 -04:00
2be827f484
Merge branch 'cdn-scripts' into develop
2013-03-17 09:33:19 -04:00
0bcea534ae
better "reroll" comment
2013-03-17 09:13:25 -04:00
0c1151b123
don't add bootstrap css files in when instantiating derby-ui-boostrap,
...
instead compile in with the css. index.coffee directives are run
against static pages too, which overwrites our bootstrap
responsive (which we need) with the app's custom responsive styles. We
may change this, but for now this commit allows us to keep the
marketing site and main site styles separate
2013-03-17 09:11:19 -04:00
dbc3906eb3
possible fix to dom losing functions after model.resetDom()
2013-03-16 20:02:01 -04:00
903479af5a
add view functions and(), or(), notEqual()
2013-03-16 19:10:40 -04:00
7083e7a103
yarr, fix all teh bugs
2013-03-16 16:30:45 -04:00
f9ab61178b
Cleanup
2013-03-16 15:17:55 -04:00
1a1144b3cc
If the user selects an already selected pet, deselect it
2013-03-16 15:10:50 -04:00
6d34fa8953
Highlight active pet
2013-03-16 15:09:16 -04:00
419351494c
Clean up helpers + choose Pet
2013-03-16 14:58:09 -04:00
2ffe0aecf9
FeedEgg
2013-03-16 11:18:27 -04:00
48cbe7c383
Merge branch 'master' into develop
...
Conflicts:
views/app/settings.html
2013-03-15 18:40:21 -04:00
545e5fc2a4
allow manually unlocking party system
2013-03-15 18:39:39 -04:00
368748b67a
add delete account functionality (*sigh*, y'all asked for it)
2013-03-15 17:59:15 -04:00
6c61c0f7db
add delete account functionality (*sigh*, y'all asked for it)
2013-03-15 17:58:37 -04:00
325d906708
begin adding toggle-header
2013-03-15 17:30:59 -04:00
174a0d2362
cleaner view.fn "tnl"
2013-03-15 17:30:46 -04:00
7f93b525c0
move tnl to a view function instead of model function, beging adding
...
party stats visuals (hp & exp presently)
2013-03-15 17:30:42 -04:00
3fa6aaceed
add 'show helm' option
2013-03-15 17:20:15 -04:00
f2faf8c968
add 'show helm' option
2013-03-15 17:20:01 -04:00
823f524d57
begin adding toggle-header
2013-03-15 16:47:48 -04:00
b76b1a33f5
cleaner view.fn "tnl"
2013-03-15 12:06:38 -04:00
d2837afbd4
move tnl to a view function instead of model function, beging adding
...
party stats visuals (hp & exp presently)
2013-03-15 12:00:47 -04:00
Tyler Renelle