Alex Huddleston
|
f6a176c10b
|
Resized all buttons with icons so the space where you can click on them matches the size of the button itself.
|
2018-04-27 17:57:00 -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 |
|
Alex Huddleston
|
98fbbedcae
|
Changed canvas resolution reference to 1080p landscape. Fixed scaling/position issues that resulted. Progress bar in Goals now thoroughly broken.
|
2018-04-26 21:19:15 -05:00 |
|
Alex Huddleston
|
db06d56727
|
Prefab cleanup. Scenes cleanup.
|
2018-04-26 15:17:13 -05:00 |
|
shadow8t4
|
e2f77b89d0
|
Replaced the Tyranitar with a non-IP-infringing monster model.
|
2018-04-26 13:46:03 -05:00 |
|
shadow8t4
|
b8191dc53a
|
I'mfdsjgsfj
|
2018-04-26 13:22:05 -05:00 |
|
shadow8t4
|
00922143d3
|
djlkfs
|
2018-04-26 13:18:32 -05:00 |
|
asleal2
|
509dd83b67
|
Merge branch 'darrel' of https://github.tamu.edu/shadow8t4/MoChaApp into darrel
|
2018-04-26 13:13:14 -05:00 |
|
asleal2
|
23feaf4ebf
|
working stats page
|
2018-04-26 13:12:50 -05:00 |
|
shadow8t4
|
d48de56a1c
|
asjkfdl
|
2018-04-26 13:11:35 -05:00 |
|
asleal2
|
050ffa15f9
|
working stats page
|
2018-04-26 13:10:58 -05:00 |
|
shadow8t4
|
2b51820510
|
Merge branch 'darrel' into alex
|
2018-04-26 13:08:42 -05:00 |
|
shadow8t4
|
44601503d2
|
fine.
|
2018-04-26 13:07:25 -05:00 |
|
darrelmarek
|
57f3955deb
|
removed redundant items on monstercreator scene
|
2018-04-26 12:51:50 -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 |
|
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 |
|
Patrick Kitchens
|
a50979a502
|
Merge branch 'alex' of https://github.tamu.edu/shadow8t4/MoChaApp into patrick
|
2018-04-26 10:14:11 -05:00 |
|
shadow8t4
|
5e7b5f407e
|
Navigation plbs.
|
2018-04-26 09:54:29 -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
|
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 |
|
Patrick Kitchens
|
28dd214897
|
Commit for testing XML.
|
2018-04-26 05:33:52 -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 |
|
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
|
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 |
|