Commit graph

134 commits

Author SHA1 Message Date
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
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
5651fc6034 thanks 2018-04-26 11:06:39 -05:00
shadow8t4
27e2c484e6 Oh plbs 2018-04-26 11:04:53 -05:00
shadow8t4
734c7c4c35 samn don 2018-04-26 11:00:35 -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
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
d4e4f8a07b made monster manager work across scenes 2018-04-26 07:23:04 -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
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
483a166193 playerpref steps 2018-04-26 04:58:15 -05:00
asleal2
9291b70295 playerpref steps 2018-04-26 04:54:43 -05:00
asleal2
c051a6683c playerpref steps 2018-04-26 04:42:59 -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