atlante45
4dda71e830
Final code for minecraft import to review
2013-07-09 12:41:44 +02:00
atlante45
5703a60797
Merge branch 'master' of git://github.com/worklist/hifi into 19368
2013-07-09 10:25:58 +02:00
atlante45
d38c1f081c
Modified code according to review for UI job
2013-07-09 10:25:46 +02:00
ZappoMan
1f0df9a945
added scanTreeWithOcclusion() for testing
2013-07-08 20:52:14 -07:00
Philip Rosedale
5a5492a722
Merge branch 'master' of https://github.com/worklist/hifi
2013-07-08 17:04:35 -07:00
Philip Rosedale
e9f8e50d49
Merge pull request #623 from machinelevel/dev4
...
Added safety checks to processEvents(), which was causing problems. Also...
2013-07-08 17:04:06 -07:00
Philip Rosedale
4936676cc1
Merge pull request #627 from ey6es/kinected
...
Basic depth camera support (only built in when OpenNI is available).
2013-07-08 16:57:10 -07:00
Eric Johnston
c298f78ae9
Fixed multi-touch event loop problems by selectively processing just the touch events.
2013-07-08 16:31:28 -07:00
Eric Johnston
7de2281226
Merge branch 'master' of https://github.com/worklist/hifi into dev4
2013-07-08 16:29:51 -07:00
Philip Rosedale
4bafea768e
Merge branch 'master' of https://github.com/worklist/hifi
2013-07-08 16:18:15 -07:00
Philip Rosedale
95ac0a891f
Merge
2013-07-08 16:17:51 -07:00
Stephen Birarda
c2ad02def2
Merge pull request #625 from PhilipRosedale/master
...
Tuned smooth gyro look to feel better
2013-07-08 15:55:52 -07:00
Eric Johnston
14374fb0df
Merge branch 'master' of https://github.com/worklist/hifi into dev4
2013-07-08 15:31:11 -07:00
Andrzej Kapolka
b1050c633b
Suppress warnings for OpenNI.
2013-07-08 14:17:03 -07:00
Andrzej Kapolka
5f3a37139f
Merge branch 'master' of https://github.com/worklist/hifi into kinected
2013-07-08 14:04:42 -07:00
Andrzej Kapolka
c5c9debed5
Fix for combined gyro/depth camera.
2013-07-08 13:03:53 -07:00
Andrzej Kapolka
c43994fe03
Orientation -> rotation.
2013-07-08 12:54:27 -07:00
Andrzej Kapolka
4a22154737
Fix for leaning, smoothing.
2013-07-08 11:35:42 -07:00
ZappoMan
195d926fde
Merge pull request #626 from tschw/19376
...
Code Review for Job #19376
2013-07-08 10:46:02 -07:00
atlante45
4899f77a0c
Complete color handling in minecraft import
2013-07-08 16:11:50 +02:00
atlante45
013aabc65c
Merge branch 'master' of git://github.com/worklist/hifi into 19373
2013-07-08 15:54:37 +02:00
atlante45
981e4c61b5
Tags files missing in last commit
2013-07-08 13:45:38 +02:00
atlante45
1f78c6461d
Merge branch 'master' of git://github.com/worklist/hifi into 19373
2013-07-08 13:37:55 +02:00
atlante45
6c840a9ec3
Functionnal version of minecraft import
2013-07-08 13:37:47 +02:00
Eric Johnston
4341e8596f
Merge branch 'master' of https://github.com/worklist/hifi into dev4
2013-07-07 22:19:13 -07:00
Andrzej Kapolka
357ac05d35
Removed debug logging.
2013-07-05 22:58:57 -07:00
Andrzej Kapolka
f9f2c66115
Merge branch 'master' of https://github.com/worklist/hifi into kinected
...
Conflicts:
interface/src/Application.cpp
interface/src/Avatar.cpp
interface/src/Avatar.h
libraries/avatars/src/AvatarData.h
2013-07-05 22:52:42 -07:00
Andrzej Kapolka
9c6e5b23e0
Alignment fixes.
2013-07-05 22:44:47 -07:00
Andrzej Kapolka
7a65ebbba3
Remove Freenect/LibUSB bits.
2013-07-05 22:17:59 -07:00
Andrzej Kapolka
9c977450e3
Finally got the rotations figured out; I had forgotten the default pose/bind
...
pose distinction.
2013-07-05 22:14:32 -07:00
Andrzej Kapolka
ff5d1455aa
More work on joint tracking.
2013-07-05 17:45:29 -07:00
tosh
c2e2ff0ffe
changes broadcast function in Application to use a different name but the same signature as in NodeList
2013-07-05 14:16:50 +02:00
tosh
2da132be65
upstream merge
2013-07-04 21:21:11 +02:00
tosh
689794259d
Merge branch 'master' of git://github.com/worklist/hifi into 19376
...
Conflicts:
interface/src/Application.cpp
2013-07-04 21:20:36 +02:00
Philip Rosedale
d70eb38542
Properly make the goHome() function in slot group
2013-07-03 23:43:53 -07:00
Philip Rosedale
5df09b2932
remove debugging printf
2013-07-03 23:20:55 -07:00
Philip Rosedale
0f312d4c9b
Tuned smooth gyro look values to feel better.
2013-07-03 23:17:43 -07:00
Philip Rosedale
92cec4cfa0
Merge branch 'master' of https://github.com/worklist/hifi
2013-07-03 22:55:09 -07:00
Philip Rosedale
2de6d3eb6a
Make 'Go Home' an option from the options because it conflicts with 'G' for gravity on/off
2013-07-03 22:55:01 -07:00
Stephen Birarda
ab249d6c78
Merge pull request #624 from ey6es/master
...
Per Ryan's request, use 15 blinks per minute as a baseline/maximum frequency.
2013-07-03 17:33:31 -07:00
Andrzej Kapolka
43258f9dcd
Use 15 blinks per minute as a base/maximum frequency.
2013-07-03 17:12:43 -07:00
Andrzej Kapolka
b7e9173796
Merge branch 'master' of https://github.com/worklist/hifi
2013-07-03 17:10:56 -07:00
Andrzej Kapolka
30f77975cf
Trying to get the right rotations, send them on the wire.
2013-07-03 17:07:22 -07:00
ZappoMan
c0d14d2bd4
Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling
2013-07-03 15:36:41 -07:00
Eric Johnston
3ea100e595
Added safety checks to processEvents(), which was causing problems. Also narrowed the scope of the events processed.
...
It can now be disabled in the interface by un-checking touch-look, which most people don't use yet.
Also, the event processing time should be limited to 1 ms.
2013-07-03 15:33:18 -07:00
ZappoMan
e4579fe6c6
make regions and submaps configurable
2013-07-03 15:28:39 -07:00
ZappoMan
1c143f4b1d
Merge pull request #616 from birarda/node
...
your agents are now nodes
2013-07-03 15:27:58 -07:00
Stephen Birarda
0b4348812c
agentData to nodeData in voxel-server
2013-07-03 15:22:28 -07:00
Stephen Birarda
0be42698b5
resolve conflicts on merge with upstream master
2013-07-03 15:12:50 -07:00
Stephen Birarda
c8b86c651f
Merge pull request #622 from birarda/master
...
remove an extra g
2013-07-03 15:06:23 -07:00
