Commit graph

49 commits

Author SHA1 Message Date
darrelmarek
770c4f751b Basic inventory system 2018-04-19 13:45:53 -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
darrelmarek
93ab0fd77c Merge remote-tracking branch 'origin/alex' into darrel 2018-04-18 19:37:44 -05:00
darrelmarek
ea19992e9d updated gitignore 2018-04-18 19:31:30 -05:00
shadow8t4
36fd467819 Script updates. 2018-04-18 18:15:11 -05:00
Alex Huddleston
6bc5863f80 Merge branch 'darrel' into alex 2018-04-18 18:08:45 -05:00
Alex Huddleston
d3eea10752 Stop worrying about Assets/Plugins/ 2018-04-17 19:36:16 -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
darrelmarek
8074d5a610 Fixed step counter 2018-04-13 13:01:35 -05:00
shadow8t4
36ccc4033f Added a placeholder monster for the main screen. 2018-04-12 14:14:12 -05:00
shadow8t4
a335ba9594 Cleaned up button script some more. 2018-04-12 13:38:53 -05:00
shadow8t4
9a306c1f7d One more fix. 2018-04-12 13:24:12 -05:00
shadow8t4
4cacab3b2b Cleaned up prefabs... might cause merge conflicts. Added fonts. 2018-04-12 13:22:42 -05:00
shadow8t4
7848e7ba3c Fixed button scripts. 2018-04-12 11:10:33 -05:00
shadow8t4
9a4bbf5e9b Updating 2018-04-12 10:43:06 -05:00
darrelmarek
d0e5084898 updated scenes with canvas prefab 2018-04-10 15:28:51 -05:00
shadow8t4
cffe754268 Updated. 2018-04-10 14:52:01 -05:00
darrelmarek
146677f069 Fixed res error 2018-04-10 14:49:39 -05:00
shadow8t4
517b5ff95a changes. 2018-04-10 14:27:15 -05:00
darrelmarek
99250b6b4c Merge branch 'darrel' of https://github.tamu.edu/shadow8t4/MoChaApp into darrel 2018-04-10 14:21:14 -05:00
darrelmarek
131016e479 small things 2018-04-10 14:21:12 -05:00
shadow8t4
d01ec79c68 Updating. 2018-04-10 14:00:37 -05:00
shadow8t4
1c1f789b84 Pushing some visual changes 2018-04-10 13:58:58 -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
shadow8t4
831c4aa35d Updating. 2018-04-10 12:57:05 -05:00
shadow8t4
1a6e7b04fa Clean up, added scene for stats. 2018-04-10 12:54:57 -05:00
darrelmarek
21146a11fd Added pedometer 2018-04-10 12:44:50 -05:00
darrelmarek
1ecd0e0cf0 Added buttons, changed some settings 2018-04-06 15:12:37 -05:00
Darrel Marek
23c8bc4e85 Create README.md 2018-04-06 12:56:54 -05:00
darrelmarek
6c26432a17 Fresh Project 2018-04-06 12:55:27 -05:00
darrelmarek
f5cabe5740 start over 2018-04-06 12:51:10 -05:00
darrelmarek
335d331e23 i dont think this is working 2018-04-06 12:09:04 -05:00
darrelmarek
e724cc3634 Updated .gitignore
Previous gitignore that worked for me
2018-04-06 11:45:28 -05:00
darrelmarek
0b7b9a70a2 Updated gitignore 1
Inserted ** before folders
2018-04-06 11:39:46 -05:00
shadow8t4
49a4b3103d Initial Project Commit. 2018-04-05 14:20:41 -05:00
Alex Huddleston
7d94dc119b Initial commit 2018-04-05 14:04:54 -05:00