Commit Graph

257 Commits

Author SHA1 Message Date
Blake Grotewold b57bbfa83d Merge pull request #132 from danapczynski/fix_inventory_bug
Fixes bug where player could take unavailable items onto dusty path
2014-08-18 01:22:07 -04:00
Blake Grotewold 956d0fe62f Merge pull request #134 from SnoUweR/translation
Add Russian translation
2014-08-18 01:19:04 -04:00
Michael Townsend 3852fbebb6 Prevent user from modifying the displayed export code 2014-08-13 19:25:42 -04:00
Michael Townsend b18134f331 Properly pass non-arrow keydown events 2014-08-13 14:16:19 -04:00
SnoUweR 889f855c8a first version of russian localization 2014-08-06 03:50:59 +08:00
Dan Apczynski 41592e79c7 Fixed bug where player could take unavailable items onto dusty path 2014-08-03 01:49:49 -07:00
Michael Townsend bc368511c6 Merge pull request #128 from Continuities/readme-update
Cleaning up the README
2014-07-29 18:50:28 -04:00
Blake Grotewold 23d177517d Cleaning up the README
Since the addition of the l11n features, I think having other translations repos displayed is unnecessary and just clutters a short, clean readme.
2014-07-29 18:48:40 -04:00
Michael Townsend 79fff84f67 Merge branch 'title-blink' 2014-07-29 18:24:20 -04:00
Michael Townsend 20539fdd18 Merge branch 'master' into title-blink 2014-07-29 18:20:10 -04:00
skj3gg e1f3d31dea Add variable for blink interval and remove unnecessary type checking
Cleans up global variable that was introduced in favor of a variable in
Events. Removes type checking from conditionals and instead sets
BLINK_INTERVAL variable to false when stopped.
2014-07-28 13:42:11 -04:00
Michael Townsend 5ceac11e53 merge leave cooldowns 2014-07-26 11:42:50 -04:00
Michael Townsend cc3cdb72fe Merge branch 'leaving-event-cooldown' 2014-07-26 11:40:01 -04:00
Michael Townsend 5bc0578862 Merge branch 'master' into leaving-event-cooldown 2014-07-26 11:31:30 -04:00
Michael Townsend 4118c84e68 Merge pull request #127 from TonyLambregts/master
stop creating income without enough resources
2014-07-26 11:08:47 -04:00
Tony Lambregts 08277b33ae Let thieves Steal. 2014-07-24 21:38:02 -06:00
skj3gg 79e765eb08 Blink only happens on specified events
Now event objects must have a blink flag if they want to use the title
blink. For starters, this is only global, outside, and room events.
2014-07-24 12:00:51 -04:00
Tony Lambregts 0087da9b5e stop creating income without enough resources
Fix issue where there worker created income without enough resources
available.
2014-07-23 19:00:36 -06:00
Blake Grotewold d6a6a7a000 Add title blinking on events
When there is an event, blink the title so that a user can know when an
event happens, even if they aren't on that tab. From discussion in #121
2014-07-23 02:43:06 -04:00
Blake Grotewold 8ceb9488aa Add cooldown when leaving events
Adding this cooldown prevents users from accidently clicking leave or
continue before they have a chance to eat or collect loot.  This was
originally brought up in and resolves #8. May be of interest to #122 as
well
2014-07-23 02:02:05 -04:00
Blake Grotewold f3d8fe71b4 Update langs.js 2014-07-23 00:15:09 -04:00
Blake Grotewold 22a110de26 Merge pull request #123 from PaolaFalcon/SpanishTranslation
Spanish translation, latin american version
2014-07-23 00:14:14 -04:00
Paola Falcon cac2c8eda6 Revert "Added entry to langs.js"
This reverts commit f8883d49f1.
2014-07-22 10:15:40 -05:00
Paola Falcon 12d79bdb1e Revert "Commented japanese entry"
This reverts commit b0a226f842.
2014-07-22 10:15:29 -05:00
Paola Falcon b0a226f842 Commented japanese entry 2014-07-21 09:32:30 -05:00
Paola Falcon f8883d49f1 Added entry to langs.js 2014-07-21 09:25:40 -05:00
Paola Falcon 10bd9fc980 Spanish translation, latin american version 2014-07-18 17:09:22 -05:00
Michael Townsend ca0ccb4ef8 Fixed broken import event 2014-07-18 15:58:58 -04:00
Michael Townsend 2ba2812a8b Merge pull request #120 from anubisthejackle/make-nomad-buy-buttons-reactivate
Fixing issue where buttons would not update when Wandering Nomad was act...
2014-07-17 22:49:23 -04:00
Travis Weston 82edff18b4 Fixing issue where buttons would not update when Wandering Nomad was active as referenced in Issue #108 2014-07-17 21:53:54 -04:00
Blake Grotewold 0f9ceda729 Merge pull request #102 from anubisthejackle/whitespace-fixes
Covert whitespace to tabs as per coding standard
2014-07-17 19:25:45 -04:00
Michael Townsend ef5c226fe2 Merge pull request #119 from anubisthejackle/gh-pages
Creates Github Pages
2014-07-17 18:21:04 -04:00
Michael Townsend 35b7926ed0 Merge pull request #113 from Continuities/fire-state
Add fire and temperature to State.game
2014-07-17 17:35:32 -04:00
Travis Weston a25b5b7acd Changed GH Pages link in readme 2014-07-17 16:47:18 -04:00
Travis Weston 64a37d8593 Added github pages link in README.md 2014-07-17 16:23:37 -04:00
Travis Weston 33e9772a1a Fixing whitespace conformity on engine.js 2014-07-16 23:45:48 -04:00
Travis Weston d164d1d466 Merge branch 'master' into whitespace-fixes 2014-07-16 23:32:13 -04:00
Blake Grotewold 1bb62e3a56 Merge pull request #117 from anubisthejackle/fix-path-stores-animation
Fixed issue where path stores animation would not run.
2014-07-16 22:02:29 -04:00
Travis Weston da53de1ed2 Fixed issue where path stores animation would not run. 2014-07-16 21:53:11 -04:00
Michael c5a7113161 Disabling dropbox support until ADR is hosted on HTTPS (if ever). 2014-07-16 19:09:04 -04:00
Michael 1ec7ae22f9 Removing JP translation from the list until it is complete. 2014-07-16 19:02:49 -04:00
Michael 4fd756d83d Merge branch 'master' of https://github.com/Continuities/adarkroom.git 2014-07-16 18:59:39 -04:00
Michael 0f78bae1cc Merge pull request 104 - Dropbox connector. 2014-07-16 18:57:50 -04:00
Blake Grotewold 185e4c3c86 Fix the room is fire.
Typo of the game.temerature.text instead of game.fire.text
2014-07-16 18:57:34 -04:00
Michael Townsend bf0b8979ac Merge pull request #112 from anubisthejackle/make-menu-stick
Fixed issue where menu would float away from bottom of the page if moved...
2014-07-16 18:37:43 -04:00
Blake Grotewold eb5b008225 Add fire and temperature to State.game
Adding fire and temperature to game state will allow persistence of the
fire and temp on reloads.
2014-07-15 23:52:33 -04:00
Travis Weston 00e57a4bfa Fixed issue where menu would float away from bottom of the page if moved and scrolled. (References Issue #109) 2014-07-15 23:23:33 -04:00
slicer2k 66ba9d9a65 load js files in right order. 2014-07-15 07:50:30 +02:00
slicer2k f56e9678b0 uncommented GA 2014-07-14 23:08:28 +02:00
slicer2k faf5ec9353 JSLinted 2014-07-14 23:07:17 +02:00