Commit Graph

437 Commits

Author SHA1 Message Date
Michael Townsend c725b58c1a Merge pull request #344 from AndySky21/hut-fire-pot
Added hut fire event original strings
2015-04-30 09:42:01 -04:00
Michael Townsend 42c81cd5db Merge pull request #342 from AndySky21/It-fix
Italian translation fix
2015-04-30 09:41:01 -04:00
Michael Townsend d30b4e2ff7 Merge pull request #347 from AndySky21/income-on-load
Correct jobs incomes on load
2015-04-30 09:39:22 -04:00
Andrea Rendine c2f8ac89fa Correct jobs incomes on load
Currently, when a game is loaded, job production/consumption rates in tooltips are shown based on the unit, rather than multiplied by the employed village number. Incomes are then corrected when the numbers change.
With the initial call of updateVillageIncome() function, the correct numbers are displayed when the game is opened and loaded.
2015-04-30 00:01:36 +02:00
Andrea Rendine fc089c808c Added hut fire event original strings
Although there was a previous commit referring to it, in POT file the strings related to "hut fire event" were not present.
I added them at the end of the file, with reference to original positions in Outside.js.
2015-04-29 23:19:34 +02:00
Andrea Rendine 4dd0af9f01 Typo fix 2015-04-29 23:03:16 +02:00
Andrea Rendine d4312385d4 Italian translation fix.
Original for documentation.
2015-04-29 23:01:39 +02:00
Andrea Rendine a1092170c7 Italian translation fix.
Sentences corrected for length and sense.
2015-04-29 22:59:12 +02:00
Arnaud Panapadeatchy c3f7b620f5 Fix French translation 2015-04-25 12:01:23 -04:00
Arnaud Panapadeatchy 0c2dc6c905 Add more French translations 2015-04-24 09:40:35 -04:00
Michael Townsend 3cc2b708cb Merge pull request #328 from cjhooker/bigger-quantity-adjust-buttons
Make quantity-adjust buttons bigger
2015-04-18 19:40:26 -04:00
Chris Hooker 165f2d1dd0 Make quantity-adjust buttons bigger 2015-04-18 15:10:13 -04:00
Michael Townsend 909894cb50 Update engine.js 2015-04-16 10:17:59 -04:00
Michael Townsend 1abb3588e6 Update index.html 2015-04-16 10:17:20 -04:00
Michael Townsend 446811b638 Update README.md 2015-04-16 10:13:33 -04:00
Michael Townsend 16f2e1f118 Merge pull request #327 from codeskull/master
Typo (ru)
2015-03-23 10:03:35 -04:00
Cyril 614df477a0 Typo 2015-03-23 11:45:34 +03:00
Blake Grotewold dfe9f19565 Update so that linguist reads ADR as JS 2015-03-18 16:04:34 -04:00
Michael Townsend 9361913bea Merge pull request #241 from jwvg0425/patch-2
I have no way of verifying this text, so I'm just gonna trust you!
2015-03-10 10:48:30 -04:00
Nam Hyeon Uk ae0f146008 Fixing Text
Fixing some text
2015-03-10 14:02:33 +09:00
Michael Townsend c1182fdb47 Merge pull request #240 from jwvg0425/patch-1
mistranslation
2015-03-09 09:53:49 -04:00
Michael Townsend 0fa44cfc55 Merge pull request #239 from fabrice31/master
French: Fixing texts + Complete translations
2015-03-07 00:40:35 -05:00
Nam Hyeon Uk 7d8367d407 mistranslation
I think "{0} per {1}s" means "{0} per {1}seconds". maybe that's a mistranslation.
2015-03-07 13:25:30 +09:00
Fabrice Bournisien 67571851b1 French: Fixing texts + Complete translations 2015-03-04 22:37:33 +01:00
Blake Grotewold 0bd474d2fd Merge pull request #238 from hano/master
Typo
2015-03-02 13:46:54 -05:00
hano c9900d7b91 Typo 2015-03-02 14:10:53 +01:00
Sebastian Korotkiewicz 2e7ccccf40 new readme
Closes #167
2015-02-25 11:36:01 -05:00
Blake Grotewold f998c270da Merge anubisthejackle:issue115
Closes #115
Closes #224
2015-02-14 17:14:22 -05:00
Blake Grotewold 5fcd897b17 Merge pull request #230 from anubisthejackle/issue229
Fix negative gatherers
2015-02-12 12:52:09 -05:00
Travis Weston 7333d03dbb Use Outside.killVillagers to kill villagers 2015-02-12 12:45:27 -05:00
Travis Weston 6ee6470972 Merging updates 2015-02-11 18:55:27 -05:00
Travis Weston 340851a99d Updated against suggestions 2015-02-11 18:21:08 -05:00
Michael Townsend 7c978f4f15 Merge pull request #226 from Continuities/convensions
Add convention pieces. jshintrc and gitattributes
2015-02-10 10:59:53 -05:00
Blake Grotewold 06b281fd3c Remove explicit line endings 2015-02-10 10:57:10 -05:00
Blake Grotewold eee2bffaf0 Add convention pieces. jshintrc and gitattributes 2015-02-10 09:59:00 -05:00
Travis Weston f2b8ad6268 Merge remote-tracking branch 'upstream/master' into issue115
Conflicts:
	script/outside.js
	script/path.js
2015-02-10 07:11:10 -05:00
Blake Grotewold c87541b8b9 Merge pull request #222 from anubisthejackle/issue80 2015-02-09 19:37:10 -05:00
Travis Weston 6e044292ae Add in doubleTime capabilities
Add hyper / classic to menu
2015-02-09 19:31:24 -05:00
Blake Grotewold 5d921d9464 Merge pull request #204 from rgravina/188_fix_jshint_warnings 2015-02-09 19:25:08 -05:00
Robert Gravina 67b3c7fb7e Low-risk fixes suggested by JSHint. 2015-02-09 19:20:29 -05:00
Blake Grotewold afe1230691 Merge pull request #225 from anubisthejackle/master
Limit Fire event to only Outside module
2015-02-09 11:06:19 -05:00
Travis Weston 25b2fbfa5f Limit Fire event to only Outside module 2015-02-08 22:33:18 -05:00
Travis Weston 8010597e44 Add hut fire event.
Closes #35
2015-02-08 11:23:32 -05:00
Michael Townsend 0334219d9f Merge pull request #219 from voldedore/add_new_lang_vi
Translation: Vietnamese
2015-02-07 19:13:50 -05:00
Travis Weston 2d3daa572d Move movement functions to Engine. Create scrollable Path sidebar 2015-02-07 14:00:32 -05:00
vinh v 619ee8c2cb Vietnamese translation: css mod
larger button because of long text.

.button{width: 100px !important;}
-->
.button{width: 120px !important;}
2015-02-07 19:17:52 +01:00
Blake Grotewold fca371f8d8 Merge pull request #223 from yuanyelele/master
update adarkroom.pot and zh_cn translation
2015-02-07 13:12:29 -05:00
Travis Weston 3d00ed3c40 Add scrolling via keyboard 2015-02-07 11:19:37 -05:00
vinh v 9bc9f5d055 Vietnamese translation: Capitalization fixed 2015-02-07 17:05:24 +01:00
袁野 518b47b483 update zh_cn translation
Signed-off-by: 袁野 <yuanyelele@gmail.com>
2015-02-07 22:49:36 +08:00