Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-10 15:56:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
41988 commits 67 branches 56 tags 1.2 GiB
Commit graph

534 commits

Author SHA1 Message Date
James B. Pollack
7cd8b183e8 Merge pull request #22 from ericrius1/atpHomeReset 
Added some book names
 2016-04-06 11:48:21 -07:00
James B. Pollack
30b32f27f8 rotateable lid 2016-04-06 11:46:02 -07:00
ericrius1
1f00ae99e8 Added book names 2016-04-06 11:45:38 -07:00
James B. Pollack
416c8752b3 after much struggle... what seems to be a working reset. at home IRL 2016-04-05 22:38:11 -07:00
James B. Pollack
a9e4707470 temp disable ping 2016-04-05 21:52:07 -07:00
James B. Pollack
078fe7db90 music box and revert hand grab 2016-04-05 18:49:33 -07:00
James B. Pollack
cb8adf6c2f Merge branch 'homereset' of github.com:imgntn/hifi into homereset 2016-04-05 18:23:46 -07:00
ericrius1
ed3b9ab209 lamp is now always grabbable 2016-04-05 16:42:04 -07:00
James B. Pollack
7d6018e895 Merge pull request #20 from ericrius1/atpHomeReset 
Whiteboard marker and eraser fixes, and some name changes
 2016-04-05 16:04:40 -07:00
ericrius1
bf46eda6c1 name changes 2016-04-05 15:57:32 -07:00
James B. Pollack
738d3d249b lid stuff 2016-04-05 15:54:13 -07:00
ericrius1
1257fac0f5 removed s3 paths 2016-04-05 15:08:32 -07:00
ericrius1
bd4e3b3460 whiteboard markers and erasers now spawn back at rack when they collide with home 2016-04-05 15:01:08 -07:00
James B. Pollack
40be28a916 Merge branch 'homereset' of github.com:imgntn/hifi into homereset 2016-04-05 10:33:58 -07:00
James B. Pollack
024ce4954c wrappers 2016-04-05 10:33:54 -07:00
James B. Pollack
9f60a4e05c music boxin it 2016-04-05 09:37:00 -07:00
James B. Pollack
e780e46d5f most of a music box 2016-04-04 19:56:25 -07:00
James B. Pollack
d833c52e4b various scripts 2016-04-04 15:11:06 -07:00
James B. Pollack
9e8f590ffe plant hull and whiteboard marker delay 2016-04-04 10:06:06 -07:00
James B. Pollack
4998ceb604 music boxx 2016-04-02 22:56:58 -07:00
James B. Pollack
6c75a8a5b3 Merge pull request #19 from ericrius1/atpHomeReset 
changed the way desklamp works
 2016-04-02 15:15:33 -07:00
ericrius1
72197bf975 changed the way desklamp works 2016-04-01 18:43:54 -07:00
James B. Pollack
c87abd023c Merge pull request #18 from ericrius1/atpHomeReset 
Name changes and plant tweaks
 2016-04-01 16:36:41 -07:00
ericrius1
a74f6223bb jumk name update 2016-04-01 16:30:17 -07:00
ericrius1
f60210e49b added collision hull to cuckoo clock 2016-04-01 16:14:03 -07:00
ericrius1
9bdfd53ae7 made water can a box shape 2016-04-01 16:12:05 -07:00
ericrius1
4a0b502f15 changed angular damping to default for water can 2016-04-01 15:53:55 -07:00
James B. Pollack
e7bd9940a6 resets 2016-04-01 15:15:32 -07:00
ericrius1
68642099b7 changed name of whiteboard stuff 2016-04-01 15:12:57 -07:00
ericrius1
56ab1e86ba Merge remote-tracking branch 'james/homereset' into atpHomeReset 2016-04-01 15:06:17 -07:00
ericrius1
b8cdd5c626 updates 2016-04-01 15:05:22 -07:00
James B. Pollack
2e7d20cb03 Merge pull request #17 from ericrius1/atpHomeReset 
made plant bowl static and tweaked lamp properties
 2016-04-01 15:03:11 -07:00
James B. Pollack
44fe56698e catcher 2016-04-01 14:53:54 -07:00
ericrius1
95d39555ee fruit bowl 2016-04-01 14:53:49 -07:00
ericrius1
eef9bb0b2f updated apple names 2016-04-01 14:52:51 -07:00
James B. Pollack
e7f5ddf67a werk 2016-04-01 14:48:12 -07:00
ericrius1
12bbe9b522 made plant static 2016-04-01 13:48:46 -07:00
James B. Pollack
619a724eb8 junk and shelf stuff 2016-04-01 11:49:30 -07:00
James B. Pollack
1302ea80d4 reset 2016-04-01 10:53:55 -07:00
James B. Pollack
d2105248ff try enabling blu chair 2016-04-01 10:49:39 -07:00
James B. Pollack
f9026fae66 various asans fixes 2016-04-01 09:35:19 -07:00
James B. Pollack
f891babd67 transformers 2016-03-31 18:21:57 -07:00
ericrius1
39f5ed443a fixed merge conflicts 2016-03-31 17:16:36 -07:00
James B. Pollack
c87dae69b0 remove plant for now 2016-03-31 16:59:48 -07:00
ericrius1
9ff4540697 growing plant fixes 2016-03-31 16:45:12 -07:00
ericrius1
724d403fc7 behavior as expected 2016-03-31 16:08:06 -07:00
ericrius1
50e1a11f6c change flower name 2016-03-31 15:16:57 -07:00
ericrius1
aead16da89 growing flowers faster 2016-03-31 15:10:43 -07:00
ericrius1
4cf5f41eed changed chair path 2016-03-31 14:03:05 -07:00
James B. Pollack
1524c8324f revert 2016-03-31 09:24:31 -07:00