Commit graph

74 commits

Author SHA1 Message Date
darrelmarek
c3e33c5115 image prefab bs 2018-04-26 12:34:13 -05:00
Darrel Marek
c8777e958a random items + monster draw script for home 2018-04-26 10:38:28 -05:00
Darrel Marek
aff276ff78 Editing goals page, added monster manager to home 2018-04-26 09:46:58 -05:00
Darrel Marek
0596bac28b Merge branch 'alex' into darrel 2018-04-26 07:25:00 -05:00
Darrel Marek
bb9a8117e1 Merged with andrew 2018-04-26 07:02:55 -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
asleal2
483a166193 playerpref steps 2018-04-26 04:58:15 -05:00
asleal2
c051a6683c playerpref steps 2018-04-26 04:42:59 -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
00e3956098 progress bars 2018-04-25 23:24:16 -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
9b7c5de385 Added progress bars, working on integrating the actual fitbit data and goal system 2018-04-25 13:50:59 -05:00
shadow8t4
3b3b8ba23f Second UI Overhaul. Menu button not implemented yet. Profile page updated. 2018-04-25 13:27:28 -05:00
Alex Huddleston
f646a55f15 A bunch of UI changes. 2018-04-25 10:36:45 -05:00
darrelmarek
9e5d3feec0 Merged alex + darrel 2018-04-24 13:49:36 -05:00
Alex Huddleston
7ae3db37e5 Merge branch 'darrel' into alex 2018-04-23 19:28:26 -05:00
darrelmarek
eb61f607b1 Working on inventory 2 2018-04-23 18:49:34 -05:00
shadow8t4
94bf0ca36d Rearraged layout, navigates more like the prototype. Cleaned up visuals. 2018-04-23 15:43:53 -05:00
shadow8t4
cde6bed6eb Credits page implemented. 2018-04-23 13:11:59 -05:00
shadow8t4
24df4c0ad6 Merge branch 'darrel' into alex 2018-04-23 11:37:50 -05:00
Darrel Marek
fd71606833 working on inventory 2018-04-23 09:47:32 -05:00
Alex Huddleston
806f1913bc Updated. Home screen shows a monster now. 2018-04-22 00:37:40 -05:00
Alex Huddleston
501cfe3f15 Updating. 2018-04-21 19:03:58 -05:00
Alex Huddleston
d5d06e9f9e Committing for the night. 2018-04-20 22:44:29 -05:00
shadow8t4
a1934f0e84 Replaced GetLeaderboard with LeaderboardManager. Manages all button functions and leaderboard stuff. 2018-04-20 12:22:14 -05:00
shadow8t4
586fb2ea8c Merge branch 'master' into alex 2018-04-19 19:04:14 -05:00
shadow8t4
aeb7761236 Updating. 2018-04-19 19:03:30 -05:00
darrelmarek
843ca90028 Added Goals page 2018-04-19 14:38:04 -05:00
shadow8t4
531ce602f4 Sorry Darrel. 2018-04-19 14:18:53 -05:00
shadow8t4
49293add72 icon.G 2018-04-19 14:17:39 -05:00
darrelmarek
3687f8be0b updated monster creator 2018-04-19 14:15:08 -05:00
asleal2
f19c06111f making Goals scene 2018-04-19 14:10:50 -05:00
darrelmarek
015d67f490 More inventory 2018-04-19 14:16:03 -05:00
darrelmarek
0bedb71a40 Added save + load buttons for monster 2018-04-19 13:11:00 -05:00
darrelmarek
1501bd9bc9 Merge remote-tracking branch 'origin/alex' into darrel 2018-04-19 13:05:13 -05:00
darrelmarek
de96f58931 Actually fixed step counter 2018-04-19 13:03:05 -05:00
darrelmarek
ec30a48236 Merged, fixed step counter, fixed monster creator 2018-04-19 12:41:05 -05:00
Alex Huddleston
843816242d Small naming change. 2018-04-18 21:53:33 -05:00
Alex Huddleston
51d06cfd0c Leaderboard Scene. 2018-04-18 21:49:39 -05:00
shadow8t4
36fd467819 Script updates. 2018-04-18 18:15:11 -05:00
shadow8t4
d1213977eb Darrel has a button now. 2018-04-17 15:15:29 -05:00
shadow8t4
425eeb8574 Working HTTP request scene. 2018-04-17 15:13:19 -05:00
asleal2
668024e7b2 added GetData C# script 2018-04-17 14:16:10 -05:00
shadow8t4
959fa5e8f9 Updating visuals. 2018-04-17 14:13:50 -05:00
darrelmarek
650130e01b Monster saving and loading 2018-04-17 13:55:28 -05:00
Darrel Marek
91a36214e2 updated monster creator 2018-04-15 23:08:14 -05:00
Darrel Marek
c014439830 Fixed drag and dropping 2018-04-15 17:19:01 -05:00