Jeffrey Ventrella
82683dbabc
merge
2013-05-28 17:58:02 -07:00
Stephen Birarda
65f10cb99a
fix the enum in AABox, fix a warning in Head
2013-05-28 16:26:18 -07:00
Andrzej Kapolka
1df7806464
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-27 14:40:30 -07:00
Andrzej Kapolka
949befee09
Fix for NaN.
2013-05-27 14:37:07 -07:00
Andrzej Kapolka
cfb66bee95
Capsule/box collisions.
2013-05-27 14:05:44 -07:00
Andrzej Kapolka
70b25fd6c4
Sphere/box collisions for voxels, various utility functions.
2013-05-25 19:59:07 -07:00
ZappoMan
48ca562b10
tweak ViewFrustum::matches() to use EPSILON compare
2013-05-25 15:28:56 -07:00
Andrzej Kapolka
95f1a9adaa
Removed unused nearCenter/farCenter from ViewFrustum.
2013-05-23 16:34:11 -07:00
ZappoMan
473665fb4a
Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation
2013-05-23 12:16:29 -07:00
ZappoMan
25700ae490
fixes to coloring bugs, coding standard cleanup
2013-05-23 12:08:51 -07:00
ZappoMan
2130572034
fixed color initialization on VoxelNode construction
2013-05-23 12:07:56 -07:00
Andrzej Kapolka
34b526f15c
Restore the original floor behavior.
2013-05-23 10:32:12 -07:00
Andrzej Kapolka
629c7b0146
Send all environment data in the same packet and only send it about once a
...
second.
2013-05-22 17:09:35 -07:00
birarda
9ec04855f8
Merge pull request #386 from ZappoMan/voxel_animation
...
Fix some crashing issues on delete
2013-05-22 14:27:29 -07:00
ZappoMan
47c4ff887e
CR feedback
2013-05-22 14:13:38 -07:00
ZappoMan
06f2528d6a
fix crashing on deleting voxels in server and client
2013-05-22 13:23:01 -07:00
Andrzej Kapolka
8b1362636e
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-21 22:29:46 -07:00
Philip Rosedale
8b65fcae75
Merge pull request #352 from tschw/master
...
refactors logging, adds comments, and revises names & formatting in all submitted code
2013-05-21 22:10:10 -07:00
Andrzej Kapolka
a864a6f8c6
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-21 21:34:09 -07:00
Andrzej Kapolka
fd98982fa6
Support for multiple environments, collisions with notional planet surfaces.
2013-05-21 21:33:08 -07:00
ZappoMan
09711d86ed
fix compiler warning
2013-05-21 18:03:14 -07:00
ZappoMan
c316899f27
CR feedback
2013-05-21 17:42:55 -07:00
ZappoMan
166ad4f73d
CR feedback
2013-05-21 17:37:21 -07:00
tosh
ba4f4b9809
Merge branch 'master' of git://github.com/worklist/hifi
2013-05-21 22:49:39 +02:00
ZappoMan
0bcd629c8a
Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation
2013-05-21 13:46:04 -07:00
ZappoMan
869a100486
cleanup
2013-05-21 13:37:58 -07:00
Andrzej Kapolka
0377ca1adb
Compute nodes' enclosing radius in the same place.
2013-05-21 13:32:41 -07:00
Andrzej Kapolka
597769a861
Added basic capsule/sphere collisions between avatar and voxels.
2013-05-21 12:58:02 -07:00
ZappoMan
d6d9b053f5
removed extra color exists bitmask since we weren't using it and it was redundant
2013-05-21 12:45:40 -07:00
ZappoMan
edcc92cfb6
cleanup code
2013-05-21 11:58:48 -07:00
ZappoMan
e8fd96018b
cleanup code
2013-05-21 11:52:57 -07:00
ZappoMan
b61d6cf4e8
cleanup code
2013-05-21 11:48:30 -07:00
ZappoMan
e47d9ea21f
cleanup code
2013-05-21 11:44:48 -07:00
ZappoMan
7c9be4b9f5
cleanup code
2013-05-21 11:42:13 -07:00
ZappoMan
a7f0a66aee
code cleanup
2013-05-21 11:31:47 -07:00
ZappoMan
4f9c7fed59
removed UI for want exists bits, defaults to true
2013-05-21 11:25:50 -07:00
ZappoMan
ef2d27aba6
getting closer to working delete
2013-05-21 10:43:31 -07:00
tosh
a86b8a1d93
refactors logging
2013-05-21 01:00:10 +02:00
ZappoMan
a53f84fcb9
latest hacking
2013-05-20 15:51:47 -07:00
ZappoMan
321d1952d6
first cut at exists bits
2013-05-20 12:56:59 -07:00
Andrzej Kapolka
85bca558f5
Tabs -> spaces, spacing fix.
2013-05-20 09:38:01 -07:00
Andrzej Kapolka
0c03f66948
Fixed the frustum computation, fixed a bug in Plane.
2013-05-19 22:32:55 -07:00
Andrzej Kapolka
dd3e8d524a
Support for eye offset position/orientation in camera/frustum.
2013-05-19 18:37:21 -07:00
Andrzej Kapolka
3ed99f40a6
Working on support for off-axis projection.
2013-05-17 10:17:21 -07:00
Andrzej Kapolka
8e04c17cc2
Merge branch 'master' of https://github.com/worklist/hifi
...
Conflicts:
interface/src/Application.cpp
2013-05-14 14:44:22 -07:00
Andrzej Kapolka
ebc612f87a
Start out with gray, fix coloring smaller portions by (similar to deleting)
...
breaking up leaf nodes into their components.
2013-05-14 14:23:08 -07:00
ZappoMan
8dc61d89fc
Added support for "destructive" vs "non-destructive" voxel create
...
- changed VoxelTree to support destructive and non-destructive mode
- added protocol packet headers to differentiate
- added new UI to switch modes
- default mode now, non-destructive.
2013-05-14 14:19:31 -07:00
ZappoMan
4e92f5d3d8
tweaks to delta sending
2013-05-14 12:11:32 -07:00
ZappoMan
fa37b88fa8
first cut at delta view frustum encoding
2013-05-14 09:02:01 -07:00
ZappoMan
f63407aea5
added printDebugDetails()
2013-05-14 08:57:49 -07:00