77e37804e8
habitrpg-shared: bug fixes on hydrate()
2013-05-22 13:57:10 +01:00
258cf55abb
fix int() view helper (restore streak)
2013-05-22 11:30:17 +01:00
1596808c25
move everything to lodash, since we're using it for other things
...
anyway (cloneDeep, findIndex, etc). make sure to return `true`
explicitly after all _.each functions! if you accidently return
false (happens more often than you'd think), it kills the loop. As a
result, I'm using .forEach() native function where i can for
simplicity, but many of our _.each iterate object keys
2013-05-22 11:29:24 +01:00
a31eb184a2
habitrpg-shared: don't forget the package req!
2013-05-22 11:27:16 +01:00
5a25244096
Merge branch 'habitrpg-shared' into develop
...
Conflicts:
src/app/helpers.coffee
src/app/items.coffee
2013-05-22 11:13:27 +01:00
598f2f6c46
habitrpg-shared: don't cloneDeep our user object for the time being. we can't access __proto__ objects as a result (see https://github.com/codeparty/racer/issues/116 ), the negative side-effect is this cause certain notifications not to show, because model.on() listeners can't tell the difference between $spec object properties & model.get()
2013-05-22 11:08:05 +01:00
2230ce6688
habitpg-shared: move viewHelpers to misc, add hydrate() function (see https://github.com/codeparty/racer/issues/116 ) to prevent data-loss on user.get()
2013-05-22 00:40:54 +01:00
bc49e4668c
only show restore-streak on dailies
2013-05-21 14:39:23 +01:00
ff2fedda48
add ability to restore lost streaks, also add int() view helper
...
function (pretty cool actually, https://groups.google.com/forum/?fromgroups#!topic/derbyjs/otFCLu2p7yY )
2013-05-21 14:33:31 +01:00
e21bc9869d
Merge branch 'develop' of github.com:lefnire/habitrpg into develop
2013-05-21 12:57:40 +01:00
cc097c32f7
clean up of preen_cron, which I'm re-enstating
2013-05-21 12:54:06 +01:00
b77a62e915
Merge pull request #1002 from MrConcept/master
...
Merge Master
2013-05-20 11:09:37 -07:00
105087c823
Removes +4 Gems on Reset exploit
2013-05-20 19:52:37 +02:00
f412a20203
habitrpg-shared: cron bug-fixes
2013-05-20 10:56:38 +01:00
5776bec545
Merge branch 'develop' of github.com:lefnire/habitrpg into develop
2013-05-20 10:28:49 +01:00
ed057799a3
put coin_single_[silver|gold].png back in (thought we weren't using
...
anymore, i was wrong)
2013-05-20 10:27:53 +01:00
9c173e3a08
HP potion description clarify.
...
People getting confused about its use.
2013-05-20 11:08:04 +02:00
d870325169
Margin on Buttons for #996 & 128eb8a
2013-05-20 09:59:36 +01:00
83ac2adb79
habithabitrpg-shared: cron mostly working wiht habitrpg-shared https://github.com/HabitRPG/habitrpg-shared/commit/7805a2ba264f48f0ac80bce552bec4fefdf109e9
2013-05-20 01:15:33 +01:00
0b445df909
habitrpg-shared: *almost* working wth new scoring ( https://github.com/HabitRPG/habitrpg-shared/commit/c0cf9780fe8e17211d4749b9c3eb2a0fd389db64 ) - need to fix for cron, API, and other misc bugs
2013-05-19 23:50:41 +01:00
128eb8adb7
tavern: add submit bug / feature buttons up top, fixes #996
2013-05-19 20:43:48 +01:00
6a36f4bd1d
habitrpg-shared: helpers now working https://github.com/HabitRPG/habitrpg-shared/commit/d42ac5d53ca077ebc746d8d0f48cc1f51e37ae63
2013-05-19 18:53:13 +01:00
5d1368e794
habitrpg-shared: got items working (see https://github.com/HabitRPG/habitrpg-shared/commit/1feb209c2486ff3dd3ebb84dccd4f300d1c31ed6 )
2013-05-19 18:01:50 +01:00
6a6a75edda
Merge branch 'develop' of github.com:lefnire/habitrpg into develop
2013-05-19 15:02:50 +01:00
ae4c5723e0
chat: allow admins to remove other people's messages
2013-05-19 15:02:04 +01:00
9b46805452
Merge pull request #989 from Shaners/develop
...
Bacon Bacon
2013-05-18 01:09:05 -07:00
5cff970947
Bacon Bacon
...
Putting some bacon into the tavern NPC graphic. The people demand bacon.
2013-05-17 16:42:26 -07:00
081b5be657
Merge pull request #17 from lefnire/develop
...
Update my Develop
2013-05-17 16:36:30 -07:00
92e8e5b597
done trying to futz with user-menu css for maintaining visibility when
...
header hidden. Instead, just put it elsewhere in html if header
hidden. fixes #981
2013-05-17 12:09:43 +01:00
4c0fe42d4e
only hide header bits with preferences.hideHeader, fixes #979
2013-05-17 10:22:21 +01:00
a6973e9ae2
back to websockets
2013-05-17 09:58:37 +01:00
9946495564
Merge branch 'develop'
2013-05-17 09:57:32 +01:00
636e7aa4c0
Merge branch 'develop' of github.com:lefnire/habitrpg into develop
2013-05-16 17:58:49 +01:00
f1767191d3
Merge pull request #977 from Shaners/patch-1
...
Update npcs.styl
2013-05-16 09:28:42 -07:00
0c6a71a581
Update npcs.styl
...
Should fix Bailey's full body graphic.
2013-05-16 10:22:37 -06:00
f6df9a610a
get rid of some old unused images
2013-05-16 12:16:24 +01:00
af8dbb9f1a
Use @Shaners new NPCs sprites instead of images
2013-05-16 12:00:04 +01:00
85018568e4
Merge pull request #973 from Shaners/develop
...
Backer-Gear Tweaks, matt tweak, add NPCs
2013-05-16 03:12:14 -07:00
2cebbb93e5
NPC Sprite Sheet and CSS
2013-05-15 21:44:39 -07:00
8bb0718cea
Backer-Gear Tweaks, NPCs
2013-05-15 17:22:32 -07:00
c9cfd2c30b
Merge pull request #16 from lefnire/develop
...
Update my develop branch
2013-05-15 17:07:14 -07:00
eca7b1b53b
Merge branch 'develop'
2013-05-15 12:47:58 +01:00
149961c07d
z-index fix on NPC popover dialogs
2013-05-15 12:23:18 +01:00
4aeb7c5635
better "level: 1" positioning, add stats to party members
2013-05-15 11:51:16 +01:00
5a01963c1f
back to xhr-polling or a bit, will figure out why websockets having
...
This reverts commit d59f1f6925
2013-05-15 09:58:38 +01:00
aef76ae969
pets: bug fix for users who haven't been properly converted to pets array system
2013-05-15 09:14:42 +01:00
d59f1f6925
Revert "back to xhr-polling or a bit, will figure out why websockets having"
...
This reverts commit e5549d0501
2013-05-14 23:53:59 +01:00
e5549d0501
back to xhr-polling or a bit, will figure out why websockets having
...
issues soon
2013-05-14 23:42:36 +01:00
950be4daf2
cron: better solution to testing "due today" for tasks with repeat
...
options, and user with custom dayStart. Still not sure if this is the
ideal solution, but addresses #963
2013-05-14 19:01:05 +01:00
3ae295c9a3
don't include 'disabled' shading for todos
2013-05-14 18:20:19 +01:00
Tyler Renelle