876 Commits

Author SHA1 Message Date
Fakey McFakename 1fada4620b Update world.js (#739)
'disintigrate' -> 'disintegrate'
2025-05-23 11:33:06 -04:00
uwueric d39db9eeee Added a two-headed creature encounter (tier 1 encounter) (#741)
* Added two-headed creature encounter (tier 1) to event->encounters.js
2025-05-23 11:31:54 -04:00
Blake Grotewold e1c67e5f6f Merge pull request #662 from ClashTheBunny/main
Remove junk files
2025-02-17 23:06:57 -06:00
Blake Grotewold fe26527185 Merge pull request #708 from Quix0r/fixes/no-thumbs-db
Don't include Thumbs.db files
2025-02-17 23:06:47 -06:00
Esa Juhani Ruoho caad2ea61e Fix Candy Box url (#722)
as per https://github.com/doublespeakgames/adarkroom/issues/693 - the current Candy Box url is dead and leads to spam. This fixes the url.
2024-04-02 17:13:28 -04:00
An! 42dcfef723 resolve loadAudioFile error when query string in URL (#718)
When the URL contains a query string (e.g., "?lang=zh_cn") or is accessed with index.html, loadAudioFile fails to load the audio files. The issue has been resolved by removing that from the URL before before concatenating "src" link.
2023-12-02 11:25:22 -05:00
Michael Townsend fce8af38a8 defensing timer recall 2023-09-14 14:10:08 -04:00
Amir Rajan 4fcef234d8 Update README.md (#711)
Added link to Steam version.
2023-07-08 10:41:46 -04:00
Michael Townsend 6f67c12893 - scroll path when outfit gets long 2023-06-24 10:38:31 -04:00
Michael Townsend d6059af2b1 - put alien allow in the outfitting options
- prevent queueing up multiple explosions from the unstable automaton
2023-06-15 16:08:38 -04:00
Michael Townsend 68c5e2dfca bugs 2023-06-12 14:40:55 -04:00
Michael Townsend 9c02581b15 bugs 2023-06-12 10:36:01 -04:00
Michael Townsend 4c683dd397 bugs 2023-06-12 10:20:28 -04:00
Roland Häder 9edcd50b39 Continued:
- don't include these files, you can have them locally
2023-06-10 01:25:11 +02:00
Michael Townsend 7ee96fd108 Expansion (#707)
This additional content explores the aftermath of an event in The Ensign. A large dungeon, The Executioner, reveals the fate of one of the Wanderers’ most powerful weapons though multiple wings, each ending with a unique boss encounter. The fabricator allows the player to craft powerful items out of alien alloy, introducing new combat mechanics.
2023-06-09 12:38:16 -04:00
Michael Townsend 431b72fab8 - replace universal analytics with GA-4 2023-01-01 15:49:09 -05:00
Tadeáš Cipro 29e1e25063 Czech (cs) translation completed (#681)
* Update translation template file

- regenerated adarkroom.pot using pybabel

* Add script for POT recompilation

* Complete Czech translation (cs)

- finished czech translation
- converted into JS
- added language entry into langs.js

Co-authored-by: santen <tadeas.cipro@kinet.cz>
2021-11-29 11:25:41 -05:00
Michael Townsend 48ece588ed - added campaign to marketing link 2021-01-28 14:33:17 -05:00
Michael Townsend 7af870ab53 - fixed logo in dark mode 2021-01-28 14:02:19 -05:00
Michael Townsend bddb27131e - added link to doublespeak
- added cross-promotion event for Penrose
- removed dead Dropbox code
2021-01-28 13:54:23 -05:00
Michael Townsend f8b3c03e9b Merge pull request #667 from orsi/doublespeakgames
Major optimization of audio size and safari audio fix
2020-10-30 11:53:04 -04:00
jorsi 817decef2e remove audio preload 2020-10-12 21:59:16 -04:00
jorsi af34686c71 reduce audio file sizes by converting to mmono, lowering sample rate to 22k from 44k, and lowering bit depth to 16bit from 24bit 2020-10-12 21:50:57 -04:00
jorsi 9d8049988d fix safari audio bug where error prevents leaving worldmap locations -- reveals another safari bug where decodeAudioData doesn't return a promise to start playing music immediately 2020-10-09 12:22:06 -04:00
jorsi d0a12ac4a5 merge upstream/main 2020-10-08 12:57:21 -04:00
Michael Townsend 9e19425a9e Disable audio until bugs and hosting can be worked out 2020-10-05 12:23:08 -04:00
jorsi a601473645 We have audio! Thanks @orsi! 2020-09-10 12:45:10 -04:00
jorsi 9a7568885d Merge branch 'master' of https://github.com/doublespeakgames/adarkroom into doublespeakgames 2020-09-03 20:43:00 -04:00
jorsi c1f0e70233 fix jshint warning about leading decimals confused for dot properties 2020-09-03 20:33:07 -04:00
jorsi 371c657c08 remove god mod function 2020-09-03 20:28:49 -04:00
jorsi da51fd0dfd restore original google analytics 2020-09-03 20:12:05 -04:00
Randall Mason 9bb0caa04c Remove junk files 2020-08-29 13:56:25 -05:00
Michael Townsend d6d1c1b987 Merge pull request #660 from Jaredcscott/master
Updating description of energy cells
2020-08-16 09:03:44 -04:00
Jared Scott 9e4aa7ee05 Merge pull request #1 from Jaredcscott/Jaredcscott-patch-1
Update to description of energy cells
2020-08-15 23:32:01 -06:00
Jared Scott a5dfe8f189 Update path.js 2020-08-15 23:30:41 -06:00
jorsi e260dcfff3 fix sound turning on/off randomly on first user click due to toggleVolume call 2020-06-21 14:05:19 -04:00
jorsi 2a7f8441dd fix invalid state error in safari when trying to stop background music 2020-06-21 13:53:08 -04:00
jorsi f6b7a35a32 fix audio context resuming for browsers with no autoplay policy 2020-06-08 22:56:05 -04:00
jorsi dafc86325d normalize volume levels of sound effects that were too loud 2020-06-04 23:28:59 -04:00
jorsi 51ddd24c79 fix enableGodMode order to prevent strange behaviour 2020-06-04 19:35:28 -04:00
jorsi b099a1d122 improve encounter music 2020-06-04 19:25:57 -04:00
jorsi 2b0d1b7920 improve audio 2020-06-04 16:38:13 -04:00
jorsi dc3184e31b improve footstep sounds 2020-06-04 15:52:31 -04:00
jorsi a5c81f10e8 prevent same sound from playing multiple times 2020-06-04 15:52:15 -04:00
jorsi 54e6731748 add missing sound effects 2020-06-04 15:21:28 -04:00
jorsi ed05aee1d4 add missing event music; lower volume for space music 2020-06-03 19:12:09 -04:00
jorsi 8dea25ccd2 reorder enable god mode code to prevent duplicate area tabs 2020-06-03 18:29:30 -04:00
jorsi 031d9435e3 fix wrong function call 2020-06-03 18:26:06 -04:00
jorsi 783886b9b2 fix space music fading in when ending game by adding separate background volume function 2020-06-03 18:22:48 -04:00
jorsi 44a7552de4 fix room music playing when in another scene 2020-06-03 18:14:19 -04:00
jorsi 3b43a2754a refactor audio engine: simplified gain channels, improve fading between audio, rename functions 2020-06-03 17:44:27 -04:00
jorsi fd4fbe6bd4 preload high priority area and event audio 2020-06-03 16:39:35 -04:00
jorsi 3a2819d8af refactor functions 2020-06-03 16:39:12 -04:00
jorsi a5d81c2da7 reorganize audio library order 2020-06-03 16:27:19 -04:00
jorsi 986d76ab3d remove unused audio references 2020-06-03 16:24:50 -04:00
jorsi fa9081f6df improve fire sounds 2020-06-03 15:02:58 -04:00
jorsi 0274e9ea5d add shady builder event music 2020-06-03 15:02:51 -04:00
jorsi 20de297144 modify audio levels for village sounds 2020-06-02 22:09:29 -04:00
jorsi eae6d40be1 add google analytics for github site 2020-06-02 21:14:16 -04:00
jorsi 1c7b3fbd31 improve village sounds 2020-06-02 20:58:51 -04:00
jorsi 740204de85 lower volume as altitude increases 2020-06-02 16:02:25 -04:00
jorsi bfd8b3690e add function to get current volume 2020-06-02 16:02:12 -04:00
jorsi 28c4462ffb update space music 2020-06-02 16:01:48 -04:00
jorsi c710538db8 add plague event music 2020-06-02 16:01:35 -04:00
jorsi 4c7c5d0346 add ending music 2020-06-02 16:01:24 -04:00
jorsi 8e5f8bbae6 add space sounds 2020-06-02 14:23:33 -04:00
jorsi 956b05074d add more landmark music 2020-06-02 12:26:38 -04:00
jorsi 4f61055909 add enable god mode function 2020-06-02 10:44:00 -04:00
jorsi 0198cce7fc add several landmark loops 2020-06-01 23:52:56 -04:00
jorsi f9d42adb67 remove .wav files 2020-06-01 20:15:37 -04:00
jorsi 9109591d44 remove console.log 2020-06-01 19:42:17 -04:00
jorsi d2dae63a10 set debug false 2020-06-01 19:41:15 -04:00
jorsi 3ceb34298b cleanup 2020-06-01 19:40:40 -04:00
jorsi 46c26632e7 add outside event music; add encounter music 2020-06-01 19:36:28 -04:00
jorsi a9701124c8 add music for room events 2020-06-01 15:37:12 -04:00
jorsi 28cab1d08f add more sfx for world; add more sfx for ship 2020-06-01 13:48:24 -04:00
jorsi 793af7caed replace missing audio with placeholder beep 2020-06-01 11:12:00 -04:00
jorsi fe3f2d2fff use .flac as audio format 2020-06-01 10:50:24 -04:00
jorsi e2845c1784 lower event music volume for now -- way too loud relative to main 2020-06-01 00:47:08 -04:00
jorsi fc7b72f47b add full path to audio sources when fetching 2020-06-01 00:42:56 -04:00
jorsi 6b5acb915a make audio urls relative 2020-06-01 00:37:02 -04:00
jorsi 274f20e674 add rough outline of path and world' 2020-06-01 00:28:37 -04:00
jorsi 17b21bec08 add rough songs for outside 2020-05-31 23:29:53 -04:00
jorsi 113596fca6 rough outline for room audio 2020-05-31 19:19:36 -04:00
jorsi 1d4f48b464 fix music not starting on arrival when fire is dead 2020-05-31 14:02:23 -04:00
jorsi d3f1d9c779 prototype fire sounds 2020-05-31 13:53:43 -04:00
jorsi 3adf493a11 add audioLibrary to scripts 2020-05-31 13:53:33 -04:00
jorsi 18e8af9809 refactor audio-related code to use AudioLibrary module 2020-05-30 23:33:10 -04:00
jorsi a340584136 create AudioLibrary module to consolidate audio 2020-05-30 23:03:46 -04:00
jorsi 20132690da play music on landmark events 2020-05-30 22:35:42 -04:00
jorsi 3c6a386423 remove logging 2020-05-30 22:27:38 -04:00
jorsi 8db47cecf9 add button to turn volume on and off 2020-05-30 22:20:29 -04:00
jorsi 1d84e5f85c connect majority actions to sound effects;add more placeholder loops and effects 2020-05-30 19:48:44 -04:00
jorsi 71786c3671 add majority of sound definitions 2020-05-30 17:20:01 -04:00
jorsi 21267e383d add outline of space sounds 2020-05-29 19:13:34 -04:00
jorsi d951755f4c add outline of ship sounds 2020-05-29 19:13:28 -04:00
jorsi 221a97035c add more room sounds definitions 2020-05-29 19:04:49 -04:00
jorsi f188f45e4b add outline of ship sounds 2020-05-29 19:04:37 -04:00
jorsi c35912b3ff add more sound definitions 2020-05-29 18:47:10 -04:00
jorsi bd519404c2 add Room craft* sound effect definitions 2020-05-29 18:33:47 -04:00
jorsi 1f8dbc161c add outline of world sounds 2020-05-29 18:31:44 -04:00
jorsi 9ae1ac06f5 add outline of Path sounds 2020-05-29 18:21:57 -04:00
jorsi de9d2e6a17 add more sound effect definitions 2020-05-29 18:21:40 -04:00
jorsi 39fbd169ad add rest of sound definitions for room 2020-05-29 18:14:35 -04:00
jorsi 7df62849ea add outline of outside audio 2020-05-29 18:12:40 -04:00
jorsi 12c6559802 add basic outline of audio for room 2020-05-29 17:53:18 -04:00
jorsi 978f53d40b rough implementation for changing background music 2020-05-29 13:59:58 -04:00
jorsi 9ae328d49b initial start for audio support 2020-05-28 19:10:09 -04:00
Blake Grotewold f74515f06d Merge pull request #651 from AleksMU/master
add russian translate
2019-10-21 14:13:52 -05:00
Blake Grotewold 4cdd298a08 Merge pull request #655 from decrecementofeliz/galician-translation
Add Galician translation
2019-10-21 14:11:54 -05:00
decrecementofeliz 0e5d6a6324 add gitignore - ds_files 2019-10-08 15:12:03 +02:00
decrecementofeliz f64cc7a68d language-list: missing file from previous commit 2019-10-07 23:55:56 +02:00
decrecementofeliz 69cdc2603b Add Galician translation 2019-10-07 21:18:00 +02:00
Aleksey 5434a678ee add russian translate 2019-04-30 22:04:43 +03:00
Michael Townsend 491d461276 Merge pull request #644 from dblark/master
Update Chinese (Simplified) Translation
2019-01-28 15:38:07 -05:00
周圣杰 5d195f01d8 Update Chinese (Simplified) Translation
Update Chinese (Simplified) Translation
2019-01-28 12:51:09 +08:00
Michael Townsend 754fcd6ded Merge pull request #557 from andylizi/master
Update Chinese-Simplified translation (Resolve conflicts in #502)
2018-09-19 10:20:35 -04:00
Michael Townsend dc06cf9de6 Merge pull request #622 from youknowone/update-pot
Add missing gettext markers + Update adarkroom.pot
2018-09-19 10:18:33 -04:00
Michael Townsend 246dbcdb99 Merge pull request #632 from gitupofftheflooranddosomework/patch-1
Fixes issue in 613
2018-09-18 15:48:16 -04:00
Michael Townsend 9b699b56c8 Merge pull request #619 from mmKALLL/master
Fix for LICENSE.md preview formatting
2018-09-18 15:30:35 -04:00
gitupofftheflooranddosomework dd9fc140bb Fixes issue in 613
This is made to fix the issues in issue #613
2018-09-18 15:54:30 -03:00
Michael Townsend 06e1d5a5db Merge pull request #626 from Roarez/master
Fix buying maps causing crashes #515
2018-09-17 11:04:19 -04:00
Roarez d498a13177 Fix buying maps causing crashes
Fixes the applyMap function that could not uncover single points of map on the top and left borders and thus was causing an infinite loop crash
2018-09-11 00:43:49 +01:00
Jeong YunWon c36ad262a5 Update adarkroom.pot 2018-06-09 23:47:04 +09:00
Jeong YunWon 99f28877e8 Add missing messages to gettext 2018-06-09 23:47:04 +09:00
mmKALLL db42a9053c Improved LICENSE.md asterisk formatting. 2018-04-23 02:28:10 +09:00
mmKALLL 8101b7c6b7 Fixed LICENSE.md asterisk formatting. 2018-04-23 02:27:16 +09:00
mmKALLL c64421cccc Merge branch 'master' of https://github.com/doublespeakgames/adarkroom 2018-04-23 02:05:29 +09:00
Michael Townsend 15ddf72e43 Merge pull request #593 from silence44/localization
Added missing translations and small fixes for ru and uk
2017-12-17 11:51:31 -05:00
Michael Townsend b978b71e49 Merge pull request #603 from hun0975/patch-1
Update strings.po
2017-12-17 11:47:30 -05:00
Michael Townsend 5eb4241a8b Merge pull request #602 from hun0975/master
Change Hangul(ko) expression
2017-12-17 11:47:15 -05:00
Michael Townsend 2800b51d96 Merge pull request #608 from hun0975/patch-5
jshint warning ('cur' is already defined)
2017-12-17 11:43:16 -05:00
Michael Townsend d46f414a41 Merge pull request #609 from hun0975/patch-6
Remove unused variables
2017-12-17 11:42:47 -05:00
Michael Townsend bba2af9844 Merge pull request #610 from hun0975/patch-7
jshint warning(missing semicolon)
2017-12-17 11:41:28 -05:00
hun0975 4122805484 jshint warning(missing semicolon)
missing semicolon!
So just add a semicolon
2017-12-04 15:54:18 +09:00
hun0975 639e9960d8 Remove unused variables
line 114
the 'c1' variables is not used
so i remove
2017-12-04 15:46:21 +09:00
hun0975 4e37103171 jshint warning ('cur' is already defined)
The "cur" variable is defined twice in each for loop.
So I pulled out the definition part of the "cur" variable.
2017-12-04 15:35:00 +09:00
hun0975 6228a89af4 Update strings.po 2017-11-26 23:39:26 +09:00
hun0975 4e8c0d8e9f Change Hangul(ko) expression
Existing expression does not match Korean grammar.
"동굴 넓고 어두운 아가리를 벌리고 있다" -> "동굴의 입구는 넓고 어두웠다."
2017-11-12 21:09:45 +09:00
Denys Lishchenko 9af04ebc1a Added missing translations and small fixes for ru and uk 2017-10-03 00:51:04 +02:00
Michael Townsend 36f5a82e20 Merge pull request #552 from DeeNewcum/master
bug -- doubleTime is harmful during space.js, so disable it
2017-09-11 17:12:54 -04:00
andylizi 8dfed2531d Update Chinese-Simplified translation
Merge remote-tracking branch 'ldzhangyx/master'
2017-08-01 14:23:30 +08:00
Blake Grotewold 67188cb5f4 Merge pull request #555 from djuretic/master
Complete Esperanto translation
2017-07-28 10:34:53 -05:00
Dušan Juretić ba8c794e18 Updated string.js 2017-07-21 08:53:37 -04:00
AetherSeed fed46fa749 Esperanto translation update
Fixed the use of "po"
2017-07-21 08:52:11 -04:00
Dušan Juretić 971b007387 Esperanto .js file updated 2017-07-20 19:37:00 -04:00
AetherSeed 08c87fe03f Esperanto translation review
Think I have everything now. Something might have slipped through, but this is as far as I go.
2017-07-20 07:21:05 -04:00
AetherSeed c87c9f2816 More Esperanto translations 2017-07-14 00:13:20 -04:00
AetherSeed 7ce3f93a41 More Esperanto translations 2017-07-14 00:12:28 -04:00
AetherSeed a93b0d5ea0 More Esperanto translations 2017-07-13 07:21:44 -04:00
AetherSeed 0521823617 More Esperanto translations 2017-07-13 07:20:19 -04:00
AetherSeed 11a6b46ffa More Esperanto translations 2017-07-12 22:29:47 -04:00
AetherSeed e08ac0e1f6 Pli da tradukaĵoj - More translations 2017-07-12 14:44:36 -04:00
Dušan Juretić 87bb841c5a Minor changes and updated eo/strings.js 2017-07-11 21:52:57 -04:00
Dušan Juretić abf1ecf749 Merge remote-tracking branch 'aetherseed/AetherSeed-patch-2' into master
Conflicts:
	lang/eo/strings.po
2017-07-11 21:47:57 -04:00
AetherSeed 35d3776d80 Tradukaĵeto
Eĉ pli da tradukaĵoj.
2017-07-10 19:33:25 +12:00
AetherSeed 67ee05609a Kaj denove pli!
Nu, ne finite, sed plikomplete!
2017-07-10 12:51:20 +12:00
Dušan Juretić 127c378168 More Esperanto sentences 2017-07-09 11:25:23 -04:00
AetherSeed 826d34467e Kaj pli da tradukaĵoj
Mi plie tradukis. Eble iom da la "bat"aj vortoj devas esti kontrolotaj.
2017-07-09 19:30:07 +12:00
Dušan Juretić 309aebb701 Merge remote-tracking branch 'upstream/master' 2017-07-08 12:43:49 -04:00
AetherSeed b1ee57246c Pli da tradukaĵoj
Mi tradukis iome la netradukitajn aferojn.
2017-07-04 17:22:17 +12:00
Dee Newcum 7548e8cced doubleTime is harmful during space.js, it makes it much harder 2017-06-16 15:22:42 -05:00
Michael Townsend 9e3874bc8e Merge pull request #548 from BAirborne/master
New event in the village
2017-05-18 11:15:00 -04:00
Chris Farrow f0edb8f6d5 Moved the shady builder to the room module 2017-05-18 10:11:18 -05:00
Chris Farrow 1156df4693 got rid of an accidental comma 2017-05-13 15:15:31 -05:00
Chris Farrow 878e83d631 adjusted some of the text for the shady builder event 2017-05-13 15:11:36 -05:00
Chris Farrow 59c79b686d Made an event where a shady builder would enter the village and either build a house or steal some wood 2017-05-12 16:23:15 -05:00
Michael Townsend 2798cbd679 Merge pull request #546 from hasantayyar/patch-1
Po metadata fixed for Turkish translation
2017-05-02 10:29:43 -04:00
Hasan Tayyar BEŞİK 4c9945bf9f Po metadata fixed for Turksih translation
and added some missing Turkish translations
2017-05-02 09:33:39 +02:00
Michael Townsend d72fba341d Merge pull request #545 from Yrlish/close_app_dialog
Added the option to close the 'get app' dialog
2017-05-01 10:11:56 -04:00
Dennis 84336b06a3 Added the option to close the 'get app' dialog 2017-04-30 10:57:31 +02:00
Michael Townsend 90011d652b Add missing comma
Closes #544.
2017-04-27 10:15:04 -04:00
Michael Townsend 1cb6dd6fb3 Merge pull request #541 from VacuumSPP/master
Added strings.js file for Lithuanian language
2017-04-20 10:28:02 -04:00
Eimis Karpicius b909cbe2ec Added strings.js file for Lithuanian language
Accidentally forgot to add the strings.js file in my commit.
2017-04-20 00:38:28 +01:00
Michael Townsend c0ebe80d41 Merge pull request #540 from VacuumSPP/master
Complete Lithuanian Translation
2017-04-18 20:41:34 -04:00
Eimis Karpicius 32b8dc2a17 Fixed Lithuanian entry 2017-04-19 00:15:25 +01:00
Eimis Karpicius 13cfbea718 Fixed Lithuanian line 2017-04-19 00:14:49 +01:00
Eimis Karpicius 6949fdaaf9 Update README.md 2017-04-19 00:13:58 +01:00
Eimis Karpicius 99a44d37f6 Added Lithuanian
Added a selection for the Lithuanian language
2017-04-19 00:13:20 +01:00
Eimis Karpicius e75b46f8fd Added Lithuanian
Added line 13 - 'lt':'lietuvių'
2017-04-19 00:11:29 +01:00
Eimis Karpicius b91ed2adec Lithuanian translation
Added full Lithuanian language translation.
2017-04-19 00:09:59 +01:00
Dušan Juretić 21a9fe2838 More translations 2017-04-05 17:20:03 -03:00
Dušan Juretić dae2cc46f7 More translations and fixed some typos 2017-04-02 10:50:42 -03:00
Dušan Juretić b3c4b68cf4 Merge pull request #1 from spagy/master
Further Esperanto Translation
2017-04-02 10:38:00 -03:00
Spagy cf8a4ca927 Revert Dropbox to Dropboks 2017-04-02 12:28:06 +01:00
Spagy 65bbbdbb3c Further Esperanto Translation 2017-04-02 11:32:00 +01:00
Dušan Juretić d3bb96c347 Updated string.js 2017-04-01 10:30:00 -03:00
Frigorifico9 f22b8a8253 Update strings.po 2017-04-01 01:39:46 -05:00
Dušan Juretić 714cc422a2 First version of Esperanto 2017-03-31 21:59:25 -03:00
Michael Townsend 1db603fd08 Merge pull request #539 from julianAkkaya/patch-1
Fixed some translation mistakes
2017-03-30 10:51:23 -04:00
julianAkkaya 2ef34f6895 Fixed some translation mistakes 2017-03-30 16:45:49 +02:00
Michael Townsend 9856060f15 Merge pull request #534 from Clonewayx/master
start of czech translation
2017-03-19 13:44:50 -04:00
Michael Townsend 9a6f752e26 Merge pull request #535 from Torelli/improving-ptbr-translaction
Small translaction correction
2017-03-19 13:44:18 -04:00
Michael Townsend 0a66d0f946 Merge pull request #536 from bkRyusim/master
I translated some missing words.
2017-03-19 13:43:38 -04:00
Michael Townsend 65f1c1a0f2 Merge pull request #537 from Wafflenaut/master
Complete Latvian Translation, Minor Swedish Updates
2017-03-18 10:15:55 -04:00
Wafflenaut 02e3fccf83 Added full Latvian translation. 2017-03-16 20:55:39 -04:00
백승윤 70bda18b37 I translated some missing words. 2017-03-15 00:55:08 +09:00
Torelli 35d456aa98 Small translaction correction
Small translaction correction
2017-03-12 00:35:25 -03:00
Clon eab4153bf4 start of czech translation 2017-03-11 11:09:30 +01:00
Wafflenaut 23d26deb51 Updated Swedish Translation - Issue Ticket 490
Fix four missing swedish entries mentioned in Issue 490 - still 213/772
translations to be completed
2017-02-25 20:05:29 -05:00
Michael Townsend be5deb9a38 Merge pull request #525 from RDDDIB/master
Completed Spanish translation
2017-02-05 11:20:12 -05:00
Roland Baumann ad8ffd29db Completed Spanish translation 2017-02-05 03:58:16 -05:00
Michael Townsend 52983348d1 Merge pull request #501 from lucasloisp/jshint-compliance
Improved JSHint compliance in the code
2017-02-04 12:15:23 -05:00
Lucas Lois fb9e39bbaf Merge branch 'master' into jshint-compliance 2017-01-25 11:44:18 -03:00
Esa Koskinen c8c71e945a Merge pull request #1 from doublespeakgames/master
Update fork to latest head
2017-01-20 11:27:24 +02:00
Michael Townsend efe44ba3a7 Merge pull request #522 from yangzeon/master
update Chinese translation
2017-01-04 10:08:29 -05:00
yangzeon 99643972a4 update zh_CN.po
>_<
2017-01-04 15:00:10 +08:00
yangzeon 37d6da02cf Merge remote-tracking branch 'refs/remotes/doublespeakgames/master' 2017-01-04 12:52:33 +08:00
Michael Townsend 040cc74a5f Merge pull request #521 from StivArts/patch-1
Added more translations (ES)
2016-12-31 11:01:05 -05:00
Jaime Arancibia Soto 5be6694c4a Added more translations (ES)
I added some translations that were not, greetings
2016-12-31 05:47:14 -03:00
Continuities 5f13d94cdf Marketing stuff, mostly 2016-12-17 14:53:21 -05:00
Michael Townsend b0c202d5a3 Merge pull request #519 from jgblight/move-tooltip
tooltip on top near bottom of store and trading post
2016-12-11 15:06:17 -05:00
Jennifer 3ae7ee16cc tooltip on top near bottom of store and trading post 2016-12-10 21:09:18 -08:00
Michael Townsend 0f50adc7aa Merge pull request #518 from salzix/translation-pl-update-1
Added missing PL translations, some fixes to existing ones
2016-12-09 14:16:40 -05:00
Tomasz Wegrowski bc3d9d02b9 Added missing PL translations, fixed some, replaced 'hut' translation with more proper for village building 'chata' 2016-12-09 11:30:17 +01:00
Michael Townsend 21d0d7df93 Merge pull request #517 from joyceambrosio/master
Improved pt-br translation
2016-12-08 10:38:40 -05:00
joyceambrosio 834b8eb4b4 Improved translation to pt-br language 2016-12-08 07:46:08 -02:00
joyceambrosio 2b44f49974 Improved pt-br translation 2016-12-08 07:35:42 -02:00
Michael Townsend d028790c86 Merge pull request #500 from heptocat/master
de: update string.js
2016-11-20 11:22:49 -05:00
Michael Townsend d03ed0c9e3 Merge pull request #498 from burunduk/patch-1
Update Ukrainian
2016-11-20 11:22:11 -05:00
Michael Townsend 0916f78736 Merge pull request #507 from vankasteelj/master
update french localization
2016-11-20 11:21:33 -05:00
Michael Townsend 549fcc9f93 Merge pull request #511 from SongyuWang/master
update zh_cn
2016-11-02 10:21:26 -04:00
Michael Townsend 56ff564630 Merge pull request #512 from davidduewel/master
Changed one word in Indonesian
2016-11-02 10:20:32 -04:00
davidduewel 35053247da Merge pull request #1 from davidduewel/davidduewel-patch-1
Updated One Word in Indonesian
2016-11-02 09:55:05 +00:00
davidduewel 02ec5ab53b Updated One Word in Indonesian 2016-11-02 09:51:00 +00:00
wangsongyuf 16337ab8b9 update zh_cn
This is the first time I try to contribute opensource project. I just
wanna have a taste of the process and hope I did not mess it up. If this
works, I will try to edit more thing next time.
2016-11-01 20:40:02 -04:00
Michael Townsend 8fab454a63 Merge pull request #510 from doug2k1/pt-br-lang
Fix some errors in pt-br translation
2016-10-29 19:59:26 -04:00
Douglas Matoso 8981d332f0 Fix some errors in pt-br translation 2016-10-29 21:16:31 -02:00
Michael Townsend b3520a6247 Merge pull request #509 from Superari15/patch-1
Added link to Android app
2016-10-28 11:41:37 -04:00
Arihant Tripathy 0e23bc12b9 Added link to Android app 2016-10-28 21:00:06 +05:30
vankasteelj b150caff07 update french localization 2016-10-16 19:35:47 +02:00
Blake Grotewold 1a6b41c2a1 Don't save carryables if they haven't been found yet. 2016-10-11 02:29:41 -04:00
Lucas Lois 69267045a8 Made events/room.js and state_manager.js jshinthint compliant 2016-10-02 18:07:02 -03:00
Lucas Lois 36b01a78b6 Made scoring.js, space.js and world.js jshint compliant 2016-10-02 17:57:17 -03:00
Lucas Lois c1ce1a89d9 Made room.js jshint compliant 2016-10-02 17:52:39 -03:00
Lucas Lois 05edb2a98a Made path.js jshint compliant 2016-10-02 17:52:22 -03:00
Lucas Lois a903a1c9fe Made outside.js jshint compliant 2016-10-02 17:45:09 -03:00
Lucas Lois 8370eac8aa Made events.js jshint compliant 2016-10-02 17:40:54 -03:00
Lucas Lois 4ced5337da Made engine.js jshint compliant.
Error on /script/engine.js at 775:128 was ignored
2016-10-02 17:22:32 -03:00
Lucas Lois 90aa1ca4fd Made Button.js jshint compliant 2016-10-02 17:00:57 -03:00
Lucas Lois b5276f7f83 Made translate.js jshint compliant 2016-10-02 16:48:27 -03:00
hep cat d156a6a810 de: update string.js
corrected existing translations
- typos
- added missing spaces which were very annoying since the words were then together
- minor changes according design guide lines https://github.com/doublespeakgames/adarkroom/wiki/Design-Guide#narrative
     - since nouns are capitalized in German, previous translators must have accidentally left some words capitalized, which was inconsistent with the rest
     - light fire -> "feuer entfachen" instead of "feuer machen", which is consistent with the same use of the word "light" in other situations
     - sammel holz -> holz sammeln, since the player should not be adressed directly with an imperative, and none of the other buttons (like feuer schüren) had the imperative (which would then be schüre feuer)
2016-10-01 19:13:45 +02:00
Michael Townsend 5a99e22b64 Fixing bugs 2016-09-23 11:39:07 -04:00
Michael Townsend 8a80f7c164 Fixing bugs 2016-09-23 11:32:34 -04:00
Michael Townsend fbc91a3756 Disable pause button until I have time to rework/fix it
The pause button displays weirdly and doesn't appear to work properly. Disable it until it can be reworked.
2016-09-23 11:16:08 -04:00
Michael Townsend a5f5f0f8dc Create main.css 2016-09-22 11:22:22 -04:00
Olexandr Nesterenko 9d2c4fc125 Update Ukrainian 2016-09-21 18:31:36 +03:00
Blake Grotewold 8d9c4a1a92 Merge remote-tracking branch 'origin/master' 2016-09-17 15:18:22 -04:00
Michael Townsend 1fc1836a95 Merge pull request #463 from AndySky21/Take-everything-bug
Take-everything bug
2016-09-01 11:15:34 -04:00
Michael Townsend 559022cb80 Merge pull request #492 from erdifr/fix-mix
Fix mixed-content warning.
2016-09-01 10:10:33 -04:00
erdifr 2f9448174f Fix mixed-content warning.
Use https:// instead of http:// to load jQuery and Google Analytics. Now
Google Chrome will load jQuery and Google Analytics instead of blocking
the scripts and throwing a mixed-content warning.
2016-08-31 19:37:34 -04:00
Michael Townsend 947d51ff04 Merge pull request #491 from pratnala/master
Updating the app download links
2016-08-21 13:08:33 -04:00
Pratyush Nalam 678daa1cde Editing image sizes 2016-08-21 12:59:02 -04:00
Pratyush Nalam de79622d24 Update App Store image and added Google Play link 2016-08-21 12:50:48 -04:00
Continuities a988d962f1 Add link to Google Play 2016-07-08 18:41:10 -04:00
Michael Townsend f4fa4e4ae8 Merge pull request #486 from doublespeakgames/revert-485-patch-1
Revert "Fix message typo."
2016-05-12 13:53:07 -04:00
Michael Townsend e1b1ed28b1 Revert "Fix message typo." 2016-05-12 13:53:01 -04:00
Michael Townsend 8150d47513 Merge pull request #485 from jimt/patch-1
Fix message typo.
2016-05-12 11:10:20 -04:00
Jim Tittsler cc1e658144 Fix message typo. 2016-05-12 23:59:38 +09:00
Blake Grotewold 0fbb713e17 fix merge conflict error 2016-03-19 15:17:32 -04:00
Blake Grotewold 9438d2c30b Merge pull request #471 from code-kit/master
More Weapons/Tools Information on Path Tab
2016-03-19 15:01:01 -04:00
Blake Grotewold 7871f47776 Merge #469 2016-03-19 15:00:32 -04:00
Blake Grotewold 9a45ad1380 Merge pull request #467 from AndySky21/setHeal
Set heal
2016-03-19 14:56:36 -04:00
Blake Grotewold f410af90b3 Merge pull request #465 from AndySky21/missing-lines
Missing lines
2016-03-19 14:56:19 -04:00
Blake Grotewold 5b870244f5 Merge pull request #464 from AndySky21/StoreZero-bug
StoreZero bug
2016-03-19 14:56:10 -04:00
Blake Grotewold cc18daa111 Merge pull request #463 from AndySky21/Take-everything-bug
Take-everything bug
2016-03-19 14:55:55 -04:00
Blake Grotewold 3d8e07510f Merge pull request #462 from AndySky21/mapBug
Map bug fix
2016-03-19 14:55:42 -04:00
Blake Grotewold 984cc1abca Merge pull request #461 from AndySky21/Supplies-bug
Supplies bug
2016-03-19 14:55:26 -04:00
Elizabeth Donohew 41293d48a8 Rewrote a couple of the descriptions that I added before for the tools. 2016-02-24 00:03:28 -06:00
Elizabeth Donohew 9083a9582c Hovering over a tool on the path tab now gives a small description on how the tool can be used. 2016-02-23 22:40:04 -06:00
Elizabeth Donohew 4d9890f2ef Renamed total to currentBagCapacity in the updateOutfitting method and extracted some functionality into a method called updateBagSpace. 2016-02-23 21:07:21 -06:00
Elizabeth Donohew 7efe142637 Shows the damage that a weapon deals only when hovering over a weapon on the path tab. 2016-02-23 20:46:19 -06:00
Andrea Rendine a3b1fea424 Method and property fix
World.testMap() sets World.seenAll. The latter is true when the whole map has been explored.
World.testMap() is called:

* on world init
* on return home (when the map is updated)
* on applyMap() (when the map is bought from the scout)
2016-02-20 13:17:45 +01:00
Andrea Rendine 5129756455 Translation fix
Shorter and clearer for "see farther"
2016-02-19 01:29:11 +01:00
Andrea Rendine 276dd64068 Minor translation fix 2016-02-19 01:27:28 +01:00
Andrea Rendine 189af75c31 Correct changes
Limited subset of commits:
* unified function for healing (Events.doHeal);
* unified function for attacks (Events.damage);
* check if health is max, and disable healing buttons (Events.setHeal and related calls)
* grouping buttons (attackButtons, healButtons and exitButtons for weapon attacks, meat & meds, continue/leave)
2016-02-17 15:22:13 +01:00
Andrea Rendine 368529f024 Reverted changes
Revert to previous version (no pause)
2016-02-17 15:07:26 +01:00
Andrea Rendine 68732ce0d9 Reverted changes
Revert to previous version
2016-02-17 14:16:39 +01:00
Andrea Rendine 7ba7f2247e Reverted changes
Reverted to previous version.
2016-02-17 14:08:41 +01:00
Andrea Rendine 131e5c1140 Reverted changes
Revert to previous version (no pause)
2016-02-17 14:06:09 +01:00
Andrea Rendine df63ccb651 Switch cooldown
Easy way to switch cooldown on pause button according to new button option
2016-02-17 10:27:38 +01:00
Andrea Rendine ac34b717d3 Forcing cooldown
Added an option.
Button.cooldown(btn, X) where X is a number, forces a one-time cooldown of X seconds for btn.
2016-02-17 10:19:32 +01:00
Andrea Rendine e4bb616a93 Legends
Text set by data-legend attribute
2016-02-17 01:55:53 +01:00
Andrea Rendine 07998376e7 Several changes
As some of them are related to each other, this commit involves a lot of updates.

* Autopause on blur. This is an idea I took from Gridland (!), if window loses focus the fight pauses (timed check courtesy of the enemy), and it restarts when the window has focus again (if the pause button is clicked, then the player must click again in order to resume).
* Delayed start for fights. This will allow players to read the description without the player attacking them. No way to cheat, buttons are not enabled. I used Events._LEAVE_COOLDOWN as cooldown time, not for laziness, but because I guess the two durations have the same purpose: to allow (force) the player to read stuff.
* Take everything and leave just by name. If the player can just take something, the text is "take all you can", if they can take everything but there are several options it's "take everything", if the option is only one the text is "take everything and X", where X is the verb of the only possible option (note: in the latter case, the button cools down together with the option itself).
* success/failure mechanics no longer relies upon try/catch, but on a simple mechanism: a variable taking a bool value, set to true when one of the end conditions happens. The precedence goes to the enemy (if the player kills and dies the fight is lost).
2016-02-17 01:53:21 +01:00
Andrea Rendine aae770c5a1 Timing for winning and efficiency 2016-02-16 11:02:10 +01:00
Andrea Rendine 24e744a27e Heal when necessary
Events.setHeal() enables/disables eatMeat and useMeds buttons depending on player's HP.
The check is done in 4 cases:

* when a fight starts
* after an attack
* after healing
* in the loot screen
2016-02-16 03:02:45 +01:00
Andrea Rendine aa62b7f9be Buttons positioning 2
The last 2 remainings from original structure
2016-02-16 02:58:51 +01:00
Andrea Rendine bf7472ba37 Buttons positioning
Residual structure fixed.
2016-02-16 02:56:44 +01:00
Andrea Rendine def892953a Cooldown time from graphics
Not a problem of precision, but a width measurement issue. Fixed and restored to previous precision level.
2016-02-16 00:27:44 +01:00
Andrea Rendine 091929cf90 Cleanup
Events.damage method now groups all common lines for Events.animateRanged and Events.animateMelee.
Balance between success and failure is now determined by Events.lost. It is set to "true" when the player is killed and prevents Events.winFight() altogether.
Events.endFight() groups the 2 consistent actions in winFight and loseFight, i.e., pause unsetting and stopping the enemy.
Completely renewed trap method: instead of relying on a separate counter, enemy.data('stunned') now returns the number of remaining seconds of stunning. Enemy's timed attack decreases this value by the attack delay time (the enemy fights for its freedom).
2016-02-16 00:26:23 +01:00
AndySky21 6ace681a91 Pause during fight
This commit adds a pause button during the fight. It relies upon the new
Events.paused property: when set to true, no buttons will work except
the pause button itself, and cooldown on attack/healing buttons is
interrupted.
This commit also groups event buttons in different groups (attack,
healing, scene), so that the position of "eat meat" and "use meds" does
not depend on how many scene buttons are present (sometimes 1, other
times 2)
2016-02-15 21:04:02 +01:00
Andrea Rendine 59e71232d4 Minor fixes
For code consistency: in updateSupplies, num is forced to never be greater than have, so the "greater or equal" comparison is pointless
Increase buttons reactivate when total store quantity is greater than supplies.
Also, removed useless nesting of Math.min.
2016-02-15 10:41:42 +01:00
AndySky21 5a618be261 Po update and IT notifications
PO files updated with current POT version. Italian translation of event
notifications.
2016-02-15 03:07:50 +01:00
Andrea Rendine 4bd00fa328 No check on null stores
Unlike other stuff, stores in the side box never disappear during the game when they reach 0, once they've been "seen" (i.e., once State stores[store] has been set). But on reload they appear only if the quantity is positive.
For the sake of consistency, now null stores are visible on load (see what you're missing, bro).
2016-02-14 21:24:43 +01:00
Andrea Rendine d295ca9aa5 Take all and what?
The change is somehow linguistic, rather than anything else.
"Take everything and leave" changes name and becomes "Take everything and X", where X is the verb of the command it impersonates.
This way after completing mines e.g. it is "Take everything and continue", acting like "continue" button.
It now also cools down if it impersonates a "leave" button (leave buttons cool down. IDK why).
2016-02-14 21:00:04 +01:00
Andrea Rendine 28cdca6003 Update world map on return
World.seenAll must be updated only when committing state changes (i.e., on return home safe), not during exploration.
2016-02-14 16:09:15 +01:00
Andrea Rendine 3b66f5cad5 Buy map when needed
Buy map button availability depends on the fact that there are still unexplored parts of the map.
2016-02-14 15:54:59 +01:00
Andrea Rendine bee221093e Apply useful maps
Maps cost! Let's apply them where necessary.
World.testMap() checks if there's still something to explore.
World.seenAll is true when everything has been seen. It is updated by uncoverMap().
World.applyMap() chooses a random center, with the conditions that 

1. there's still something to explore
1. the center itself is an undiscovered area.

Buy Map is active only when a map is still useful.
2016-02-14 15:47:38 +01:00
Andrea Rendine f1656f9a4f Buy map when needed
Maps cost! And casual gamers could possibly forget whether they've explored everything.
The Buy map button is now disabled if the whole map has been seen (yes, even a single uncovered tile is enough).
2016-02-14 13:46:26 +01:00
Andrea Rendine 3e51471b0b Remove State outfit on death
Supplies are not removed from state when embarking, so they remain in place in case the game is closed during exploration. So it now happens in case of death, along with Path.outfit reset.
2016-02-14 11:53:29 +01:00
Andrea Rendine 2c2490290c Leave outfit in place
It seems counterintuitive for players that, if the game is closed while exploring, everything remains unchanged but supplies are lost. I had to choose between cooling down Embark, thus making it explicit that it's as if the player had died, or leave supplies in place. I chose the latter.
2016-02-14 11:48:27 +01:00
Andrea Rendine 0f8a2ccfb6 Outfit update on Income
A very easy fix indeed. When Path is active, the outfit is updated on Income event. This way the "available" tooltip is reliable, increment/decrement buttons are activated/deactivated correctly and there is no risk of phantom resources.
2016-02-14 02:39:49 +01:00
Andrea Rendine 4032738d57 Code style
Tab in place.
2016-02-14 02:31:41 +01:00
Andrea Rendine e3d5e25b94 Merge pull request #19 from doublespeakgames/master
Update 2016-02-11
2016-02-11 14:23:04 +01:00
pacharan ea38d220d1 Update and rename string.js to strings.js 2016-01-10 21:23:58 -05:00
Blake Grotewold 9a0a764cb5 Merge pull request #453 from pacharan/patch-2
Create main.css
2016-01-10 18:09:30 -05:00
pacharan 201961c12e Create main.css 2016-01-11 05:10:05 +07:00
Blake Grotewold 23796cb36e Merge branch 'pr/447' 2015-12-30 03:29:14 -06:00
Blake Grotewold 49f6cd5255 Merge branch 'master' into pr/447 2015-12-30 03:28:52 -06:00
Blake Grotewold 99c57da055 update adarkroom.pot 2015-12-30 03:28:41 -06:00
Blake Grotewold b28c8583c6 Merge pull request #450 from miratcan/master
Added missing Turkish translations, fixed wrong lines.
2015-12-30 03:25:58 -06:00
Blake Grotewold 0f73054faf Add Thai to README 2015-12-30 03:25:03 -06:00
Blake Grotewold 2ebae56dc5 Merge pull request #451 from pacharan/master
Thai translation.
2015-12-30 03:23:25 -06:00
pacharan e0b1d3800a add Thai translation 2015-12-26 23:38:01 +07:00
Blake Grotewold 9943c4c568 add confirm hyper
lets the user know what hyper mode is, and confirms turning it on.
Updates .pot to match current source.
2015-12-22 16:41:10 -06:00
pacharan 2c2436e63e add Thai translation 2015-12-21 13:46:11 +07:00
pacharan 92e7ef83af add Thai translation 2015-12-21 13:44:17 +07:00
Mirat Can Bayrak 7df8efb380 Added missing Turkish translations. 2015-12-20 14:14:58 +02:00
Sang-gi Lee 0db5bf3dec Update Korean translation 2015-12-11 16:40:24 +09:00
Michael Townsend c66d484627 Added import/export tracking 2015-12-04 10:57:16 -05:00
Michael Townsend 78bf47bfa1 Merge pull request #445 from satakieli/patch-3
Update strings.po / fixed Swedish translation
2015-11-10 10:17:33 -05:00
Continuities fba203cea1 conversion tweaks 2015-11-09 18:36:55 -05:00
Anna Robbins 3ef2b22e99 Update strings.po
Proofed and updated up until line 450
2015-10-28 16:06:10 +01:00
Blake Grotewold 3849f7871f Merge pull request #444 from tom76kimo/patch-1
Update link of Traditional Chinese
2015-10-23 01:05:34 -04:00
Tom Wu d5e317836a Update link of Traditional Chinese
The link should be `zh_tw`
2015-10-23 11:45:02 +08:00
Michael Townsend ecd391ff6a Merge pull request #442 from uasi/ja-fix-typo
Fix typo in Japanese translation
2015-10-10 10:51:31 -04:00
Tomoki Aonuma bad5e58cc9 Fix typo in Japanese translation 2015-10-10 23:44:47 +09:00
Michael Townsend da289ea1d7 Update main.css 2015-10-05 12:41:46 -04:00
Akai Alonkai 55b5c3e1e7 Removed background-color for config lists.
Background colors for unordered list in options were set to match body.
This created a problem during and after the space game when the body and
text were inverted, but the ul was not. See Issue #432.

Tried this via Chrome's dev tools while at the effected screen in dark
theme, and it seemed to work.
2015-09-22 10:47:50 -04:00
Blake Grotewold 0f243637a1 Merge pull request #435 from TwistedAkai/master
Made fur gambling return fur.
2015-09-20 16:36:40 -04:00
Akai Alonkai 95057c9704 Made fur gambling return fur.
Function was paying out in wood, not fur, contrary to notification text.
2015-09-20 16:32:54 -04:00
Andrea Rendine 239735f487 Merge pull request #18 from doublespeakgames/master
Update 2015-09-20
2015-09-20 14:41:47 +02:00
Michael Townsend b533f86d2a Merge pull request #433 from ngosang/spanish_translation
Update Spanish translation
2015-09-18 09:54:43 -04:00
ngosang b700c4b9f5 Update Spanish translation 2015-09-17 23:57:38 +02:00
Michael Townsend 6670a9ce09 Merge pull request #431 from ngosang/test2
Update all strings.js
2015-09-17 16:52:52 -04:00
ngosang b5db2b558d Update all strings.js 2015-09-03 10:03:31 +02:00
Michael Townsend 94fea5a3a8 Merge pull request #429 from bdorer/master
de: updated German language files
2015-08-18 22:13:32 -04:00
Michael Townsend 4626961286 Merge pull request #428 from JeanAraujo/master
Update PT-BR Translation
2015-08-18 22:13:11 -04:00
bdorer1 5aa5748ddd de: updated German language files 2015-08-19 00:08:22 +02:00
Jean Araujo 066a34b125 Update strings.js 2015-08-12 14:29:20 -03:00
Jean Araujo 75324a5240 Update strings.po 2015-08-12 14:28:18 -03:00
Continuities a0b343246c Code style 2015-08-02 11:40:27 -04:00
Michael Townsend 64f6797c3e Merge pull request #425 from Sebring/master
Showing total in stores tooltip - Issue #170
2015-08-02 11:36:57 -04:00
Sebring 1e37f45530 Display time delay on total row in tooltip 2015-07-29 20:08:09 +02:00
Sebring 100ff277ff Styles for total in tooltip 2015-07-29 16:59:16 +02:00
Sebring fea54cd97f Add total to tooltip 2015-07-29 16:57:26 +02:00
Blake Grotewold 95cf44c2f2 Fix removeBranch function definition 2015-07-25 20:23:35 -04:00
Blake Grotewold 3cbb049a7e Update Russian and French translation .js files 2015-07-24 22:18:32 -04:00
Ricky Chandra e504e79cd0 Add Indonesian translation 2015-07-24 22:10:34 -04:00
Yuki Usagi 075ac8934e Add Traditional Chinese
Consolidation of 97bb59e f177db4 35eff47 51197a3

Closes #421
2015-07-24 22:05:45 -04:00
Blake Grotewold 4159febc77 Merge pull request #422 from TeddyBear06/patch-1
Update strings.po
2015-07-24 21:38:11 -04:00
Blake Grotewold e23550c1a0 Merge pull request #419 from Anwinz/patch-2
Update strings.po
2015-07-24 21:36:49 -04:00
Ludovic 98682e1b24 Update strings.po
Fix some typos mistakes.
2015-07-22 17:34:57 +02:00
Anwinz 62ad16e4b8 Update strings.po 2015-07-07 21:49:53 +03:00
Andrea Rendine 65d7cfd784 Hyper-proof cooldown state
Kept the distinction between "argument" time and script time. I called the latter "time" instead of "milliseconds" because, well, it's just tenth of seconds.
Residual timeout is always stored in "nominal" time, not adjusted by hyper. I.e. if a button has a nominal timeout of 60 seconds and half cooldown had expired on reload, residual is stored as 300. In cooldown, Engine.setInterval makes the time flow with double speed
2015-06-29 12:49:57 -04:00
Andrea Rendine e95cb5235e Merge pull request #17 from doublespeakgames/master
Update 2015-06-29
2015-06-29 16:29:08 +02:00
ekgr a923c1c0bd Added a Greek translation 2015-06-28 18:05:56 -04:00
Masaki KOBAYASHI ed837f3aec fix typo 2015-06-28 14:56:31 -04:00
Andrea Rendine 03fae08ff2 Compass relocation
This commit carries some changes.
* the compass is now a "special" item, not "good". It allows a different placing
* Store block is now divided into 2 parts. All the script is adapted to make room for it, including empty block check and insert animation for the new #store children divs
** Above: stackable storable items (resources), whose tooltip shows updated income/consumption rates
** Below: special storable items. As of now, it only contains the compass. Special block has a special style, with some distance from resources block if that one exists.
* Compass row has an empty tooltip which is filled in by World
2015-06-28 14:27:37 -04:00
Andrea Rendine 128f1341a0 Merge pull request #16 from doublespeakgames/master
Massive update 2015-06-27
2015-06-27 18:19:09 +02:00
Andrea Rendine 7208b845b1 Take all, take everything, leave if possible
Multiple fixes:
1. take all of a kind
2. take everything
3. if possible, leave
4. drop menu on hover
5. Same item not shown as drop option
2015-06-27 02:13:14 -04:00
Andrea Rendine da0d39b579 Check for delayed events
This triggers onload for all those events whose (possible) reward is registered with a time delay.
2015-06-27 01:43:09 -04:00
Andrea Rendine cb717b41d0 function for fire hut event and more
Effect of hut fire is associated with new Outside method .destroyHuts().
2015-06-27 00:44:26 -04:00
Blake Grotewold 09c070adfa Make tooltips in Lights off not so black 2015-06-27 00:42:23 -04:00
Andrea Rendine 358fe5fbcc Restore navigation property
Instead of a timed method to restore lx/rx navigation, a property will be set to true. In that case, the keyup method will not be executed, but it will restore navigation for further use.
2015-06-27 00:26:41 -04:00
wmassingham f94cfe2590 disable tab navigation during events (fixes #403) depends on @AndySky21's branch world-to-path 2015-06-27 00:26:40 -04:00
Andrea Rendine 08bd1c7caf Single letter representations for enemies
R wild animals (beast, birds, lizards, rats)
T mutated creatures (includes giant lizards)
E human enemies (old men, scavengers, thugs and squatters)
D armed human enemies (includes vigilantes, soldiers, snipers, commandos, veterans and chiefs)
2015-06-27 00:26:40 -04:00
SVS 1d2f95b561 Change the enemy labels 2015-06-27 00:26:40 -04:00
Andrea Rendine daf5de3973 Property for tab navigation
Added Engine.tabNavigation property. When true, it enables keyboard navigation to/from tabs. It is disabled on world and enabled some milliseconds after Path.onArrival(), so that when player returns s/he finds him/herself on Path tab instead of navigating.
2015-06-27 00:26:40 -04:00
Andrea Rendine 64a02c162c Modified command destination for save
Export dialog replaces selection dialog, rather than overlapping it.
Closing it exits the panel and returns to current game.
Aborting Import dialog returns the player to the selection screen, so that s/he can save before trying to load.
2015-06-26 23:49:30 -04:00
Andrea Rendine c4535c029a Alphabetical order for workers
I had missed this completely. Workers are listed in alphabetical order in English. Now they are ordered in other languages too.

Alphabetical order for outfit
2015-06-26 23:42:11 -04:00
Blake Grotewold 7babe5d102 Clean up Available Lanaguges
In my never ending fight against the readme. This is my next iteration
2015-06-26 23:30:46 -04:00
Andrea Rendine 92f7cf683e Unified legend
Legends on boxes and lists are currently added via CSS and as stylesheets cannot be localised, translated strings rely upon an additional inline CSS.
This commit inserts localised legends as "data-legend" attributes on proper elements, and then this attribute is shown by stylesheet rule content: attr(data-legend). No need of localisation script and more compact CSS rules.
2015-06-26 22:10:02 -04:00
Andrea Rendine 93649307f6 Non-overlapping up/down buttons
Fixed dimensions and margins for up/down arrows.
2015-06-26 21:54:41 -04:00
Andrea Rendine 8306f155f1 Notifications for outside events
As said in #363, there are almost no notifications for outside events.
I took a little liberty to suggest new sentences. Inspired by the game atmosphere and the double notification for Hut Fire, wrote lines for events and possible outcomes.
they're associated to buttons where there are no outcome scenes.
2015-06-26 21:31:20 -04:00
Blake Grotewold 4fed30380f Merge pull request #414 from ekgr/master
Changed size of languages menu (issue#413)
2015-06-21 13:44:14 -04:00
ekgr 4724aaf6e3 Changed size of languages menu
The Portuguese (brazil) option was too long and wrapping around to the next line, appearing right over the next language in the menu. Increased the width to accommodate in one line. Also increased the max height as the last language option wasn't visible. The menu can take one more language before needing to increase the height.
2015-06-21 17:25:47 +02:00
Blake Grotewold d5bbca90a4 Merge pull request #412 from JMRedford/patch-1
Change Plague events to take half of population.
2015-06-14 22:44:15 -04:00
John Redford ee591ca218 Update outside.js
Changed sickness event to kill up to half of the villagers instead of up to 20.
2015-06-14 00:47:08 -05:00
mac craig 612d247709 Create contributing.md
Creation of the contributing.md file to set rules and guidelines for future or current contributors.
Let me know if you want me to set out some basic contributing guidelines, or if the owner has anything in mind.

See the links below for information on contributing.md
https://github.com/blog/1184-contributing-guidelines
https://guides.github.com/activities/contributing-to-open-source/
2015-06-13 17:33:33 -04:00
Blake Grotewold 2d207e55c1 Update Brazilian Portuguese
Change from fall to drop.
2015-06-13 17:27:19 -04:00
Luan Haddad d4d4cec489 Add Brazilian Portuguese (pt_BR) 2015-06-10 19:50:42 -04:00
Blake Grotewold 5dbe98f0f1 Merge pull request #406 from derwilly/master
updated string.po
2015-06-08 15:38:58 -04:00
Ferdinand S. 8d38513798 updated string.po
fixed typo in line 875. "villeicht" -> "vielleicht"
2015-06-05 18:06:01 +02:00
Andrea Rendine c0864c27f3 Merge pull request #14 from doublespeakgames/master
Update 2015-05-29
2015-05-29 17:43:00 +02:00
Blake Grotewold 84577047a6 Merge pull request #391 from AndySky21/ship-title
Ship tab title
2015-05-29 10:12:08 -04:00
Andrea Rendine 66f351faeb Merge pull request #13 from doublespeakgames/master
Update 2015-05-29
2015-05-28 23:16:55 +02:00
Blake Grotewold c611fcea8c Merge pull request #394 from youknowone/master
Update localization for ko
2015-05-27 14:35:39 -04:00
Andrea Rendine f219b3288f Single letter representations for enemies
R wild animals (beast, birds, lizards, rats)
T mutated creatures (includes giant lizards)
E human enemies (old men, scavengers, thugs and squatters)
D armed human enemies (includes vigilantes, soldiers, snipers, commandos, veterans and chiefs)
2015-05-27 14:28:12 -04:00
SVS 8d3b313e9c Change the enemy labels 2015-05-27 14:25:21 -04:00
Andrea Rendine 77bff9c289 Update IT Save translation 2015-05-27 13:06:48 -04:00
Jeong YunWon 4824b0a847 Update localization for ko 2015-05-23 00:52:57 +09:00
Andrea Rendine acca5806b5 Ship title
Browser "title" is not translated when Ship tab is active.
2015-05-18 23:15:18 +02:00
Andrea Rendine c158f35b82 Merge pull request #10 from doublespeakgames/master
Update 2015-05-18
2015-05-18 17:24:32 +02:00
Andrea Rendine de705e4a5e Load event before anything else
An event could produce different notifications or rewards according to different outcomes of the event itself (e.g. a negative event impacting on buildings and/or villagers, or a wanderer leaving items of some specific kind), but the notification is generated before the onLoad() call.
I'd say that this is the best action order:
1. event action
2. event notification
3. event reward (and possible additional notifications due to that)
2015-05-13 12:08:00 -04:00
Andrea Rendine ebf5e6934e Correct DOM positions for village, store, perks box
I noticed a minor glitch with the Village box position in the DOM. As it is appended to the Outside panel, it can end up after the Wood gather button or after the Traps check. It depends on whether the latter exists or not.
I changed it a little. Now it is "prepended" (thanks jQuery!), so it's always before any other content in the panel.
It would mind e.g. for CSS consistency, as you could decide to use a style for sibling buttons and it wouldn't work unless the box is placed before or after (not between) them.

For consistency with Outside box placement issue, stores are prepended to the Room panel, as first content in the DOM tree.

For consistency with Outside box placement issue, perks are prepended to the Path panel, as first content in the DOM tree.
2015-05-13 12:01:32 -04:00
Andrea Rendine 94936f118d Stores visibility outside room
A z-index CSS property on #stores now allows it to remain on top of the tabs layers, so that hovering always works.
2015-05-13 11:50:54 -04:00
Travis Weston 8c368d363a Add take all button 2015-05-13 11:35:25 -04:00
Andrea Rendine 8f8425deb5 Merge pull request #7 from doublespeakgames/master
Update 2015-05-11
2015-05-11 19:05:50 +02:00
Blake Grotewold 66054c2825 Merge pull request #373 from youknowone/l10n-ko
more localization + fix errors +  quality work for ko
2015-05-11 10:40:59 -04:00
Blake Grotewold 95a3b68e12 Add background color to language select menu
This helps readability when language box overflows stores box
2015-05-11 10:40:11 -04:00
Blake Grotewold 9f8fa6c121 Update RU string.js 2015-05-11 10:31:11 -04:00
Дмитрий Свечников 6a9647c364 Fix some RU tranlations 2015-05-11 10:21:19 -04:00
Andrea Rendine fb13f6e808 Notification before reward
Noticed when buying the compass.
I found it weird that *first* the compass points and *then* it appears in good condition.
Now event notification precedes event reward, and it should be corrected.
2015-05-11 10:16:43 -04:00
Andrea Rendine 288f738a71 Merge pull request #6 from doublespeakgames/master
Add missing Hyper Mode pieces
2015-05-11 15:12:38 +02:00
Blake Grotewold 7fd474d3c0 Add missing Hyper Mode pieces
Some code was missing from the Hyper Mode feature addition. This
completes the use of `Engine.setTimeout` and adds doubleTime check in
button cooldowns.

Closes #374
2015-05-10 18:14:13 -04:00
Jeong YunWon dd17e716a8 more localization + fix errors + quality work for ko 2015-05-09 18:01:22 +09:00
Andrea Rendine 7cda58f947 Merge pull request #5 from doublespeakgames/master
Update 2015-05-08
2015-05-08 18:50:10 +02:00
Blake Grotewold 9cb94cb9c0 Add new KO string.js 2015-05-08 08:28:23 -04:00
Blake Grotewold 65f3d449de Merge pull request #369 from youknowone/master
Fix a lot of errors in ko translation
2015-05-08 08:21:11 -04:00
Andrea Rendine aef4bfb4e4 Add hut fire title and update IT translations for fire title and leave
Added translation for Fire title to template
Added Italian translation for Fire title

Leave

Translation of "leave" sounded like the player were abandoning something on the ground, which is correct only sometimes.
Fixed
2015-05-08 08:15:12 -04:00
Jeong YunWon 23b26b8ca1 Fix a lot of errors in ko translation 2015-05-08 13:51:28 +09:00
Andrea Rendine aa2e24e559 Merge pull request #4 from doublespeakgames/master
Update 2015-05-07
2015-05-08 00:13:37 +02:00
Blake Grotewold 3f71fe1f8b Merge pull request #365 from wxfskylove/master
Updated Chinese translation
2015-05-07 08:26:45 -04:00
Skylove e315839d41 Updated translation
Add hut fire event translation.
2015-05-07 14:20:54 +08:00
Andrea Rendine ad8e32ee56 Shortening IT translations
Shortened translations for bolas and lodge, so the button has a single line.
2015-05-06 15:47:28 -04:00
Andrea Rendine 714dd65982 Merge pull request #3 from doublespeakgames/master
Update 2015-05-06
2015-05-06 20:45:56 +02:00
Blake Grotewold 3b261c5dbf Merge pull request #357 from apricote/master
Fix #335
2015-05-05 10:39:02 -04:00
Julian Tölle 5f58372579 Added whitespace for traps in german translation
Even though the .po file contains the correct whitespace in the german
translation for the messages ('the traps contain [...] ' and ' and '),
they were not present in the .js file.
2015-05-05 16:32:44 +02:00
Andrea Rendine d6b5ffc0ad Merge pull request #2 from doublespeakgames/master
Update 2015-05-04
2015-05-04 16:21:08 +02:00
Michael Townsend 33e1da6137 Merge pull request #343 from AndySky21/hut-fire
Hut fire Italian translation
2015-05-04 09:52:13 -04:00
Michael Townsend 4e5a5fd7d3 Merge pull request #350 from AndySky21/pot-doc
Commentary
2015-05-04 09:51:39 -04:00
Blake Grotewold fba2dfb680 Merge pull request #348 from AndySky21/Readme-lang-table
Languages table
2015-05-03 22:13:45 -04:00
nicholas_pellizer 8320156f42 Hyper mode and LightsOff is now stored in the State 2015-05-03 22:09:49 -04:00
Andrea Rendine 56aaf55b72 Merge pull request #1 from doublespeakgames/master
Update
2015-05-01 14:18:07 +02:00
Andrea Rendine 644b975a37 Bait fix
Bait doesn't need plural in english but in other languages the plural could be used (in mine, for example).
2015-05-01 00:24:19 +02:00
Andrea Rendine 97021aa62d Commentary
Added comments for:
 - troublesome context
 - verbs/nouns trouble (english is quite full of homographs, you know)
 - commands and buttons (they want imperative)
 - battle buttons (attack => weapon)
 - counters and strings with references
 - strings with relevant leading/trailing spaces
 - acronyms and short forms
 - troublesome genders (A Mysterious Wander issue)
2015-05-01 00:16:12 +02:00
Andrea Rendine d458b1cd2b Impersonal verbs, translation fix and bait
See po file
2015-04-30 22:44:29 +02:00
Andrea Rendine d3c51746c7 Bait fix
Plural like scales and teeth
2015-04-30 22:42:34 +02:00
Andrea Rendine 6a0c6f6763 Impersonal verbs
Now all notifications starting with "learned" or similar direct but impersonal forms have been fixed with impersonal Italian forms.
Even more translation corrections here and there.
Note 1: A Mysterious Wanderer has been translated with plural. It refers to both the male wanderer craving for wood, and the female wanderer looting your fur. In italian the gender must be specified, so the notification with either male or female form cannot be chosen. Plural avoids confusion, just suggesting that either event has happened.
Note 2: This translation contains the text related to hut fire event (still missing).
2015-04-30 22:16:01 +02:00
Michael Townsend f85b8fdf7e Merge pull request #349 from AndySky21/patch-1
Fixed variable name
2015-04-30 11:38:42 -04:00
Michael Townsend d2bd08dcb1 Merge pull request #345 from AndySky21/stores-az-sorting
Stores alphabetical sorting
2015-04-30 11:38:12 -04:00
Andrea Rendine f0e0548116 Var
Working ina hurry is bad.
2015-04-30 17:27:50 +02:00
Andrea Rendine 4efebe4f66 Var
Working in a hurry is bad.
2015-04-30 17:26:56 +02:00
Andrea Rendine 4efb22b890 Fixed variable name
Actually in this case "name" is used in a function and is not necessary for lookups, but I think that if future changes to both room.js and outside.js occur, authors will appreciate consistency in scripts (also fixes indentation in comments).
2015-04-30 17:11:24 +02:00
Andrea Rendine dca3faa2f9 Fixed variable name
"k" still refers to the English string, while "lk" carries the translated value.
2015-04-30 16:57:18 +02:00
Michael Townsend 5c37074c2d Merge pull request #346 from AndySky21/buildings-az-sorting
Buildings alphabetical sorting
2015-04-30 09:45:26 -04:00
Michael Townsend c725b58c1a Merge pull request #344 from AndySky21/hut-fire-pot
Added hut fire event original strings
2015-04-30 09:42:01 -04:00
Michael Townsend 42c81cd5db Merge pull request #342 from AndySky21/It-fix
Italian translation fix
2015-04-30 09:41:01 -04:00
Michael Townsend d30b4e2ff7 Merge pull request #347 from AndySky21/income-on-load
Correct jobs incomes on load
2015-04-30 09:39:22 -04:00
Andrea Rendine c2f8ac89fa Correct jobs incomes on load
Currently, when a game is loaded, job production/consumption rates in tooltips are shown based on the unit, rather than multiplied by the employed village number. Incomes are then corrected when the numbers change.
With the initial call of updateVillageIncome() function, the correct numbers are displayed when the game is opened and loaded.
2015-04-30 00:01:36 +02:00
Andrea Rendine 9c1ebecda7 Buildings alphabetical sorting
The bulk of this small change was to sort buildings by alphabetical order according to translated names, instead of english strings.
This meant removing the ID splitting as well as hyphen/space replacing, as the ID is not considered for the test.
Also changed:
1. line 366: as the original english string is no longer necessary in the iteration, "name" takes the value of translated string. "name" is then used for alphabetical comparison (as before) with the right value.
2. line 378: removed the test on curPrev variable. Items already listed have been placed in alphabetical order, so there is no need to check whether each item actually follows value of control variable.
2015-04-29 23:52:58 +02:00
Andrea Rendine 8042414be7 Stores alphabetical sorting
The bulk of this small change was to sort stores by alphabetical order according to translated names, instead of english strings.
This meant removing the ID splitting as well as hyphen/space replacing, as the ID is not considered for the test.
Also changed:
1. line 800: as the original english string is no longer necessary in the iteration, k takes the value of translated string. k is then used for alphabetical comparison (as before) with the right value.
2. line 816: removed the test on curPrev variable. Items already listed have been placed in alphabetical order, so there is no need to check whether each item actually follows value of control variable.
2015-04-29 23:43:43 +02:00
Andrea Rendine fc089c808c Added hut fire event original strings
Although there was a previous commit referring to it, in POT file the strings related to "hut fire event" were not present.
I added them at the end of the file, with reference to original positions in Outside.js.
2015-04-29 23:19:34 +02:00
Andrea Rendine e65a8e7c5a Hut fire event added for real
Hut fire event strings added for further development
2015-04-29 23:12:32 +02:00
Andrea Rendine 425ce30ceb Hut fire event added for real
A previous commit referred to "Hut fire event", but the strings were not available.
Now they have been inserted.
2015-04-29 23:06:34 +02:00
Andrea Rendine 4dd0af9f01 Typo fix 2015-04-29 23:03:16 +02:00
Andrea Rendine d4312385d4 Italian translation fix.
Original for documentation.
2015-04-29 23:01:39 +02:00
Andrea Rendine a1092170c7 Italian translation fix.
Sentences corrected for length and sense.
2015-04-29 22:59:12 +02:00
Andrea Rendine 31c4d3a816 Languages table
Changed table using markup in order to correct the divided heading cell.
2015-04-29 22:52:30 +02:00
Arnaud Panapadeatchy c3f7b620f5 Fix French translation 2015-04-25 12:01:23 -04:00
Arnaud Panapadeatchy 0c2dc6c905 Add more French translations 2015-04-24 09:40:35 -04:00
Michael Townsend 3cc2b708cb Merge pull request #328 from cjhooker/bigger-quantity-adjust-buttons
Make quantity-adjust buttons bigger
2015-04-18 19:40:26 -04:00
Chris Hooker 165f2d1dd0 Make quantity-adjust buttons bigger 2015-04-18 15:10:13 -04:00
Michael Townsend 909894cb50 Update engine.js 2015-04-16 10:17:59 -04:00
Michael Townsend 1abb3588e6 Update index.html 2015-04-16 10:17:20 -04:00
Michael Townsend 446811b638 Update README.md 2015-04-16 10:13:33 -04:00
Michael Townsend 16f2e1f118 Merge pull request #327 from codeskull/master
Typo (ru)
2015-03-23 10:03:35 -04:00
Cyril 614df477a0 Typo 2015-03-23 11:45:34 +03:00
Blake Grotewold dfe9f19565 Update so that linguist reads ADR as JS 2015-03-18 16:04:34 -04:00
Michael Townsend 9361913bea Merge pull request #241 from jwvg0425/patch-2
I have no way of verifying this text, so I'm just gonna trust you!
2015-03-10 10:48:30 -04:00
Nam Hyeon Uk ae0f146008 Fixing Text
Fixing some text
2015-03-10 14:02:33 +09:00
Michael Townsend c1182fdb47 Merge pull request #240 from jwvg0425/patch-1
mistranslation
2015-03-09 09:53:49 -04:00
Michael Townsend 0fa44cfc55 Merge pull request #239 from fabrice31/master
French: Fixing texts + Complete translations
2015-03-07 00:40:35 -05:00
Nam Hyeon Uk 7d8367d407 mistranslation
I think "{0} per {1}s" means "{0} per {1}seconds". maybe that's a mistranslation.
2015-03-07 13:25:30 +09:00
Fabrice Bournisien 67571851b1 French: Fixing texts + Complete translations 2015-03-04 22:37:33 +01:00
Blake Grotewold 0bd474d2fd Merge pull request #238 from hano/master
Typo
2015-03-02 13:46:54 -05:00
hano c9900d7b91 Typo 2015-03-02 14:10:53 +01:00
Sebastian Korotkiewicz 2e7ccccf40 new readme
Closes #167
2015-02-25 11:36:01 -05:00
Blake Grotewold f998c270da Merge anubisthejackle:issue115
Closes #115
Closes #224
2015-02-14 17:14:22 -05:00
Blake Grotewold 5fcd897b17 Merge pull request #230 from anubisthejackle/issue229
Fix negative gatherers
2015-02-12 12:52:09 -05:00
Travis Weston 7333d03dbb Use Outside.killVillagers to kill villagers 2015-02-12 12:45:27 -05:00
Travis Weston 6ee6470972 Merging updates 2015-02-11 18:55:27 -05:00
Travis Weston 340851a99d Updated against suggestions 2015-02-11 18:21:08 -05:00
Michael Townsend 7c978f4f15 Merge pull request #226 from Continuities/convensions
Add convention pieces. jshintrc and gitattributes
2015-02-10 10:59:53 -05:00
Blake Grotewold 06b281fd3c Remove explicit line endings 2015-02-10 10:57:10 -05:00
Blake Grotewold eee2bffaf0 Add convention pieces. jshintrc and gitattributes 2015-02-10 09:59:00 -05:00
Travis Weston f2b8ad6268 Merge remote-tracking branch 'upstream/master' into issue115
Conflicts:
	script/outside.js
	script/path.js
2015-02-10 07:11:10 -05:00
Blake Grotewold c87541b8b9 Merge pull request #222 from anubisthejackle/issue80 2015-02-09 19:37:10 -05:00
Travis Weston 6e044292ae Add in doubleTime capabilities
Add hyper / classic to menu
2015-02-09 19:31:24 -05:00
Blake Grotewold 5d921d9464 Merge pull request #204 from rgravina/188_fix_jshint_warnings 2015-02-09 19:25:08 -05:00
Robert Gravina 67b3c7fb7e Low-risk fixes suggested by JSHint. 2015-02-09 19:20:29 -05:00
Blake Grotewold afe1230691 Merge pull request #225 from anubisthejackle/master
Limit Fire event to only Outside module
2015-02-09 11:06:19 -05:00
Travis Weston 25b2fbfa5f Limit Fire event to only Outside module 2015-02-08 22:33:18 -05:00
Travis Weston 8010597e44 Add hut fire event.
Closes #35
2015-02-08 11:23:32 -05:00
Michael Townsend 0334219d9f Merge pull request #219 from voldedore/add_new_lang_vi
Translation: Vietnamese
2015-02-07 19:13:50 -05:00
Travis Weston 2d3daa572d Move movement functions to Engine. Create scrollable Path sidebar 2015-02-07 14:00:32 -05:00
vinh v 619ee8c2cb Vietnamese translation: css mod
larger button because of long text.

.button{width: 100px !important;}
-->
.button{width: 120px !important;}
2015-02-07 19:17:52 +01:00
Blake Grotewold fca371f8d8 Merge pull request #223 from yuanyelele/master
update adarkroom.pot and zh_cn translation
2015-02-07 13:12:29 -05:00
Travis Weston 3d00ed3c40 Add scrolling via keyboard 2015-02-07 11:19:37 -05:00
vinh v 9bc9f5d055 Vietnamese translation: Capitalization fixed 2015-02-07 17:05:24 +01:00
袁野 518b47b483 update zh_cn translation
Signed-off-by: 袁野 <yuanyelele@gmail.com>
2015-02-07 22:49:36 +08:00
袁野 ba1b914e1d update translation template adarkroom.pot
Signed-off-by: 袁野 <yuanyelele@gmail.com>
2015-02-07 20:24:56 +08:00
Travis Weston 29932a96f3 Merge pull request #1 from anubisthejackle/issue35
Remove ^M from file because to heck with them.
2015-02-06 16:04:51 -05:00
Travis Weston 5fcdf29601 Remove ^M from file because to heck with them. 2015-02-06 16:02:37 -05:00
vinh v e3da87ed56 Translation: Vietnamese (fix some words) 2015-02-06 00:21:17 +01:00
vinh v ed5a0ea080 Translation: Vietnamese 2015-02-05 23:47:03 +01:00
Blake Grotewold 7f59e166de change bokmål to just norsk, until we must specify 2015-02-03 14:30:54 -05:00
jangerhard 3b4383f9b3 Translation: Norsk 2015-02-03 14:30:07 -05:00
Michael Townsend a119d5e655 Merge pull request #216 from garykrige/master
Update scoring.js
2015-01-28 15:05:43 -05:00
Gary Krige 6f2a705479 Update scoring.js
Fix verbose code
2015-01-28 21:58:36 +02:00
Blake Grotewold 48b15c1c5d Merge pull request #212 from crafteverywhere/patch-1
Corrections to the previous Chinese translations.
2015-01-18 20:36:28 -05:00
crafteverywhere 2e6cc87357 Update strings.js 2015-01-18 17:18:38 +08:00
crafteverywhere 4adce0f2d9 Corrections to the previous Chinese translations. 2015-01-18 16:10:58 +08:00
Blake Grotewold fd2181a104 Merge pull request #203 from MtCedarNet/Japanese-translation
Japanese translation
2015-01-06 23:37:52 -05:00
Alex Liebscher 5d12670979 Prevent negative HP
Closes #201
2015-01-05 01:38:35 -05:00
Blake Grotewold 516afb6037 Merge branch 'pr/205' 2015-01-05 01:02:33 -05:00
mac craig 6e43c06ff2 Add English as an "Available Language"
Added English in the available languages chart, since technically English is a playable language.
2015-01-05 00:58:30 -05:00
MtCedarNet 6774cdbac4 Improved Japanese translations. 2015-01-04 23:48:04 +09:00
MtCedarNet 464cfab7ac Change language name 'Japan' to 'Japanese'. 2015-01-04 23:46:40 +09:00
Blake Grotewold 94fdcc7463 Add buy medicine button to plague event.
Because there is a serious need for medicine, the price
is raised with this button. I felt like it should be even
higher but this will do for now.

Closes #199
2015-01-03 09:40:16 -05:00
Blake Grotewold dbd2adf9f8 add Github to menu bar
People should know that this great game is something
they can contribute to.

Closes #198
2015-01-03 09:26:48 -05:00
Blake Grotewold 1b04fa2086 Remove big TODO in engine
This was actually completed in #50 and was never removed.

Closes #45
2015-01-03 09:12:56 -05:00
Blake Grotewold 2efa9f1667 Merge pull request #196 from rgravina/162_save_path_outfit
Include state of Path outfit in save game
2014-12-24 10:27:40 -06:00
Robert Gravina 72a83d48dd Save the state of the path outfit in the State object.
Load the state when initialising the path screen. When embarking, make sure to clear the state. On arrival, update the saved state.

This enables save/load of the path state in the save game if it occurs before leaving.
2014-12-25 00:06:37 +09:00
Blake Grotewold 4201652e8f transfer Japanese strings.js 2014-12-08 15:39:30 -05:00
Blake Grotewold 073ef28a08 Correct Portuguese ISO 629-1 code. 2014-12-08 15:35:04 -05:00
Blake Grotewold 4a2c2934b2 Correct Japanese ISO 639-1 code 2014-12-08 15:33:21 -05:00
Michael Townsend a65210a169 Merge branch 'erica-scott-James_BRANCH' 2014-12-07 17:14:10 -05:00
Michael Townsend d93d2fdff9 fixing merge conflicts 2014-12-07 17:12:46 -05:00
jat023 efe8120ed3 Update language menu system 2014-11-28 10:39:40 -08:00
jat023 ad79b3ad43 New Menu style (Table format) 2014-11-28 10:37:45 -08:00
jat023 9b40c995c2 Merge branch 'EricaBranch' into James_BRANCH
Conflicts:
	README.md
2014-11-28 10:36:11 -08:00
erica-scott 327a9a1a37 Actual Finished Language display 2014-11-28 10:35:35 -08:00
erica-scott d1d81b8dd0 Finished New Language Display Idea 2014-11-28 10:33:26 -08:00
erica-scott 3b66bb69f5 Testing Language Display2 2014-11-28 10:31:58 -08:00
erica-scott 9b88143608 Testing Language Display 2014-11-28 10:26:54 -08:00
erica-scott 0030b1360f More Edits 2014-11-28 10:22:22 -08:00
erica-scott fc545204e3 Edit Language Display 2014-11-28 10:19:57 -08:00
erica-scott 170719f5b3 Trying new way to display languages 2014-11-28 10:16:51 -08:00
jat023 fb61ba1586 Updated lang.js
Added italian and japanese to javascript pop up menu in game
2014-11-28 10:14:29 -08:00
jat023 506ff9dc98 finished japanese translation 2014-11-28 09:45:49 -08:00
jat023 be3b8bbb47 Re 2014-11-28 09:40:11 -08:00
jat023 3e174a6140 renamed pg.js to strings.js 2014-11-28 09:31:55 -08:00
jat023 4e6faa8923 quotations fix in lang.jk 2014-11-28 09:29:54 -08:00
jat023 25e00f8607 Deleted unneeded files
removed cs_simplified files
updated README.md and langs.js to include pg files
2014-11-28 09:21:28 -08:00
jat023 9b500b3c5b Conversion and Translation.txt updates
Converted portugese strings.po into .js file
2014-11-26 13:39:44 -08:00
Blake Grotewold 76098f2b59 Merge branch 'pr/193' 2014-11-22 23:45:44 -07:00
Fengyang Gao 6603199060 fix minor bugs in SM 2014-11-23 10:48:26 +08:00
erica-scott 67bbe15771 Portuguese Translation Complete 2014-11-21 14:28:23 -08:00
erica-scott 7961ad6ea3 Starting Portuguese Translation 2014-11-21 09:44:09 -08:00
Blake Grotewold e7bd841d39 Add underscore to language query string regex. 2014-11-21 12:04:01 -05:00
Blake Grotewold 1dafbae5eb Correct Korean ISO 639-1 code. 2014-11-21 12:01:25 -05:00
Blake Grotewold 66c7b3e76d Update Chinese (Simplified) ISO 639-1 code 2014-11-21 11:57:00 -05:00
erica-scott d678b1933c Translation Complete 2014-11-20 13:41:06 -08:00
Blake Grotewold 94d1388b1d Prestige shouldn't contain decimals
Corrects issue of Prestige containing decimals and Infinity

Closes #69
2014-11-19 23:28:13 -06:00
erica-scott c9d7b0c007 50% Done Translation 2014-11-19 13:53:11 -08:00
erica-scott 3ca45188e5 1/3 Translation Done 2014-11-18 17:12:32 -08:00
jat023 21852088ec Started translation for Simplified Chinese
The translation is pretty basic; you just need to get Poedit and open
up the film that I have already started. After that you just translate
the lines.
I may look into reviewing some of the documentation later.
2014-11-18 12:15:41 -08:00
Michael Townsend 8284026853 Merge pull request #189 from gaofy/master
show selection color when export/import
2014-11-16 21:41:49 -05:00
Fengyang Gao ba285032f5 show selection color in textarea
Currently, you have no idea whether the text in "Export / Import" is
selected since the background is transparent.
2014-11-16 15:16:07 +08:00
Andrea Rendine 68da61e8cf Improve Italian translations
Fixed some terms for better meaning and fitting in blocks
Added note about Run as Administrator for po2js
2014-11-13 12:37:43 -05:00
Blake Grotewold 33d3dbc6a3 Merge pull request #186 from anubisthejackle/git-ignore
Add .swp to gitignore
2014-11-13 10:12:44 -05:00
Travis Weston 8a036ca1e7 Add .swp to gitignore 2014-11-12 11:54:52 -05:00
Blake Grotewold 93ffadb189 flake8 and pep257 po2js.py 2014-11-11 08:52:09 -05:00
Blake Grotewold 01f15f41f1 Correct Italian capitalization errors.
ADR doesn’t use capitalization for its storytelling.
2014-11-11 08:46:05 -05:00
AndySky21 d1f18a399c Update strings.js
debug typo fix: space after _("the traps contain")
2014-11-11 08:27:23 -05:00
AndySky21 e33da9d9e6 Italiano: Add Translations
Closes #180
Closes #153
2014-11-10 18:46:15 -05:00
Michael Townsend 940a19c68b Merge pull request #179 from AndySky21/patch-3
Update README.md
2014-11-10 16:53:27 -05:00
AndySky21 295cad1a91 Update README.md
Added Italian
2014-11-10 22:52:26 +01:00
Michael Townsend fd89dbc200 Merge pull request #178 from AndySky21/patch-2
Update translation.txt
2014-11-10 16:51:16 -05:00
AndySky21 1749b08c15 Update translation.txt
integration to Windows howto + typo fix
2014-11-10 22:50:19 +01:00
Michael Townsend 64e193666d Merge pull request #177 from ThiloVoigt555/german_translation_update
German translation update
2014-11-10 13:28:49 -05:00
ThiloVoigt555 6c97b90d85 Updated German translation 2014-11-10 19:22:03 +01:00
strollhy ea2415650b Update language for Chinese
Fix/Correct Chinese translations for the game. Making them more
accurate.

Closes #173
2014-11-09 17:52:33 -05:00
Blake Grotewold 6b3c651036 Merge pull request #175 from AndySky21/patch-1
Update translation documentation
2014-11-09 08:44:53 -05:00
AndySky21 d15536614d Update translation.txt
correction: the folders' name are lang/{language_code}
2014-11-09 14:36:17 +01:00
ThiloVoigt555 ba5bb193aa Added some new translator comments about whitespaces 2014-11-06 16:07:59 +01:00
Michael Townsend 97b4024382 Merge pull request #172 from Continuities/language-select-fix
Fix cross-browser support for language select
2014-10-28 16:38:17 -04:00
Blake Grotewold dc7afcbd75 Fix cross-browser support for language select
This fixes cross-browser support for the language select box by
replacing it with a custom menu box.
2014-10-28 16:30:57 -04:00
ThiloVoigt555 b512153d73 Add TRANSLATORS comments
This will better help the translators as they complete the difficult task
of taking one language and finding commonality in another.

Closes #165
Closes #161
2014-10-28 10:15:09 -04:00
Olexandr Nesterenko b3e094694b Add 'not enough sulfer' and 'bayonet' to localization 2014-10-28 09:58:14 -04:00
Blake Grotewold 6de6b3f746 Merge pull request #169 from sungwoncho/master
Korean: Add translation
2014-10-27 14:34:05 -04:00
Sung Won Cho 08c07e1e3c Add Korean translation 2014-10-25 19:33:50 +11:00
Michael Townsend 7711b2a1cc Merge pull request #166 from honzi/master
Alphabetize language links
2014-10-17 21:10:12 -04:00
Jan Hořava 93962c71e4 Alphabetize language links 2014-10-17 17:17:51 -07:00
Blake Grotewold 94c91b564b Merge pull request #163 from ThiloVoigt555/code-cleanup-translation
Add strings.js file for german.
2014-10-09 08:25:15 -04:00
ThiloVoigt555 40b3ef3a8b Added the missing strings.js file for german. 2014-10-09 12:37:27 +02:00
ThiloVoigt55 fbf8707f81 German: Add Translation 2014-10-08 19:39:08 -04:00
Blake Grotewold b249db27fd Merge pull request #157 from Continuities/language-init-bug
Change temp and fire to take from value not text for i18n
2014-10-06 09:40:36 -04:00
Blake Grotewold 7e1ac332ac Change temp and fire to take from value not text for i18n
This change fixes the issue of the game using the text from the saved
fire and temperature states. Clean up of the game store should be done
before next release to just save fire and temperature values only in
`game.fire` and `game.temperature` respectively.
2014-10-03 09:57:17 -04:00
Blake Grotewold 3203f490fc Add Turkish to README
This adds a link to Turkish translation on README and fixes an issue
with lang.js where a merge conflict was squashed into a rebase.
2014-10-03 09:38:20 -04:00
Volkan Ongun 23a6376b9b Turkish: Add Translation
This adds the Turkish translations to the game.

Closes #145
2014-10-02 09:19:18 -04:00
Björn Bohman 89c2270cc8 Swedish: Add translation
This adds the Swedish translation to the game.

Closes #152
2014-10-02 09:06:59 -04:00
Björn Bohman 9070ae049b Translation Template: Add .pot file for better translation workflow
This completes the workflow for creating and editing translations.

Closes #154
2014-10-02 08:58:01 -04:00
Blake Grotewold bef697a6fd Merge pull request #151 from honzi/css-formatting
Improve CSS formatting consistency
2014-09-25 11:17:57 -04:00
Honza Horava bf7563755d Improve CSS formatting consistency 2014-09-24 12:09:58 -07:00
Blake Grotewold 6266f87c1d Merge pull request #150 from burunduk/master
Add -moz-selection for firefox
2014-09-24 10:30:37 -04:00
Olexandr Nesterenko 0126032a2c Add -moz-selection for firefox 2014-09-24 10:32:29 +03:00
Michael Townsend b6c8eb5e57 Merge pull request #148 from ferrybig/fixincorrectindention
Changed lines with 4 spaces to tab since not everyone uses a tab size of...
2014-09-22 14:59:21 -04:00
ferrybig f16e303bc4 Changed lines with 4 spaces to tab since not everyone uses a tab size of 4. 2014-09-22 20:51:09 +02:00
Blake Grotewold e4eb334e8a Merge pull request #147 from S-anasol/patch-1
Add missing curly to ship.js
2014-09-20 08:57:04 -05:00
Alex 442d6254dc missing curly 2014-09-20 16:32:40 +04:00
Michael Townsend 22c91819ab Merge pull request #146 from modInfo/translation
Polish translation
2014-09-10 10:10:52 -04:00
Sebastian Korotkiewicz bdfc2cb09c Polish translation 2014-09-06 13:48:15 +02:00
Michael Townsend 84bf0e285d Merge pull request #144 from burunduk/master
Fix translation
2014-09-02 09:34:53 -04:00
Olexandr Nesterenko 45a6a871df Add new strings 2014-09-02 09:11:52 +03:00
Olexandr Nesterenko 50ba59a5c6 Add «not enough meat» and fix my «compass» commit. 2014-09-02 09:01:00 +03:00
Olexandr Nesterenko 8fddd1717c Remove unused localization string 2014-09-01 17:57:02 +03:00
Olexandr Nesterenko e58089b95c Add some strings 2014-09-01 07:35:18 +03:00
Blake Grotewold 98ae663e9b Add Russian and Ukrainian to readme
This adds links to the translations and cleans up the readme some more.
2014-08-30 21:39:16 -04:00
Michael Townsend 70515d9975 Merge pull request #141 from burunduk/master
Add Ukrainian translation.
2014-08-30 17:35:58 -04:00
Michael Townsend 151ccca8e2 Merge pull request #142 from burunduk/new-string
Add new strings to localization
2014-08-30 17:35:23 -04:00
Michael Townsend 01b5661b0a Merge pull request #143 from socram8888/master
Fix some strings in the Spanish localization
2014-08-30 17:23:04 -04:00
Marcos Vives Del Sol 54d835b788 Fix typo in ES 2014-08-30 23:16:47 +02:00
Marcos Vives Del Sol d7a92707c7 Replace "constructora" with "manitas" in ES localization 2014-08-30 16:26:23 +02:00
Marcos Vives Del Sol ff7d59c88c Replace "trampa" with "trampero" for "trapper" in the Spanish localization 2014-08-30 16:14:51 +02:00
Marcos Vives Del Sol 236f74707f Replace "sulfuro" with the more common word "azufre" in the Spanish localization 2014-08-30 16:13:19 +02:00
Marcos Vives Del Sol c3c095717f Replace "compás" with "brújula" in the Spanish localization 2014-08-30 16:12:08 +02:00
Olexandr Nesterenko 2f66d79856 Fix «the compass points ...» localization 2014-08-29 09:24:19 +03:00
Olexandr Nesterenko 9d25f0f736 Fix 'energy cell'. 2014-08-28 18:18:52 +03:00
Olexandr Nesterenko 0928274a77 Fix some strings. 2014-08-28 17:59:00 +03:00
Olexandr Nesterenko 2db4e209d5 Add 'sulphur' to localization.js 2014-08-28 17:42:21 +03:00
Olexandr Nesterenko 39e00a804f Fix some strings 2014-08-26 17:06:08 +03:00
Olexandr Nesterenko 465c636b5d Add new strings to localization 2014-08-26 16:57:25 +03:00
Olexandr Nesterenko 2b558a5c5e Add some strings. 2014-08-26 13:40:05 +03:00
Olexandr Nesterenko d059dc5a36 Update string.po 2014-08-25 22:30:54 +03:00
Olexandr Nesterenko 06e696fe59 Add some strings 2014-08-25 18:03:26 +03:00
Olexandr Nesterenko c78a4d9915 Remove and exclude *.mo files. 2014-08-25 11:26:27 +03:00
Olexandr Nesterenko d485ef84f8 Init ukrainian translation 2014-08-25 11:21:42 +03:00
Michael Townsend a2753511d4 Merge pull request #138 from calebjessie/master
Lighten up disabled button color to be more obvious.
2014-08-21 16:20:36 -04:00
Caleb Jessie fe60eb3d05 Lighten up disabled button color to be more obvious. 2014-08-21 16:12:56 -04:00
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
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
lilj 17ae094fef Update README.md 2014-05-29 21:26:48 +08:00
lilj 3a0176217f Update engine.js
auto load langs from lang config file.
2014-05-29 18:03:13 +08:00
lilj 962ca4ccd6 Update engine.js
Auto load lang menu from config file
2014-05-29 17:53:48 +08:00
lilj 99d949906a Update index.html
Load langs config.
2014-05-29 17:43:14 +08:00
lilj 88fe373ea6 Create langs.js
Langs config
2014-05-29 17:41:18 +08:00
lilj 1a033dac57 Update localization.js
Add some missing localization items.
2014-05-29 17:36:33 +08:00
Michael ec9d83f6bc Removed a capital letter in the FR translation 2014-05-19 13:42:30 -04:00
Michael b7d539abbb Slight styling issues on language menu option 2014-05-19 13:27:21 -04:00
Michael 81d8129f0f Styling on the language dropdown 2014-05-19 13:15:46 -04:00
Michael c6ccad177a Fixed localized CSS. 2014-05-19 12:48:37 -04:00
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. 2013-10-29 18:39:00 -04:00
Michael 5d07c76577 Incremented version 2013-10-29 18:07:17 -04:00
Michael b230d0586a Disallow medicine events before medicine has been discovered. 2013-10-29 18:06:40 -04:00
Michael Townsend a96e9c55c2 Update world.js 2013-10-29 15:54:25 -04:00
Vermilingua 55c93772db should fix the issue, maybe 2013-10-29 18:33:07 +11:00
Michael 363119717e Added cancel button to the save dialog. 2013-10-17 17:48:48 -04:00
Michael Townsend 701baf86d7 Merge pull request #58 from Vermilingua/importexport
Routine to migrate/backup saves
2013-10-17 06:08:36 -07:00
Vermilingua dc706c21fe added importing and exporting saves with base64 2013-10-17 22:46:33 +11:00
Michael 1ffe8f8aeb A bit of cleanup. 2013-10-16 17:45:41 -04:00
Michael Townsend a895a35939 Merge pull request #57 from Vermilingua/prestige
Prestige System
2013-10-16 14:31:33 -07:00
Vermilingua 83bf266a29 prestige system now absolutely complete 2013-10-16 21:43:40 +11:00
Vermilingua f952b4def1 completed save/load 2013-10-16 21:43:14 +11:00
Vermilingua 1be4d5edc5 started backup/loading mechanic 2013-10-16 21:43:12 +11:00
Vermilingua acc04d0780 set down framework, storage/map gen/etc. 2013-10-16 21:41:47 +11:00
Michael Townsend 63a6d98ffe Merge pull request #55 from Vermilingua/forest
Forest now fits the scene
2013-10-15 07:40:32 -07:00
Vermilingua 36b9cf2142 made the forest suit more 2013-10-15 20:09:28 +11:00
Michael 95faa0ba75 Merge branch 'master' of https://github.com/Continuities/adarkroom.git 2013-10-13 18:53:19 -04:00
Michael 22e480a80b Ignore Eclipse settings. 2013-10-13 18:52:43 -04:00
Michael Townsend 25cae71067 Merge pull request #54 from Vermilingua/warnings
Made the warnings look nicer, and added the as-of-yet mostly unused logo
2013-10-12 10:20:58 -07:00
Vermilingua f6e95850da added safari/opera and got better logos 2013-10-12 13:40:47 +11:00
Vermilingua a89bf8ee8b nicened the warnings 2013-10-12 13:30:30 +11:00
Michael 5ebbefac91 Modified comment text 2013-10-11 17:24:41 -04:00
Michael 084bf15811 Little bug in keynav code. 2013-10-11 16:24:37 -04:00
Michael dde477aade Some general code cleanup. 2013-10-10 20:53:53 -04:00
Michael Townsend fbdc84dcf1 Merge pull request #52 from Bleyddyn/master
Arrow Keys and stores update fix
2013-10-10 17:12:30 -07:00
Andrew Salamon 5f5ff3701e Fixed a problem where the stores view wasn't updating. 2013-10-09 15:32:05 -07:00
Andrew Salamon 5d482f856e Added support for switching from room to outside to path using the arrow keys. 2013-10-09 15:31:43 -07:00
Michael Townsend 30e7a06a44 Merge pull request #50 from LucidCrux/state_manager_2
State manager 2
2013-08-18 19:08:53 -07:00
LucidCrux bb84eafca6 re-enable jQuery from google 2013-07-27 18:12:00 -06:00
LucidCrux f704a2137f turned off debug 2013-07-27 17:22:25 -06:00
LucidCrux 6561e88f9f lots of bugfixes
- bugfix Engine.startThieves call changed to $SM call
- bugfix $SM.remove not deleting state
- bugfix workaround for empty string when creating states
     For some reason splitting "state.sub.sub2["sub3"]" will result in
     empty strings whereas "state.sub.sub2[\'sub3\']" didn't. Maybe a
     javascript regex quirk?

     Had to add a loop to remove '' from the split string array.
- modified collectIncome so that only one update event fires for the 
  whole function, no event if no income was added.
- modified updateBuildButtons so that buttons would show up if the
  building had already been built.
     changed check to be wood != undefined

     Also changed room to display store values of 0 instead of removing 
     the row. It was distracting to have the values shift up and down 
     when tightly managing a resource. If you haven't seen a resource 
     yet, it still doesn't show up.
2013-07-27 17:21:30 -06:00
LucidCrux 36011b5b15 set version to 1.3, add code to update State from 1.2 to 1.3 2013-07-27 12:49:03 -06:00
LucidCrux a8c6790d84 bugfix set ship,world location to true on init 2013-07-27 12:25:15 -06:00
LucidCrux 99800f1abd refactor Outside to use $SM + Room bugfix, \' to "
Refactoring of Outside.js to take better advantage of $SM and simplify
the code.

Includes a small bug fix to Room update handler

Also changed instances of escaped single quote (\') to double (") for
readability and simplicity.

====state changes====
//these were changed for the opposite reason the Room states were. These
seem like states that other locations and events may very well want to
interact with and possibly alter themselves
game.outside.buildings >> game.buildings 
game.outside.population >> game.population
game.outside.workders >> game.workers


====functions removed====
Outside.numBuilding // just a $SM.get, no shortcut really needed since
Outside.numBuilding is a pretty long name
Outside.getPopulation // same here
Outside.addBuilding // just an add
Outside.addBuildings // just addM, but wasn't even actually used


====functions refactored====
Outside.killVillagers //moved updates to handler
Outside.updateWorkersView //added local to reduce gets
Outside.increasePopulation //updates moved to handler
Outside.increaseWorker // updates moved to handler
Outside.decreaseWorkder // updates moved to handler
2013-07-26 19:21:12 -06:00
LucidCrux f4d2e8deae change to property Room.fire, Room.temperature, Room.buttons
Changed these States into properties of room. They are only ever
accessed by Room and there is no real reason to save them. By not
saving the state each time, it also makes the the player start out in
'a dark room' on every load. Rather fitting I think, and gives the fire
a little bit more purpose if you have to rewarm the builder.
2013-07-25 21:05:43 -06:00
LucidCrux 99d57efdc1 bug fix Outside.init > set features.location.outside to true 2013-07-25 20:33:04 -06:00
LucidCrux 2e3f8abd3f add $SM.setget, refactor Room to better use $SM
game.room.builder >> game.builder.level

setget is mainly for use in local copies of states, useful for keeping
code cleaner and less redundant while maintaining set/get of states by
the $SM

====functions refactored====
Room.unlockForext //remove update calls
Room.buy //remove update calls
Room.build //remove update calls
Room.cooFire //added locals to reduce gets
Room.adjustTemp //added locals to reduce gets
Room.updateBuilderState //added local to reduce gets
Room.craftUnlocked //Room unlock is always going to be true, don't need
to check parents to avoid errors anymore
Room.buyUnlocked //Room unlock is always going to be true, don't need to
check parents to avoid errors anymore
2013-07-25 20:31:30 -06:00
LucidCrux f4520bce91 speed up and bug fix 2013-07-25 02:00:41 -06:00
LucidCrux 766d3879c7 Merge remote-tracking branch 'origin/master' into state_manager_2
Conflicts:
	script/events.js
2013-07-24 21:01:59 -06:00
LucidCrux 2018ca3ae8 create and configure callback handlers for state updates
add $.Dispatch to handle object events
add subscribe calls to files
update SM fireUpdate to use new Dispatch

There are some NaN issues right now, no time to bug hunt right now, it
does kind of function though
2013-07-24 18:33:06 -06:00
LucidCrux dee7cbb9b3 refactor Engine.js for use with $SM
====functions removed====
//I just removed these because most were simpler or at least equal as
	direct $SM get/set/add calls, I realize the store ones are kind of
	subjective since calls were about equal, but oh well. If someone
	really 	feels we need the shortcut/named functions for manipulating
	stores specifically, it shouldn't be crazy to reimplement in $SM 
Engine.setStore >> $SM.set
Engine.setStores >> $SM.setM
Engine.addStore >> $SM.add
Engine.addStores >> $SM.addM
Engine.getStore >> $SM.get(requestZero = true)
Engine.storeAvailable >> $SM.get;
Engine.removeIncome >> $SM.remove //updates moved to handler


====functions moved====
//Any moved function I felt was more directly related to States or
	didn't belong where it was
Engine.addPerk > $SM.addPerk //kept function for now because of notify
	call inside, 'deep' state
Engine.hasPerk > $SM.hasPerk //kept function because of 'deep' state
	name
Engine.setIncome > $SM.setIncome //kept because it has internal logic
**Engine.getIncome > $SM.getIncome //**easily removable with
	Outside.updateVillageIncome refactor
Engine.openPath > Path.openPath //Since I'm refactoring anyways
Engine.addStolen > $SM.addStolen //internal logic
Engine.startThieves > $SM.startThieves //not sure $SM is a better place,
	but Engine should be nice and clean by the end of this, handling
	only engine mechanics
Engine.num > $SM.num //after Outside refacter, this is basically just a
	fancy $SM.get
Engine.upgradeState > $SM.updateOldState


====functions refactored====
$SM.addPerk; //updates moved to event handler, no check/create new perk
$SM.hasPerk; //don't need to check exist and ==true
$SM.collectIncome //removed changed check, update calls now handled by
	'stateUpdate' event listening
$SM.addStolen //fix to set stolen items in case a partial steal happens
$SM.startThieves //updates in handler
$SM.updateOldState //use $SM calls, add placeholder for updating to post
$SM state when more finalized 


====functions affected (by removed)====
Engine.init (Engine.getStore, Engine.storeAvailable)
Engine.collectIncome (Engine.addStores)
Engine.num (Engine.getStore)
Engine.travelTo (Engine.storeAvailable)

Room.init (Engine.getStore)
Room.unlockForest (Engine.setStore)
Room.lightFire (Engine.setStore, Engine.getStore, Engine.storeAvailable)
Room.stokeFire (Engine.setStore, Engine.getStore, Engine.storeAvailable)
Room.coolFire (Engine.setStore)
Room.buy (Engine.setStores, Engine.addStore, Engine.getStore)
Room.build (Engine.setStores, Engine.getStore)
Room.craftUnlocked (Engine.getStore, Engine.storeAvailable)
Room.buyUnlocked (Engine.storeAvailable)
Room.updateButton (Engine.storeAvailable)

Outside.gatherWood (Engine.addStores)
Outside.checkTraps (Engine.addStores, Engine.getStore)
Outside.updateVillage (Engine.getStore)

Path.embark (Engine.addStore)
Path.getCapacity (Engine.getStore)
Path.updateOutfitting (Engine.getStore)
Path.createOutfittingRow (Engine.getStore)
Path.increaseSupply (Engine.getStore)

World.goHome (Engine.addStore)
World.updateSupplies (Engine.getStore)
World.checkDanger (Engine.getStore)
World.getMaxHealth (Engine.getStore)
World.getMaxWater (Engine.getStore)

Ship.reinforceHull (Engine.addStore, Engine.getStore)
Ship.upgradeEngine (Engine.addStore, Engine.getStore)

Events.loadScene (Engine.addStores)
Events.updateButtons (Engine.getStore)
Events.buttonClick (Engine.getStore)

Events.Global (Engine.addStores, Engine.removeIncome)
Events.Room (Engine.addStore, Engine.addStores, Engine.getStore,
Engine.storeAvailable)
2013-07-24 17:41:36 -06:00
Michael Townsend 03867cae60 Merge pull request #47 from Yeow-Meng/master
IE<8 Fixes:
2013-07-23 21:09:24 -07:00
Steve Hayes 253f946dbd IE<8 Fixes: Removed trailing commas in string literals and renamed variable char to chara 2013-07-23 23:54:06 -04:00
LucidCrux db4a346d21 create StateManager, change all State calls to managed calls
Introduced state_manager.js almost all State gets/sets are now run
through the manager (alias $SM). For now it was a simple, mostly
straightforward replacement of calls. This means that there are
redundancies and a lot of now unneeded code for things the SM will
handle. However, since I had trouble with making those changes as well
as introducing the manager all at once my first attempt, I am taking the
wiser approach and making "one change" at a time like I should have
instead of being too sure of myself.

At this point, it seems to work, but there may be bugs I didn't catch.
There was also no attempt made to update old saves to work with this. In
theory, it shouldn't be too hard. (included is a list of all state
changes)

TODO:
Save Update.
Refactor: a lot, many many redundancies now.
Refactor: "location centric" to "global centric".
Relocate all calls to different update functions to event listeners
where possible.

======================================================

The changes to State are as follows:

.room (exists) > features.location.room
.room > game.room
.room.builder > game.room.builder
.room.temperature > game.room.temperature
.room.fire > game.room.fire
.room.buttons > game.room.buttons

.outside (exists) > features.location.outside
.outside > game.outside
.outside.population > game.outside.population
.outside.buildings > game.outside.buildings
.outside.workers > game.outside.workers
.outside.seenForest > game.outside.seenForest

.world (exists) > features.location.world
.world > game.world
.world.map > game.world.map
.world.mask > game.world.mask
.starved > character.starved
.dehydrated > character.dehydrated

.ship (exists) > featuers.location.spaceShip
.ship > game.spaceShip
.ship.hull > game.spaceShip.hull
.ship.thrusters > game.spaceShip.thrusters
.ship.seenWarning > game.spaceShip.seenWarning
.ship.seenShip > game.spaceShip.seenShip

.punches > character.punches
.perks > character.perks

.thieves > game.thieves
.stolen > game.stolen
.cityCleared > game.cityCleared

.stores > stores
.income > income
2013-07-23 01:24:47 -06:00
Michael Townsend 1b1088db4f Merge pull request #44 from Zarkonnen/medicine
Fixed issue #42 by fixing wrong city exploration setpiece data.
2013-07-17 06:23:09 -07:00
Zarkonnen 7bf744e386 Fixed issue #42 by fixing wrong city exploration setpiece data. 2013-07-17 09:56:31 +02:00
Michael Townsend 252b731666 Merge pull request #39 from toofarapart/improved_item_dropping
events.js: Item dropping improvements
2013-07-15 08:43:47 -07:00
Michael Townsend d296ea4db9 Merge pull request #38 from Zarkonnen/laser_rifle_fix
Laser rifles are now listed as weapons, fixing issue #37.
2013-07-15 08:40:29 -07:00
Matt Rasmus e80fc4d286 events.js: Item dropping improvements
Item drop menu no longer disappears after clicking to drop something.
2013-07-13 17:00:57 -07:00
Zarkonnen 25f1fff6a1 Laser rifles are now listed as weapons, fixing issue #37. 2013-07-13 21:42:15 +02:00
Michael Townsend 77cac86076 Merge pull request #32 from toofarapart/all_villagers_killed_bug
All villagers killed bug
2013-07-10 19:51:36 -07:00
Matt Rasmus 22b850f1c0 outside.js: Fix incorrect display of workers.
Fixed an issue where the workers view would break temporarily if all the villagers were killed.
2013-07-10 17:56:15 -07:00
Michael Townsend 93f8e52e1f Merge pull request #30 from Zarkonnen/medicine
Medicine
2013-07-10 12:07:05 -07:00
Zarkonnen 3515cbf75f Removed mentions of "you". 2013-07-10 20:50:42 +02:00
Michael Townsend 8cb64ad3d8 Merge pull request #29 from Cogito/roadDrawing
Road drawing improvements
2013-07-10 10:57:13 -07:00
Zarkonnen d4034fe244 Fixed hospital never occurring in city. 2013-07-10 15:10:43 +02:00
Zarkonnen bb953de92b Finished first version of medicine feature. 2013-07-10 12:53:28 +02:00
Andrew Ardill 255bdd68fc world.js: Improve road drawing algorithm
Instead of drawing an 'L' shape road to the village, find the closest road,
outpost or village and draw the road to it. Care is taken to ensure that a
road is drawn if you are standing on top of an outpost, as the outpost may be
created before the tile it stands on is connected to the road network.
2013-07-10 20:52:18 +10:00
Andrew Ardill 26b955fee8 world.js: Increase functionality of getDistance
Allow passing 'from' and 'to' positions to getDistance to find the distance
between them.
2013-07-10 20:52:18 +10:00
Andrew Ardill c4afe143a9 world.js: Introduce World.VILLAGE_POS
This constant gets reused in a few places, so extract it out. Work will be
required to migrate existing code away from hard coding World.RADIUS in places
where we are talking about the village location.
2013-07-10 20:52:18 +10:00
Andrew Ardill b97f5d9914 world.js: Introduce function to copy positions 2013-07-10 20:52:17 +10:00
Michael Townsend 05fef5664d Merge pull request #27 from toofarapart/fade_to_black
(SPOILERS) A nice fade to black...
2013-07-09 19:47:45 -07:00
Michael Townsend f56697d9d0 Merge pull request #25 from toofarapart/persistent_stores_view
Stores panel now persists on all non-world/non-space views.
2013-07-08 14:25:20 -07:00
Matt Rasmus eaf2fcdfbb Keep showing the weapons panel while in the Path screen. 2013-07-08 13:58:16 -07:00
Matt Rasmus de2ad91053 Weapons panel hides when not in Room. 2013-07-08 13:10:49 -07:00
Michael Townsend b8dd1125d4 Merge pull request #21 from Zarkonnen/master
Converted zero/max buttons to +-10 buttons
2013-07-08 12:45:01 -07:00
Zarkonnen 4334f36e57 Bugfixes. 2013-07-08 21:39:28 +02:00
Michael Townsend ea0aff072f Merge pull request #28 from toofarapart/disappearing_restart_fix
(SPOILERS) Fixed a bug in which the share/restart buttons disappeared...
2013-07-08 11:55:56 -07:00
Zarkonnen 4641b0b145 Initial medicine implementation. Needs more events. 2013-07-08 19:16:16 +02:00
Matt Rasmus 0b6144660f Fixed a bug in which the share/restart buttons would disappear in certain situations. 2013-07-07 13:25:30 -07:00
Matt Rasmus 4326b2aa2a Game fades to black at the end, and stays that way until the player clicks restart. 2013-07-07 11:41:51 -07:00
Michael Townsend 54cea31db9 Merge pull request #26 from dhutty/patch-1
spelling
2013-07-07 09:09:42 -07:00
Michael Townsend 53ff72d218 Merge pull request #24 from jvantuyl/master
a grammar fix
2013-07-07 09:07:38 -07:00
dhutty aeedc5d10c spelling 2013-07-07 10:18:59 -04:00
Matt Rasmus 8dabee851d Stores panel now persists on all non-world/non-space views. 2013-07-06 14:56:27 -07:00
Jayson Vantuyl 536f09dce3 a grammar fix
"bundle of sticks", not "bundle of stick"
2013-07-06 13:53:33 -07:00
Michael Townsend 12258689e8 Merge pull request #22 from engstrom/master
Moved EatMeatButton to beginning of combat UI
2013-07-06 09:53:24 -07:00
Michael Townsend 95fddcbb2c Merge pull request #20 from evilDave/swipes
Added swipe support
2013-07-06 09:51:54 -07:00
Michael Townsend 79c0185e7e Merge pull request #23 from jvantuyl/master
Minor Spelling Fix
2013-07-06 09:50:29 -07:00
Jayson Vantuyl b14ad39c5a minor spelling fix 2013-07-05 23:43:43 -07:00
engstrom fa655aef1c Moved EatMeatButton to beginning of combat UI 2013-07-05 18:41:22 -06:00
Michael Townsend 1aaabed944 Merge pull request #18 from Erid/patch-1
Changed browser's img alt text
2013-07-05 06:43:47 -07:00
Michael Townsend e83dcd3945 Merge pull request #17 from engstrom/patch-1
Formatting the readme
2013-07-05 06:43:16 -07:00
David Clark e9679b3f26 Add swipe support. Modules can implement swipeLeft (etc). Swipes control movement in the World module (map). 2013-07-05 22:36:49 +10:00
Zarkonnen ae044376db Converted min/max buttons to +-10 buttons. Also made code shorter. 2013-07-05 13:47:23 +02:00
Elías Balioceda Fernández b1af589d53 Changed browser's img alt text
Just a minor fix
2013-07-04 21:39:55 -06:00
Dustin Engstrom 555a924fb0 Formatting the readme 2013-07-04 18:42:55 -06:00
Michael Townsend 7f1efd4ad2 Update LICENSE.md
Switched from GPLv3 to MPLv2
2013-07-04 15:21:49 -04:00
Michael Townsend 98719ccf0c Merge pull request #13 from Zarkonnen/master
Max/zero buttons
2013-07-04 07:50:07 -07:00
Michael Townsend 6a7df4d17c Fixed non-combat meat eating 2013-07-04 07:28:19 -07:00
Zarkonnen 6d99cb7c3a Added max/zero buttons to worker assignment and expedition supply packing to prevent eg having to click 50x to fill food supplies. 2013-07-04 16:15:29 +02:00
Michael Townsend cab220a5ac Merge pull request #10 from dmnd/master
Add an 'eat meat' button to the loot screen
2013-07-04 06:59:09 -07:00
Michael Townsend 242ef7f0b9 Merge pull request #7 from Cogito/moveInterface
Improve movement interface to allow click events
2013-07-04 06:55:50 -07:00
Michael Townsend 8743b16e09 Merge pull request #9 from Starefossen/patch-2
Adds link to play game online
2013-07-04 06:51:26 -07:00
Desmond Brand a86c61aaf0 Add an 'eat meat' button to the loot screen
When I played this, I would often madly try to click the 'eat meat' button
after I won a fight, only to have the 'leave' button appear in its place,
causing me to lose my chance at both healing and looting.

This patch adds an 'eat meat' button to the loot screen to avoid this UI
problem.
2013-07-04 02:56:54 -07:00
Hans Kristian Flaatten 2c8e410eab Adds link to play game online 2013-07-04 11:17:04 +02:00
Andrew Ardill 6fb7f248f7 world.js: Trigger movement with clicks on the map
Clicking on the map in different quadrants will move you in that direction.
Clicks are measured relative to the centre of the current location centre of
the map. Click above the player to move up, click below to move down etc.

This should enable better gameplay on touch devices.
2013-07-04 16:13:30 +10:00
Andrew Ardill d0a171e95b world.js: Refactor move commands out of keyDown
In order to better handle move commands, refactor them out of the keyDown
event handler. This will enable using other input methods to trigger a move
command, such as mouse clicks or touch events.
2013-07-04 14:49:21 +10:00
Michael Townsend 9327358008 Merge pull request #1 from daturkel/patch-1
Added a note to mobileWarning about arrow keys
2013-07-03 10:46:45 -07:00
Dan Turkel a37bb40c81 Added a note to mobileWarning about arrow keys
An HN commenter noted that he ignored the mobilewarning and tried the game and found it worked. That is, until he got to the Embark stage and found himself arrow key-less. This warning is slightly more verbose to avoid similar situations.
2013-07-03 13:44:45 -04:00
227 changed files with 107247 additions and 9826 deletions
+12
View File
@@ -0,0 +1,12 @@
# Default
* text=auto
# Binary files so don't modify
*.ico binary
*.png binary
*.jpg binary
*.xlsx binary
# Hide vendor and translation files from language statistics
lang/* linguist-documentation
lib/* linguist-vendored
+9
View File
@@ -0,0 +1,9 @@
/.settings
*.TODO
*.mo
*.swp
.idea
lang/.DS_Store
.DS_Store
node_modules
img/Thumbs.db
+5
View File
@@ -0,0 +1,5 @@
{
"eqnull": true,
"sub": true,
"multistr": true
}
-11
View File
@@ -1,11 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>A Dark Room</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
</buildSpec>
<natures>
</natures>
</projectDescription>
+348 -161
View File
@@ -1,189 +1,376 @@
GNU GENERAL PUBLIC LICENSE Mozilla Public License Version 2.0
==================================
Version 3, 29 June 2007 1. Definitions
--------------
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> 1.1. "Contributor"
means each individual or legal entity that creates, contributes to
the creation of, or owns Covered Software.
Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. 1.2. "Contributor Version"
Preamble means the combination of the Contributions of others (if any) used
by a Contributor and that particular Contributor's Contribution.
The GNU General Public License is a free, copyleft license for software and other kinds of works. 1.3. "Contribution"
means Covered Software of a particular Contributor.
The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free software for all its users. We, the Free Software Foundation, use the GNU General Public License for most of our software; it applies also to any other work released this way by its authors. You can apply it to your programs, too. 1.4. "Covered Software"
means Source Code Form to which the initial Contributor has attached
the notice in Exhibit A, the Executable Form of such Source Code
Form, and Modifications of such Source Code Form, in each case
including portions thereof.
When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for them if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things. 1.5. "Incompatible With Secondary Licenses"
means
To protect your rights, we need to prevent others from denying you these rights or asking you to surrender the rights. Therefore, you have certain responsibilities if you distribute copies of the software, or if you modify it: responsibilities to respect the freedom of others. (a) that the initial Contributor has attached the notice described
in Exhibit B to the Covered Software; or
For example, if you distribute copies of such a program, whether gratis or for a fee, you must pass on to the recipients the same freedoms that you received. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. (b) that the Covered Software was made available under the terms of
version 1.1 or earlier of the License, but not also under the
terms of a Secondary License.
Developers that use the GNU GPL protect your rights with two steps: (1) assert copyright on the software, and (2) offer you this License giving you legal permission to copy, distribute and/or modify it. 1.6. "Executable Form"
means any form of the work other than Source Code Form.
For the developers' and authors' protection, the GPL clearly explains that there is no warranty for this free software. For both users' and authors' sake, the GPL requires that modified versions be marked as changed, so that their problems will not be attributed erroneously to authors of previous versions. 1.7. "Larger Work"
means a work that combines Covered Software with other material, in
a separate file or files, that is not Covered Software.
Some devices are designed to deny users access to install or run modified versions of the software inside them, although the manufacturer can do so. This is fundamentally incompatible with the aim of protecting users' freedom to change the software. The systematic pattern of such abuse occurs in the area of products for individuals to use, which is precisely where it is most unacceptable. Therefore, we have designed this version of the GPL to prohibit the practice for those products. If such problems arise substantially in other domains, we stand ready to extend this provision to those domains in future versions of the GPL, as needed to protect the freedom of users. 1.8. "License"
means this document.
Finally, every program is threatened constantly by software patents. States should not allow patents to restrict development and use of software on general-purpose computers, but in those that do, we wish to avoid the special danger that patents applied to a free program could make it effectively proprietary. To prevent this, the GPL assures that patents cannot be used to render the program non-free. 1.9. "Licensable"
means having the right to grant, to the maximum extent possible,
whether at the time of the initial grant or subsequently, any and
all of the rights conveyed by this License.
The precise terms and conditions for copying, distribution and modification follow. 1.10. "Modifications"
TERMS AND CONDITIONS means any of the following:
0. Definitions.
“This License” refers to version 3 of the GNU General Public License. (a) any file in Source Code Form that results from an addition to,
deletion from, or modification of the contents of Covered
Software; or
“Copyright” also means copyright-like laws that apply to other kinds of works, such as semiconductor masks. (b) any new file in Source Code Form that contains any Covered
Software.
“The Program” refers to any copyrightable work licensed under this License. Each licensee is addressed as “you”. “Licensees” and “recipients” may be individuals or organizations. 1.11. "Patent Claims" of a Contributor
means any patent claim(s), including without limitation, method,
process, and apparatus claims, in any patent Licensable by such
Contributor that would be infringed, but for the grant of the
License, by the making, using, selling, offering for sale, having
made, import, or transfer of either its Contributions or its
Contributor Version.
To “modify” a work means to copy from or adapt all or part of the work in a fashion requiring copyright permission, other than the making of an exact copy. The resulting work is called a “modified version” of the earlier work or a work “based on” the earlier work. 1.12. "Secondary License"
means either the GNU General Public License, Version 2.0, the GNU
Lesser General Public License, Version 2.1, the GNU Affero General
Public License, Version 3.0, or any later versions of those
licenses.
A “covered work” means either the unmodified Program or a work based on the Program. 1.13. "Source Code Form"
means the form of the work preferred for making modifications.
To “propagate” a work means to do anything with it that, without permission, would make you directly or secondarily liable for infringement under applicable copyright law, except executing it on a computer or modifying a private copy. Propagation includes copying, distribution (with or without modification), making available to the public, and in some countries other activities as well. 1.14. "You" (or "Your")
means an individual or a legal entity exercising rights under this
License. For legal entities, "You" includes any entity that
controls, is controlled by, or is under common control with You. For
purposes of this definition, "control" means (a) the power, direct
or indirect, to cause the direction or management of such entity,
whether by contract or otherwise, or (b) ownership of more than
fifty percent (50%) of the outstanding shares or beneficial
ownership of such entity.
To “convey” a work means any kind of propagation that enables other parties to make or receive copies. Mere interaction with a user through a computer network, with no transfer of a copy, is not conveying. 2. License Grants and Conditions
--------------------------------
An interactive user interface displays “Appropriate Legal Notices” to the extent that it includes a convenient and prominently visible feature that (1) displays an appropriate copyright notice, and (2) tells the user that there is no warranty for the work (except to the extent that warranties are provided), that licensees may convey the work under this License, and how to view a copy of this License. If the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets this criterion. 2.1. Grants
1. Source Code.
The “source code” for a work means the preferred form of the work for making modifications to it. “Object code” means any non-source form of a work. Each Contributor hereby grants You a world-wide, royalty-free,
non-exclusive license:
A “Standard Interface” means an interface that either is an official standard defined by a recognized standards body, or, in the case of interfaces specified for a particular programming language, one that is widely used among developers working in that language. (a) under intellectual property rights (other than patent or trademark)
Licensable by such Contributor to use, reproduce, make available,
modify, display, perform, distribute, and otherwise exploit its
Contributions, either on an unmodified basis, with Modifications, or
as part of a Larger Work; and
The “System Libraries” of an executable work include anything, other than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the work with that Major Component, or to implement a Standard Interface for which an implementation is available to the public in source code form. A “Major Component”, in this context, means a major essential component (kernel, window system, and so on) of the specific operating system (if any) on which the executable work runs, or a compiler used to produce the work, or an object code interpreter used to run it. (b) under Patent Claims of such Contributor to make, use, sell, offer
for sale, have made, import, and otherwise transfer either its
Contributions or its Contributor Version.
The “Corresponding Source” for a work in object code form means all the source code needed to generate, install, and (for an executable work) run the object code and to modify the work, including scripts to control those activities. However, it does not include the work's System Libraries, or general-purpose tools or generally available free programs which are used unmodified in performing those activities but which are not part of the work. For example, Corresponding Source includes interface definition files associated with source files for the work, and the source code for shared libraries and dynamically linked subprograms that the work is specifically designed to require, such as by intimate data communication or control flow between those subprograms and other parts of the work. 2.2. Effective Date
The Corresponding Source need not include anything that users can regenerate automatically from other parts of the Corresponding Source. The licenses granted in Section 2.1 with respect to any Contribution
become effective for each Contribution on the date the Contributor first
distributes such Contribution.
The Corresponding Source for a work in source code form is that same work. 2.3. Limitations on Grant Scope
2. Basic Permissions.
All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated conditions are met. This License explicitly affirms your unlimited permission to run the unmodified Program. The output from running a covered work is covered by this License only if the output, given its content, constitutes a covered work. This License acknowledges your rights of fair use or other equivalent, as provided by copyright law. The licenses granted in this Section 2 are the only rights granted under
this License. No additional rights or licenses will be implied from the
You may make, run and propagate covered works that you do not convey, without conditions so long as your license otherwise remains in force. You may convey covered works to others for the sole purpose of having them make modifications exclusively for you, or provide you with facilities for running those works, provided that you comply with the terms of this License in conveying all material for which you do not control copyright. Those thus making or running the covered works for you must do so exclusively on your behalf, under your direction and control, on terms that prohibit them from making any copies of your copyrighted material outside their relationship with you. distribution or licensing of Covered Software under this License.
Notwithstanding Section 2.1(b) above, no patent license is granted by a
Conveying under any other circumstances is permitted solely under the conditions stated below. Sublicensing is not allowed; section 10 makes it unnecessary. Contributor:
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
(a) for any code that a Contributor has removed from Covered Software;
No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article 11 of the WIPO copyright treaty adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention of such measures. or
When you convey a covered work, you waive any legal power to forbid circumvention of technological measures to the extent such circumvention is effected by exercising rights under this License with respect to the covered work, and you disclaim any intention to limit operation or modification of the work as a means of enforcing, against the work's users, your or third parties' legal rights to forbid circumvention of technological measures. (b) for infringements caused by: (i) Your and any other third party's
4. Conveying Verbatim Copies. modifications of Covered Software, or (ii) the combination of its
Contributions with other software (except as part of its Contributor
You may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices stating that this License and any non-permissive terms added in accord with section 7 apply to the code; keep intact all notices of the absence of any warranty; and give all recipients a copy of this License along with the Program. Version); or
You may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for a fee. (c) under Patent Claims infringed by Covered Software in the absence of
5. Conveying Modified Source Versions. its Contributions.
You may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source code under the terms of section 4, provided that you also meet all of these conditions: This License does not grant any rights in the trademarks, service marks,
or logos of any Contributor (except as may be necessary to comply with
a) The work must carry prominent notices stating that you modified it, and giving a relevant date. the notice requirements in Section 3.4).
b) The work must carry prominent notices stating that it is released under this License and any conditions added under section 7. This requirement modifies the requirement in section 4 to “keep intact all notices”.
c) You must license the entire work, as a whole, under this License to anyone who comes into possession of a copy. This License will therefore apply, along with any applicable section 7 additional terms, to the whole of the work, and all its parts, regardless of how they are packaged. This License gives no permission to license the work in any other way, but it does not invalidate such permission if you have separately received it. 2.4. Subsequent Licenses
d) If the work has interactive user interfaces, each must display Appropriate Legal Notices; however, if the Program has interactive interfaces that do not display Appropriate Legal Notices, your work need not make them do so.
No Contributor makes additional grants as a result of Your choice to
A compilation of a covered work with other separate and independent works, which are not by their nature extensions of the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a storage or distribution medium, is called an “aggregate” if the compilation and its resulting copyright are not used to limit the access or legal rights of the compilation's users beyond what the individual works permit. Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate. distribute the Covered Software under a subsequent version of this
6. Conveying Non-Source Forms. License (see Section 10.2) or under the terms of a Secondary License (if
permitted under the terms of Section 3.3).
You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the machine-readable Corresponding Source under the terms of this License, in one of these ways:
2.5. Representation
a) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by the Corresponding Source fixed on a durable physical medium customarily used for software interchange.
b) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by a written offer, valid for at least three years and valid for as long as you offer spare parts or customer support for that product model, to give anyone who possesses the object code either (1) a copy of the Corresponding Source for all the software in the product that is covered by this License, on a durable physical medium customarily used for software interchange, for a price no more than your reasonable cost of physically performing this conveying of source, or (2) access to copy the Corresponding Source from a network server at no charge. Each Contributor represents that the Contributor believes its
c) Convey individual copies of the object code with a copy of the written offer to provide the Corresponding Source. This alternative is allowed only occasionally and noncommercially, and only if you received the object code with such an offer, in accord with subsection 6b. Contributions are its original creation(s) or it has sufficient rights
d) Convey the object code by offering access from a designated place (gratis or for a charge), and offer equivalent access to the Corresponding Source in the same way through the same place at no further charge. You need not require recipients to copy the Corresponding Source along with the object code. If the place to copy the object code is a network server, the Corresponding Source may be on a different server (operated by you or a third party) that supports equivalent copying facilities, provided you maintain clear directions next to the object code saying where to find the Corresponding Source. Regardless of what server hosts the Corresponding Source, you remain obligated to ensure that it is available for as long as needed to satisfy these requirements. to grant the rights to its Contributions conveyed by this License.
e) Convey the object code using peer-to-peer transmission, provided you inform other peers where the object code and Corresponding Source of the work are being offered to the general public at no charge under subsection 6d.
2.6. Fair Use
A separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library, need not be included in conveying the object code work.
This License is not intended to limit any rights You have under
A “User Product” is either (1) a “consumer product”, which means any tangible personal property which is normally used for personal, family, or household purposes, or (2) anything designed or sold for incorporation into a dwelling. In determining whether a product is a consumer product, doubtful cases shall be resolved in favor of coverage. For a particular product received by a particular user, “normally used” refers to a typical or common use of that class of product, regardless of the status of the particular user or of the way in which the particular user actually uses, or expects or is expected to use, the product. A product is a consumer product regardless of whether the product has substantial commercial, industrial or non-consumer uses, unless such uses represent the only significant mode of use of the product. applicable copyright doctrines of fair use, fair dealing, or other
equivalents.
“Installation Information” for a User Product means any methods, procedures, authorization keys, or other information required to install and execute modified versions of a covered work in that User Product from a modified version of its Corresponding Source. The information must suffice to ensure that the continued functioning of the modified object code is in no case prevented or interfered with solely because modification has been made.
2.7. Conditions
If you convey an object code work under this section in, or with, or specifically for use in, a User Product, and the conveying occurs as part of a transaction in which the right of possession and use of the User Product is transferred to the recipient in perpetuity or for a fixed term (regardless of how the transaction is characterized), the Corresponding Source conveyed under this section must be accompanied by the Installation Information. But this requirement does not apply if neither you nor any third party retains the ability to install modified object code on the User Product (for example, the work has been installed in ROM).
Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
The requirement to provide Installation Information does not include a requirement to continue to provide support service, warranty, or updates for a work that has been modified or installed by the recipient, or for the User Product in which it has been modified or installed. Access to a network may be denied when the modification itself materially and adversely affects the operation of the network or violates the rules and protocols for communication across the network. in Section 2.1.
Corresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format that is publicly documented (and with an implementation available to the public in source code form), and must require no special password or key for unpacking, reading or copying. 3. Responsibilities
7. Additional Terms. -------------------
“Additional permissions” are terms that supplement the terms of this License by making exceptions from one or more of its conditions. Additional permissions that are applicable to the entire Program shall be treated as though they were included in this License, to the extent that they are valid under applicable law. If additional permissions apply only to part of the Program, that part may be used separately under those permissions, but the entire Program remains governed by this License without regard to the additional permissions. 3.1. Distribution of Source Form
When you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, or from any part of it. (Additional permissions may be written to require their own removal in certain cases when you modify the work.) You may place additional permissions on material, added by you to a covered work, for which you have or can give appropriate copyright permission. All distribution of Covered Software in Source Code Form, including any
Modifications that You create or to which You contribute, must be under
Notwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized by the copyright holders of that material) supplement the terms of this License with terms: the terms of this License. You must inform recipients that the Source
Code Form of the Covered Software is governed by the terms of this
a) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or License, and how they can obtain a copy of this License. You may not
b) Requiring preservation of specified reasonable legal notices or author attributions in that material or in the Appropriate Legal Notices displayed by works containing it; or attempt to alter or restrict the recipients' rights in the Source Code
c) Prohibiting misrepresentation of the origin of that material, or requiring that modified versions of such material be marked in reasonable ways as different from the original version; or Form.
d) Limiting the use for publicity purposes of names of licensors or authors of the material; or
e) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or 3.2. Distribution of Executable Form
f) Requiring indemnification of licensors and authors of that material by anyone who conveys the material (or modified versions of it) with contractual assumptions of liability to the recipient, for any liability that these contractual assumptions directly impose on those licensors and authors.
If You distribute Covered Software in Executable Form then:
All other non-permissive additional terms are considered “further restrictions” within the meaning of section 10. If the Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with a term that is a further restriction, you may remove that term. If a license document contains a further restriction but permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of that license document, provided that the further restriction does not survive such relicensing or conveying.
(a) such Covered Software must also be made available in Source Code
If you add terms to a covered work in accord with this section, you must place, in the relevant source files, a statement of the additional terms that apply to those files, or a notice indicating where to find the applicable terms. Form, as described in Section 3.1, and You must inform recipients of
the Executable Form how they can obtain a copy of such Source Code
Additional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated as exceptions; the above requirements apply either way. Form by reasonable means in a timely manner, at a charge no more
8. Termination. than the cost of distribution to the recipient; and
You may not propagate or modify a covered work except as expressly provided under this License. Any attempt otherwise to propagate or modify it is void, and will automatically terminate your rights under this License (including any patent licenses granted under the third paragraph of section 11). (b) You may distribute such Executable Form under the terms of this
License, or sublicense it under different terms, provided that the
However, if you cease all violation of this License, then your license from a particular copyright holder is reinstated (a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and (b) permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 days after the cessation. license for the Executable Form does not attempt to limit or alter
the recipients' rights in the Source Code Form under this License.
Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice.
3.3. Distribution of a Larger Work
Termination of your rights under this section does not terminate the licenses of parties who have received copies or rights from you under this License. If your rights have been terminated and not permanently reinstated, you do not qualify to receive new licenses for the same material under section 10.
9. Acceptance Not Required for Having Copies. You may create and distribute a Larger Work under terms of Your choice,
provided that You also comply with the requirements of this License for
You are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation of a covered work occurring solely as a consequence of using peer-to-peer transmission to receive a copy likewise does not require acceptance. However, nothing other than this License grants you permission to propagate or modify any covered work. These actions infringe copyright if you do not accept this License. Therefore, by modifying or propagating a covered work, you indicate your acceptance of this License to do so. the Covered Software. If the Larger Work is a combination of Covered
10. Automatic Licensing of Downstream Recipients. Software with a work governed by one or more Secondary Licenses, and the
Covered Software is not Incompatible With Secondary Licenses, this
Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and propagate that work, subject to this License. You are not responsible for enforcing compliance by third parties with this License. License permits You to additionally distribute such Covered Software
under the terms of such Secondary License(s), so that the recipient of
An “entity transaction” is a transaction transferring control of an organization, or substantially all assets of one, or subdividing an organization, or merging organizations. If propagation of a covered work results from an entity transaction, each party to that transaction who receives a copy of the work also receives whatever licenses to the work the party's predecessor in interest had or could give under the previous paragraph, plus a right to possession of the Corresponding Source of the work from the predecessor in interest, if the predecessor has it or can get it with reasonable efforts. the Larger Work may, at their option, further distribute the Covered
Software under the terms of either this License or such Secondary
You may not impose any further restrictions on the exercise of the rights granted or affirmed under this License. For example, you may not impose a license fee, royalty, or other charge for exercise of rights granted under this License, and you may not initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging that any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it. License(s).
11. Patents.
3.4. Notices
A “contributor” is a copyright holder who authorizes use under this License of the Program or a work on which the Program is based. The work thus licensed is called the contributor's “contributor version”.
You may not remove or alter the substance of any license notices
A contributor's “essential patent claims” are all patent claims owned or controlled by the contributor, whether already acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or selling its contributor version, but do not include claims that would be infringed only as a consequence of further modification of the contributor version. For purposes of this definition, “control” includes the right to grant patent sublicenses in a manner consistent with the requirements of this License. (including copyright notices, patent notices, disclaimers of warranty,
or limitations of liability) contained within the Source Code Form of
Each contributor grants you a non-exclusive, worldwide, royalty-free patent license under the contributor's essential patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its contributor version. the Covered Software, except that You may alter any license notices to
the extent required to remedy known factual inaccuracies.
In the following three paragraphs, a “patent license” is any express agreement or commitment, however denominated, not to enforce a patent (such as an express permission to practice a patent or covenant not to sue for patent infringement). To “grant” such a patent license to a party means to make such an agreement or commitment not to enforce a patent against the party.
3.5. Application of Additional Terms
If you convey a covered work, knowingly relying on a patent license, and the Corresponding Source of the work is not available for anyone to copy, free of charge and under the terms of this License, through a publicly available network server or other readily accessible means, then you must either (1) cause the Corresponding Source to be so available, or (2) arrange to deprive yourself of the benefit of the patent license for this particular work, or (3) arrange, in a manner consistent with the requirements of this License, to extend the patent license to downstream recipients. “Knowingly relying” means you have actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid.
You may choose to offer, and to charge a fee for, warranty, support,
If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties receiving the covered work authorizing them to use, propagate, modify or convey a specific copy of the covered work, then the patent license you grant is automatically extended to all recipients of the covered work and works based on it. indemnity or liability obligations to one or more recipients of Covered
Software. However, You may do so only on Your own behalf, and not on
A patent license is “discriminatory” if it does not include within the scope of its coverage, prohibits the exercise of, or is conditioned on the non-exercise of one or more of the rights that are specifically granted under this License. You may not convey a covered work if you are a party to an arrangement with a third party that is in the business of distributing software, under which you make payment to the third party based on the extent of your activity of conveying the work, and under which the third party grants, to any of the parties who would receive the covered work from you, a discriminatory patent license (a) in connection with copies of the covered work conveyed by you (or copies made from those copies), or (b) primarily for and in connection with specific products or compilations that contain the covered work, unless you entered into that arrangement, or that patent license was granted, prior to 28 March 2007. behalf of any Contributor. You must make it absolutely clear that any
such warranty, support, indemnity, or liability obligation is offered by
Nothing in this License shall be construed as excluding or limiting any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law. You alone, and You hereby agree to indemnify every Contributor for any
12. No Surrender of Others' Freedom. liability incurred by such Contributor as a result of warranty, support,
indemnity or liability terms You offer. You may include additional
If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot convey a covered work so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not convey it at all. For example, if you agree to terms that obligate you to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program. disclaimers of warranty and limitations of liability specific to any
13. Use with the GNU Affero General Public License. jurisdiction.
Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed under version 3 of the GNU Affero General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, but the special requirements of the GNU Affero General Public License, section 13, concerning interaction through a network will apply to the combination as such. 4. Inability to Comply Due to Statute or Regulation
14. Revised Versions of this License. ---------------------------------------------------
The Free Software Foundation may publish revised and/or new versions of the GNU General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. If it is impossible for You to comply with any of the terms of this
License with respect to some or all of the Covered Software due to
Each version is given a distinguishing version number. If the Program specifies that a certain numbered version of the GNU General Public License “or any later version” applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the GNU General Public License, you may choose any version ever published by the Free Software Foundation. statute, judicial order, or regulation then You must: (a) comply with
the terms of this License to the maximum extent possible; and (b)
If the Program specifies that a proxy can decide which future versions of the GNU General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program. describe the limitations and the code they affect. Such description must
be placed in a text file included with all distributions of the Covered
Later license versions may give you additional or different permissions. However, no additional obligations are imposed on any author or copyright holder as a result of your choosing to follow a later version. Software under this License. Except to the extent prohibited by statute
15. Disclaimer of Warranty. or regulation, such description must be sufficiently detailed for a
recipient of ordinary skill to be able to understand it.
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
16. Limitation of Liability. 5. Termination
--------------
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
17. Interpretation of Sections 15 and 16. 5.1. The rights granted under this License will terminate automatically
if You fail to comply with any of its terms. However, if You become
If the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to their terms, reviewing courts shall apply local law that most closely approximates an absolute waiver of all civil liability in connection with the Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee. compliant, then the rights granted under this License from a particular
Contributor are reinstated (a) provisionally, unless and until such
END OF TERMS AND CONDITIONS Contributor explicitly and finally terminates Your grants, and (b) on an
ongoing basis, if such Contributor fails to notify You of the
non-compliance by some reasonable means prior to 60 days after You have
come back into compliance. Moreover, Your grants from a particular
Contributor are reinstated on an ongoing basis if such Contributor
notifies You of the non-compliance by some reasonable means, this is the
first time You have received notice of non-compliance with this License
from such Contributor, and You become compliant prior to 30 days after
Your receipt of the notice.
5.2. If You initiate litigation against any entity by asserting a patent
infringement claim (excluding declaratory judgment actions,
counter-claims, and cross-claims) alleging that a Contributor Version
directly or indirectly infringes any patent, then the rights granted to
You by any and all Contributors for the Covered Software under Section
2.1 of this License shall terminate.
5.3. In the event of termination under Sections 5.1 or 5.2 above, all
end user license agreements (excluding distributors and resellers) which
have been validly granted by You or Your distributors under this License
prior to termination shall survive termination.
```
************************************************************************
* *
* 6. Disclaimer of Warranty *
* ------------------------- *
* *
* Covered Software is provided under this License on an "as is" *
* basis, without warranty of any kind, either expressed, implied, or *
* statutory, including, without limitation, warranties that the *
* Covered Software is free of defects, merchantable, fit for a *
* particular purpose or non-infringing. The entire risk as to the *
* quality and performance of the Covered Software is with You. *
* Should any Covered Software prove defective in any respect, You *
* (not any Contributor) assume the cost of any necessary servicing, *
* repair, or correction. This disclaimer of warranty constitutes an *
* essential part of this License. No use of any Covered Software is *
* authorized under this License except under this disclaimer. *
* *
************************************************************************
************************************************************************
* *
* 7. Limitation of Liability *
* -------------------------- *
* *
* Under no circumstances and under no legal theory, whether tort *
* (including negligence), contract, or otherwise, shall any *
* Contributor, or anyone who distributes Covered Software as *
* permitted above, be liable to You for any direct, indirect, *
* special, incidental, or consequential damages of any character *
* including, without limitation, damages for lost profits, loss of *
* goodwill, work stoppage, computer failure or malfunction, or any *
* and all other commercial damages or losses, even if such party *
* shall have been informed of the possibility of such damages. This *
* limitation of liability shall not apply to liability for death or *
* personal injury resulting from such party's negligence to the *
* extent applicable law prohibits such limitation. Some *
* jurisdictions do not allow the exclusion or limitation of *
* incidental or consequential damages, so this exclusion and *
* limitation may not apply to You. *
* *
************************************************************************
```
8. Litigation
-------------
Any litigation relating to this License may be brought only in the
courts of a jurisdiction where the defendant maintains its principal
place of business and such litigation shall be governed by laws of that
jurisdiction, without reference to its conflict-of-law provisions.
Nothing in this Section shall prevent a party's ability to bring
cross-claims or counter-claims.
9. Miscellaneous
----------------
This License represents the complete agreement concerning the subject
matter hereof. If any provision of this License is held to be
unenforceable, such provision shall be reformed only to the extent
necessary to make it enforceable. Any law or regulation which provides
that the language of a contract shall be construed against the drafter
shall not be used to construe this License against a Contributor.
10. Versions of the License
---------------------------
10.1. New Versions
Mozilla Foundation is the license steward. Except as provided in Section
10.3, no one other than the license steward has the right to modify or
publish new versions of this License. Each version will be given a
distinguishing version number.
10.2. Effect of New Versions
You may distribute the Covered Software under the terms of the version
of the License under which You originally received the Covered Software,
or under the terms of any subsequent version published by the license
steward.
10.3. Modified Versions
If you create software not governed by this License, and you want to
create a new license for such software, you may create and use a
modified version of this License if you rename the license and remove
any references to the name of the license steward (except to note that
such modified license differs from this License).
10.4. Distributing Source Code Form that is Incompatible With Secondary
Licenses
If You choose to distribute Source Code Form that is Incompatible With
Secondary Licenses under the terms of this version of the License, the
notice described in Exhibit B of this License must be attached.
Exhibit A - Source Code Form License Notice
-------------------------------------------
This Source Code Form is subject to the terms of the Mozilla Public
License, v. 2.0. If a copy of the MPL was not distributed with this
file, You can obtain one at http://mozilla.org/MPL/2.0/.
If it is not possible or desirable to put the notice in a particular
file, then You may include the notice in a location (such as a LICENSE
file in a relevant directory) where a recipient would be likely to look
for such a notice.
You may add additional accurate notices of copyright ownership.
Exhibit B - "Incompatible With Secondary Licenses" Notice
---------------------------------------------------------
This Source Code Form is "Incompatible With Secondary Licenses", as
defined by the Mozilla Public License, v. 2.0.
+46 -3
View File
@@ -1,4 +1,47 @@
adarkroom A Dark Room
========= ===========
> "awake. head throbbing. vision blurry. come light the fire."
A Dark Room - A Minimalist Text Adventure a minimalist text adventure game for your browser
[Click to play](http://adarkroom.doublespeakgames.com)
<table>
<tr><th colspan=4>Available Languages</tr>
<tr>
<td><a href="http://adarkroom.doublespeakgames.com/?lang=zh_cn">Chinese (Simplified)</a></td>
<td><a href="http://adarkroom.doublespeakgames.com/?lang=zh_tw">Chinese (Traditional)</a></td>
<td><a href="http://adarkroom.doublespeakgames.com/?lang=en">English</a></td>
<td><a href="http://adarkroom.doublespeakgames.com/?lang=fr">French</a></td>
</tr><tr>
<td><a href="http://adarkroom.doublespeakgames.com/?lang=de">German</a></td>
<td><a href="http://adarkroom.doublespeakgames.com/?lang=el">Greek</a></td>
<td><a href="http://adarkroom.doublespeakgames.com/?lang=id">Indonesian</a></td>
<td><a href="http://adarkroom.doublespeakgames.com/?lang=it">Italian</a></td>
</tr><tr>
<td><a href="http://adarkroom.doublespeakgames.com/?lang=ja">Japanese</a></td>
<td><a href="http://adarkroom.doublespeakgames.com/?lang=ko">Korean</a></td>
<td><a href="http://adarkroom.doublespeakgames.com/?lang=nb">Norwegian</a></td>
<td><a href="http://adarkroom.doublespeakgames.com/?lang=pl">Polish</a></td>
</tr><tr>
<td><a href="http://adarkroom.doublespeakgames.com/?lang=pt">Portuguese</a></td>
<td><a href="http://adarkroom.doublespeakgames.com/?lang=pt_br">Portuguese (Brazil)</a></td>
<td><a href="http://adarkroom.doublespeakgames.com/?lang=ru">Russian</a></td>
<td><a href="http://adarkroom.doublespeakgames.com/?lang=es">Spanish</a></td>
</tr><tr>
<td><a href="http://adarkroom.doublespeakgames.com/?lang=sv">Swedish</a></td>
<td><a href="http://adarkroom.doublespeakgames.com/?lang=th">Thai</a></td>
<td><a href="http://adarkroom.doublespeakgames.com/?lang=tr">Turkish</a></td>
<td><a href="http://adarkroom.doublespeakgames.com/?lang=uk">Ukrainian</a></td>
</tr><tr>
<td><a href="http://adarkroom.doublespeakgames.com/?lang=vi">Vietnamese</a></td>
<td><a href="http://adarkroom.doublespeakgames.com/?lang=lt_LT">Lithuanian</a></td>
<td><a href="http://adarkroom.doublespeakgames.com/?lang=gl">Galician</a></td>
</tr>
</table>
or play the latest on [GitHub](http://doublespeakgames.github.io/adarkroom)
<a href="https://itunes.apple.com/us/app/a-dark-room/id736683061"><img src="http://i.imgur.com/DMdnDYq.png" height="50"></a>
<a href="https://play.google.com/store/apps/details?id=com.yourcompany.adarkroom"><img src="http://i.imgur.com/bLWWj4r.png" height="50"></a>
<a href="https://store.steampowered.com/app/2460660/A_Dark_Room/"><img src="https://i.imgur.com/yz6cnU0.png" height="50"></a>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
View File
Binary file not shown.
BIN
View File
Binary file not shown.
Binary file not shown.
BIN
View File
Binary file not shown.
BIN
View File
Binary file not shown.
BIN
View File
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
View File
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
View File
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
View File
Binary file not shown.
Binary file not shown.
BIN
View File
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
View File
Binary file not shown.
+42 -26
View File
@@ -1,27 +1,43 @@
<!doctype html> <!doctype html>
<html> <html>
<head> <head>
<title>A Dark Room</title> <title>A Dark Room</title>
<style> <style>
div { body {
width: 960px; background-color: #000000;
margin: auto; color: #FFFFFF;
text-align: center; }
margin-top: 100px; a {
} color: #FFFFFF;
</style> }
</head> div {
<body> width: 960px;
<div> margin: auto;
<strong> text-align: center;
A Dark Room makes use of HTML5 and CSS3, which your current browser does not appear to support.<br/> margin-top: 20px;
Please update your browser for the best experience:<br/> }
</strong> .browser {
<a href='http://www.mozilla.org/en-US/firefox/new/'><img src='img/firefox.png' alt='Firefox' /></a> width:102.4px;
<a href='https://www.google.com/intl/en/chrome/browser/'><img src='img/chrome.png' alt='Firefox' /></a> height:102.4px;
<a href='http://windows.microsoft.com/en-CA/internet-explorer/download-ie'><img src='img/ie.png' alt='Firefox' /></a> }
<br/><br/> </style>
Or you can <a href='index.html?ignorebrowser=true'>play anyway</a>, but it probably won't work! </head>
</div> <body>
</body> <center>
<img src="img/Logo1.jpg" />
<div>
<strong>
A Dark Room makes use of HTML5 and CSS3, which your current browser does not appear to support.<br/>
Please <a href="http://browsehappy.com">update your browser</a> for the best experience:<br/>
</strong>
<a href='http://www.mozilla.org/en-US/firefox/new/'><img class="browser" src='img/firefox.png' alt='Firefox' title='Firefox' /></a>
<a href='https://www.google.com/intl/en/chrome/browser/'><img class="browser" src='img/chrome.png' alt='Chrome' title='Chrome' /></a>
<a href='http://windows.microsoft.com/en-CA/internet-explorer/download-ie'><img class="browser" src='img/ie.png' alt='Internet Explorer' title='Internet Explorer' /></a>
<a href='http://www.opera.com/computer'><img class="browser" src='img/opera.png' alt='Opera' title='Opera' /></a>
<a href='http://www.apple.com/safari/'><img class="browser" src='img/safari.png' alt='Safari' title='Safari' /></a>
<br/><br/>
Or you can <a href='index.html?ignorebrowser=true'>play anyway</a>, but it probably won't work!
</div>
</center>
</body>
</html> </html>
+19
View File
@@ -0,0 +1,19 @@
Contributing to A Dark Room
===========
Hello and welcome, contributors both new, and old.
Like most projects on GitHub, A Dark Room is open source, and thrives off contributions from members of the community. We appreciate any pull requests or issues that you may open in the project, no matter the size.
<br><hr>
Before contributing to the project, there are a few things you should look over to ensure your contribution is done correctly.
Most of the projects code is written in JavaScript. We would prefer all submitted JavaScript be [JSHint](http://jshint.com/) compliant.
> "JSHint is a community-driven tool to detect errors and potential problems in JavaScript code and to enforce your team's coding conventions."
<br><br><br>
Before opening a new issue, try to check the projects [issues](https://github.com/doublespeakgames/adarkroom/issues) or [wiki](https://github.com/doublespeakgames/adarkroom/wiki).
Doing so will help prevent needless double issues.
<br>Most of the time you will be able to find what you are looking for in one of those places. If not, please open an issue and describe your problem with as much detail as possible.
Lastly, be nice, patient, open to new ideas, and have some fun!
+199
View File
@@ -0,0 +1,199 @@
body {
background-color: #272823;
color: #EEE;
}
div.headerButton {
border-left: 1px solid #EEE;
}
div#notifyGradient {
background-color: #272823;
background: -webkit-linear-gradient( rgba(39, 40, 35, 0) 0%, rgba(39, 40, 35, 1) 100% );
background: linear-gradient( rgba(39, 40, 35, 0) 0%, rgba(39, 40, 35, 1) 100% );
filter: alpha( Opacity=0, FinishOpacity=100, Style=1, StartX=0, StartY=0, FinishX=0, FinishY=500 );
}
div#saveNotify {
background: #272823;
}
.eventPanel:before {
background-color: #272823;
}
.eventTitle:after {
background-color: #272823;
}
div.tooltip {
background-color: #171813;
border: 1px solid black;
box-shadow: -1px 3px 2px #111;
}
div#population {
background-color: #272823;
}
div#village:before {
background: #272823;
}
div#village {
border: 1px solid #EEE;
}
div#stores:before {
background: #272823;
}
div#stores {
border: 1px solid #EEE;
}
div#blueprints:before {
background: #272823;
}
div#blueprints {
border: 1px solid #EEE;
}
div#weapons:before {
background: #272823;
}
div#weapons {
border: 1px solid #EEE;
}
div#bagspace {
background-color: #272823;
}
div#outfitting:before {
background: #272823;
}
div#perks {
border: 1px solid #EEE;
}
div#perks:before {
background-color: #272823;
}
div#outfitting {
border: 1px solid #EEE;
}
#bagspace-world {
border: 1px solid #EEE;
}
div.supplyItem {
border: 1px solid #EEE;
}
#backpackTitle {
background-color: #272823;
}
#backpackSpace {
background-color: #272823;
}
#healthCounter {
background-color: #272823;
}
#map {
border: 1px solid #EEE;
}
#map .landmark {
color: #EEE;
}
#dropMenu {
background: none repeat scroll 0 0 #272823;
box-shadow: -1px 3px 2px #111;
}
div.button {
border: 1px solid #EEE;
}
div.button.disabled, div.button.disabled:hover {
border-color: #444;
color: #444;
}
.upBtn:after, .upManyBtn:after {
border-color: transparent transparent #272823;
}
.upBtn:before, .upManyBtn:before {
border-color: transparent transparent #EEE;
}
.upBtn.disabled:before, .upManyBtn.disabled:before {
border-color: transparent transparent #555;
}
.dnBtn:after, .dnManyBtn:after {
border-color: #272823 transparent transparent;
}
.dnBtn:before, .dnManyBtn:before {
border-color: #EEE transparent transparent;
}
.dnBtn.disabled:before, .dnManyBtn.disabled:before {
border-color: #555 transparent transparent;
}
body.noMask .eventTitle {
background-color: #EEE;
color: #272823;
}
body.noMask .eventTitle:after {
background-color: #EEE;
}
body.noMask .eventPanel {
background-color: #EEE;
}
body.noMask #description {
color: #272823;
}
body.noMask #buttons > .button {
border: 1px solid #272823;
color: #272823;
}
#stars > div, #starsBack > div {
color: black;
}
.endGame, .outro {
color:#272823;
}
#wait-btn {
border-color: black;
color: black;
}
#theEnd {
color: #272823;
}
.logo-icon > path {
stroke: white;
}
+36
View File
@@ -0,0 +1,36 @@
div#fabricateButtons {
position: relative;
top: 5px;
left: 0;
}
div#fabricateButtons::before {
content: attr(data-legend);
position: relative;
top: -5px;
}
div#blueprints::before {
content: attr(data-legend);
position: absolute;
top: -13px;
background-color: white;
}
div#blueprints {
position: absolute;
top: 0px;
right: 237px;
border: 1px solid black;
cursor: default;
padding: 5px 10px;
width: 200px;
}
div.blueprintRow {
position: relative;
}
div.blueprintRow .row_key {
float: none;
}
+665 -497
View File
File diff suppressed because it is too large Load Diff
+60 -64
View File
@@ -1,64 +1,60 @@
div#village { div#village {
position: absolute; position: absolute;
top: 0px; top: 0px;
right: 0px; right: 0px;
border: 1px solid black; border: 1px solid black;
cursor: default; cursor: default;
padding: 5px 10px; padding: 5px 10px;
width: 200px; width: 200px;
} }
div#population { div#population {
position: absolute; position: absolute;
top: -13px; top: -13px;
right: 10px; right: 10px;
background-color: white; background-color: white;
} }
.noHuts #population { .noHuts #population {
display: none; display: none;
} }
div#village:before { div#village:before {
position: absolute; position: absolute;
background: white; background: white;
content: "village"; content: attr(data-legend);
left: 8px; left: 8px;
top: -13px; top: -13px;
} }
div#village.noHuts:before { div#workers {
content: "forest"; position:absolute;
} top: -4px;
left: 160px;
div#workers { width: 150px;
position:absolute; }
top: -4px;
left: 160px; .workerRow > .row_val {
width: 150px; position: relative;
} padding-right: 20px;
-webkit-touch-callout: none;
.workerRow > .row_val { -webkit-user-select: none;
position: relative; -khtml-user-select: none;
padding-right: 20px; -moz-user-select: none;
-webkit-touch-callout: none; -ms-user-select: none;
-webkit-user-select: none; user-select: none;
-khtml-user-select: none; }
-moz-user-select: none;
-ms-user-select: none; .workerRow {
user-select: none; position: relative;
} margin: 10px 0px;
cursor: default;
.workerRow { }
position: relative;
margin: 10px 0px; .workerRow .tooltip {
cursor: default; width: 150px;
} }
.workerRow .tooltip { div.storeRow div.tooltip {
width: 150px; width: 160px;
} }
div.storeRow div.tooltip {
width: 160px;
}
+67 -65
View File
@@ -1,66 +1,68 @@
#outfitting { #outfitting {
position: relative; position: relative;
border: 1px solid black; border: 1px solid black;
width: 200px; width: 200px;
margin-bottom: 20px; margin-bottom: 20px;
padding: 5px 10px; padding: 5px 10px;
} }
div#outfitting:before { div#outfitting:before, div#perks:before {
position: absolute; content: attr(data-legend);
content: "supplies"; position: absolute;
top: -13px; top: -13px;
background-color: white; background-color: white;
} }
div.outfitRow { div.outfitRow {
position: relative; position: relative;
cursor: default; cursor: default;
margin: 10px -30px 10px 0px; margin: 10px -30px 10px 0px;
} }
div.outfitRow > .row_val { div.outfitRow > .row_val {
padding-right: 30px; padding-right: 30px;
-webkit-touch-callout: none; -webkit-touch-callout: none;
-webkit-user-select: none; -webkit-user-select: none;
-khtml-user-select: none; -khtml-user-select: none;
-moz-user-select: none; -moz-user-select: none;
-ms-user-select: none; -ms-user-select: none;
user-select: none; user-select: none;
} }
div.outfitRow .tooltip { div.outfitRow .tooltip {
width: 150px; width: 150px;
} }
div#bagspace { div#bagspace {
background-color: white; background-color: white;
position: absolute; position: absolute;
top:-13px; top:-13px;
right: 10px; right: 10px;
} }
div#perks { div#perks {
position: absolute; position: absolute;
top: 0px; top: 0px;
right: 0px; right: 0px;
border: 1px solid black; border: 1px solid black;
cursor: default; cursor: default;
padding: 5px 10px; padding: 5px 10px;
width: 200px; width: 200px;
} }
div#perks:before { div.perkRow {
position: absolute; position: relative;
content: "perks"; }
top: -13px;
background-color: white; div.perkRow .row_key {
} float: none;
}
div.perkRow {
position: relative; #pathScroller {
} padding-top: 10px;
position: relative;
div.perkRow .row_key { top: -10px;
float: none; max-height: 660px;
width: 475px;
overflow-y: auto;
} }
+60 -79
View File
@@ -1,79 +1,60 @@
div#buildBtns { div#buildBtns {
position: absolute; position: absolute;
top: 50px; top: 50px;
left: 0px; left: 0px;
} }
div#buildBtns:before { div#buildBtns:before, div#craftBtns:before, div#buyBtns:before {
content: "build:"; content: attr(data-legend);
position: relative; position: relative;
top: -5px; top: -5px;
} }
div#craftBtns { div#craftBtns {
position: absolute; position: absolute;
top: 50px; top: 50px;
left: 150px; left: 150px;
} }
div#craftBtns:before { div#buyBtns {
content: "craft:"; position: absolute;
position: relative; top: 50px;
top: -5px; left: 300px;
} }
div#buyBtns { div#storesContainer {
position: absolute; position: absolute;
top: 50px; top: 0px;
left: 300px; right: 0px;
} }
div#buyBtns:before { div#stores:before, div#weapons:before {
content: "buy:"; position: absolute;
position: relative; background: white;
top: -5px; content: attr(data-legend);
} left: 8px;
top: -13px;
div#storesContainer { }
position: absolute;
top: 0px; div#stores {
right: 0px; position: relative;
} z-index:10;
border: 1px solid black;
div#stores { cursor: default;
position: relative; padding: 5px 10px;
border: 1px solid black; width: 200px;
cursor: default; }
padding: 5px 10px;
width: 200px; div.storeRow {
} position: relative;
}
div.storeRow {
position: relative; div#weapons {
} margin-top: 15px;
position: relative;
div#stores:before { right: 0px;
position: absolute; border: 1px solid black;
background: white; cursor: default;
content: "stores"; padding: 5px 10px;
left: 8px; width: 200px;
top: -13px; }
}
div#weapons {
margin-top: 15px;
position: relative;
right: 0px;
border: 1px solid black;
cursor: default;
padding: 5px 10px;
width: 200px;
}
div#weapons:before {
position: absolute;
background: white;
content: "weapons";
left: 8px;
top: -13px;
}

Some files were not shown because too many files have changed in this diff Show More