Commit Graph

415 Commits

Author SHA1 Message Date
Michael Townsend 0fa44cfc55 Merge pull request #239 from fabrice31/master
French: Fixing texts + Complete translations
2015-03-07 00:40:35 -05: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
袁野 ba1b914e1d update translation template adarkroom.pot
Signed-off-by: 袁野 <yuanyelele@gmail.com>
2015-02-07 20:24:56 +08:00
Travis Weston 29932a96f3 Merge pull request #1 from anubisthejackle/issue35
Remove ^M from file because to heck with them.
2015-02-06 16:04:51 -05:00
Travis Weston 5fcdf29601 Remove ^M from file because to heck with them. 2015-02-06 16:02:37 -05:00
vinh v e3da87ed56 Translation: Vietnamese (fix some words) 2015-02-06 00:21:17 +01:00
vinh v ed5a0ea080 Translation: Vietnamese 2015-02-05 23:47:03 +01:00
Blake Grotewold 7f59e166de change bokmål to just norsk, until we must specify 2015-02-03 14:30:54 -05:00
jangerhard 3b4383f9b3 Translation: Norsk 2015-02-03 14:30:07 -05:00
Michael Townsend a119d5e655 Merge pull request #216 from garykrige/master
Update scoring.js
2015-01-28 15:05:43 -05:00
Gary Krige 6f2a705479 Update scoring.js
Fix verbose code
2015-01-28 21:58:36 +02:00
Blake Grotewold 48b15c1c5d Merge pull request #212 from crafteverywhere/patch-1
Corrections to the previous Chinese translations.
2015-01-18 20:36:28 -05:00
crafteverywhere 2e6cc87357 Update strings.js 2015-01-18 17:18:38 +08:00
crafteverywhere 4adce0f2d9 Corrections to the previous Chinese translations. 2015-01-18 16:10:58 +08:00
Blake Grotewold fd2181a104 Merge pull request #203 from MtCedarNet/Japanese-translation
Japanese translation
2015-01-06 23:37:52 -05:00
Alex Liebscher 5d12670979 Prevent negative HP
Closes #201
2015-01-05 01:38:35 -05:00
Blake Grotewold 516afb6037 Merge branch 'pr/205' 2015-01-05 01:02:33 -05:00
mac craig 6e43c06ff2 Add English as an "Available Language"
Added English in the available languages chart, since technically English is a playable language.
2015-01-05 00:58:30 -05:00
MtCedarNet 6774cdbac4 Improved Japanese translations. 2015-01-04 23:48:04 +09:00
MtCedarNet 464cfab7ac Change language name 'Japan' to 'Japanese'. 2015-01-04 23:46:40 +09:00
Blake Grotewold 94fdcc7463 Add buy medicine button to plague event.
Because there is a serious need for medicine, the price
is raised with this button. I felt like it should be even
higher but this will do for now.

Closes #199
2015-01-03 09:40:16 -05:00
Blake Grotewold dbd2adf9f8 add Github to menu bar
People should know that this great game is something
they can contribute to.

Closes #198
2015-01-03 09:26:48 -05:00
Blake Grotewold 1b04fa2086 Remove big TODO in engine
This was actually completed in #50 and was never removed.

Closes #45
2015-01-03 09:12:56 -05:00
Blake Grotewold 2efa9f1667 Merge pull request #196 from rgravina/162_save_path_outfit
Include state of Path outfit in save game
2014-12-24 10:27:40 -06:00