 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 |
|
|
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 |
|