Commit graph

82 commits

Author SHA1 Message Date
asleal2
736e9c3376 Daily goals work now 2018-04-30 17:08:14 -05:00
shadow8t4
0d74c776ef Shell code for notifications. Updated credit information. 2018-04-30 15:16:03 -05:00
shadow8t4
66d704ab34 Goals has icons for user running and monster running, base implementation of grabbing random user. 2018-04-30 13:54:14 -05:00
Alex Huddleston
dde52effed Second progress bar added. Now fills based on how much time is left in the day. 2018-04-29 22:53:51 -05:00
Alex Huddleston
97a75a6ef6 Android back button functionality. SceneLoader script removed, refactored into NavigationMenu. 2018-04-27 17:33:53 -05:00
shadow8t4
1f7d0cdfb6 Made the progress bar look a little nicer / match the overall UI more. 2018-04-27 12:04:11 -05:00
Alex Huddleston
3339a851f8 Fixed progress bar. 2018-04-26 22:58:14 -05:00
shadow8t4
d48de56a1c asjkfdl 2018-04-26 13:11:35 -05:00
shadow8t4
8bf1d021d7 update. 2018-04-26 12:49:09 -05:00
shadow8t4
6b17d4a60d Make goals look nice. 2018-04-26 12:40:50 -05:00
darrelmarek
3c162a0fb9 Merge branch 'alex' into darrel 2018-04-26 12:38:42 -05:00
asleal2
f86ce2c50d Merge branch 'darrel' of https://github.tamu.edu/shadow8t4/MoChaApp into darrel 2018-04-26 12:34:26 -05:00
asleal2
341945e946 working stats page 2018-04-26 12:34:20 -05:00
darrelmarek
c3e33c5115 image prefab bs 2018-04-26 12:34:13 -05:00
shadow8t4
bff66d9110 UI element comment for positioning elements dynamically in scripts. 2018-04-26 11:23:43 -05:00
Patrick Kitchens
9e847cb658 ok 2018-04-26 10:59:14 -05:00
Darrel Marek
c8777e958a random items + monster draw script for home 2018-04-26 10:38:28 -05:00
Patrick Kitchens
a50979a502 Merge branch 'alex' of https://github.tamu.edu/shadow8t4/MoChaApp into patrick 2018-04-26 10:14:11 -05:00
shadow8t4
3fcdf5b9e1 I think I successfully merged Darrel's changes. 2018-04-26 09:52:31 -05:00
Darrel Marek
aff276ff78 Editing goals page, added monster manager to home 2018-04-26 09:46:58 -05:00
shadow8t4
e342a6a0eb Navigation Menu implemented. 2018-04-26 09:37:47 -05:00
Darrel Marek
0596bac28b Merge branch 'alex' into darrel 2018-04-26 07:25:00 -05:00
Darrel Marek
d4e4f8a07b made monster manager work across scenes 2018-04-26 07:23:04 -05:00
Darrel Marek
d5a5432f4b Merge branch 'andrew' into darrel 2018-04-26 06:59:42 -05:00
Darrel Marek
53a6f8c3f1 Monsters + inventory working 2018-04-26 06:59:29 -05:00
Patrick Kitchens
519dfff2bc Updated, AndroidManifest still not working right 2018-04-26 06:36:49 -05:00
Patrick Kitchens
28dd214897 Commit for testing XML. 2018-04-26 05:33:52 -05:00
asleal2
9291b70295 playerpref steps 2018-04-26 04:54:43 -05:00
asleal2
df378ecc50 playerpref steps 2018-04-26 04:38:54 -05:00
asleal2
908c88ed85 playerpref steps 2018-04-26 03:03:43 -05:00
asleal2
009e8ee9c9 playerpref steps 2018-04-26 02:54:53 -05:00
asleal2
a2d0555a52 playerpref steps 2018-04-26 02:52:47 -05:00
asleal2
62fbee44c8 playerpref steps 2018-04-26 02:48:59 -05:00
asleal2
cbc73b4546 playerpref steps 2018-04-26 02:46:35 -05:00
asleal2
fe61c6fc49 playerpref steps 2018-04-26 02:39:44 -05:00
asleal2
37a6524ae2 playerpref steps 2018-04-26 02:35:06 -05:00
asleal2
5f518d4010 playerpref steps 2018-04-26 02:20:35 -05:00
asleal2
0fa4abc797 playerpref steps 2018-04-26 02:09:18 -05:00
asleal2
ced7137fd0 playerpref steps 2018-04-26 01:36:56 -05:00
asleal2
f857f2f831 playerpref steps 2018-04-26 01:27:34 -05:00
asleal2
eb914d25de playerpref steps 2018-04-26 01:20:23 -05:00
asleal2
c2ed30d441 playerpref steps 2018-04-26 01:18:08 -05:00
Patrick Kitchens
576ee9b8b9 OAuth implemented. Data is ? 2018-04-26 00:58:00 -05:00
darrelmarek
f3c4d0b610 Progress bar hooked up with pedometer 2018-04-26 00:55:51 -05:00
Darrel Marek
1d11f0c3dd Piped pedometer steps into goals 2018-04-26 00:18:01 -05:00
asleal2
2f7f287033 progress bars 2018-04-25 23:16:41 -05:00
Darrel Marek
1001ba58a3 Resources stuff 2018-04-25 23:16:28 -05:00
darrelmarek
97557bfb47 Created resources folder + more work on inventory 2018-04-25 22:33:46 -05:00
asleal2
c6e0281a9b multiple progress bars, text is overlapping though 2018-04-25 19:59:40 -05:00
asleal2
5cf0257e18 Added progress bars, working on integrating the actual fitbit data and goal system 2018-04-25 13:47:56 -05:00