Commit Graph

31 Commits

Author SHA1 Message Date
Tyler Renelle
6b0a6692ff [#1977] misc fixes 2013-12-12 17:38:01 -07:00
Tyler Renelle
d4e0ae85a0 [#1977] port pet-feeding to user.ops, so that it's now available in the API. Also add handling of 200 errors to simply notify and continue on up to server (friendly messages) 2013-12-12 15:58:17 -07:00
Tyler Renelle
ee1cd3c05d [#1977] APIv2 WIP - start of a framework where operations are shared
between client & server. If the op is called on the client, it updates
the user & then POSTs to the server with op of the same name. If called
on server, it updates the user and user.save()s
2013-12-11 21:42:57 -07:00
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
c524972aa2 Merge pull request #1952 from HabitRPG/sabe/tweak
Tweaks from Sabe
2013-12-08 08:50:37 -08:00
Tyler Renelle
f8f8a1334b Merge branch 'develop' into classes
Conflicts:
	views/options/inventory/stable.jade
2013-12-07 20:23:26 -07:00
Tyler Renelle
46f91db14c Mounts: prevent feeding special pets 2013-12-07 13:54:19 -07:00
Tyler Renelle
c51cdd0849 classes: proper handling of items on class-switch, un-equipping items,
etc. Paves way for item-loss on death. See habitrpg-shared#acae9c3
2013-12-06 15:41:58 -07:00
Tyler Renelle
b852d9a9f2 classes #943 more general solution to two-handed weapons habitrpg-shared#41da82f 2013-12-06 11:46:07 -07:00
Tyler Renelle
8216828514 classes #943 reroll sets you on your new class's item track. Handling of two-handed staves 2013-12-06 10:51:23 -07:00
Tyler Renelle
3e5c213694 classes armory: separate gear listings by class type, show selected gear 2013-12-06 09:26:02 -07:00
Tyler Renelle
5fea978e6b costumes: add costume support in inventory 2013-12-04 22:50:20 -07:00
Sabe Jones
30a5b349f8 Fix #1909 (keep stack selected after selling item) 2013-12-01 10:16:21 -06:00
Matteo Pagliazzi
1dfd3b8b05 remove code moved in previous commit 2013-11-23 17:45:03 +01:00
Matteo Pagliazzi
4bedefbc57 use helpers.countPets on server, fix client side pet count 2013-11-20 18:48:48 +01:00
Matteo Pagliazzi
557d65a626 do not count rare pets into pet counts & fix beast master achievement 2013-11-18 16:18:57 +01:00
Tyler Renelle
2b286ba889 [#1821] [#1723] fix pet counters (incl for member modals) 2013-11-15 17:51:00 -08:00
Tyler Renelle
bfbc907fa1 mounts: show when selectedFood by green-circle highlighting pets 2013-11-10 22:53:20 -08:00
Tyler Renelle
e990850b01 mounts: new saddle logic. saddles don't drop, can only purchase for
5G. Saddle instantly raises pet=>mount (full 50pts). Saddles no longer
required as "finisher" item. (@lemoness)
2013-11-10 20:23:14 -08:00
Tyler Renelle
543635dd37 mounts: change growth-points requirement to 50 (@lemoness) 2013-11-10 19:20:34 -08:00
Tyler Renelle
4c15905cd9 mounts: block creating mount if they already have it 2013-11-10 15:13:50 -08:00
Tyler Renelle
cd79649100 mounts: fix isUser class bringing user too far down. Fix initial drop bug. Remove items.currentPet if turned into mount 2013-11-10 13:43:11 -08:00
Tyler Renelle
284114c056 mounts: counting bug fixes, put pets & mounts in tabs 2013-11-10 12:28:08 -08:00
Tyler Renelle
085919c000 mounts: update all html & javascript to support UserSchema overhaul (60421a8). Also add very basic feeding & saddling mounts functionality. use progress bars to indicate pet feeding progress 2013-11-10 11:04:41 -08: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
e4f2a4386d eggs: bug fixes on selling potions 2013-10-19 20:22:12 -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
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
55dffcc317 [#1476] re-order "you already have this combo" message to bail early 2013-09-08 22:42:59 -04:00
Matteo Pagliazzi
7cd075d787 initial grunt support, gzip enabled 2013-09-06 19:19:43 +02:00