Tyler Renelle
2c1d8e1688
halloween: functional new skins for female sprites (requires habitrpg-shared@d7482fe)
2013-10-22 14:32:51 -07:00
Tyler Renelle
6f32ac2a24
halloween: purchase full set
2013-10-22 13:59:30 -07:00
Tyler Renelle
d184237c79
halloween: begin adding mechanic for the special skins
2013-10-22 13:24:31 -07:00
Tyler Renelle
b55cb1ccdb
bailey update for skin tones, 0.0.10, selling drops. @lemoness this is
...
the new format (jade), hit me offline for a tour
2013-10-20 00:13:50 -07:00
Tyler Renelle
2cf814acd6
drops: description on combining eggs/potions, selling to
...
alex. de-selectable drops. sell in a button of alex's dialog
2013-10-19 23:44:03 -07:00
Tyler Renelle
c882525150
eggs: add ability to sell potions / eggs
2013-10-19 20:04:26 -07:00
Tyler Renelle
017398eb83
eggs: some cleanup and passing around of $index so we can retrieve
...
egg/pot value
2013-10-19 19:58:11 -07:00
Tyler Renelle
378d158a44
pegs: restructure inventory/market html so we market is aware of
...
inventory and we can sell items
2013-10-19 19:36:59 -07:00
Tyler Renelle
be624a03b0
pets: basic framework for selecting both eggs & potions. now it shows which is hatchable with green background, setting up for selling eggs
2013-10-19 19:30:39 -07:00
Tyler Renelle
609499a4c9
front-page: update promo video
2013-10-19 16:24:20 -07:00
Tyler Renelle
cef8431af0
charts: port toggleChart back in (functional, but it's not getting the
...
right width)
2013-10-19 16:15:48 -07:00
Matteo Pagliazzi
066364e3c9
fix refresh chat button sending message
2013-10-16 21:36:56 +02:00
Matteo Pagliazzi
a56242d1a7
working chat refresh button
2013-10-16 21:02:57 +02:00
Tyler Renelle
3d777372a1
Merge pull request #1609 from Shaners/patch-1
...
Quick Fix - Task Editing Cancel
2013-10-15 19:53:29 -07:00
Tyler Renelle
109d46b2ca
paypal: fix to #1615 , explicitly set rm variable to avoid POST / on
...
paypal redirect
2013-10-13 16:05:18 -07:00
Matteo Pagliazzi
68426c7ccb
profile edits saved only on click
2013-10-13 20:47:59 +02:00
Matteo Pagliazzi
4e56df0e82
restore values saved only when Save is clicked
2013-10-13 19:58:13 +02:00
Matteo Pagliazzi
c3086c6194
fix not showing veteran wolf
2013-10-13 19:40:07 +02:00
Tyler Renelle
a53725da14
gems: add to tutorial on drop unlock
2013-10-12 20:22:56 -07:00
Tyler Renelle
890e8bf8b3
gems: can click main gem button, doens't require [+]
2013-10-12 20:08:06 -07:00
Tyler Renelle
81f9f9b4c5
gems: justin in gem-purchase dialog
2013-10-12 20:01:18 -07:00
Tyler Renelle
b4e5a1925b
add donate button
2013-10-12 19:47:40 -07:00
Tyler Renelle
4c018d84c1
Merge branch 'paypal' into develop
...
Conflicts:
bower.json
2013-10-12 19:23:44 -07:00
Tyler Renelle
f8328d3eeb
paypal: add configurable merchant and sandbox/production environment
2013-10-12 19:22:06 -07:00
Tyler Renelle
5de0c928fe
paypal: conslidate buy gems modals
2013-10-12 16:51:01 -07:00
Tyler Renelle
09cd132420
paypal: begin adding paypal alternative to credit-card payments
2013-10-12 15:24:35 -07:00
Shane Lister
6d259bdd48
Quick Fix - Task Editing Cancel
...
Temp fix for #1599
Hides the edit button on task editing.
Shows new cancel button on task editing.
Hides task notes on task editing.
Notes:
Still needs a save button up top, ```save(task)``` didn't seem to be working with ng-click (also tried a couple other things.) Will revisit.
'ng-if's could also work instead of 'ng-hide's.
Decided that we don't really need to have the task notes popover display while editing tasks since that stuff is already in the task editing pane.
2013-10-10 22:52:52 -07:00
Tyler Renelle
43be09a5d5
Merge pull request #1575 from Shaners/newSkin
...
New skin tones
2013-10-04 15:27:09 -07:00
Andre Casey
b3c3aeab05
Fixes #1556 . Removed HTML code in popover for now.
2013-10-03 16:49:15 -07:00
Matteo Pagliazzi
bb8bbe4e0f
remove stable flickering, fixes #1557
2013-09-29 16:43:01 +02:00
Dušan Juretić
602c78c1be
show egg and potion count in inventory
2013-09-28 11:52:51 -04:00
Shane Lister
91c9e5627f
Update profile.jade
...
Reorder and add new skin choices.
2013-09-26 23:23:30 -07:00
Matteo Pagliazzi
f816947b8e
update blog link
2013-09-20 19:50:56 +02:00
Matteo Pagliazzi
8540e2f59b
show group gems popover
2013-09-19 19:04:32 +02:00
Matteo Pagliazzi
86b3ca5d6b
remove duplicate tooltip
2013-09-18 17:41:23 +02:00
Dušan Juretić
c6472bc615
fix hardcoded total pets count
2013-09-18 11:07:23 -03:00
Tyler Renelle
35945f0a44
change bailey links to her twitter
2013-09-17 15:40:20 -04:00
Tyler Renelle
e62007e74e
add jquery.cookie for tour (suddenly required?)
2013-09-17 15:20:09 -04:00
Tyler Renelle
5006cda946
[ #1394 ] fix customizationsNotification issue
2013-09-17 14:59:06 -04:00
Tyler Renelle
082bfd46da
Merge branch 'develop' of github.com:lefnire/habitrpg into develop
2013-09-17 14:16:11 -04:00
Tyler Renelle
36b3a77877
[ #1397 #1543 #1540 ] start adding in unlock notifications (working for some, not for all). Also some tour & header fixes
2013-09-17 14:10:10 -04:00
Matteo Pagliazzi
66a8af5959
Merge pull request #1545 from djuretic/develop
...
Profile: allow deletion of websites
2013-09-17 10:50:04 -07:00
Tyler Renelle
f26b0a2cf5
[ #1394 ] add drop notifications back in
2013-09-17 12:16:16 -04:00
Dušan Juretić
daa06943ab
fix user profile websites show/hide conditions
2013-09-16 22:59:08 -03:00
Tyler Renelle
bb2b17b24e
Merge pull request #1538 from djuretic/develop
...
Do not allow empty task names when editing tasks
2013-09-16 13:33:38 -07:00
Dušan Juretić
64edf31eb4
show hatching potion selector after buying an egg
2013-09-15 16:40:20 -03:00
Dušan Juretić
72c4733a0f
do not allow empty task names when editing tasks
2013-09-14 21:38:50 -03:00
Matteo Pagliazzi
98fa007f36
do not trigger validation error on float number, fix #1463
2013-09-13 20:01:22 +02:00
Matteo Pagliazzi
2523643dd5
Merge branch 'develop' of https://github.com/lefnire/habitrpg into develop
2013-09-13 18:31:16 +02:00
Matteo Pagliazzi
89d102aa1f
do not show border on if habit has only + action
2013-09-13 18:23:02 +02:00
