5ceac11e53
merge leave cooldowns
2014-07-26 11:42:50 -04:00
5bc0578862
Merge branch 'master' into leaving-event-cooldown
2014-07-26 11:31:30 -04:00
08277b33ae
Let thieves Steal.
2014-07-24 21:38:02 -06:00
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
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
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
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
ca0ccb4ef8
Fixed broken import event
2014-07-18 15:58:58 -04:00
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
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
35b7926ed0
Merge pull request #113 from Continuities/fire-state
...
Add fire and temperature to State.game
2014-07-17 17:35:32 -04:00
33e9772a1a
Fixing whitespace conformity on engine.js
2014-07-16 23:45:48 -04:00
d164d1d466
Merge branch 'master' into whitespace-fixes
2014-07-16 23:32:13 -04:00
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
da53de1ed2
Fixed issue where path stores animation would not run.
2014-07-16 21:53:11 -04:00
c5a7113161
Disabling dropbox support until ADR is hosted on HTTPS (if ever).
2014-07-16 19:09:04 -04:00
1ec7ae22f9
Removing JP translation from the list until it is complete.
2014-07-16 19:02:49 -04:00
0f78bae1cc
Merge pull request 104 - Dropbox connector.
2014-07-16 18:57:50 -04:00
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
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
faf5ec9353
JSLinted
2014-07-14 23:07:17 +02:00
5c6e36f5fa
Fixing unclosed curly bracket in engine.js
2014-07-14 10:47:26 -04:00
aca23d6043
Connection to the dropbox datastore api
...
-> this is the first attempt, improvements welcome :)
2014-07-13 19:45:53 +02:00
d351e4c815
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
script/engine.js
script/localization.js
2014-07-13 12:52:29 -04:00
216c51b44b
Fixing whitespace conformity in setpieces.js
2014-07-13 12:22:16 -04:00
2d0fccaf1c
Fixed whitespace conformity in room.js
2014-07-13 11:52:19 -04:00
991bf7e764
Fixing whitespace conformity in outside.js
2014-07-13 11:43:19 -04:00
6e90a79c5f
Fixing whitespace conformity in global.js
2014-07-13 11:34:35 -04:00
c91bf1d20a
Fixing whitespace conformity in encounters.js
2014-07-13 11:32:07 -04:00
4bb126c205
Fixing minor whitespace conformity in state_manager.js, fixed whitespace conformity in world.js
2014-07-13 11:26:21 -04:00
674d44f6a8
Fixing whitespace conformity in space.js
2014-07-13 11:24:44 -04:00
249b8742ff
Fixed whitespace conformity in room.js
2014-07-13 11:21:34 -04:00
b402008769
Fixed whitespace conformity in path.js
2014-07-13 11:20:17 -04:00
53c9dc715b
Fixed whitespace conformity in outside.js
2014-07-13 11:18:33 -04:00
6e3b3a8b10
Fixed whitespace conformity in localization.js
2014-07-13 00:56:35 -04:00
4b079a22f1
Fixed whitespace conformity in events.js
2014-07-13 00:49:38 -04:00
8cf3ab3dc9
Fixing whitespace conformity in Engine.js
2014-07-12 23:40:15 -04:00
4f82e33f7c
Merge pull request #101 from anubisthejackle/fix-memory-usage
...
Fixed a memory usage issue when using system over long periods or with l...
2014-07-12 22:47:37 -04:00
b7a2c29aa0
Fixed a memory usage issue when using system over long periods or with large numbers of notifications. Now, notifications that fall outside the notification gradient are automatically removed
2014-07-12 20:09:36 -04:00
b26fafe599
Make keydown return true unless arrow key
2014-06-19 09:33:35 -04:00
7fb0ae8f02
Fix string
2014-06-19 10:18:56 +03:00
5d2bc3ebac
Fix French "not enough cloth" translation
2014-06-14 22:55:31 -04:00
17f902e65c
Add Engine.autoSelect and add to Engine.export64
2014-06-06 11:59:46 -04:00
523fb6a90e
Update engine.js
2014-05-31 10:22:56 +08:00
87b1fd2d5c
Update engine.js
2014-05-30 12:19:24 +08:00
3a0176217f
Update engine.js
...
auto load langs from lang config file.
2014-05-29 18:03:13 +08:00
962ca4ccd6
Update engine.js
...
Auto load lang menu from config file
2014-05-29 17:53:48 +08:00
1a033dac57
Update localization.js
...
Add some missing localization items.
2014-05-29 17:36:33 +08:00
b7d539abbb
Slight styling issues on language menu option
2014-05-19 13:27:21 -04:00
81d8129f0f
Styling on the language dropdown
2014-05-19 13:15:46 -04:00
Michael Townsend