Commit graph

328 commits

Author SHA1 Message Date
James B. Pollack
bcc4dcb362 Merge pull request #9 from ericrius1/homereset
fixed baton bug
2016-03-21 10:36:38 -07:00
ericrius1
66e969fec7 volume change 2016-03-21 10:35:10 -07:00
ericrius1
9188c9de0d iown false 2016-03-21 10:31:27 -07:00
James B. Pollack
93a920f80d tank 2016-03-21 10:28:41 -07:00
James B. Pollack
c71d8914d5 clean 2016-03-21 10:24:50 -07:00
ericrius1
795747f408 merged 2016-03-21 10:23:51 -07:00
ericrius1
a0d9c24365 merged 2016-03-21 10:22:18 -07:00
ericrius1
16baeb9955 fix merge conflics 2016-03-21 10:14:19 -07:00
James B. Pollack
258d6d391f no tank 2016-03-21 10:08:19 -07:00
ericrius1
52665e38c7 every 30 seconds, syncing local time 2016-03-18 18:36:12 -07:00
ericrius1
156f186e49 fixed bugs 2016-03-18 18:28:59 -07:00
James B. Pollack
87bdffa273 visualize them 2016-03-18 17:28:48 -07:00
ericrius1
257424ae61 fan sounds 2016-03-18 17:10:42 -07:00
James B. Pollack
90dba7d472 tank rotation 2016-03-18 17:06:33 -07:00
James B. Pollack
9433ea8f06 syntax 2016-03-18 16:46:23 -07:00
James B. Pollack
8ae2468165 check 2016-03-18 16:44:33 -07:00
James B. Pollack
b112bb2080 start pos 2016-03-18 16:40:48 -07:00
James B. Pollack
d37ff80541 tank 2016-03-18 16:36:06 -07:00
ericrius1
f51e7f463c fixed merge conflics 2016-03-18 16:30:17 -07:00
ericrius1
7bf97bfb92 fixed syntax error 2016-03-18 16:22:45 -07:00
ericrius1
af234d56f1 uncomment stuff; 2016-03-18 16:12:28 -07:00
ericrius1
b61fec657c merge 2016-03-18 16:11:45 -07:00
ericrius1
4c8be15ca3 baton logging 2016-03-18 16:08:51 -07:00
ericrius1
3dace325b3 dressing room lights toggling on and off 2016-03-18 15:57:13 -07:00
ericrius1
a7d2ff7c29 fixed whiteboard markers not hsowing up 2016-03-18 15:23:53 -07:00
James B. Pollack
acba6817f2 hmm 2016-03-18 14:52:34 -07:00
ericrius1
bdfaadc892 living room lights emit texture toggling correctly 2016-03-18 14:31:51 -07:00
James B. Pollack
0aab01d774 remove switches to prep for next merge 2016-03-18 12:37:28 -07:00
ericrius1
4eb31c9459 Merge remote-tracking branch 'james/homereset' into dressingRoomFix 2016-03-18 11:58:29 -07:00
James B. Pollack
bc2270f4a0 kinetic objects 2016-03-18 11:48:03 -07:00
James B. Pollack
9e6cea2f41 gravity and cleaning 2016-03-18 10:55:10 -07:00
James B. Pollack
5dff9de3a0 reset by searching 2016-03-18 10:49:14 -07:00
James B. Pollack
0f17d1f12e add reset userdata to everything 2016-03-17 22:19:20 -07:00
James B. Pollack
c072cd323e start fish fix 2016-03-17 19:11:12 -07:00
James B. Pollack
855f505ae1 minor adjustments 2016-03-17 17:01:48 -07:00
ericrius1
c1725dda58 living room lights 2016-03-17 15:09:07 -07:00
James B. Pollack
8f00e9ea27 werk 2016-03-17 15:08:35 -07:00
ericrius1
009326b085 logs 2016-03-17 14:34:41 -07:00
ericrius1
ef0872ec52 fan switch working; 2016-03-17 14:31:48 -07:00
ericrius1
2168a1a6ed changed time 2016-03-17 13:43:17 -07:00
ericrius1
be7a7f329b fixed virtual baton stuff; 2016-03-17 13:42:16 -07:00
ericrius1
7ccf7b42d8 change parent 2016-03-17 13:18:40 -07:00
James B. Pollack
0789f869da tankfix 2016-03-17 11:18:56 -07:00
James B. Pollack
5dbec15ae0 logging 2016-03-17 11:10:28 -07:00
James B. Pollack
78775baf8c yo; 2016-03-17 11:06:46 -07:00
James B. Pollack
bb18366cbd clean and log 2016-03-17 10:58:24 -07:00
ericrius1
6adb46199c removed logging 2016-03-17 10:51:10 -07:00
James B. Pollack
d9526b6506 utils 2016-03-17 10:45:52 -07:00
ericrius1
16b98b53f3 parented clock components 2016-03-17 10:40:59 -07:00
James B. Pollack
9933690ed6 whitebrd 2016-03-17 10:36:35 -07:00