Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• 7b84b2e84b Merge branch 'master' of https://git.elab.kth.se/marek/Twitch-grabs-candy master adligeerik 2018-11-25 08:47:43 +0100
• 073f1f3805 new pictures adligeerik 2018-11-25 08:47:17 +0100
• 94f2e8c34e Merge branch 'master' of git.elab.kth.se:marek/Twitch-grabs-candy Davide Bongiovanni 2018-11-25 08:26:37 +0100
• be72ed2dfd 3D models for scale rig Wilhelm Westermark 2018-11-25 08:26:37 +0100
• 2e4a3e9e07 Fixed order placing Davide Bongiovanni 2018-11-25 08:26:25 +0100
• 3500e29157 Merge branch 'master' of git.elab.kth.se:marek/Twitch-grabs-candy Davide Bongiovanni 2018-11-25 00:02:39 +0100
• 6c45e79137 Parsing new order Davide Bongiovanni 2018-11-25 00:02:33 +0100
• da94ed3e15 Added candy count code Davide Bongiovanni 2018-11-25 00:02:15 +0100
• 46801a586f Final fast code for the scale Wilhelm Westermark 2018-11-24 23:53:50 +0100
• ccaee0bddd Remove faulty file Wilhelm Westermark 2018-11-24 23:42:10 +0100
• 7d22bc3b86 Updated for mobile Wilhelm Westermark 2018-11-24 23:41:36 +0100
• ea4b383e66 fixed the numeric picker Marek Baczynski 2018-11-25 00:01:11 +0200
• a789310c2d Merge branch 'master' of git.elab.kth.se:marek/Twitch-grabs-candy Davide Bongiovanni 2018-11-24 22:15:50 +0100
• 86820ebfc6 fixed windows Marek Baczynski 2018-11-24 23:13:55 +0200
• 3ed89ee6dc Some changes Davide Bongiovanni 2018-11-24 21:54:49 +0100
• 9b0f67b5ef order site 1 Marek Baczynski 2018-11-24 22:52:47 +0200
• 54833c1c9d working chat and robot contoller adligeerik 2018-11-24 21:11:04 +0100
• 95892796ed Merged the chat parser with the robot control pk23 2018-11-24 21:23:19 +0200
• 87449e287e Merge branch 'master' of https://git.elab.kth.se/marek/Twitch-grabs-candy pk23 2018-11-24 21:18:28 +0200
• 0d7a234a25 move function has been updated with the chat parser pk23 2018-11-24 21:16:16 +0200
• d0717ec157 Merged the Chat parser with the robot arm control. pk23 2018-11-24 20:59:09 +0200
• 071236bc0e Merge branch 'master' of git.elab.kth.se:marek/Twitch-grabs-candy Davide Bongiovanni 2018-11-24 19:54:01 +0100
• c1f64d6f4c Some working overlay action Davide Bongiovanni 2018-11-24 19:53:07 +0100
• 974894f1ee Average code on serial available Wilhelm Westermark 2018-11-24 19:51:04 +0100
• 9ee108ee57 key words adligeerik 2018-11-24 19:07:40 +0100
• 78edcbd44b Merge branch 'master' of https://git.elab.kth.se/marek/Twitch-grabs-candy adligeerik 2018-11-24 18:58:30 +0100
• da0d5556a8 test adligeerik 2018-11-24 18:58:22 +0100
• dd289bbb16 speed should accumulate correctly Marek Baczynski 2018-11-24 19:57:16 +0200
• 06e405c86c test for chat adligeerik 2018-11-24 18:26:53 +0100
• 526b963686 Merge branch 'master' of https://git.elab.kth.se/marek/Twitch-grabs-candy adligeerik 2018-11-24 16:42:20 +0100
• 7994f3a432 linear added adligeerik 2018-11-24 16:42:01 +0100
• 4c906a71e9 changig directions mid movement fix Marek Baczynski 2018-11-24 17:41:50 +0200
• c4fd668de7 toplevel added adligeerik 2018-11-24 16:34:47 +0100
• eafbee72ce spaced the tabs Marek Baczynski 2018-11-24 17:06:04 +0200
• 1db35c90c8 tabs adligeerik 2018-11-24 16:04:13 +0100
• 7d3723eab3 Merge branch 'master' of https://git.elab.kth.se/marek/Twitch-grabs-candy adligeerik 2018-11-24 15:46:05 +0100
• 902acd4cf6 functi adligeerik 2018-11-24 15:45:52 +0100
• 8846655cd9 yes Marek Baczynski 2018-11-24 16:44:50 +0200
• 0842d94e68 arduino scale firmware Marek Baczynski 2018-11-24 15:54:28 +0200
• b6c8cc2f1b Example adligeerik 2018-11-24 12:59:56 +0100
• 3bac559b81 comands work adligeerik 2018-11-24 12:13:29 +0100
• e0a898d423 waitcmd adligeerik 2018-11-24 10:39:24 +0100
• a954326103 class adligeerik 2018-11-24 10:35:12 +0100
• 0fbc0c02e0 pybot adligeerik 2018-11-24 00:06:37 +0100
• b08e51f1d3 Removed non ascii character adligeerik 2018-11-23 23:37:48 +0100
• 989a808d3f drivers for arm adligeerik 2018-11-23 23:33:38 +0100
• 6c8e7c1eed Move arm file started adligeerik 2018-11-23 22:14:08 +0100
• 5c8afc9708 go go go Marek Baczynski 2018-11-23 22:28:39 +0200