37d6da02cf
Merge remote-tracking branch 'refs/remotes/doublespeakgames/master'
2017-01-04 12:52:33 +08:00
040cc74a5f
Merge pull request #521 from StivArts/patch-1
...
Added more translations (ES)
2016-12-31 11:01:05 -05:00
5be6694c4a
Added more translations (ES)
...
I added some translations that were not, greetings
2016-12-31 05:47:14 -03:00
5f13d94cdf
Marketing stuff, mostly
2016-12-17 14:53:21 -05:00
b0c202d5a3
Merge pull request #519 from jgblight/move-tooltip
...
tooltip on top near bottom of store and trading post
2016-12-11 15:06:17 -05:00
3ae7ee16cc
tooltip on top near bottom of store and trading post
2016-12-10 21:09:18 -08:00
0f50adc7aa
Merge pull request #518 from salzix/translation-pl-update-1
...
Added missing PL translations, some fixes to existing ones
2016-12-09 14:16:40 -05:00
bc3d9d02b9
Added missing PL translations, fixed some, replaced 'hut' translation with more proper for village building 'chata'
2016-12-09 11:30:17 +01:00
21d0d7df93
Merge pull request #517 from joyceambrosio/master
...
Improved pt-br translation
2016-12-08 10:38:40 -05:00
834b8eb4b4
Improved translation to pt-br language
2016-12-08 07:46:08 -02:00
2b44f49974
Improved pt-br translation
2016-12-08 07:35:42 -02:00
d028790c86
Merge pull request #500 from heptocat/master
...
de: update string.js
2016-11-20 11:22:49 -05:00
d03ed0c9e3
Merge pull request #498 from burunduk/patch-1
...
Update Ukrainian
2016-11-20 11:22:11 -05:00
0916f78736
Merge pull request #507 from vankasteelj/master
...
update french localization
2016-11-20 11:21:33 -05:00
549fcc9f93
Merge pull request #511 from SongyuWang/master
...
update zh_cn
2016-11-02 10:21:26 -04:00
56ff564630
Merge pull request #512 from davidduewel/master
...
Changed one word in Indonesian
2016-11-02 10:20:32 -04:00
35053247da
Merge pull request #1 from davidduewel/davidduewel-patch-1
...
Updated One Word in Indonesian
2016-11-02 09:55:05 +00:00
02ec5ab53b
Updated One Word in Indonesian
2016-11-02 09:51:00 +00:00
16337ab8b9
update zh_cn
...
This is the first time I try to contribute opensource project. I just
wanna have a taste of the process and hope I did not mess it up. If this
works, I will try to edit more thing next time.
2016-11-01 20:40:02 -04:00
8fab454a63
Merge pull request #510 from doug2k1/pt-br-lang
...
Fix some errors in pt-br translation
2016-10-29 19:59:26 -04:00
8981d332f0
Fix some errors in pt-br translation
2016-10-29 21:16:31 -02:00
b3520a6247
Merge pull request #509 from Superari15/patch-1
...
Added link to Android app
2016-10-28 11:41:37 -04:00
0e23bc12b9
Added link to Android app
2016-10-28 21:00:06 +05:30
b150caff07
update french localization
2016-10-16 19:35:47 +02:00
1a6b41c2a1
Don't save carryables if they haven't been found yet.
2016-10-11 02:29:41 -04:00
d156a6a810
de: update string.js
...
corrected existing translations
- typos
- added missing spaces which were very annoying since the words were then together
- minor changes according design guide lines https://github.com/doublespeakgames/adarkroom/wiki/Design-Guide#narrative
- since nouns are capitalized in German, previous translators must have accidentally left some words capitalized, which was inconsistent with the rest
- light fire -> "feuer entfachen" instead of "feuer machen", which is consistent with the same use of the word "light" in other situations
- sammel holz -> holz sammeln, since the player should not be adressed directly with an imperative, and none of the other buttons (like feuer schüren) had the imperative (which would then be schüre feuer)
2016-10-01 19:13:45 +02:00
5a99e22b64
Fixing bugs
2016-09-23 11:39:07 -04:00
8a80f7c164
Fixing bugs
2016-09-23 11:32:34 -04:00
fbc91a3756
Disable pause button until I have time to rework/fix it
...
The pause button displays weirdly and doesn't appear to work properly. Disable it until it can be reworked.
2016-09-23 11:16:08 -04:00
a5f5f0f8dc
Create main.css
2016-09-22 11:22:22 -04:00
9d2c4fc125
Update Ukrainian
2016-09-21 18:31:36 +03:00
8d9c4a1a92
Merge remote-tracking branch 'origin/master'
2016-09-17 15:18:22 -04:00
1fc1836a95
Merge pull request #463 from AndySky21/Take-everything-bug
...
Take-everything bug
2016-09-01 11:15:34 -04:00
559022cb80
Merge pull request #492 from erdifr/fix-mix
...
Fix mixed-content warning.
2016-09-01 10:10:33 -04:00
2f9448174f
Fix mixed-content warning.
...
Use https:// instead of http:// to load jQuery and Google Analytics. Now
Google Chrome will load jQuery and Google Analytics instead of blocking
the scripts and throwing a mixed-content warning.
2016-08-31 19:37:34 -04:00
947d51ff04
Merge pull request #491 from pratnala/master
...
Updating the app download links
2016-08-21 13:08:33 -04:00
678daa1cde
Editing image sizes
2016-08-21 12:59:02 -04:00
de79622d24
Update App Store image and added Google Play link
2016-08-21 12:50:48 -04:00
a988d962f1
Add link to Google Play
2016-07-08 18:41:10 -04:00
f4fa4e4ae8
Merge pull request #486 from doublespeakgames/revert-485-patch-1
...
Revert "Fix message typo."
2016-05-12 13:53:07 -04:00
e1b1ed28b1
Revert "Fix message typo."
2016-05-12 13:53:01 -04:00
8150d47513
Merge pull request #485 from jimt/patch-1
...
Fix message typo.
2016-05-12 11:10:20 -04:00
cc1e658144
Fix message typo.
2016-05-12 23:59:38 +09:00
0fbb713e17
fix merge conflict error
2016-03-19 15:17:32 -04:00
9438d2c30b
Merge pull request #471 from code-kit/master
...
More Weapons/Tools Information on Path Tab
2016-03-19 15:01:01 -04:00
7871f47776
Merge #469
2016-03-19 15:00:32 -04:00
9a45ad1380
Merge pull request #467 from AndySky21/setHeal
...
Set heal
2016-03-19 14:56:36 -04:00
f410af90b3
Merge pull request #465 from AndySky21/missing-lines
...
Missing lines
2016-03-19 14:56:19 -04:00
5b870244f5
Merge pull request #464 from AndySky21/StoreZero-bug
...
StoreZero bug
2016-03-19 14:56:10 -04:00
cc18daa111
Merge pull request #463 from AndySky21/Take-everything-bug
...
Take-everything bug
2016-03-19 14:55:55 -04:00
yangzeon