Commit graph

25 commits

Author SHA1 Message Date
Darrel Marek
4c0766a0b6 Merge branch 'Patrick' into darrel 2018-05-03 16:12:26 -05:00
darrelmarek
ecc3e5876f Monsters load on home and stats page! 2018-04-30 18:58:50 -05:00
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
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
00922143d3 djlkfs 2018-04-26 13:18:32 -05:00
darrelmarek
57f3955deb removed redundant items on monstercreator scene 2018-04-26 12:51:50 -05:00
darrelmarek
c3e33c5115 image prefab bs 2018-04-26 12:34:13 -05:00
Darrel Marek
aff276ff78 Editing goals page, added monster manager to home 2018-04-26 09:46:58 -05:00
Darrel Marek
53a6f8c3f1 Monsters + inventory working 2018-04-26 06:59:29 -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
darrelmarek
9e5d3feec0 Merged alex + darrel 2018-04-24 13:49:36 -05:00
darrelmarek
eb61f607b1 Working on inventory 2 2018-04-23 18:49:34 -05:00
Darrel Marek
fd71606833 working on inventory 2018-04-23 09:47:32 -05:00
shadow8t4
49293add72 icon.G 2018-04-19 14:17:39 -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
ec30a48236 Merged, fixed step counter, fixed monster creator 2018-04-19 12:41:05 -05:00
shadow8t4
4cacab3b2b Cleaned up prefabs... might cause merge conflicts. Added fonts. 2018-04-12 13:22:42 -05:00
darrelmarek
d0e5084898 updated scenes with canvas prefab 2018-04-10 15:28:51 -05:00
darrelmarek
7a447724cc Work on monster creator 2018-04-10 13:45:41 -05:00
darrelmarek
5776f298ff Edited scenes
Added event systems and working buttons to every scene
2018-04-10 13:20:36 -05:00
darrelmarek
48bad5cf73 Added monster parts sprites 2018-04-10 13:01:21 -05:00