Jeffrey Ventrella
ca5adb791c
pull avatars from handholding
2013-05-10 13:25:40 -07:00
ZappoMan
b9a023af37
Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization
2013-05-10 13:19:06 -07:00
ZappoMan
322cb2ff23
implemented partial VBOs support in copyWrittenDataToReadArrays()
2013-05-10 13:18:51 -07:00
Jeffrey Ventrella
939665419d
made some improvements to handshake
2013-05-10 13:04:41 -07:00
Jeffrey Ventrella
eb49a9e4f2
hand holding
2013-05-10 12:52:39 -07:00
Jeffrey Ventrella
9db5d7e202
hand holding
2013-05-10 12:45:37 -07:00
Jeffrey Ventrella
87f8df7e7b
...
2013-05-10 12:28:46 -07:00
Jeffrey Ventrella
a5496ee99e
Merge remote-tracking branch 'upstream/master'
2013-05-10 12:24:24 -07:00
Jeffrey Ventrella
685df2c65c
thingy
2013-05-10 12:23:58 -07:00
Jeffrey Ventrella
9598976894
Merge remote-tracking branch 'upstream/master'
2013-05-10 12:20:01 -07:00
Jeffrey Ventrella
619c1a843f
working on hand holding algo
2013-05-10 12:18:49 -07:00
Andrzej Kapolka
012c2c9c9f
Changed "Quit" menu item to "Test" (Quit should apparently be added
...
automatically).
2013-05-10 12:11:32 -07:00
Andrzej Kapolka
66a8e40712
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-10 12:09:25 -07:00
Andrzej Kapolka
8d0fdcac06
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-10 12:08:50 -07:00
ZappoMan
0888a6605f
CR fixes
2013-05-10 12:08:43 -07:00
ZappoMan
bfa7c91a7a
fixed menu behavior
2013-05-10 12:08:03 -07:00
Andrzej Kapolka
5a113fd546
Added a stub for a Qt application class that creates a menu (which, since it's
...
unparented, will only appear on OS X) with a test item connected to a slot.
2013-05-10 12:07:47 -07:00
ZappoMan
e84d2696f9
fixed menu behavior
2013-05-10 12:04:52 -07:00
Jeffrey Ventrella
474423e33f
Merge remote-tracking branch 'upstream/master'
2013-05-10 11:27:41 -07:00
Jeffrey Ventrella
40e7603e49
removed print statements
2013-05-10 11:27:07 -07:00
Philip Rosedale
7d69eb09c2
Merge remote-tracking branch 'upstream/master'
2013-05-10 10:55:39 -07:00
Stephen Birarda
2f9c16f495
have the oculus drive the body yaw, head pitch, and head roll
2013-05-10 10:55:26 -07:00
Philip Rosedale
f8701e6c0c
Re-added Head Mouse working correctly with invensense
2013-05-10 10:55:05 -07:00
Andrzej Kapolka
e6e5b20dee
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-10 10:20:04 -07:00
Stephen Birarda
cc38e4c5c4
Merge remote-tracking branch 'upstream/master' into oculus
2013-05-10 10:18:36 -07:00
Stephen Birarda
04447dfcbd
drive body yaw and render pitch with oculus when connected
2013-05-10 10:17:21 -07:00
Stephen Birarda
adbca70eba
expand the OculusManager to return euler angles
2013-05-10 10:16:23 -07:00
ZappoMan
3af8a1b8f4
code review fixes
2013-05-10 10:03:28 -07:00
Andrzej Kapolka
beadb6a93d
Merge branch 'master' of https://github.com/worklist/hifi
...
Conflicts:
interface/src/main.cpp
2013-05-10 10:03:05 -07:00
Andrzej Kapolka
f6fcdd78b2
Adding/removing voxels at different sizes.
2013-05-10 09:53:53 -07:00
ZappoMan
9dc09de75e
make VoxelSystem::deleteVoxelAt() work properly
2013-05-10 09:32:56 -07:00
Jeffrey Ventrella
470349d662
made avatars taller an fixed proportions a bit
2013-05-09 23:31:45 -07:00
ZappoMan
6b5eceeae1
Merge pull request #269 from Ventrella/master
...
improved camera first person mode and cleaned up some camera code
2013-05-09 22:26:59 -07:00
ZappoMan
f0b4dde388
Merge pull request #267 from PhilipRosedale/master
...
Stars meridians removed and count reduced, some log cleanup
2013-05-09 22:25:56 -07:00
Philip Rosedale
8521a9e146
added one more log line
2013-05-09 22:23:15 -07:00
ZappoMan
4fe93af5cd
create and delete voxels locally
2013-05-09 22:22:32 -07:00
Jeffrey Ventrella
751254ab56
set default camera mode back to third person
2013-05-09 22:22:21 -07:00
ZappoMan
bd3ea6ef65
create and delete voxels locally
2013-05-09 22:20:13 -07:00
Jeffrey Ventrella
6254a6886f
cleaned up camera code and improved first person mode
2013-05-09 22:11:33 -07:00
Philip Rosedale
eefd0c36f1
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-09 22:06:57 -07:00
Philip Rosedale
527b65f6a4
Log cleanup. removed star field meridians.
2013-05-09 22:06:32 -07:00
Jeffrey Ventrella
697e0d0cbe
fixed spacing issue
2013-05-09 17:51:05 -07:00
Jeffrey Ventrella
bca5436fab
indentation
2013-05-09 17:36:39 -07:00
Jeffrey Ventrella
6dfa20976d
Merge remote-tracking branch 'upstream/master'
2013-05-09 17:24:50 -07:00
Jeffrey Ventrella
eed56db9e5
more fixes to hand holding
2013-05-09 17:24:16 -07:00
Philip Rosedale
cdab62c10c
Merge pull request #265 from ZappoMan/render_voxels_optimization
...
Optimized Voxel Rendering Performance by implementing blended VBO strategy
2013-05-09 17:21:05 -07:00
Jeffrey Ventrella
ede3cc2f3d
tweak tweak
2013-05-09 17:18:26 -07:00
Jeffrey Ventrella
ab3ee1688d
more work on hand holding
2013-05-09 17:14:54 -07:00
ZappoMan
2128cb8bff
get rid of dead code
2013-05-09 17:10:25 -07:00
Jeffrey Ventrella
6c58dbeab2
thingy
2013-05-09 17:02:40 -07:00
ZappoMan
33fc9f5389
fixed partial VBO updates
2013-05-09 17:01:20 -07:00
Jeffrey Ventrella
9d548c43ad
twiddle tweak iterate whittle
2013-05-09 16:54:01 -07:00
Andrzej Kapolka
78b37fe920
Starting on coloring support.
2013-05-09 16:26:51 -07:00
Stephen Birarda
f656800fa7
add getters for yaw, pitch and roll to the OculusManager class
2013-05-09 16:10:49 -07:00
Andrzej Kapolka
ecd12e0ac4
Show the voxels to be added/deleted as wireframe cubes.
2013-05-09 16:09:07 -07:00
Jeffrey Ventrella
513701391e
working on hand touching
2013-05-09 16:07:43 -07:00
Stephen Birarda
999ab5cb20
initial setup to connect to oculus and grab sensors
2013-05-09 15:45:09 -07:00
Jeffrey Ventrella
c2deba6e39
improved avatar touch code
2013-05-09 15:15:28 -07:00
Philip Rosedale
52337a1fae
Merge remote-tracking branch 'upstream/master'
2013-05-09 15:03:45 -07:00
Philip Rosedale
c0a54eca14
Added head lean to broadcast data packets, lean now being set from invensense accelerometers.
2013-05-09 15:03:19 -07:00
Stephen Birarda
613066f786
add linking of LibOVR to interface CMakeLists.txt
2013-05-09 15:03:14 -07:00
ZappoMan
7b22300164
Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization
2013-05-09 14:39:41 -07:00
Jeffrey Ventrella
3ba93397bd
fixed a bug in menu clicking
2013-05-09 14:37:13 -07:00
Andrzej Kapolka
c411083057
Working on adding an "add voxel in front of avatar" command.
2013-05-09 14:30:50 -07:00
ZappoMan
3aa862fa34
removed some debug messages
2013-05-09 14:19:42 -07:00
ZappoMan
c73d4ddfa4
Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization
2013-05-09 14:06:42 -07:00
ZappoMan
f490f3ed53
More work on partial VBO updates still not working 100% correctly
2013-05-09 14:04:08 -07:00
Philip Rosedale
ef1848a68c
Merge remote-tracking branch 'upstream/master'
2013-05-09 14:03:03 -07:00
Philip Rosedale
dd33cedf8d
Removed old serial code for Maple ADC
2013-05-09 14:01:22 -07:00
Jeffrey Ventrella
8ecfbce15e
fixed some small formatting things
2013-05-09 14:00:40 -07:00
Jeffrey Ventrella
14d47d87d8
thingy
2013-05-09 13:52:03 -07:00
Jeffrey Ventrella
14b943f1f7
added lean code for Philip...
2013-05-09 13:48:05 -07:00
Andrzej Kapolka
145c6484f4
Fixed issue with mouse pressed state, use mouse buttons to add/delete voxels
...
(numbers now switch between modes).
2013-05-09 13:33:23 -07:00
Philip Rosedale
dbdd4160cc
Added acceleration reading, gravity baseline, and line displays to invensense
2013-05-09 13:29:09 -07:00
Jeffrey Ventrella
b61a9687f8
thingy
2013-05-09 13:14:08 -07:00
Jeffrey Ventrella
17c61c88c7
cleaned up avatar slow-down upon nearness; fixed mouse pressed bug;
2013-05-09 13:04:22 -07:00
Jeffrey Ventrella
7cfc9844a3
Merge remote-tracking branch 'upstream/master'
2013-05-09 11:22:55 -07:00
Jeffrey Ventrella
e923f5446d
clean up
2013-05-09 11:22:24 -07:00
ZappoMan
a476c8362c
Merge pull request #254 from PhilipRosedale/master
...
Fixed bug with bodies springing into view on startup
2013-05-09 11:01:33 -07:00
Andrzej Kapolka
dcd42096a5
Tabs -> spaces.
2013-05-09 10:56:08 -07:00
Andrzej Kapolka
7ff8b84f4c
Return the box face, as well as the distance, from the ray intersection test.
...
Use it to determine which voxel neighbor we create when adding.
2013-05-09 10:46:52 -07:00
Andrzej Kapolka
2b9c2ca9a2
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-09 10:42:59 -07:00
Philip Rosedale
d2cccce80a
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-09 10:42:36 -07:00
Stephen Birarda
1c073c1c71
correct the accelerometer sensitivity
2013-05-09 10:38:02 -07:00
Stephen Birarda
f95ba24f21
also read accelerometer data from invensense boards
2013-05-09 10:34:40 -07:00
Andrzej Kapolka
4a0657fead
Set up the lights after applying the camera transform so that they will be in
...
world, not view, space.
2013-05-09 10:29:15 -07:00
ZappoMan
a08d89a074
Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization
2013-05-09 10:28:05 -07:00
ZappoMan
655f14121d
Voxel Render Optimization - using blended VBO update strategy
...
- Fixed a bug in updateNodeInArraysAsFullVBO() that caused blended strategy
to not work properly.
- Implement strategy to usually update only the portion of the VBOs that
have changed, unless nodes have been removed, and then update the full
VBO. This siginificantly improves treeToArrays() performance
- Still to do implement partial strategy for copy buffers and update GPU
2013-05-09 10:25:12 -07:00
Andrzej Kapolka
0cff127082
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-09 09:56:58 -07:00
Andrzej Kapolka
785e55e06f
Working on voxel editing.
2013-05-09 09:56:35 -07:00
Jeffrey Ventrella
a75f655e40
Merge remote-tracking branch 'upstream/master'
2013-05-08 22:46:57 -07:00
Jeffrey Ventrella
0ac2765b09
cleaned up a few small code thingies; added a check for where avatar velocity updates avatar position;
2013-05-08 22:45:28 -07:00
Philip Rosedale
39c35ea5c4
spacing
2013-05-08 21:19:33 -07:00
Philip Rosedale
5db7b74c1e
spacing
2013-05-08 21:19:15 -07:00
Philip Rosedale
2bf9b3e6fd
Fixed problem with springy body repositioning on startup
2013-05-08 21:18:10 -07:00
ZappoMan
bb65137b7e
Optimized performance of newTreeToArrays() by implementing blended VBO strategy
...
- Introduced concept of sometimes only updating the new/changed part of the VBO
while other times updating the full VBO. This allows us to get the speed
advantage of only partial VBO updates when nodes haven't been removed
- Some debugging output related to _alwaysRenderFullVBO
- added cleanupRemovedVoxels() which actually deletes the nodes that were
previously removed (fixes a memory leak!!)
2013-05-08 20:33:41 -07:00
Philip Rosedale
408a21b515
Fixed Eve's missing mouth and the bad triangles!
2013-05-08 20:26:38 -07:00
Philip Rosedale
14f0ecdc51
Lowered avatar drag to allow faster flight, increased drag when near others
2013-05-08 20:07:27 -07:00
Philip Rosedale
4bb8f49132
Added new cooler movement sound that is velocity sensitive.
2013-05-08 20:02:29 -07:00
Philip Rosedale
ddc97a6ac9
Merge remote-tracking branch 'upstream/master'
2013-05-08 19:36:45 -07:00
Philip Rosedale
76c5a74876
Added gyro pitch to view, moved onscreen displays around to look nicer.
2013-05-08 19:35:48 -07:00
Jeffrey Ventrella
fc549b73bd
fixed merge conflict
2013-05-08 19:25:23 -07:00
Jeffrey Ventrella
bbd85664d6
Merge remote-tracking branch 'upstream/master'
2013-05-08 19:24:07 -07:00
Jeffrey Ventrella
7a24c50063
put orientation back in avatar folder (this should be put in a more logical place at some point) - also did some work on avatar renderer
2013-05-08 19:22:21 -07:00
ZappoMan
5cfbcc5caa
Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization
2013-05-08 18:06:30 -07:00
ZappoMan
244b4a17f7
lowered voxel count so Ryan can run, and handle too many voxels case slightly more gracefully than crashing
2013-05-08 18:06:13 -07:00
ZappoMan
bf81587e1b
Merge pull request #243 from PhilipRosedale/master
...
Procedural noise support added on client, adds a bit of noise when moving
2013-05-08 17:44:15 -07:00
Philip Rosedale
08c48bf6a7
Merge remote-tracking branch 'upstream/master'
2013-05-08 17:27:31 -07:00
Philip Rosedale
5052f4af5e
Added render option for avatars, code cleanup.
2013-05-08 17:26:44 -07:00
Philip Rosedale
ebf06187b7
Merge remote-tracking branch 'upstream/master'
2013-05-08 16:16:27 -07:00
ZappoMan
9bde92fe78
Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization
2013-05-08 15:35:09 -07:00
ZappoMan
4e789dcfbf
Merge pull request #250 from ey6es/master
...
Directory fix for shaders on OS X.
2013-05-08 15:34:55 -07:00
Andrzej Kapolka
da822e5299
We need to adjust the directory on OS X before we attempt to load the shaders.
2013-05-08 15:33:39 -07:00
ZappoMan
b35c88029e
Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization
2013-05-08 15:07:24 -07:00
ZappoMan
4301506f0c
Merge pull request #249 from ey6es/master
...
Fix for build error on OS X.
2013-05-08 15:07:08 -07:00
Andrzej Kapolka
1f58e28b36
Need the ARB suffix on this. I'm surprised it compiled for me!
2013-05-08 15:05:35 -07:00
ZappoMan
5f55d511c5
Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization
2013-05-08 15:01:50 -07:00
Philip Rosedale
5e450827d8
Merge pull request #237 from ey6es/master
...
Added basic environment data and atmosphere rendering.
2013-05-08 15:01:12 -07:00
ZappoMan
9a04f2c00c
Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization
2013-05-08 14:57:20 -07:00
Philip Rosedale
ad25150d62
Merge remote-tracking branch 'upstream/master'
2013-05-08 14:51:52 -07:00
Philip Rosedale
fd5789abb8
Merge remote-tracking branch 'upstream/master'
2013-05-08 14:40:53 -07:00
Philip Rosedale
a9882d054f
Invensense gyros now correctly controlling head motion, code cleanups.
2013-05-08 14:39:41 -07:00
ZappoMan
cb5ccee1e4
CR cleanup
2013-05-08 14:32:55 -07:00
ZappoMan
ed30a03b2e
CR cleanup
2013-05-08 14:30:18 -07:00
ZappoMan
ad67c363ec
Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization
2013-05-08 14:27:37 -07:00
ZappoMan
70557cd51c
Optimized removeOutOfView()
...
- don't recurse down trees that are fully INSIDE of the view frustum, because those nodes
are guaranteed to also be INSIDE
- changes to extraData of the recurse operation to make this possible
- adding debug stats to track how many nodes are inside, outside, intersect
- change call to removeOutOfView() to not call if last elapsed time has not
yet passed since last call (similar to treeToArrays() logic)
2013-05-08 14:24:08 -07:00
Andrzej Kapolka
1c8b835bb8
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-08 13:15:21 -07:00
Andrzej Kapolka
caeccf59ec
When the stars and the atmosphere are both on, adjust the stars' alpha value
...
based on the distance from the atmosphere.
2013-05-08 13:13:56 -07:00
ZappoMan
0b873dddc8
Merge pull request #244 from Ventrella/master
...
moved Orientation class to shared folder
2013-05-08 12:51:26 -07:00
Andrzej Kapolka
8a21823469
Render the stars, when enabled, before the atmosphere.
2013-05-08 12:11:48 -07:00
ZappoMan
7a5ce57b4e
added alwaysDisplay mode to PerformanceWarnings class
2013-05-08 12:01:55 -07:00
Andrzej Kapolka
c34b6df2f4
Merge branch 'master' of https://github.com/worklist/hifi
...
Conflicts:
voxel-server/src/main.cpp
2013-05-08 11:56:03 -07:00
Andrzej Kapolka
5138f62aef
Use the "proper" alpha value (i.e., the one from the original shader). This
...
makes the sky somewhat darker, but that probably just means we need more
scattering or a brighter sun.
2013-05-08 11:50:59 -07:00
Andrzej Kapolka
82f16e7f34
Include the "sky from space" shaders, too, and use them when the camera is
...
outside the atmosphere's outer radius.
2013-05-08 11:42:31 -07:00
Philip Rosedale
131377aaf9
Converted gyro values to floats and converted to exact degrees/second per docs.
2013-05-08 11:22:49 -07:00
Philip Rosedale
de6627f922
Merge remote-tracking branch 'upstream/master'
2013-05-08 10:40:05 -07:00
Andrzej Kapolka
8d4a74cf03
Render environment -> render atmosphere.
2013-05-08 10:00:31 -07:00
Philip Rosedale
355cff21c5
Merge remote-tracking branch 'upstream/master'
2013-05-08 09:06:13 -07:00
Philip Rosedale
baf64c07dc
Added Procedural audio noise when moving, scaled to velocity
2013-05-08 09:04:38 -07:00
Jeffrey Ventrella
9e60c8a36e
increased GRAVITY_SCALE to 10.0; tidied-up avatar code; moved Orientation class to shared folder
2013-05-08 08:59:29 -07:00
ZappoMan
de969891d8
Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization
2013-05-08 01:19:35 -07:00
ZappoMan
ddf49ffdec
removed addRandomSphere() which was dead code
2013-05-08 00:46:02 -07:00
ZappoMan
f1425216ba
removed VoxelSystem::createSphere() which was dead code
2013-05-08 00:45:27 -07:00
Andrzej Kapolka
80cdd597f4
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-07 17:53:27 -07:00
ZappoMan
085bfa384a
Merge pull request #225 from PhilipRosedale/master
...
Added perlin noise example function noiseTest()
2013-05-07 17:53:07 -07:00
ZappoMan
005b2fce35
Merge pull request #223 from Ventrella/master
...
cleaned up a bunch of spacings inside of parentheses
2013-05-07 17:51:43 -07:00
Andrzej Kapolka
9e6e5acf19
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-07 17:42:47 -07:00
Andrzej Kapolka
7c8a06ed4d
Added wrapper classes for shaders/shader programs to ease the process of
...
compiling, linking, assigning uniforms, etc. They're modeled after the ones
included in QtOpenGL, which we can't use at the moment because they require
a Qt OpenGL context.
2013-05-07 17:40:55 -07:00
Stephen Birarda
75ba88923f
remove the serial interface close in destructor, incorrect solution
2013-05-07 17:09:49 -07:00
Andrzej Kapolka
c7e31ec414
Merge branch 'master' of https://github.com/worklist/hifi
...
Conflicts:
libraries/shared/src/PacketHeaders.h
2013-05-07 14:44:17 -07:00
Andrzej Kapolka
47f3566929
Wavelengths, switch for environment rendering, far plane adjustment.
2013-05-07 14:40:30 -07:00
Stephen Birarda
92daa8e6e0
revert the type squish
2013-05-07 13:43:07 -07:00
Stephen Birarda
9be92cebdd
revert type squish, spacing, code review comment
2013-05-07 13:41:48 -07:00
Stephen Birarda
d5d9479b65
make eve send her ID to identify with the avatar mixer
2013-05-07 13:38:56 -07:00
Philip Rosedale
0ae700d746
Merge remote-tracking branch 'upstream/master'
2013-05-07 12:53:19 -07:00
Philip Rosedale
e1645b1158
Testing audio noise generation at client
2013-05-07 12:48:35 -07:00
Stephen Birarda
0566330a8a
some magic number removals
2013-05-07 12:44:45 -07:00
Andrzej Kapolka
7faa9e4318
More work on atmosphere rendering; rendering now working.
2013-05-07 12:40:15 -07:00
Stephen Birarda
85dfb23fbd
add constant for UNKNOWN_AGENT_ID
2013-05-07 12:39:35 -07:00
Stephen Birarda
83e59b1aa8
more deletions
2013-05-07 12:05:32 -07:00
Stephen Birarda
5c90b4575e
trivial deletions for cleanup
2013-05-07 12:05:25 -07:00
Stephen Birarda
4eeb1ed5b1
have interface clients tell the avatar-mixer and voxel-server what their ID is
2013-05-07 12:05:19 -07:00
Philip Rosedale
331d4116d9
Finished noiseTest example (in util.h) that uses Perlin noise to draw a bitmap in 2D.
2013-05-07 11:14:12 -07:00
Philip Rosedale
be1b803656
Noise Test function, adjust chat position
2013-05-07 10:41:39 -07:00
Philip Rosedale
27540f1286
Fixes per code review
2013-05-07 09:59:37 -07:00
Jeffrey Ventrella
fe11d929e3
cleaned up code spacing
2013-05-07 08:43:14 -07:00
Philip Rosedale
c7635604a9
Fixes in merge.
2013-05-07 08:40:11 -07:00
Jeffrey Ventrella
65181cb4e0
changed some spacing formatting things
2013-05-06 22:23:16 -07:00
Philip Rosedale
31593dccd4
improved comment of function
2013-05-06 18:46:19 -07:00
Philip Rosedale
00c8673ceb
Added Utility function angleBetween() which returns the positive angle between any two 3D vectors.
2013-05-06 18:45:06 -07:00
Jeffrey Ventrella
ef76c6ba0a
Merge remote-tracking branch 'upstream/master'
2013-05-06 18:29:42 -07:00
Jeffrey Ventrella
22a0e39d6c
more work on avatar touch, reachable radius, and hand states
2013-05-06 18:29:20 -07:00
Philip Rosedale
631ee8f478
Merge remote-tracking branch 'upstream/master'
2013-05-06 18:23:06 -07:00
Stephen Birarda
55a1e26585
remove the Texture class no longer in use
2013-05-06 18:10:21 -07:00
Stephen Birarda
f424b75e7b
some spacing repairs after merging Philip's levels pull
2013-05-06 17:50:44 -07:00
birarda
133e95f116
Merge pull request #210 from PhilipRosedale/master
...
Added invensense gyro level indicators
2013-05-06 17:47:38 -07:00
Jeffrey Ventrella
9c1f163175
Merge remote-tracking branch 'upstream/master'
2013-05-06 17:00:04 -07:00
Philip Rosedale
9c56e5a2f7
Merge remote-tracking branch 'upstream/master'
2013-05-06 16:59:46 -07:00
Jeffrey Ventrella
9fc56a6230
working out avatar touch stuff
2013-05-06 16:59:43 -07:00
ZappoMan
84da976383
removed _voxelCleanupLock
2013-05-06 16:38:24 -07:00
ZappoMan
f5808f43b5
some cleanup pre CR
2013-05-06 16:24:09 -07:00
Philip Rosedale
ff88d1fc06
Created a drawVector() call that will draw a vector in 3-space with axes for testing
2013-05-06 16:18:27 -07:00
Jeffrey Ventrella
fd4a0c9acd
working on detection of avatars entering into each other's peripersonal space
2013-05-06 16:17:16 -07:00
ZappoMan
94529d54e8
some cleanup pre CR
2013-05-06 16:16:21 -07:00
ZappoMan
b69c1a3474
some cleanup pre CR
2013-05-06 16:14:10 -07:00
ZappoMan
68d58650a5
removed some debug code
2013-05-06 16:09:21 -07:00
ZappoMan
09923d1c97
second cut at view culling voxels
2013-05-06 15:51:56 -07:00
Jeffrey Ventrella
c1ac3eb320
improving the code for detecting collisions, hand movement and handholding
2013-05-06 15:14:13 -07:00
Jeffrey Ventrella
114dfeacf6
thingy
2013-05-06 14:22:01 -07:00
Jeffrey Ventrella
40771e4c47
thingy
2013-05-06 14:18:14 -07:00
Jeffrey Ventrella
bc15bc2292
Merge remote-tracking branch 'upstream/master'
2013-05-06 13:53:16 -07:00
ZappoMan
4f7adf7a05
Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization
2013-05-06 13:47:13 -07:00
Philip Rosedale
3b3e6ae075
Merge remote-tracking branch 'upstream/master'
2013-05-06 13:42:23 -07:00
Andrzej Kapolka
a44cb3fcb6
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-06 13:41:30 -07:00
Stephen Birarda
784fa5882a
closing of serial interface should be conditional on __APPLE__
2013-05-06 13:36:58 -07:00
ZappoMan
043a284d4d
Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization
2013-05-06 13:36:31 -07:00
Andrzej Kapolka
5b873c1e8f
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-06 13:33:07 -07:00
ZappoMan
7ba9d4aa86
First cut are removing out of view voxels and switch to using PerformanceWarnings
2013-05-06 13:32:09 -07:00
Stephen Birarda
250df35bc1
resolve conflicts on merge with upstream master
2013-05-06 13:31:50 -07:00
Andrzej Kapolka
2226d722cf
Merge branch 'master' of https://github.com/worklist/hifi
...
Conflicts:
libraries/shared/src/PacketHeaders.h
2013-05-06 13:31:46 -07:00