 Michael
|
36c75529ff
|
Merge branch 'master' of https://github.com/Continuities/adarkroom.git
|
2013-11-14 21:33:40 -05:00 |
|
|
Michael
|
16824386eb
|
Use a textarea instead of a prompt for export to prevent truncation in
Chrome.
|
2013-11-14 21:33:14 -05:00 |
|
|
Michael Townsend
|
dcb4f67f8d
|
Merge pull request #66 from grotr/master
Add reverse color scheme.
|
2013-11-14 11:46:39 -08:00 |
|
|
Blake Grotewold
|
c78689f2c7
|
Add reverse color scheme.
|
2013-11-14 12:29:27 -06:00 |
|
|
Michael!
|
c27430f29e
|
A few small tweaks, and added link to the iOS app.
|
2013-11-13 22:18:27 -05:00 |
|
|
Michael
|
52974eaa96
|
Added link to the ADR iOS app on the Mobile Warning splash page.
|
2013-11-09 21:43:08 -05:00 |
|
|
Michael Townsend
|
9ae4ea53d9
|
Merge pull request #63 from Vermilingua/fallbackjquery
Cleaned up the scars from the merge, and added the working fallback
|
2013-11-03 09:46:51 -08:00 |
|
|
Vermilingua
|
d78fd6acc0
|
added fallback, without merge scars
|
2013-11-03 08:45:42 +11:00 |
|
|
Vermilingua
|
918e4fa782
|
tidied
|
2013-11-03 08:42:33 +11:00 |
|
|
Michael
|
ebee3be4d1
|
Sometimes I'm dumb.
|
2013-11-01 23:03:50 -04:00 |
|
|
Michael
|
994f01c78c
|
Some refactoring and some bug fixes.
|
2013-11-01 23:00:51 -04:00 |
|
|
Michael Townsend
|
d8f6e73c6b
|
Merge pull request #59 from Vermilingua/scoring
added scoring system
|
2013-11-01 14:17:45 -07:00 |
|
|
Vermilingua
|
e60abd0153
|
end screen looks nicer
|
2013-11-01 23:12:06 +11:00 |
|
|
Vermilingua
|
d7fc109554
|
made store collection routine in SM, and updated everything to suit
|
2013-11-01 17:01:21 +11:00 |
|
|
Vermilingua
|
a68f58e648
|
scoring system 100% complete
|
2013-11-01 16:35:20 +11:00 |
|
|
Vermilingua
|
3b3755cda9
|
started scoring system, yet to be populated
|
2013-11-01 16:35:19 +11:00 |
|
|
Michael Townsend
|
a19643517a
|
Update prestige.js
Null check in Prestige.load
|
2013-10-31 14:37:19 -04:00 |
|
|
Michael Townsend
|
c738342bad
|
Update world.js
Only add the cache if there is prestige data
|
2013-10-31 14:36:03 -04:00 |
|
|
Michael Townsend
|
f5847f66ba
|
Update engine.js
|
2013-10-30 18:20:32 -04:00 |
|
|
Michael Townsend
|
de9f88dfab
|
Merge pull request #60 from Vermilingua/save-fix
Save fix
|
2013-10-30 15:20:11 -07:00 |
|
|
Vermilingua
|
2c31e4ecda
|
strips nonwords, spaces, and newlines from both the input and output
|
2013-10-31 07:17:41 +11:00 |
|
|
Michael
|
a24d492681
|
Fixed a bug with the page title.
1.3.1
|
2013-10-29 18:39:00 -04:00 |
|
|
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
1,3
|
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 |
|