Commit graph

Select branches

Hide pull requests

master

Mono Color

• cde6bed6eb Credits page implemented. shadow8t4 2018-04-23 13:11:59 -0500
• 24df4c0ad6 Merge branch 'darrel' into alex shadow8t4 2018-04-23 11:37:50 -0500
• fd71606833 working on inventory Darrel Marek 2018-04-23 09:47:32 -0500
• 806f1913bc Updated. Home screen shows a monster now. Alex Huddleston 2018-04-22 00:37:40 -0500
• 501cfe3f15 Updating. Alex Huddleston 2018-04-21 19:03:58 -0500
• d5d06e9f9e Committing for the night. Alex Huddleston 2018-04-20 22:44:29 -0500
• a1934f0e84 Replaced GetLeaderboard with LeaderboardManager. Manages all button functions and leaderboard stuff. shadow8t4 2018-04-20 12:22:14 -0500
• 586fb2ea8c Merge branch 'master' into alex shadow8t4 2018-04-19 19:04:14 -0500
• aeb7761236 Updating. shadow8t4 2018-04-19 19:03:30 -0500
• 843ca90028 Added Goals page darrelmarek 2018-04-19 14:38:04 -0500
• c432760c06 Merge branch 'master' of https://github.tamu.edu/shadow8t4/MoChaApp asleal2 2018-04-19 14:29:43 -0500
• 8a28133b57 removed my key I accidentally added asleal2 2018-04-19 14:29:16 -0500
• 531ce602f4 Sorry Darrel. shadow8t4 2018-04-19 14:18:53 -0500
• 49293add72 icon.G shadow8t4 2018-04-19 14:17:39 -0500
• 29ce1c1211 Updated monster manager darrelmarek 2018-04-19 14:16:56 -0500
• 3687f8be0b updated monster creator darrelmarek 2018-04-19 14:15:08 -0500
• 8f76e8c83d Updated gitignore (plugins.meta) darrelmarek 2018-04-19 14:13:34 -0500
• f19c06111f making Goals scene asleal2 2018-04-19 14:10:50 -0500
• 4cb7845f6e Merge pull request #4 from shadow8t4/alex Alex Huddleston 2018-04-19 10:54:23 -0500
• afeebf294a Added #if to fix build on my computer. shadow8t4 2018-04-19 10:52:28 -0500
• 43d85e782c Updating readme to have some better info. Alex Huddleston 2018-04-19 10:13:26 -0500
• 0896a343c2 Merge pull request #3 from shadow8t4/alex Alex Huddleston 2018-04-19 10:06:59 -0500
• 015d67f490 More inventory darrelmarek 2018-04-19 14:16:03 -0500
• 770c4f751b Basic inventory system darrelmarek 2018-04-19 13:45:53 -0500
• 0bedb71a40 Added save + load buttons for monster darrelmarek 2018-04-19 13:11:00 -0500
• 1501bd9bc9 Merge remote-tracking branch 'origin/alex' into darrel darrelmarek 2018-04-19 13:05:13 -0500
• de96f58931 Actually fixed step counter darrelmarek 2018-04-19 13:03:05 -0500
• ec30a48236 Merged, fixed step counter, fixed monster creator darrelmarek 2018-04-19 12:41:05 -0500
• 843816242d Small naming change. Alex Huddleston 2018-04-18 21:53:33 -0500
• 51d06cfd0c Leaderboard Scene. Alex Huddleston 2018-04-18 21:49:39 -0500
• 93ab0fd77c Merge remote-tracking branch 'origin/alex' into darrel darrelmarek 2018-04-18 19:37:44 -0500
• 36fd467819 Script updates. shadow8t4 2018-04-18 18:15:11 -0500
• 6bc5863f80 Merge branch 'darrel' into alex Alex Huddleston 2018-04-18 18:08:45 -0500
• ea19992e9d updated gitignore darrelmarek 2018-04-18 19:31:30 -0500
• d3eea10752 Stop worrying about Assets/Plugins/ Alex Huddleston 2018-04-17 19:36:16 -0500
• d1213977eb Darrel has a button now. shadow8t4 2018-04-17 15:15:29 -0500
• 425eeb8574 Working HTTP request scene. shadow8t4 2018-04-17 15:13:19 -0500
• 668024e7b2 added GetData C# script asleal2 2018-04-17 14:16:10 -0500
• 959fa5e8f9 Updating visuals. shadow8t4 2018-04-17 14:13:50 -0500
• 650130e01b Monster saving and loading darrelmarek 2018-04-17 13:55:28 -0500
• 91a36214e2 updated monster creator Darrel Marek 2018-04-15 23:08:14 -0500
• c014439830 Fixed drag and dropping Darrel Marek 2018-04-15 17:19:01 -0500
• 8074d5a610 Fixed step counter darrelmarek 2018-04-13 13:01:35 -0500
• 36ccc4033f Added a placeholder monster for the main screen. shadow8t4 2018-04-12 14:14:12 -0500
• a335ba9594 Cleaned up button script some more. shadow8t4 2018-04-12 13:38:53 -0500
• 9a306c1f7d One more fix. shadow8t4 2018-04-12 13:24:12 -0500
• 4cacab3b2b Cleaned up prefabs... might cause merge conflicts. Added fonts. shadow8t4 2018-04-12 13:22:42 -0500
• 19c91242ac Merge pull request #1 from shadow8t4/darrel Alex Huddleston 2018-04-12 12:00:14 -0500
• 7848e7ba3c Fixed button scripts. shadow8t4 2018-04-12 11:10:33 -0500
• 9a4bbf5e9b Updating shadow8t4 2018-04-12 10:43:06 -0500
• d0e5084898 updated scenes with canvas prefab darrelmarek 2018-04-10 15:28:51 -0500
• cffe754268 Updated. shadow8t4 2018-04-10 14:52:01 -0500
• 146677f069 Fixed res error darrelmarek 2018-04-10 14:49:39 -0500
• 517b5ff95a changes. shadow8t4 2018-04-10 14:27:15 -0500
• 99250b6b4c Merge branch 'darrel' of https://github.tamu.edu/shadow8t4/MoChaApp into darrel darrelmarek 2018-04-10 14:21:14 -0500
• 131016e479 small things darrelmarek 2018-04-10 14:21:12 -0500
• d01ec79c68 Updating. shadow8t4 2018-04-10 14:00:37 -0500
• 1c1f789b84 Pushing some visual changes shadow8t4 2018-04-10 13:58:58 -0500
• 7a447724cc Work on monster creator darrelmarek 2018-04-10 13:45:41 -0500
• 5776f298ff Edited scenes darrelmarek 2018-04-10 13:20:36 -0500
• 48bad5cf73 Added monster parts sprites darrelmarek 2018-04-10 13:01:21 -0500
• 831c4aa35d Updating. shadow8t4 2018-04-10 12:57:05 -0500
• 1a6e7b04fa Clean up, added scene for stats. shadow8t4 2018-04-10 12:54:57 -0500
• 21146a11fd Added pedometer darrelmarek 2018-04-10 12:44:50 -0500
• 1ecd0e0cf0 Added buttons, changed some settings darrelmarek 2018-04-06 15:12:37 -0500
• 23c8bc4e85 Create README.md Darrel Marek 2018-04-06 12:56:54 -0500
• 6c26432a17 Fresh Project darrelmarek 2018-04-06 12:55:27 -0500
• f5cabe5740 start over darrelmarek 2018-04-06 12:51:10 -0500
• 335d331e23 i dont think this is working darrelmarek 2018-04-06 12:09:04 -0500
• e724cc3634 Updated .gitignore darrelmarek 2018-04-06 11:45:28 -0500
• 0b7b9a70a2 Updated gitignore 1 darrelmarek 2018-04-06 11:39:46 -0500
• 49a4b3103d Initial Project Commit. shadow8t4 2018-04-05 14:20:41 -0500
• 7d94dc119b Initial commit Alex Huddleston 2018-04-05 14:04:54 -0500