Tyler Renelle
dcfa9e4724
Merge remote-tracking branch 'ryepdx/conText-bug' into develop
...
Conflicts:
locales/en/main.json
2014-01-26 17:07:06 -08:00
Tyler Renelle
ba1095eb33
Merge pull request #108 from creidieki/develop
...
Fix typo in description of constitution.
2014-01-26 17:01:34 -08:00
Tyler Renelle
bbecfb3ffd
Merge pull request #116 from deilann/petcounting
...
adding mechanic to count previously owned pets
2014-01-26 16:57:53 -08:00
Sabe Jones
f53a2a87c3
fix(mounts): Offset gryphons by 5x, 5y
...
Corrects positioning errors of gryphon mounts vs. avatar sprites. Known issue: we lose one chunky!pixel from the uttermost tip of the wing. More adept Pixelist work welcome!
2014-01-26 15:43:28 -08:00
Tyler Renelle
e739c4e78f
Merge pull request #115 from deilann/copy-strings
...
adding strings for copy and fixing a typo
2014-01-26 12:37:31 -08:00
Cole Gleason
2a32517ae4
Merge pull request #117 from deilann/dequip-1
...
changing dequip to make sense for all classes
2014-01-26 12:06:50 -08:00
deilann
dbbcee0c1c
syntax fix
...
fixed comment
2014-01-26 11:53:02 -08:00
Ryan Casey
285e5904af
Removed random 1 at the end of the line.
2014-01-26 12:36:27 -07:00
Marcelo Sizer
bc023189fd
Fix typo
2014-01-26 17:35:23 -02:00
Marcelo Sizer
58cc787b5c
Split main.json
2014-01-26 17:32:40 -02:00
Ryan Casey
6b5c9777d1
Changed 'conText' key for constitution tooltip to 'constText'.
2014-01-26 11:50:32 -07:00
Sabe Jones
f1bbd92ceb
fix(mounts): Relocate wing to head layer
...
Implements @baconsaur's revised placement of wings for Gryphon mounts. Avatars now sit behind the wing, which protrudes from the Gryphon's shoulder facing the player. There are further fixes to be done, but this should get us closer to the artist's original vision.
2014-01-26 10:20:39 -08:00
deilann
b6c8452043
changing dequip to make sense for all classes
2014-01-25 18:17:33 -08:00
deilann
44a5a9c716
adding mechanic to count previously owned pets
2014-01-25 17:58:18 -08:00
deilann
7799ae31e9
adding strings for copy and fixing a typo
2014-01-25 17:53:51 -08:00
Tyler Renelle
54473b7135
feat(i18n): update to ads content
2014-01-25 13:50:44 -08:00
Matteo Pagliazzi
a369377a06
fix(translations): typo
2014-01-25 16:39:16 +01:00
Matteo Pagliazzi
138966cf1f
Merge pull request #114 from HabitRPG/paglias/translations-refactoring
...
Refactor translations
2014-01-24 13:52:46 -08:00
Matteo Pagliazzi
bd54bf1c53
refactor(translations)
2014-01-24 22:49:42 +01:00
Cole Gleason
b246a6d430
Merge branch 'round-boss' into develop
2014-01-24 15:33:30 -06:00
Cole Gleason
e76c81b3d7
refactor(api.percent): allow for round direction to be specified
2014-01-24 15:31:08 -06:00
Matteo Pagliazzi
50af412b1d
refactor(translations)
2014-01-24 21:27:34 +01:00
Matteo Pagliazzi
c96adf3552
refactor(translations): achievements
2014-01-24 20:08:19 +01:00
Matteo Pagliazzi
1663e09f74
improve(translation): stringNotFound use template
2014-01-24 18:03:03 +01:00
Matteo Pagliazzi
aae81e7f93
fic(translations): remove string for terms and privacy
2014-01-24 17:39:11 +01:00
Matteo Pagliazzi
0b21a089be
fix(translations): merge pr
2014-01-24 17:10:05 +01:00
Marcelo Sizer
fd8e67e236
Fix version conflicts
2014-01-24 07:24:29 -02:00
Cole Gleason
cbd3aeac70
Merge pull request #89 from colegleason/ultimate-gear
...
Calculate ultimateGear achievement in user.ops
2014-01-23 22:04:46 -08:00
Cole Gleason
a501d5c3ba
perf(ultimateGear): move ultimateGear from ops to fns so it only runs once
2014-01-24 00:02:51 -06:00
Cole Gleason
2283093845
fix(ultimateGear): fix bug where ultimateGear isn't awarded
...
This does several things:
- Moves the calculation of the ultimateGear achievement into its own
function on user.ops.
- Only computes ultimateGear if item is last and the user does not
already have the achievement
- Fixes bug where ultimateGear was not awarded if user wasn't wearing
their class gear at the time of item purchase.
- Adds content.classes and content.gearTypes which we should start using
elsewhere.
- Added tests for ultimateGear
Fixes HabitRPG/habitrpg#2232 .
2014-01-23 23:49:04 -06:00
Marcelo Sizer
576cf1f58b
Fix spacing errors
2014-01-23 22:00:12 -02:00
Matteo Pagliazzi
5e0bcfd874
fix(translations)
2014-01-23 16:58:03 +01:00
Matteo Pagliazzi
63bd5e071c
fix(translations)
2014-01-23 16:53:21 +01:00
Matteo Pagliazzi
2f05c63b8f
(translations)
2014-01-23 16:09:25 +01:00
Matteo Pagliazzi
753760275d
improve(translations)
2014-01-23 15:51:29 +01:00
Matteo Pagliazzi
2bc0286d36
fix(json)
2014-01-23 15:48:01 +01:00
Matteo Pagliazzi
64c1e74afb
Merge pull request #111 from luveluen/develop
...
Update main.json
2014-01-23 06:36:11 -08:00
Luveluen
b3d2793e76
Update main.json
2014-01-23 10:29:06 +01:00
Sabe Jones
667a4264c5
docs(rebirth): Bullet point to reassure users that they can get their limited ed gear back after Rebirth
2014-01-22 20:41:43 -06:00
Sabe Jones
02311e8500
fix(translations): Remove more spurious NBSPs from English translation
2014-01-22 20:32:12 -06:00
Dušan Juretić
432ab0dc66
Test quests valid values
2014-01-22 22:40:12 -03:00
Matteo Pagliazzi
a46e1273ae
improve(translation): merge @Sinza- pr
2014-01-22 19:42:50 +01:00
Marcelo Sizer
b648bf7b6b
Add missing strings
2014-01-22 16:21:57 -02:00
Marcelo Sizer
7ebfb28b78
Add strings for views/shared/modals folder
2014-01-22 16:01:03 -02:00
Matteo Pagliazzi
28bc3382d5
Revert "improve(translations): add translations for achievement modals"
...
This reverts commit c7f07e3522
2014-01-22 17:34:32 +01:00
Matteo Pagliazzi
c7f07e3522
improve(translations): add translations for achievement modals
2014-01-22 17:08:47 +01:00
Matteo Pagliazzi
7f7d0cfdf1
Merge pull request #107 from luveluen/develop
...
Update main.json
2014-01-22 06:35:23 -08:00
Luveluen
73d89dae07
Update main.json
2014-01-22 12:07:34 +01:00
Sabe Jones
af2bfa3efe
fix(locales): Remove spurious nbsp from English locale settings page
2014-01-21 19:41:51 -06:00
Tyler Renelle
0aa2f44693
chore(css): mounts consolidation
2014-01-21 17:00:32 -08:00
