Commit Graph

312 Commits

Author SHA1 Message Date
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
Travis Weston 5c6e36f5fa Fixing unclosed curly bracket in engine.js 2014-07-14 10:47:26 -04:00
Jens Neuber aca23d6043 Connection to the dropbox datastore api
-> this is the first attempt, improvements welcome :)
2014-07-13 19:45:53 +02:00
Travis Weston d351e4c815 Merge remote-tracking branch 'upstream/master'
Conflicts:
	script/engine.js
	script/localization.js
2014-07-13 12:52:29 -04:00
Travis Weston 42ed1cea1f Fixing whitespace conformity in base64.js 2014-07-13 12:26:36 -04:00
Travis Weston 216c51b44b Fixing whitespace conformity in setpieces.js 2014-07-13 12:22:16 -04:00
Travis Weston 2d0fccaf1c Fixed whitespace conformity in room.js 2014-07-13 11:52:19 -04:00
Travis Weston 991bf7e764 Fixing whitespace conformity in outside.js 2014-07-13 11:43:19 -04:00
Travis Weston 6e90a79c5f Fixing whitespace conformity in global.js 2014-07-13 11:34:35 -04:00
Travis Weston c91bf1d20a Fixing whitespace conformity in encounters.js 2014-07-13 11:32:07 -04:00
Travis Weston 4bb126c205 Fixing minor whitespace conformity in state_manager.js, fixed whitespace conformity in world.js 2014-07-13 11:26:21 -04:00
Travis Weston 674d44f6a8 Fixing whitespace conformity in space.js 2014-07-13 11:24:44 -04:00
Travis Weston 249b8742ff Fixed whitespace conformity in room.js 2014-07-13 11:21:34 -04:00
Travis Weston b402008769 Fixed whitespace conformity in path.js 2014-07-13 11:20:17 -04:00
Travis Weston 53c9dc715b Fixed whitespace conformity in outside.js 2014-07-13 11:18:33 -04:00
Travis Weston 6e3b3a8b10 Fixed whitespace conformity in localization.js 2014-07-13 00:56:35 -04:00
Travis Weston 4b079a22f1 Fixed whitespace conformity in events.js 2014-07-13 00:49:38 -04:00
Travis Weston 8cf3ab3dc9 Fixing whitespace conformity in Engine.js 2014-07-12 23:40:15 -04:00
Michael Townsend 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
Travis Weston 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
Michael Townsend 54dd2955ea Merge pull request #100 from TrevorBramble/bugfix-langs-declaration
add missing comma to langs definition
2014-07-11 20:37:50 -04:00
Trevor Bramble 15751ec8fb replace single space indents with tabs (style conformance) 2014-07-11 17:34:24 -07:00
Trevor Bramble e444378fd5 add missing comma to langs definition 2014-07-11 17:32:19 -07:00
Michael Townsend 5f4df5bbeb Merge pull request #98 from Nutzchannel/master
Possible Japanese support?
2014-06-28 16:23:26 -04:00
Nutzchannel c660e9cdd5 2169 2014-06-26 15:42:25 -04:00
Nutzchannel bc4688652b got to line 2129 2014-06-25 20:48:12 -04:00
Nutzchannel 28b5118be7 got to line 1880 on new file 2014-06-25 18:49:28 -04:00
Nutzchannel 6c415f7fd4 Button size in main.css 2014-06-25 14:52:31 -04:00
Nutzchannel 39945e5f4c Added Japanese folder 2014-06-25 14:51:10 -04:00
Nutzchannel 45cd119f9c Start for a Japanese translation
More language support
2014-06-25 14:45:33 -04:00
Michael Townsend 96f2b89704 Merge pull request #97 from grotr/master
Make keydown return true unless arrow key
2014-06-19 09:47:55 -04:00
Blake Grotewold b26fafe599 Make keydown return true unless arrow key 2014-06-19 09:33:35 -04:00
Michael Townsend 272495281c Merge pull request #96 from burunduk/master
Fix string
2014-06-19 09:17:29 -04:00
Olexandr Nesterenko 7fb0ae8f02 Fix string 2014-06-19 10:18:56 +03:00
Michael Townsend a9dcbc338b Merge pull request #94 from grotr/master
Fix French "not enough cloth" translation
2014-06-15 16:12:05 -04:00
Blake Grotewold 5d2bc3ebac Fix French "not enough cloth" translation 2014-06-14 22:55:31 -04:00
Michael Townsend 230017ba58 Merge pull request #89 from grotr/master
Add Engine.autoSelect and add to Engine.export64
2014-06-06 12:05:09 -04:00
Blake Grotewold 17f902e65c Add Engine.autoSelect and add to Engine.export64 2014-06-06 11:59:46 -04:00
Michael Townsend 4d0b838fdb Merge pull request #85 from lilj/master
Chinese Translation po file is coming
2014-06-02 10:05:27 -04:00
lilj e3b2763911 2014-05-31 12:15:53 +08:00
lilj 5ad15330d5 2014-05-31 12:04:45 +08:00
lilj f5be58a306 Add Simple Chinese Translation 2014-05-31 11:56:09 +08:00
lilj 523fb6a90e Update engine.js 2014-05-31 10:22:56 +08:00
Michael Townsend ff9694ebf8 Merge pull request #84 from lilj/master
hope more translation will coming soon!
2014-05-30 10:24:03 -04:00
lilj 87b1fd2d5c Update engine.js 2014-05-30 12:19:24 +08:00
lilj b4fa432e04 Update langs.js 2014-05-30 12:17:42 +08:00