5d5f1d2b1b
chore(legal): Update revision date
2015-07-27 16:58:16 -05:00
4f36ecb8d1
fix(legal): TOS and privacy tweaks
...
Also updates the front page daily users brag to account for the 25% growth since the introduction of the joinOthers string.
2015-07-27 15:26:31 -05:00
e72543641c
Puts keys of the kennel modal on the inventory ctrl so pet counting variables can be accesssed
...
Closes #5668
2015-07-25 23:22:35 -05:00
f31d1b4b1b
Merge branch 'develop' into TheHollidayInn-tasks-select-with-keys-fix
2015-07-24 22:16:57 -05:00
f749d1a3cb
Make todos selectable with vimium
2015-07-24 22:08:13 -05:00
6aae668b8c
Rework gem adjustment so it actually makes sense
2015-07-24 17:30:47 -05:00
9e25c29e04
Correct maxPrize calculation
2015-07-24 17:30:47 -05:00
e37c60e0f2
Expand functions to make them readable
2015-07-24 17:30:45 -05:00
0b85dc3e27
Correct getChallenges name
2015-07-24 17:30:44 -05:00
61d0172567
Add mising semi colons and line breaks
2015-07-24 17:30:43 -05:00
a89b612bbe
Impliment challenge controller changes in view
2015-07-24 17:30:42 -05:00
bac979ca4d
Eliminate unused variable
2015-07-24 17:30:42 -05:00
2441f6363e
Consolidate transition code
2015-07-24 17:30:42 -05:00
5cd42e85c7
bail out and alert user if prize is too high
2015-07-24 17:30:41 -05:00
7c4486e001
Use gem calc functions
2015-07-24 17:30:41 -05:00
c92678008b
Write functions to check if user has balance for challenge creation
2015-07-24 17:30:41 -05:00
cb27c3dc44
Correct indentation and equality checks on shuldShowChallenge
2015-07-24 17:30:40 -05:00
eea01216d7
Move backToChallenges to private functions section
2015-07-24 17:30:40 -05:00
fb6a34c2ed
Set default group to tavern if no default group is found
2015-07-24 17:30:40 -05:00
fe2fb6deba
Remove out of context comment
2015-07-24 17:30:40 -05:00
f8e2e74336
Move getChallenges private method to bottom of file
2015-07-24 17:30:39 -05:00
ef9dfac087
Create new function to check for enough gems, added @crookedneighbor 's tests, and added tests to check for enoughGems when user creates a habitrpg challenge
2015-07-24 17:30:37 -05:00
53c21b07a3
Reset enough gems variable if user selects group other than habitrpg
2015-07-24 17:30:36 -05:00
fce622ddc7
Added hide and error message when a user tries to create a challenge for HabitRPG group and they have no gems
2015-07-24 17:30:36 -05:00
d022a0eb67
Merge branch 'develop' into sabrecat/death-modal
...
Conflicts:
common/dist/sprites/habitrpg-shared.css
common/dist/sprites/spritesmith0.png
common/dist/sprites/spritesmith2.png
common/dist/sprites/spritesmith3.css
common/dist/sprites/spritesmith3.png
common/dist/sprites/spritesmith4.css
common/dist/sprites/spritesmith4.png
2015-07-24 16:11:51 -05:00
fca6f91f13
Merge branch 'develop' into analytics-service-server-side
2015-07-24 15:19:31 -05:00
dc26e1680c
Merge pull request #5661 from HabitRPG/sabrecat/mystery
...
July 2015 subscriber goodies
2015-07-24 12:29:07 -07:00
966e90da4e
Added height and width so Vimium can find the checkboxes
2015-07-23 21:20:18 -05:00
c8982b3513
fix(analytics): Track intro tour steps 1-2
2015-07-23 15:07:37 -05:00
d32d05e873
feat(mystery): July 2015 goodies
...
Also makes the mystery box opening notification translatable and adds item graphics to it.
2015-07-23 12:05:13 -05:00
8a363efc43
Merge branch 'develop' into TheHollidayInn-pet-actions-esc-to-cancel
2015-07-22 17:59:50 -05:00
c41271e558
Merge branch 'develop' into refactor_member_modal_and_stats_page
2015-07-22 17:39:39 -05:00
7b9102c88c
Move gear counting to counting script
2015-07-22 17:37:35 -05:00
f40cfd2b66
Move all pet counting to shared count scripts
2015-07-22 17:32:12 -05:00
0f1c92184c
chore(news): iOS update Bailey
2015-07-22 15:42:35 -05:00
c61eccaaba
Removed if statements and fixed style issues
2015-07-22 15:38:17 -05:00
7d622792a8
Merge pull request #5635 from HabitRPG/sabrecat/quests-page
...
Improve quest drop notification
2015-07-22 10:28:16 -07:00
6d52f842ff
fix(quest): Move party jump to cb
2015-07-22 11:52:15 -05:00
107e27a2c6
Deselect food, egg, and potion when hitting the escape key
2015-07-21 21:52:29 -05:00
0313170921
feat(quests): Invite party button
2015-07-21 15:25:34 -05:00
5789f22320
WIP(death): Draft with decal
2015-07-21 14:39:08 -05:00
0039a17366
WIP(death): More display tweaks
2015-07-21 13:57:13 -05:00
c286d08bc8
WIP(death): New death modal
2015-07-20 16:24:05 -05:00
632faafa4f
fix(quests): Refactoring
...
Based on feedback from @crookedneighbor and @gisikw. Removes double ternary in the block that normalizes the item type string, and reverts the notification logic to if/else if format instead of switch/case. Also removes a block of commented-out code once used for death notifications.
2015-07-20 14:17:35 -05:00
65c14b1e3f
Refactor inventory ctrl variables
2015-07-20 12:51:10 -05:00
3d40da4004
Remove countPets and countMounts from codebase
2015-07-20 08:11:00 -05:00
2695419182
Use better beastMaster / mountMaster counts
2015-07-19 21:51:30 -05:00
3643d11d97
Refactor pet and mount count into one method
2015-07-19 20:56:14 -05:00
aee37b2a0e
Swap out pet and mount count with stat calc functions
2015-07-19 20:40:15 -05:00
89bfc83b95
Organize stat functions alphabetically
2015-07-19 20:19:16 -05:00
Sabe Jones