ZappoMan
|
d7e34d25bf
|
small tweak to corner boxes
|
2013-05-02 22:38:58 -07:00 |
|
ZappoMan
|
2b11cad1ab
|
Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization
|
2013-05-02 22:33:41 -07:00 |
|
ZappoMan
|
bf6229b842
|
Merge pull request #184 from PhilipRosedale/master
Moved ground plane, 1 meter spacing
|
2013-05-02 22:31:06 -07:00 |
|
Philip Rosedale
|
9716ea9550
|
Ground plane moved to 0->10 and lines are exactly 1 meter
|
2013-05-02 22:28:41 -07:00 |
|
ZappoMan
|
ac879f5809
|
added corner voxels to scene
|
2013-05-02 22:27:33 -07:00 |
|
ZappoMan
|
34a059db9a
|
more optimizations of render pipeline
|
2013-05-02 22:26:56 -07:00 |
|
Philip Rosedale
|
1973ebbb9c
|
Merge pull request #179 from PhilipRosedale/master
Improved stats display (Mbps), enumerated transmitter devices, avatars slow down around people
|
2013-05-02 20:52:14 -07:00 |
|
Philip Rosedale
|
581365f1f1
|
Fixes per code review.
|
2013-05-02 20:51:17 -07:00 |
|
Philip Rosedale
|
2195a140fd
|
Merge remote-tracking branch 'upstream/master'
|
2013-05-02 20:36:43 -07:00 |
|
ZappoMan
|
771c604121
|
more render pipeline optimizations
|
2013-05-02 18:12:55 -07:00 |
|
Jeffrey Ventrella
|
7a52d51251
|
adding avatar renderer
|
2013-05-02 17:47:28 -07:00 |
|
Jeffrey Ventrella
|
c46fc5a861
|
(1) added avatar tilting while walking; (2) added avatar renderer; (3) tweaked body proportions; (4)
|
2013-05-02 17:46:10 -07:00 |
|
Stephen Birarda
|
dea2038200
|
send the address and socket of device requesting pair to last available
|
2013-05-02 17:00:39 -07:00 |
|
ZappoMan
|
fcce4753c9
|
more optimizations on render pipeline
|
2013-05-02 16:37:31 -07:00 |
|
Stephen Birarda
|
e5cd66313a
|
check the number of sscanf matches, store sending socket for device to reply
|
2013-05-02 16:28:19 -07:00 |
|
Stephen Birarda
|
9050642390
|
add pairing device to vector after creation
|
2013-05-02 16:11:34 -07:00 |
|
ZappoMan
|
5a14c71225
|
added dirty bit support to VoxelTree, use it to determine when to call treeToArrays
|
2013-05-02 15:57:31 -07:00 |
|
Andrzej Kapolka
|
8e2c43e983
|
Need to disable blending when we render the distorted screen quad.
|
2013-05-02 15:54:58 -07:00 |
|
Andrzej Kapolka
|
ccded56ecf
|
Use the right type here; Xcode complains about it.
|
2013-05-02 15:20:29 -07:00 |
|
Andrzej Kapolka
|
762c635744
|
Restored constant value added another reference to the SDK docs.
|
2013-05-02 14:44:03 -07:00 |
|
Andrzej Kapolka
|
5de15dd5a4
|
Final bits for Oculus support. Works!
|
2013-05-02 14:39:00 -07:00 |
|
Jeffrey Ventrella
|
673936e141
|
adjusted proportions of avatar skeleton to make it closer to average human
|
2013-05-02 14:05:51 -07:00 |
|
Stephen Birarda
|
c2f6d3b8f9
|
Merge branch 'master' of github.com:worklist/hifi into pairing
|
2013-05-02 13:33:21 -07:00 |
|
ZappoMan
|
c353c1d2bf
|
added command line options for packets per second and debug packet sending
|
2013-05-02 13:18:12 -07:00 |
|
ZappoMan
|
8f0dd1ffa1
|
added render pipeline warnings menu item
|
2013-05-02 13:17:06 -07:00 |
|
Jeffrey Ventrella
|
cd334c2ade
|
renamed avatar skeleton from "bones" to "joints" to be more consistent with standard language. Also improved skeleton some
|
2013-05-02 13:13:56 -07:00 |
|
Andrzej Kapolka
|
b0bbca281d
|
Merge branch 'master' of https://github.com/worklist/hifi
Conflicts:
interface/src/main.cpp
|
2013-05-02 13:10:39 -07:00 |
|
Andrzej Kapolka
|
94f1e03eb1
|
More work on Oculus integration; added some notes to explain the source of the
magic numbers.
|
2013-05-02 13:02:11 -07:00 |
|
ZappoMan
|
7625c9a621
|
add command line option to debug voxel sending time
|
2013-05-02 12:54:26 -07:00 |
|
ZappoMan
|
e2481f514c
|
lower warning threshold to 1 millisecond for voxel render pipeline steps
|
2013-05-02 12:53:56 -07:00 |
|
Stephen Birarda
|
d2ca0d4dc4
|
Merge remote-tracking branch 'upstream/master' into invensense
|
2013-05-02 12:29:37 -07:00 |
|
Stephen Birarda
|
4a3d713bc7
|
remove the invensense testing program
|
2013-05-02 12:27:21 -07:00 |
|
ZappoMan
|
0f48ac67b8
|
added timing details to voxel sending behavior
|
2013-05-02 12:27:16 -07:00 |
|
ZappoMan
|
275772bb3d
|
debugging voxel sending behavior
|
2013-05-02 12:26:51 -07:00 |
|
Stephen Birarda
|
9e3b862c67
|
hook up the invensense via existing SerialInterface class
|
2013-05-02 12:26:12 -07:00 |
|
ZappoMan
|
174c3ee65b
|
search into level appropriately
|
2013-05-02 11:31:20 -07:00 |
|
Jeffrey Ventrella
|
6e86cbd65a
|
Merge pull request #180 from Ventrella/master
fixed merge issue
|
2013-05-02 11:07:35 -07:00 |
|
Jeffrey Ventrella
|
4eda930f4a
|
Merge remote-tracking branch 'upstream/master'
|
2013-05-02 11:06:18 -07:00 |
|
Jeffrey Ventrella
|
35a8066bd6
|
fixed merge problem
|
2013-05-02 11:05:51 -07:00 |
|
Jeffrey Ventrella
|
42ce96c82e
|
Merge pull request #177 from Ventrella/master
I made a few minor fixes in Avatar
|
2013-05-02 11:01:24 -07:00 |
|
ZappoMan
|
a6d2bb73ad
|
added warnings if bitstream processing takes too long
|
2013-05-01 23:24:46 -07:00 |
|
ZappoMan
|
6a7ebb3a55
|
fixed LOD issue in client
|
2013-05-01 22:57:19 -07:00 |
|
Philip Rosedale
|
900caa6278
|
Changed idle simulate call to 16msecs (which will set avatar mixer rate at 60FPS), further small stats improvements
|
2013-05-01 22:40:38 -07:00 |
|
Philip Rosedale
|
e2cc9d792c
|
Merge remote-tracking branch 'upstream/master'
|
2013-05-01 22:04:43 -07:00 |
|
Philip Rosedale
|
ee1e5d16fc
|
Avatars are now slowed down when they get near other avatars, for easy fine positioning.
|
2013-05-01 22:03:57 -07:00 |
|
ZappoMan
|
3422bdaf29
|
Merge pull request #178 from ZappoMan/render_voxels_optimization
fixed local mode
|
2013-05-01 21:23:17 -07:00 |
|
ZappoMan
|
0f71627923
|
fixed local mode
|
2013-05-01 21:22:41 -07:00 |
|
Philip Rosedale
|
e2ce927492
|
Merge remote-tracking branch 'upstream/master'
|
2013-05-01 20:57:40 -07:00 |
|
Philip Rosedale
|
09a6a476d5
|
Slow down when near other avatars - incremental commit
|
2013-05-01 20:55:40 -07:00 |
|
Philip Rosedale
|
f78f983e2d
|
Merge pull request #176 from ZappoMan/render_voxels_optimization
Render voxels optimization
|
2013-05-01 20:52:48 -07:00 |
|