ada/mochapine64backup
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Commit graph

  • c183473d99 Merge pull request #7 from shadow8t4/alex master Alex Huddleston 2018-05-04 11:09:17 -0500
  • dff6f9036b extra fixes to pedometer/fitbit behavior asleal2 2018-05-04 02:59:27 -0500
  • 030c4b922d stats update on fitbit use, refresh button asleal2 2018-05-04 01:45:02 -0500
  • e5f5c08bef Fixed Fitbit Login screen. shadow8t4 2018-05-03 20:56:07 -0500
  • bb225801b9 Back button on home doesn't quit out of app. would reset fitbit login, which could prove to be annoying. Now only pressing back from main will quit. shadow8t4 2018-05-03 18:53:21 -0500
  • 09420f5edc Fixing small inconsistency. shadow8t4 2018-05-03 18:36:31 -0500
  • 8504e890b7 Fixing errors from merges. shadow8t4 2018-05-03 18:31:39 -0500
  • ecb4c71577 Merge pull request #6 from shadow8t4/darrel Alex Huddleston 2018-05-03 18:21:09 -0500
  • b5c291ac44 Merge branch 'andrew' into darrel Darrel Marek 2018-05-03 16:23:16 -0500
  • 4c0766a0b6 Merge branch 'Patrick' into darrel Darrel Marek 2018-05-03 16:12:26 -0500
  • b873cbd083 Ugly fitbit version :( Patrick Kitchens 2018-05-03 15:51:17 -0500
  • d8ad2def11 added new progress bar, should all work... asleal2 2018-05-01 03:45:51 -0500
  • 499a0aedfd added new progress bar, should all work... asleal2 2018-04-30 21:30:05 -0500
  • 008b327c9d Fixing personal goals bar. Alex Huddleston 2018-04-30 19:24:40 -0500
  • 2b48b84ca9 fixed oob error asleal2 2018-04-30 19:08:06 -0500
  • ecc3e5876f Monsters load on home and stats page! darrelmarek 2018-04-30 18:58:50 -0500
  • 83fbdcd8ed fixed daily goal, added personal progress bar asleal2 2018-04-30 18:48:10 -0500
  • 736e9c3376 Daily goals work now asleal2 2018-04-30 17:08:14 -0500
  • 0d74c776ef Shell code for notifications. Updated credit information. shadow8t4 2018-04-30 15:16:03 -0500
  • b48673d776 Updating credits. shadow8t4 2018-04-30 14:15:21 -0500
  • 66d704ab34 Goals has icons for user running and monster running, base implementation of grabbing random user. shadow8t4 2018-04-30 13:54:14 -0500
  • dde52effed Second progress bar added. Now fills based on how much time is left in the day. Alex Huddleston 2018-04-29 22:53:51 -0500
  • 843bed5bce Updating. Alex Huddleston 2018-04-29 16:54:04 -0500
  • 2a9b4522d6 I guess somehow this broke so I'm fixing it. Alex Huddleston 2018-04-28 02:00:17 -0500
  • 4c8136bdaf A few more clean up things. Alex Huddleston 2018-04-27 18:03:17 -0500
  • f6a176c10b Resized all buttons with icons so the space where you can click on them matches the size of the button itself. Alex Huddleston 2018-04-27 17:57:00 -0500
  • 97a75a6ef6 Android back button functionality. SceneLoader script removed, refactored into NavigationMenu. Alex Huddleston 2018-04-27 17:33:53 -0500
  • 1f7d0cdfb6 Made the progress bar look a little nicer / match the overall UI more. shadow8t4 2018-04-27 12:04:11 -0500
  • 3339a851f8 Fixed progress bar. Alex Huddleston 2018-04-26 22:58:14 -0500
  • 98fbbedcae Changed canvas resolution reference to 1080p landscape. Fixed scaling/position issues that resulted. Progress bar in Goals now thoroughly broken. Alex Huddleston 2018-04-26 21:19:15 -0500
  • db06d56727 Prefab cleanup. Scenes cleanup. Alex Huddleston 2018-04-26 15:17:13 -0500
  • 6b332d8167 Merge pull request #5 from shadow8t4/alex Alex Huddleston 2018-04-26 14:56:13 -0500
  • e2f77b89d0 Replaced the Tyranitar with a non-IP-infringing monster model. shadow8t4 2018-04-26 13:46:03 -0500
  • b8191dc53a I'mfdsjgsfj shadow8t4 2018-04-26 13:22:05 -0500
  • 00922143d3 djlkfs shadow8t4 2018-04-26 13:18:32 -0500
  • 509dd83b67 Merge branch 'darrel' of https://github.tamu.edu/shadow8t4/MoChaApp into darrel asleal2 2018-04-26 13:13:14 -0500
  • 23feaf4ebf working stats page asleal2 2018-04-26 13:12:50 -0500
  • d48de56a1c asjkfdl shadow8t4 2018-04-26 13:11:35 -0500
  • 050ffa15f9 working stats page asleal2 2018-04-26 13:10:58 -0500
  • 2b51820510 Merge branch 'darrel' into alex shadow8t4 2018-04-26 13:08:42 -0500
  • 44601503d2 fine. shadow8t4 2018-04-26 13:07:25 -0500
  • 57f3955deb removed redundant items on monstercreator scene darrelmarek 2018-04-26 12:51:50 -0500
  • 8bf1d021d7 update. shadow8t4 2018-04-26 12:49:09 -0500
  • 6b17d4a60d Make goals look nice. shadow8t4 2018-04-26 12:40:50 -0500
  • 3c162a0fb9 Merge branch 'alex' into darrel darrelmarek 2018-04-26 12:38:42 -0500
  • f86ce2c50d Merge branch 'darrel' of https://github.tamu.edu/shadow8t4/MoChaApp into darrel asleal2 2018-04-26 12:34:26 -0500
  • 341945e946 working stats page asleal2 2018-04-26 12:34:20 -0500
  • c3e33c5115 image prefab bs darrelmarek 2018-04-26 12:34:13 -0500
  • bff66d9110 UI element comment for positioning elements dynamically in scripts. shadow8t4 2018-04-26 11:23:43 -0500
  • 5651fc6034 thanks Patrick Kitchens 2018-04-26 11:06:39 -0500
  • 27e2c484e6 Oh plbs shadow8t4 2018-04-26 11:04:53 -0500
  • 734c7c4c35 samn don shadow8t4 2018-04-26 11:00:35 -0500
  • 9e847cb658 ok Patrick Kitchens 2018-04-26 10:59:14 -0500
  • c8777e958a random items + monster draw script for home Darrel Marek 2018-04-26 10:38:28 -0500
  • a50979a502 Merge branch 'alex' of https://github.tamu.edu/shadow8t4/MoChaApp into patrick Patrick Kitchens 2018-04-26 10:14:11 -0500
  • 5e7b5f407e Navigation plbs. shadow8t4 2018-04-26 09:54:29 -0500
  • 3fcdf5b9e1 I think I successfully merged Darrel's changes. shadow8t4 2018-04-26 09:52:31 -0500
  • aff276ff78 Editing goals page, added monster manager to home Darrel Marek 2018-04-26 09:46:58 -0500
  • e342a6a0eb Navigation Menu implemented. shadow8t4 2018-04-26 09:37:47 -0500
  • 0596bac28b Merge branch 'alex' into darrel Darrel Marek 2018-04-26 07:25:00 -0500
  • d4e4f8a07b made monster manager work across scenes Darrel Marek 2018-04-26 07:23:04 -0500
  • bb9a8117e1 Merged with andrew Darrel Marek 2018-04-26 07:02:55 -0500
  • d5a5432f4b Merge branch 'andrew' into darrel Darrel Marek 2018-04-26 06:59:42 -0500
  • 53a6f8c3f1 Monsters + inventory working Darrel Marek 2018-04-26 06:59:29 -0500
  • 519dfff2bc Updated, AndroidManifest still not working right Patrick Kitchens 2018-04-26 06:36:49 -0500
  • 28dd214897 Commit for testing XML. Patrick Kitchens 2018-04-26 05:33:52 -0500
  • 483a166193 playerpref steps asleal2 2018-04-26 04:58:15 -0500
  • 9291b70295 playerpref steps asleal2 2018-04-26 04:54:43 -0500
  • c051a6683c playerpref steps asleal2 2018-04-26 04:42:59 -0500
  • df378ecc50 playerpref steps asleal2 2018-04-26 04:38:54 -0500
  • 908c88ed85 playerpref steps asleal2 2018-04-26 03:03:43 -0500
  • 009e8ee9c9 playerpref steps asleal2 2018-04-26 02:54:53 -0500
  • a2d0555a52 playerpref steps asleal2 2018-04-26 02:52:47 -0500
  • 62fbee44c8 playerpref steps asleal2 2018-04-26 02:48:59 -0500
  • cbc73b4546 playerpref steps asleal2 2018-04-26 02:46:35 -0500
  • fe61c6fc49 playerpref steps asleal2 2018-04-26 02:39:44 -0500
  • 37a6524ae2 playerpref steps asleal2 2018-04-26 02:35:06 -0500
  • 5f518d4010 playerpref steps asleal2 2018-04-26 02:20:35 -0500
  • 0fa4abc797 playerpref steps asleal2 2018-04-26 02:09:18 -0500
  • ced7137fd0 playerpref steps asleal2 2018-04-26 01:36:56 -0500
  • f857f2f831 playerpref steps asleal2 2018-04-26 01:27:34 -0500
  • eb914d25de playerpref steps asleal2 2018-04-26 01:20:23 -0500
  • c2ed30d441 playerpref steps asleal2 2018-04-26 01:18:08 -0500
  • 576ee9b8b9 OAuth implemented. Data is ? Patrick Kitchens 2018-04-26 00:58:00 -0500
  • f3c4d0b610 Progress bar hooked up with pedometer darrelmarek 2018-04-26 00:55:51 -0500
  • 1d11f0c3dd Piped pedometer steps into goals Darrel Marek 2018-04-26 00:18:01 -0500
  • 00e3956098 progress bars asleal2 2018-04-25 23:24:16 -0500
  • 2f7f287033 progress bars asleal2 2018-04-25 23:16:41 -0500
  • 1001ba58a3 Resources stuff Darrel Marek 2018-04-25 23:16:28 -0500
  • 97557bfb47 Created resources folder + more work on inventory darrelmarek 2018-04-25 22:33:46 -0500
  • c6e0281a9b multiple progress bars, text is overlapping though asleal2 2018-04-25 19:59:40 -0500
  • 9b7c5de385 Added progress bars, working on integrating the actual fitbit data and goal system asleal2 2018-04-25 13:50:59 -0500
  • 5cf0257e18 Added progress bars, working on integrating the actual fitbit data and goal system asleal2 2018-04-25 13:47:56 -0500
  • 3b3b8ba23f Second UI Overhaul. Menu button not implemented yet. Profile page updated. shadow8t4 2018-04-25 13:27:28 -0500
  • f646a55f15 A bunch of UI changes. Alex Huddleston 2018-04-25 10:36:45 -0500
  • 9e5d3feec0 Merged alex + darrel darrelmarek 2018-04-24 13:49:36 -0500
  • 7ae3db37e5 Merge branch 'darrel' into alex Alex Huddleston 2018-04-23 19:28:26 -0500
  • a464b42a91 We have a dope splash and stuff now. Alex Huddleston 2018-04-23 19:28:03 -0500
  • eb61f607b1 Working on inventory 2 darrelmarek 2018-04-23 18:49:34 -0500
  • 94bf0ca36d Rearraged layout, navigates more like the prototype. Cleaned up visuals. shadow8t4 2018-04-23 15:43:53 -0500