Commit Graph

650 Commits

Author SHA1 Message Date
Michael Townsend d03ed0c9e3 Merge pull request #498 from burunduk/patch-1
Update Ukrainian
2016-11-20 11:22:11 -05:00
Michael Townsend 0916f78736 Merge pull request #507 from vankasteelj/master
update french localization
2016-11-20 11:21:33 -05:00
Michael Townsend 549fcc9f93 Merge pull request #511 from SongyuWang/master
update zh_cn
2016-11-02 10:21:26 -04:00
Michael Townsend 56ff564630 Merge pull request #512 from davidduewel/master
Changed one word in Indonesian
2016-11-02 10:20:32 -04:00
davidduewel 35053247da Merge pull request #1 from davidduewel/davidduewel-patch-1
Updated One Word in Indonesian
2016-11-02 09:55:05 +00:00
davidduewel 02ec5ab53b Updated One Word in Indonesian 2016-11-02 09:51:00 +00:00
wangsongyuf 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
Michael Townsend 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
Douglas Matoso 8981d332f0 Fix some errors in pt-br translation 2016-10-29 21:16:31 -02:00
Michael Townsend b3520a6247 Merge pull request #509 from Superari15/patch-1
Added link to Android app
2016-10-28 11:41:37 -04:00
Arihant Tripathy 0e23bc12b9 Added link to Android app 2016-10-28 21:00:06 +05:30
vankasteelj b150caff07 update french localization 2016-10-16 19:35:47 +02:00
Blake Grotewold 1a6b41c2a1 Don't save carryables if they haven't been found yet. 2016-10-11 02:29:41 -04:00
Michael Townsend 5a99e22b64 Fixing bugs 2016-09-23 11:39:07 -04:00
Michael Townsend 8a80f7c164 Fixing bugs 2016-09-23 11:32:34 -04:00
Michael Townsend 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
Michael Townsend a5f5f0f8dc Create main.css 2016-09-22 11:22:22 -04:00
Olexandr Nesterenko 9d2c4fc125 Update Ukrainian 2016-09-21 18:31:36 +03:00
Blake Grotewold 8d9c4a1a92 Merge remote-tracking branch 'origin/master' 2016-09-17 15:18:22 -04:00
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
Blake Grotewold 0fbb713e17 fix merge conflict error 2016-03-19 15:17:32 -04:00
Blake Grotewold 9438d2c30b Merge pull request #471 from code-kit/master
More Weapons/Tools Information on Path Tab
2016-03-19 15:01:01 -04:00
Blake Grotewold 7871f47776 Merge #469 2016-03-19 15:00:32 -04:00
Blake Grotewold 9a45ad1380 Merge pull request #467 from AndySky21/setHeal
Set heal
2016-03-19 14:56:36 -04:00
Blake Grotewold f410af90b3 Merge pull request #465 from AndySky21/missing-lines
Missing lines
2016-03-19 14:56:19 -04:00
Blake Grotewold 5b870244f5 Merge pull request #464 from AndySky21/StoreZero-bug
StoreZero bug
2016-03-19 14:56:10 -04:00
Blake Grotewold cc18daa111 Merge pull request #463 from AndySky21/Take-everything-bug
Take-everything bug
2016-03-19 14:55:55 -04:00
Blake Grotewold 3d8e07510f Merge pull request #462 from AndySky21/mapBug
Map bug fix
2016-03-19 14:55:42 -04:00
Blake Grotewold 984cc1abca Merge pull request #461 from AndySky21/Supplies-bug
Supplies bug
2016-03-19 14:55:26 -04:00
Elizabeth Donohew 41293d48a8 Rewrote a couple of the descriptions that I added before for the tools. 2016-02-24 00:03:28 -06:00
Elizabeth Donohew 9083a9582c Hovering over a tool on the path tab now gives a small description on how the tool can be used. 2016-02-23 22:40:04 -06:00
Elizabeth Donohew 4d9890f2ef Renamed total to currentBagCapacity in the updateOutfitting method and extracted some functionality into a method called updateBagSpace. 2016-02-23 21:07:21 -06:00
Elizabeth Donohew 7efe142637 Shows the damage that a weapon deals only when hovering over a weapon on the path tab. 2016-02-23 20:46:19 -06:00
Andrea Rendine a3b1fea424 Method and property fix
World.testMap() sets World.seenAll. The latter is true when the whole map has been explored.
World.testMap() is called:

* on world init
* on return home (when the map is updated)
* on applyMap() (when the map is bought from the scout)
2016-02-20 13:17:45 +01:00
Andrea Rendine 5129756455 Translation fix
Shorter and clearer for "see farther"
2016-02-19 01:29:11 +01:00
Andrea Rendine 276dd64068 Minor translation fix 2016-02-19 01:27:28 +01:00
Andrea Rendine 189af75c31 Correct changes
Limited subset of commits:
* unified function for healing (Events.doHeal);
* unified function for attacks (Events.damage);
* check if health is max, and disable healing buttons (Events.setHeal and related calls)
* grouping buttons (attackButtons, healButtons and exitButtons for weapon attacks, meat & meds, continue/leave)
2016-02-17 15:22:13 +01:00
Andrea Rendine 368529f024 Reverted changes
Revert to previous version (no pause)
2016-02-17 15:07:26 +01:00
Andrea Rendine 68732ce0d9 Reverted changes
Revert to previous version
2016-02-17 14:16:39 +01:00
Andrea Rendine 7ba7f2247e Reverted changes
Reverted to previous version.
2016-02-17 14:08:41 +01:00