 Tyler Renelle
|
9946495564
|
Merge branch 'develop'
|
2013-05-17 09:57:32 +01:00 |
|
|
Tyler Renelle
|
636e7aa4c0
|
Merge branch 'develop' of github.com:lefnire/habitrpg into develop
|
2013-05-16 17:58:49 +01:00 |
|
|
Tyler Renelle
|
f1767191d3
|
Merge pull request #977 from Shaners/patch-1
Update npcs.styl
|
2013-05-16 09:28:42 -07:00 |
|
|
Shane Lister
|
0c6a71a581
|
Update npcs.styl
Should fix Bailey's full body graphic.
|
2013-05-16 10:22:37 -06:00 |
|
|
Tyler Renelle
|
f6df9a610a
|
get rid of some old unused images
|
2013-05-16 12:16:24 +01:00 |
|
|
Tyler Renelle
|
af8dbb9f1a
|
Use @Shaners new NPCs sprites instead of images
|
2013-05-16 12:00:04 +01:00 |
|
|
Tyler Renelle
|
85018568e4
|
Merge pull request #973 from Shaners/develop
Backer-Gear Tweaks, matt tweak, add NPCs
|
2013-05-16 03:12:14 -07:00 |
|
|
Shane Lister
|
2cebbb93e5
|
NPC Sprite Sheet and CSS
|
2013-05-15 21:44:39 -07:00 |
|
|
Shane Lister
|
8bb0718cea
|
Backer-Gear Tweaks, NPCs
|
2013-05-15 17:22:32 -07:00 |
|
|
Shane Lister
|
c9cfd2c30b
|
Merge pull request #16 from lefnire/develop
Update my develop branch
|
2013-05-15 17:07:14 -07:00 |
|
|
Tyler Renelle
|
eca7b1b53b
|
Merge branch 'develop'
|
2013-05-15 12:47:58 +01:00 |
|
|
Tyler Renelle
|
149961c07d
|
z-index fix on NPC popover dialogs
|
2013-05-15 12:23:18 +01:00 |
|
|
Tyler Renelle
|
4aeb7c5635
|
better "level: 1" positioning, add stats to party members
|
2013-05-15 11:51:16 +01:00 |
|
|
Tyler Renelle
|
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 |
|
|
Tyler Renelle
|
aef76ae969
|
pets: bug fix for users who haven't been properly converted to pets array system
|
2013-05-15 09:14:42 +01:00 |
|
|
Tyler Renelle
|
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 |
|
|
Tyler Renelle
|
e5549d0501
|
back to xhr-polling or a bit, will figure out why websockets having
issues soon
|
2013-05-14 23:42:36 +01:00 |
|
|
Tyler Renelle
|
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 |
|
|
Tyler Renelle
|
3ae295c9a3
|
don't include 'disabled' shading for todos
|
2013-05-14 18:20:19 +01:00 |
|
|
Tyler Renelle
|
19016cc895
|
fix #958
|
2013-05-14 18:17:19 +01:00 |
|
|
Tyler Renelle
|
02215aeda0
|
Merge branch 'master' of github.com:lefnire/habitrpg
|
2013-05-14 18:10:47 +01:00 |
|
|
Tyler Renelle
|
0a0cf1d94e
|
cron: fix repeat, for old users without default task.repeat={}
|
2013-05-14 18:10:24 +01:00 |
|
|
Tyler Renelle
|
5d421bdbd4
|
Merge pull request #962 from Celtis/patch-1
Minor grammatical fix
|
2013-05-14 10:05:44 -07:00 |
|
|
Celtis
|
0b8960470a
|
Minor grammatical fix
|
2013-05-14 18:51:38 +02:00 |
|
|
Tyler Renelle
|
92b178b4a4
|
huge cron fixes which should solve streak, dayStart, "timezone" issues
|
2013-05-14 17:39:42 +01:00 |
|
|
Stan Lindsey
|
ed0bbb782e
|
Merge pull request #960 from LazuliKazeno/translations
French translation complete
|
2013-05-14 08:37:41 -07:00 |
|
|
Stan Lindsey
|
42056e6ed3
|
Merge pull request #955 from sorko/translations
Updated some Russian n Ukrainian Translations
|
2013-05-14 08:35:31 -07:00 |
|
|
Tyler Renelle
|
2c7492709c
|
tags: make tag-selection checkboxes for now, peopel aren't
understanding combobox
|
2013-05-14 16:07:37 +01:00 |
|
|
sorko
|
96ebde3fa3
|
Update app.json
50%
|
2013-05-14 16:20:40 +03:00 |
|
|
LazuliKazeno
|
7f1527ed01
|
End of french translation
|
2013-05-14 14:17:55 +02:00 |
|
|
w13
|
213c2cbf51
|
Partially translated into Urdu language
This is a right-to-left language so I want to make sure it is properly supported first before translating more!
|
2013-05-14 18:36:56 +07:00 |
|
|
sorko
|
8e80c08dfe
|
Update app.json
|
2013-05-14 14:24:47 +03:00 |
|
|
w13
|
71389c0b22
|
Partially translated to Urdu
|
2013-05-14 18:21:56 +07:00 |
|
|
w13
|
643606360f
|
Partially translated to Urdu.
|
2013-05-14 18:13:21 +07:00 |
|
|
Daniel Saewitz
|
dd6e090a1b
|
Merge pull request #953 from cleave29/translations
Added German translation
|
2013-05-14 00:45:02 -07:00 |
|
|
cleave29
|
36f391a828
|
Update app.json
|
2013-05-14 01:42:10 -06:00 |
|
|
Daniel Saewitz
|
5628287368
|
Merge pull request #951 from WielebnyB/translations
Added Polish Translation
|
2013-05-13 16:45:06 -07:00 |
|
|
WielebnyB
|
bcbbe4799b
|
Update app.json
|
2013-05-14 01:23:49 +02:00 |
|
|
Tyler Renelle
|
4d5b87351f
|
misspelled matt boch
|
2013-05-14 00:07:40 +01:00 |
|
|
WielebnyB
|
c7a68c5a2e
|
Update app.json
|
2013-05-14 00:33:42 +02:00 |
|
|
Tyler Renelle
|
a8f9cc972f
|
fix up stables / matt for smaller screens
|
2013-05-13 23:17:54 +01:00 |
|
|
WielebnyB
|
cdcdc11849
|
Update app.json
|
2013-05-14 00:14:28 +03:00 |
|
|
Tyler Renelle
|
4a23ad4856
|
Merge branch 'develop'
Conflicts:
locales/en/app.json
|
2013-05-13 21:31:18 +01:00 |
|
|
Tyler Renelle
|
be08568c3b
|
npcs: matt stable-master in the the pets tab (bravo @Shaners!). also
include link to the pets spritesheet, and some info on mounts
|
2013-05-13 21:29:27 +01:00 |
|
|
LazuliKazeno
|
35fe5dc68d
|
Begin the french translation
From beginning to stable/tavern (i'm not convinced with my translation of "stable" yet)
|
2013-05-13 23:14:48 +03:00 |
|
|
Daniel Saewitz
|
90fca5c98a
|
Remove translate middleware
|
2013-05-13 15:44:21 -04:00 |
|
|
Daniel Saewitz
|
017999d544
|
Merge
|
2013-05-13 15:42:39 -04:00 |
|
|
Daniel Saewitz
|
28adcc5b30
|
Merge pull request #948 from lancemanfv/translations
Translations
|
2013-05-13 12:36:17 -07:00 |
|
|
lancemanfv
|
e98a9c7629
|
Update app.json
|
2013-05-13 21:07:13 +03:00 |
|
|
lancemanfv
|
02d13c5ddd
|
Update app.json
|
2013-05-13 20:50:36 +03:00 |
|