Commit Graph

152 Commits

Author SHA1 Message Date
Michael 88f9d3fc3b Merge branch 'vanadar-master' 2014-05-19 12:44:54 -04:00
Michael 957dbdf0e5 merged 2014-05-19 12:44:30 -04:00
Michael 4043658907 Merge branch 'master' of https://github.com/Continuities/adarkroom.git 2014-05-19 11:48:47 -04:00
Michael 2ca0a7a948 Expand import dialog to a textarea 2014-05-19 11:48:40 -04:00
Vanadar 09b5f3aba1 add switch language button 2014-05-19 11:49:46 +02:00
Michael Townsend 72a0380456 Update README.md 2014-05-15 09:35:08 -04:00
Michael a925349a13 Fixed bug #79 2014-04-23 22:24:27 -04:00
Michael Townsend 4963fda7e8 Merge pull request #77 from grotr/master
Add disableSelection to stop highlighting
2014-04-02 18:55:35 -04:00
Blake Grotewold e4b56f64c1 Create enableSelection function, Make selection available during export 2014-04-02 00:22:30 -05:00
Blake Grotewold a0aa2eaab9 Add disableSelection to stop highlighting 2014-04-01 19:25:59 -05:00
vanadar 1f52094384 vetements -> chiffons 2014-02-28 20:44:55 +01:00
vanadar 1cb7e85383 amélioration des traductions 2014-02-09 13:13:05 +01:00
vanadar cfaeb51603 corrections sur des traductions 2014-02-08 16:02:08 +01:00
vanadar cc2f374143 fin des trads, un peu de ménage & de doc 2014-02-08 14:13:59 +01:00
Vanadar 5dd42bcc4d correction css 2014-02-07 18:30:29 +01:00
Vanadar c7ad5384f4 suite des trads 2014-02-07 18:26:03 +01:00
Vanadar 71ee298e50 suite des traductions 2014-02-06 18:36:14 +01:00
Vanadar 7ac28eeb1a suites des trads 2014-02-05 17:06:30 +01:00
vanadar 989c6b4cfc Lib & fichiers de trad 2014-02-04 22:28:29 +01:00
vanadar f986e0323e Start trad fr 2014-02-04 22:27:00 +01:00
Michael Townsend 8ad2f82fd0 Merge pull request #73 from WillHuxtable/master
Removed annoying blue selection color. Now it is transparent
2014-01-03 06:45:21 -08:00
Will Huxtable 7f0bd94dab Removed annoying blue highlight color. Now it is transparent 2014-01-03 10:28:11 +00:00
Michael b583721581 Actually fixed the bug I thought I fixed ages ago. Turns out saving at
outposts is a stupid idea!
2013-11-26 11:36:51 -05:00
Michael Townsend b4eab29125 Merge pull request #68 from coolbeans7/master
Update setpieces.js
2013-11-17 09:45:17 -08:00
coolbeans7 e1df9e9e75 Update setpieces.js
Corrected typo - much => must
2013-11-15 15:03:20 -08:00
Michael Townsend 333b0b75e0 Merge pull request #67 from grotr/master
Updates README to not use rawgithub
2013-11-15 10:26:36 -08:00
Blake Grotewold 9daca0b6ee Updates README to not use rawgithub 2013-11-15 11:32:16 -06:00
Michael 1a5157dac4 Incremented version 2013-11-14 21:35:54 -05:00
Michael 36c75529ff Merge branch 'master' of https://github.com/Continuities/adarkroom.git 2013-11-14 21:33:40 -05:00
Michael 16824386eb Use a textarea instead of a prompt for export to prevent truncation in
Chrome.
2013-11-14 21:33:14 -05:00
Michael Townsend dcb4f67f8d Merge pull request #66 from grotr/master
Add reverse color scheme.
2013-11-14 11:46:39 -08:00
Blake Grotewold c78689f2c7 Add reverse color scheme. 2013-11-14 12:29:27 -06:00
Michael! c27430f29e A few small tweaks, and added link to the iOS app. 2013-11-13 22:18:27 -05:00
Michael 52974eaa96 Added link to the ADR iOS app on the Mobile Warning splash page. 2013-11-09 21:43:08 -05:00
Michael Townsend 9ae4ea53d9 Merge pull request #63 from Vermilingua/fallbackjquery
Cleaned up the scars from the merge, and added the working fallback
2013-11-03 09:46:51 -08:00
Vermilingua d78fd6acc0 added fallback, without merge scars 2013-11-03 08:45:42 +11:00
Vermilingua 918e4fa782 tidied 2013-11-03 08:42:33 +11:00
Michael ebee3be4d1 Sometimes I'm dumb. 2013-11-01 23:03:50 -04:00
Michael 994f01c78c Some refactoring and some bug fixes. 2013-11-01 23:00:51 -04:00
Michael Townsend d8f6e73c6b Merge pull request #59 from Vermilingua/scoring
added scoring system
2013-11-01 14:17:45 -07:00
Vermilingua e60abd0153 end screen looks nicer 2013-11-01 23:12:06 +11:00
Vermilingua d7fc109554 made store collection routine in SM, and updated everything to suit 2013-11-01 17:01:21 +11:00
Vermilingua a68f58e648 scoring system 100% complete 2013-11-01 16:35:20 +11:00
Vermilingua 3b3755cda9 started scoring system, yet to be populated 2013-11-01 16:35:19 +11:00
Michael Townsend a19643517a Update prestige.js
Null check in Prestige.load
2013-10-31 14:37:19 -04:00
Michael Townsend c738342bad Update world.js
Only add the cache if there is prestige data
2013-10-31 14:36:03 -04:00
Michael Townsend f5847f66ba Update engine.js 2013-10-30 18:20:32 -04:00
Michael Townsend de9f88dfab Merge pull request #60 from Vermilingua/save-fix
Save fix
2013-10-30 15:20:11 -07:00
Vermilingua 2c31e4ecda strips nonwords, spaces, and newlines from both the input and output 2013-10-31 07:17:41 +11:00
Michael a24d492681 Fixed a bug with the page title. 1.3.1 2013-10-29 18:39:00 -04:00