Commit Graph

588 Commits

Author SHA1 Message Date
Michael Townsend 1fc1836a95 Merge pull request #463 from AndySky21/Take-everything-bug
Take-everything bug
2016-09-01 11:15:34 -04:00
Michael Townsend 559022cb80 Merge pull request #492 from erdifr/fix-mix
Fix mixed-content warning.
2016-09-01 10:10:33 -04:00
erdifr 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
Michael Townsend 947d51ff04 Merge pull request #491 from pratnala/master
Updating the app download links
2016-08-21 13:08:33 -04:00
Pratyush Nalam 678daa1cde Editing image sizes 2016-08-21 12:59:02 -04:00
Pratyush Nalam de79622d24 Update App Store image and added Google Play link 2016-08-21 12:50:48 -04:00
Continuities a988d962f1 Add link to Google Play 2016-07-08 18:41:10 -04:00
Michael Townsend f4fa4e4ae8 Merge pull request #486 from doublespeakgames/revert-485-patch-1
Revert "Fix message typo."
2016-05-12 13:53:07 -04:00
Michael Townsend e1b1ed28b1 Revert "Fix message typo." 2016-05-12 13:53:01 -04:00
Michael Townsend 8150d47513 Merge pull request #485 from jimt/patch-1
Fix message typo.
2016-05-12 11:10:20 -04:00
Jim Tittsler cc1e658144 Fix message typo. 2016-05-12 23:59:38 +09:00
Andrea Rendine d295ca9aa5 Take all and what?
The change is somehow linguistic, rather than anything else.
"Take everything and leave" changes name and becomes "Take everything and X", where X is the verb of the command it impersonates.
This way after completing mines e.g. it is "Take everything and continue", acting like "continue" button.
It now also cools down if it impersonates a "leave" button (leave buttons cool down. IDK why).
2016-02-14 21:00:04 +01:00
Andrea Rendine e3d5e25b94 Merge pull request #19 from doublespeakgames/master
Update 2016-02-11
2016-02-11 14:23:04 +01:00
pacharan ea38d220d1 Update and rename string.js to strings.js 2016-01-10 21:23:58 -05:00
Blake Grotewold 9a0a764cb5 Merge pull request #453 from pacharan/patch-2
Create main.css
2016-01-10 18:09:30 -05:00
pacharan 201961c12e Create main.css 2016-01-11 05:10:05 +07:00
Blake Grotewold 23796cb36e Merge branch 'pr/447' 2015-12-30 03:29:14 -06:00
Blake Grotewold 49f6cd5255 Merge branch 'master' into pr/447 2015-12-30 03:28:52 -06:00
Blake Grotewold 99c57da055 update adarkroom.pot 2015-12-30 03:28:41 -06:00
Blake Grotewold b28c8583c6 Merge pull request #450 from miratcan/master
Added missing Turkish translations, fixed wrong lines.
2015-12-30 03:25:58 -06:00
Blake Grotewold 0f73054faf Add Thai to README 2015-12-30 03:25:03 -06:00
Blake Grotewold 2ebae56dc5 Merge pull request #451 from pacharan/master
Thai translation.
2015-12-30 03:23:25 -06:00
pacharan e0b1d3800a add Thai translation 2015-12-26 23:38:01 +07:00
Blake Grotewold 9943c4c568 add confirm hyper
lets the user know what hyper mode is, and confirms turning it on.
Updates .pot to match current source.
2015-12-22 16:41:10 -06:00
pacharan 2c2436e63e add Thai translation 2015-12-21 13:46:11 +07:00
pacharan 92e7ef83af add Thai translation 2015-12-21 13:44:17 +07:00
Mirat Can Bayrak 7df8efb380 Added missing Turkish translations. 2015-12-20 14:14:58 +02:00
Sang-gi Lee 0db5bf3dec Update Korean translation 2015-12-11 16:40:24 +09:00
Michael Townsend c66d484627 Added import/export tracking 2015-12-04 10:57:16 -05:00
Michael Townsend 78bf47bfa1 Merge pull request #445 from satakieli/patch-3
Update strings.po / fixed Swedish translation
2015-11-10 10:17:33 -05:00
Continuities fba203cea1 conversion tweaks 2015-11-09 18:36:55 -05:00
Anna Robbins 3ef2b22e99 Update strings.po
Proofed and updated up until line 450
2015-10-28 16:06:10 +01:00
Blake Grotewold 3849f7871f Merge pull request #444 from tom76kimo/patch-1
Update link of Traditional Chinese
2015-10-23 01:05:34 -04:00
Tom Wu d5e317836a Update link of Traditional Chinese
The link should be `zh_tw`
2015-10-23 11:45:02 +08:00
Michael Townsend ecd391ff6a Merge pull request #442 from uasi/ja-fix-typo
Fix typo in Japanese translation
2015-10-10 10:51:31 -04:00
Tomoki Aonuma bad5e58cc9 Fix typo in Japanese translation 2015-10-10 23:44:47 +09:00
Michael Townsend da289ea1d7 Update main.css 2015-10-05 12:41:46 -04:00
Akai Alonkai 55b5c3e1e7 Removed background-color for config lists.
Background colors for unordered list in options were set to match body.
This created a problem during and after the space game when the body and
text were inverted, but the ul was not. See Issue #432.

Tried this via Chrome's dev tools while at the effected screen in dark
theme, and it seemed to work.
2015-09-22 10:47:50 -04:00
Blake Grotewold 0f243637a1 Merge pull request #435 from TwistedAkai/master
Made fur gambling return fur.
2015-09-20 16:36:40 -04:00
Akai Alonkai 95057c9704 Made fur gambling return fur.
Function was paying out in wood, not fur, contrary to notification text.
2015-09-20 16:32:54 -04:00
Andrea Rendine 239735f487 Merge pull request #18 from doublespeakgames/master
Update 2015-09-20
2015-09-20 14:41:47 +02:00
Michael Townsend b533f86d2a Merge pull request #433 from ngosang/spanish_translation
Update Spanish translation
2015-09-18 09:54:43 -04:00
ngosang b700c4b9f5 Update Spanish translation 2015-09-17 23:57:38 +02:00
Michael Townsend 6670a9ce09 Merge pull request #431 from ngosang/test2
Update all strings.js
2015-09-17 16:52:52 -04:00
ngosang b5db2b558d Update all strings.js 2015-09-03 10:03:31 +02:00
Michael Townsend 94fea5a3a8 Merge pull request #429 from bdorer/master
de: updated German language files
2015-08-18 22:13:32 -04:00
Michael Townsend 4626961286 Merge pull request #428 from JeanAraujo/master
Update PT-BR Translation
2015-08-18 22:13:11 -04:00
bdorer1 5aa5748ddd de: updated German language files 2015-08-19 00:08:22 +02:00
Jean Araujo 066a34b125 Update strings.js 2015-08-12 14:29:20 -03:00
Jean Araujo 75324a5240 Update strings.po 2015-08-12 14:28:18 -03:00