ZappoMan
e8ce60d275
implement support for three children encoding
2013-10-16 21:42:55 -07:00
ZappoMan
d2bab77c88
implement support for three children encoding
2013-10-16 21:42:47 -07:00
ZappoMan
1e5ce8a7e5
first cut at really getting _children UNION to work
2013-10-16 12:54:37 -07:00
ZappoMan
afcf6dd3e0
type squish
2013-10-15 18:28:56 -07:00
ZappoMan
6fff53a2dc
next round of voxelnode size improvements
2013-10-15 14:43:51 -07:00
ZappoMan
9800dc0fde
removed dead code
2013-10-15 13:40:55 -07:00
ZappoMan
05c9d4febc
added old style voxelnode for size comparison
2013-10-15 13:37:14 -07:00
ZappoMan
9d0ff1595a
make voxelnode population statistics static members instead of per node
2013-10-15 13:33:38 -07:00
ZappoMan
86ba5e3064
some size comparison debugging
2013-10-15 12:11:49 -07:00
ZappoMan
9ba39c3a84
removed center from AABox to further save memory
2013-10-15 12:05:54 -07:00
ZappoMan
c9b0edf345
first cut at reducing memory footprint of AABox
2013-10-15 11:29:04 -07:00
Philip Rosedale
9f05faa088
Merge pull request #1059 from ZappoMan/voxel_memory_stats
...
Voxel memory stats/Load voxels on persist thread/Save memory with VoxelNode size savings
2013-10-14 20:51:38 -07:00
ZappoMan
924053f2ec
added additional debugging of VoxelNode memory usage, shrunk size of VoxelNode by better alignment
2013-10-14 15:10:56 -07:00
ZappoMan
f0fc973db1
move loading of voxel file to the persist thread so that assignment client will load voxel server faster
2013-10-14 12:42:15 -07:00
ZappoMan
1513003ecd
added more stats to voxel server status
2013-10-14 12:20:50 -07:00
ZappoMan
3425685119
first cut at added voxel node memory usage debugging to client and server
2013-10-14 12:09:44 -07:00
ZappoMan
8c5c1aeae7
Merge pull request #1058 from ZappoMan/hide_cursor
...
make mouse cursor hiding more aware of focused window and bounds
2013-10-14 11:50:21 -07:00
ZappoMan
6f9fdfba2f
make mouse cursor hiding more aware of focused window and bounds
2013-10-14 11:39:48 -07:00
ZappoMan
5663fdd85a
Merge pull request #1057 from machinelevel/dev4
...
Leap interface and Avatar: left-hand IK works for Leap interface.
2013-10-14 10:21:43 -07:00
Eric Johnston
d5885acd75
Cleanup and simplification per feedback
2013-10-14 10:09:08 -07:00
Eric Johnston
7bc2cf6fa9
Leap interface and Avatar: left-hand IK works for Leap interface.
...
This is in and smooth, and there's a decision to be made:
In the case where only one hand is visible, we have to decide if it's the left or right hand. Currently it's simple, based on which side it's detected on.
So far this seems to work best, in the (very) common case where hands go in/out of the sensor's field frequently.
We could also use a history-based heuristic to hold one hand as left/right, but that means that when it guesses wrong the error lingers.
Detecting handedness based on where the thumbs are would be better, but is unreliable on the Leap.
I went for the simple/clear version, but we can do whatever we want.
2013-10-14 09:01:50 -07:00
Philip Rosedale
78b2f2665d
Merge pull request #1056 from birarda/master
...
add reset of node types of interest to NodeList reset
2013-10-11 18:51:20 -07:00
Stephen Birarda
dc4548a91b
Merge pull request #1054 from PhilipRosedale/i-can-always-move
...
better movement near others
2013-10-11 17:49:52 -07:00
Stephen Birarda
5ca805693c
reset nodeTypesOfInterest on NodeList reset
2013-10-11 17:48:54 -07:00
Philip Rosedale
a29de84fae
Merge pull request #1055 from birarda/assignment
...
add audio injection from javascript
2013-10-11 17:44:45 -07:00
Stephen Birarda
2bbaf7d31e
remove static instance set from Agent.cpp
2013-10-11 17:40:28 -07:00
Stephen Birarda
cdfb232078
remove the Agent static instance
2013-10-11 17:40:02 -07:00
Stephen Birarda
0eae0f129c
allow audio injection from javascript
2013-10-11 17:37:48 -07:00
Philip Rosedale
b071776c22
Merge pull request #1051 from ZappoMan/keep_local_voxels
...
Clean up some crashes in client side handling of voxels
2013-10-11 17:15:41 -07:00
Philip Rosedale
3cd4415e6d
Merge pull request #1052 from ZappoMan/hide_cursor
...
implement hide cursor on no mouse movement
2013-10-11 17:14:29 -07:00
Philip Rosedale
03bb2c8b19
Merge pull request #1053 from birarda/master
...
change goToUser shortcut to @
2013-10-11 17:10:50 -07:00
Philip Rosedale
6281a28f69
better movement near others
2013-10-11 17:00:25 -07:00
Stephen Birarda
6369e9959f
change goToUser shortcut to @
2013-10-11 15:25:17 -07:00
ZappoMan
56a888cc2a
Merge pull request #1048 from stojce/19435
...
Code Review for Job #19435
2013-10-11 15:09:43 -07:00
ZappoMan
e91127bc5c
implement hide cursor on no mouse movement
2013-10-11 14:56:37 -07:00
Stephen Birarda
515e2d5a23
handle conflicts on merge with upstream master
2013-10-11 14:24:05 -07:00
stojce
355a1f3da3
Merge branch 'master' of https://github.com/worklist/hifi into 19435
...
Conflicts:
interface/src/avatar/Head.cpp
interface/src/avatar/Head.h
2013-10-11 22:54:59 +02:00
ZappoMan
f2ef80b704
Merge pull request #1049 from stojce/19426
...
Code Review for Job #19426
2013-10-11 12:54:13 -07:00
ZappoMan
c6df36a40b
Merge pull request #1047 from stojce/19434
...
Code Review for Job #19434
2013-10-11 12:52:13 -07:00
ZappoMan
dfe23c9342
merge cleanup
2013-10-11 12:49:50 -07:00
Stephen Birarda
2a5e672b5a
Merge pull request #1050 from birarda/master
...
remove a random sleep time debug
2013-10-11 11:15:29 -07:00
Stephen Birarda
8be527f85d
remove sleep time debug
2013-10-11 11:15:10 -07:00
ZappoMan
4da19531ca
Merge branch 'master' of https://github.com/worklist/hifi into keep_local_voxels
2013-10-11 10:49:57 -07:00
ZappoMan
edaa67121f
Merge pull request #1046 from birarda/master
...
fix node kill bugs and add debugging
2013-10-11 10:30:04 -07:00
Stephen Birarda
13ac5472ea
fix an idiotic bug with silent node kill thread
2013-10-11 10:23:59 -07:00
Stephen Birarda
60095bcbca
add debug on NodeList clear
2013-10-11 10:08:28 -07:00
Stephen Birarda
eebd38189b
add killing of local voxels to domain change
2013-10-11 10:07:42 -07:00
stojce
a87346d39c
Merge branch 'master' of https://github.com/worklist/hifi into 19426
2013-10-11 14:19:31 +02:00
ZappoMan
4be07ececb
fixed a couple crashes and cleaned up some code
2013-10-11 01:30:09 -07:00
Philip Rosedale
53e2486d4d
Merge pull request #1045 from birarda/data-server
...
fix bug with constant avatar kill/adds
2013-10-10 18:05:23 -07:00