 Matteo Pagliazzi
|
d89d1e50dd
|
Merge branch 'develop' into api-v3
|
2016-03-25 15:58:04 +01:00 |
|
|
Keith Holliday
|
d7b6e0b760
|
Ported refPush and added tests
|
2016-03-25 08:33:55 -05:00 |
|
|
Matteo Pagliazzi
|
192409a0b5
|
Merge branch 'api-v3' into api-v3-equip-feed-hatch2
|
2016-03-25 12:22:55 +01:00 |
|
|
Matteo Pagliazzi
|
0a65e6a6f1
|
v3: port hatch, equip and feed ops
|
2016-03-24 18:59:09 +01:00 |
|
|
Matteo Pagliazzi
|
159b9eaa8d
|
port disable classes and change class ops
|
2016-03-24 14:25:30 +01:00 |
|
|
Sabe Jones
|
be159adf77
|
fix(event): pastel skin, not hair
|
2016-03-23 15:36:24 -04:00 |
|
|
Sabe Jones
|
1286b6fbee
|
fix(event): make spring hair/skin available server side
|
2016-03-23 15:36:24 -04:00 |
|
|
Sabe Jones
|
f7027b5cf3
|
feat(event): subscriber items 2016-03
|
2016-03-23 15:36:24 -04:00 |
|
|
Matteo Pagliazzi
|
0bde9e2df2
|
Merge branch 'develop' into api-v3
|
2016-03-21 23:03:28 +01:00 |
|
|
Matteo Pagliazzi
|
f04d8d4d97
|
do not remove ops/fns from common/script/index.js until they have been ported everywhere
|
2016-03-21 22:50:18 +01:00 |
|
|
Matteo Pagliazzi
|
bd3c162b97
|
port allocateNow and autoAllocate
|
2016-03-20 20:21:15 +01:00 |
|
|
Matteo Pagliazzi
|
480194f53c
|
add routes for buy ops and integration tests
|
2016-03-20 17:41:17 +01:00 |
|
|
Matteo Pagliazzi
|
fea2e0d8c0
|
correctly stub methods and test errors
|
2016-03-20 16:06:31 +01:00 |
|
|
Matteo Pagliazzi
|
657f19af0d
|
add tests for shared.ops.buySpecialSpell and partially fix shared.ops.buy
|
2016-03-20 13:46:56 +01:00 |
|
|
Matteo Pagliazzi
|
2560096466
|
port buyQuest tests
|
2016-03-20 13:33:34 +01:00 |
|
|
Matteo Pagliazzi
|
ad8834f4ed
|
port tests for shared.ops.buyMysterySet.js
|
2016-03-20 13:12:06 +01:00 |
|
|
Matteo Pagliazzi
|
71f304786c
|
add pickDeep utility function to pick nested properties from objects
|
2016-03-20 13:07:14 +01:00 |
|
|
Matteo Pagliazzi
|
957e1d26d6
|
add tests for fns/ultimateGear, fns/handleTwoHanded, fns/randomVal, fns/predictableRandom and partial tests for ops/buy
|
2016-03-19 18:05:02 +01:00 |
|
|
Matteo Pagliazzi
|
ff72706cae
|
wip(shared): port buy ops and linked fns
|
2016-03-19 16:04:27 +01:00 |
|
|
Sabe Jones
|
8447259016
|
Merge pull request #6921 from HabitRPG/sabrecat/spring-2016
Spring Fling 2016
|
2016-03-18 16:08:46 -05:00 |
|
|
Sabe Jones
|
10a8476aaf
|
WIP(event): Spring Fling cont'd
|
2016-03-17 13:10:05 -04:00 |
|
|
Sabe Jones
|
4effa79e17
|
WIP(event): Spring Fling partial
|
2016-03-17 13:04:12 -04:00 |
|
|
Blade Barringer
|
c7310b97ec
|
Revert "Revert inventory equipment/gear sorting due to inability to de/equip and maybe performance issues."
This reverts commit 9d50201180.
|
2016-03-17 08:09:18 -05:00 |
|
|
Alys
|
9d50201180
|
Revert inventory equipment/gear sorting due to inability to de/equip and maybe performance issues.
This reverts commits 1c811dbc82, 146810a3e9, 9508ed45df, a6fb945120.
|
2016-03-17 21:47:29 +10:00 |
|
|
Blade Barringer
|
146810a3e9
|
feat: Add set property to content
|
2016-03-15 19:41:19 -05:00 |
|
|
Matteo Pagliazzi
|
219ec01ce9
|
port shared.ops.allocate
|
2016-03-15 18:41:23 +01:00 |
|
|
Matteo Pagliazzi
|
b2b4340ee3
|
change response for shared.ops.sleep, save user in POST /user/sleep and add integration tests for it
|
2016-03-15 17:05:07 +01:00 |
|
|
Matteo Pagliazzi
|
490c6a9ae1
|
wip(shared): port sleep op
|
2016-03-15 16:33:44 +01:00 |
|
|
Matteo Pagliazzi
|
f55df39fb7
|
Merge branch 'develop' into api-v3
|
2016-03-13 23:19:04 +01:00 |
|
|
Matteo Pagliazzi
|
70df1137a0
|
fix statsComputed getter
|
2016-03-13 22:39:14 +01:00 |
|
|
Matteo Pagliazzi
|
8e3284a4e3
|
wip(shared): adapt to v3
|
2016-03-13 22:26:32 +01:00 |
|
|
Matteo Pagliazzi
|
b948fc031f
|
fix typo in common code
|
2016-03-13 21:12:19 +01:00 |
|
|
Matteo Pagliazzi
|
c02082a200
|
Merge branch 'develop' into api-v3
|
2016-03-12 16:00:24 +01:00 |
|
|
Matteo Pagliazzi
|
6fa23ae49f
|
make sure to clone drop so original properties do not change
|
2016-03-11 19:11:46 +01:00 |
|
|
Matteo Pagliazzi
|
fbdbd8e006
|
Merge branch 'develop' into api-v3
|
2016-03-10 18:30:09 +01:00 |
|
|
Matteo Pagliazzi
|
05676d834e
|
remove git conflict data
|
2016-03-10 17:13:13 +01:00 |
|
|
Matteo Pagliazzi
|
c39967767c
|
Merge branch 'develop' into split-shared
|
2016-03-10 17:00:59 +01:00 |
|
|
Sabe Jones
|
d92614844a
|
Merge pull request #6849 from HabitRPG/sabrecat/pets-201603
Pet quest March 2016
|
2016-03-09 15:11:14 -06:00 |
|
|
Sabe Jones
|
cc53e6e9dc
|
Merge pull request #6733 from vIiRuS/mobileStorage
Store data for next mobile update
|
2016-03-09 14:56:15 -06:00 |
|
|
Sabe Jones
|
d153df7805
|
feat(content): snail pet quest WIP
|
2016-03-09 15:34:57 -05:00 |
|
|
Blade Barringer
|
3fa9d17ad4
|
Merge branch 'develop' into api-v3
|
2016-03-08 19:25:50 -06:00 |
|
|
Matteo Pagliazzi
|
986bfd8035
|
split remaining utilities from shared
|
2016-03-08 19:35:02 +01:00 |
|
|
Blade Barringer
|
155cd6c626
|
fix: Correct how faq module is exported
|
2016-03-08 11:59:45 -06:00 |
|
|
Matteo Pagliazzi
|
bb6f0f4252
|
split user.fns
|
2016-03-08 18:58:39 +01:00 |
|
|
Matteo Pagliazzi
|
393a26e51a
|
fix typo: reroll -> rebirth
|
2016-03-08 18:02:23 +01:00 |
|
|
Matteo Pagliazzi
|
a351cb5f4e
|
change references to imported libs
|
2016-03-08 17:49:18 +01:00 |
|
|
Matteo Pagliazzi
|
5a2daabada
|
remove all changes from eslint --fix
|
2016-03-08 17:45:14 +01:00 |
|
|
Matteo Pagliazzi
|
eeebe4c342
|
wip: split shared ops
|
2016-03-07 23:02:42 +01:00 |
|
|
Matteo Pagliazzi
|
8437c21a51
|
start splitting ops (readCard has tests)
|
2016-03-07 19:32:49 +01:00 |
|
|
Matteo Pagliazzi
|
863ca9954e
|
errors working with babel 6, export v3 shared modules in main common module
|
2016-03-05 18:58:40 +01:00 |
|