|
|
fc458a1dba
|
Merge branch 'master' into JSON
|
2016-04-02 23:50:31 -04:00 |
|
|
|
5674a0644a
|
Merge pull request #26 from kihashi/feature/#20-card-footers-alternate-browsers
Tags now display without fullwidth.
|
2016-03-31 23:14:39 -04:00 |
|
|
|
3b0014f0cf
|
Tags now display without fullwidth.
This makes them display in other browsers as well as fit other screen
resolutions.
|
2016-03-31 23:14:05 -04:00 |
|
|
|
8a2ee7e5b0
|
Merge pull request #25 from kihashi/master
Update JSON Branch
|
2016-03-31 13:27:05 -04:00 |
|
|
|
0361d73457
|
Removed default color class from buttons to avoid conflicts with Vue.
|
2016-03-30 23:30:00 -04:00 |
|
|
|
ece5832bd8
|
Merge pull request #18 from kihashi/feature/#16-page-footer
Added a page footer.
|
2016-03-30 23:28:37 -04:00 |
|
|
|
ab1ed27666
|
Added a page footer.
|
2016-03-30 23:28:18 -04:00 |
|
|
|
a05f216801
|
Merge pull request #17 from kihashi/feature/#11-items-in-multiple-bundles
Updated the user_data array to store the position from `item.bundles`.
|
2016-03-30 23:04:33 -04:00 |
|
|
|
0fcaa42214
|
Updated the user_data array to store the position from item.bundles.
All of the associated check, get, and set methods have been updated.
I have no idea if these are as performant or not.
|
2016-03-30 23:03:14 -04:00 |
|
|
|
5f1bf11187
|
Merge pull request #14 from kihashi/feature/#12-encode-data-strings
Added base64 encoding of the string.
|
2016-03-30 22:16:40 -04:00 |
|
|
|
872769a74d
|
Added base64 encoding of the string.
|
2016-03-30 22:16:17 -04:00 |
|
|
|
096e457e08
|
Merge pull request #10 from kihashi/bulma
Converted app to use Bulma.
|
2016-03-30 18:00:35 -04:00 |
|
|
|
f330975a17
|
Converted app to use Bulma.
|
2016-03-30 17:59:40 -04:00 |
|
|
|
b753627c53
|
Fixed some malformed JSON.
|
2016-03-21 19:12:48 -04:00 |
|
|
|
e6240a1ccc
|
Merge branch 'gh-pages'
|
2016-03-21 18:53:30 -04:00 |
|
|
|
9469ff689b
|
Merge branch 'JSON'
|
2016-03-21 18:50:54 -04:00 |
|
|
|
90041444ec
|
Added items from the River Fish Bundle.
|
2016-03-21 14:38:24 -04:00 |
|
|
|
452b33b5b0
|
Merge pull request #6 from kihashi/JSON
JSON Update
|
2016-03-21 11:33:42 -04:00 |
|
|
|
098a15fa8e
|
Fixed a syntax problem in an array.
|
2016-03-21 11:26:00 -04:00 |
|
|
|
bc772e38c1
|
Fixed bundles for items with multiple bundles.
|
2016-03-21 11:23:13 -04:00 |
|
|
|
0a0f7319c4
|
Added the items from the Artisan Bundle.
|
2016-03-21 11:13:39 -04:00 |
|
|
|
06ca7212a7
|
Added items from the Animal Bundle
|
2016-03-21 09:39:51 -04:00 |
|
|
|
0fd2f99a4a
|
Merge branch 'master' into JSON
|
2016-03-21 00:17:16 -04:00 |
|
|
|
2b22192238
|
Merge pull request #5 from kihashi/master
Add basic Data Binding
|
2016-03-21 00:16:52 -04:00 |
|
|
|
5ac012a0f9
|
Hooked up all the buttons to the basic user_data.
|
2016-03-21 00:15:55 -04:00 |
|
|
|
53c8d82cb9
|
Added basic user_data.
|
2016-03-21 00:13:23 -04:00 |
|
|
|
a85ad85b57
|
Added a search box to the alphabetical list.
|
2016-03-21 00:13:06 -04:00 |
|
|
|
aa0e700d2c
|
Merge pull request #4 from kihashi/master
Update beta from master
|
2016-03-20 22:27:49 -04:00 |
|
|
|
51b33b0ed3
|
Removed bundle name hardcode.
|
2016-03-20 22:26:08 -04:00 |
|
|
|
a7a0d554b2
|
Switched from a list of items to a panel.
Each panel shows a button for each bundle it is in with a checkbox.
This will need to be hooked up to an onclick even in the future.
|
2016-03-20 22:23:03 -04:00 |
|
|
|
3d8d6e8ff2
|
Added seasons to existing items.
|
2016-03-20 22:21:33 -04:00 |
|
|
|
7fc920647e
|
Fixed HTML formatting.
|
2016-03-18 18:04:22 -04:00 |
|
|
|
bb29a3234c
|
Added Seasons and skills tabs.
|
2016-03-18 17:43:50 -04:00 |
|
|
|
39116c4b7e
|
Merge branch 'JSON'
|
2016-03-18 17:21:22 -04:00 |
|
|
|
87d8303cbd
|
Changed season and skill IDs to be more natural.
|
2016-03-18 16:38:49 -04:00 |
|
|
|
ce57976d85
|
Added Skills and Seasons.
|
2016-03-18 16:21:30 -04:00 |
|
|
|
8e9dddde38
|
Fixed a missing Source.
|
2016-03-17 09:42:57 -04:00 |
|
|
|
658ffa0e8d
|
Merge pull request #3 from kihashi/master
OnClick assignment now gets executed.
|
2016-03-17 09:38:52 -04:00 |
|
|
|
d6587155be
|
OnClick assignment now gets executed.
|
2016-03-17 09:38:29 -04:00 |
|
|
|
0643487524
|
Merge pull request #2 from kihashi/master
Async JSON Data
|
2016-03-17 09:32:47 -04:00 |
|
|
|
0ba17be6bc
|
Merge pull request #1 from kihashi/JSON
Added JSON loading to the main page.
|
2016-03-17 09:31:53 -04:00 |
|
|
|
8e4009cf8d
|
Updated the Javascript to load the JSON data.
|
2016-03-16 23:19:46 -04:00 |
|
|
|
f23ff97acd
|
Added Vue Resource plug in.
This allows us to async load the JSON data.
|
2016-03-16 23:19:25 -04:00 |
|
|
|
259abd92f5
|
Fixed an errant tab in the JSON.
|
2016-03-16 23:18:34 -04:00 |
|
|
|
d7e24a04a5
|
Merge branch 'master' into JSON
|
2016-03-16 18:29:50 -04:00 |
|
|
|
0608149ede
|
Moved the JSON to the top level to match other files.
|
2016-03-16 18:29:42 -04:00 |
|
|
|
5c6a8ef9a2
|
Added JS from codepen.
|
2016-03-16 18:11:14 -04:00 |
|
|
|
3d9002406a
|
Added JS and CSS Links.
|
2016-03-16 18:11:01 -04:00 |
|
|
|
b1d67c2afb
|
Removed python files and reorganized html/css.
|
2016-03-16 17:55:06 -04:00 |
|
|
|
9b28e5d7ad
|
Added items from the Quality Crops Bundle.
|
2016-03-16 14:36:10 -04:00 |
|
