ZappoMan
1b302f60f8
Merge branch 'master' of https://github.com/worklist/hifi into keep_local_voxels
2013-10-21 16:03:53 -07:00
ZappoMan
023a521948
some debug timing and voxel stats display
2013-10-21 14:39:05 -07:00
Lord Waymaster
25d5b38f5f
Starfield modification to randomly generate stars
...
Starfield now generates stars at startup rather than load them from the
server - approx. 50msec to load 50,000 stars.
STAR_COLORIZATION const in Generator.cpp is used to defined how
colorful the stars should be.
STARFIELD_NUM_STARS and STARFIELD_SEED sets the number of stars and the
random number seed used to generate the starfield.
2013-10-17 23:24:03 -07:00
ZappoMan
001418649f
show total memory usage for voxels
2013-10-17 17:08:46 -07:00
Stephen Birarda
73d3ecccf3
resolve conflicts on merge with upstream master
2013-10-17 14:37:58 -07:00
Philip Rosedale
c48856df52
Merge pull request #1075 from ZappoMan/voxelnode_memory_savings
...
VoxelNode memory savings
2013-10-17 14:26:40 -07:00
ZappoMan
d566026026
Merge branch 'master' of https://github.com/worklist/hifi into voxelnode_memory_savings
2013-10-17 12:31:31 -07:00
Stephen Birarda
fa146e302d
remove 16-bit node IDs and replace with UUIDs
2013-10-17 11:49:41 -07:00
PhilipRosedale
9643c1262c
Fix mute button, visualize gaze direction when showing headMouse
2013-10-17 11:03:12 -07:00
Stephen Birarda
012fccc72e
send ping to AvM and VS for socket activation
2013-10-16 18:01:15 -07:00
ZappoMan
6fff53a2dc
next round of voxelnode size improvements
2013-10-15 14:43:51 -07:00
Philip Rosedale
746bce8626
All onscreen text, overlay OFF when stats are off
2013-10-15 11:01:22 -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
3425685119
first cut at added voxel node memory usage debugging to client and server
2013-10-14 12:09:44 -07:00
ZappoMan
6f9fdfba2f
make mouse cursor hiding more aware of focused window and bounds
2013-10-14 11:39: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
Stephen Birarda
6369e9959f
change goToUser shortcut to @
2013-10-11 15:25:17 -07:00
ZappoMan
e91127bc5c
implement hide cursor on no mouse movement
2013-10-11 14:56:37 -07: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
ZappoMan
4da19531ca
Merge branch 'master' of https://github.com/worklist/hifi into keep_local_voxels
2013-10-11 10:49:57 -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
bf3f507301
Merge pull request #1043 from birarda/master
...
fix domain jumping with goToUser, remove planet environments
2013-10-10 17:25:43 -07:00
ZappoMan
fbcf66b232
Merge branch 'master' of https://github.com/worklist/hifi into keep_local_voxels
...
Conflicts:
interface/src/Menu.h
2013-10-10 16:37:07 -07:00
Stephen Birarda
6f868a00eb
reset environment on domain-server change
2013-10-10 16:34:35 -07:00
Philip Rosedale
43e01ee105
Merge pull request #1039 from birarda/data-server
...
add ability to jump to a user's domain and location
2013-10-10 15:37:21 -07:00
ZappoMan
c86bad77c9
progress on keep local voxels
2013-10-10 15:23:22 -07:00
Andrzej Kapolka
42d3ee450b
Fix for seg fault on exit.
2013-10-10 15:15:28 -07:00
Andrzej Kapolka
052c8246fa
Let's use the "eye level" position.
2013-10-10 10:49:19 -07:00
Andrzej Kapolka
0881cd4c92
Merge branch 'master' of https://github.com/worklist/hifi
2013-10-10 10:32:19 -07:00
Andrzej Kapolka
ea639afe44
Use the head joint position so that lean affects camera position in first
...
person mode.
2013-10-10 10:31:34 -07:00
Philip Rosedale
27a892fa55
Removed old head rotation code, menu items, added ability to turn off faceshift head rotation
2013-10-09 22:46:34 -07:00
Stephen Birarda
f7a0dd514e
load NodeList and Profile settings with menu settings load
2013-10-09 15:23:07 -07:00
Philip Rosedale
4afa82d626
Merge branch 'master' of https://github.com/worklist/hifi
2013-10-09 15:10:16 -07:00
Stephen Birarda
d3b95d19a1
send the user's last domain and position to data-server
2013-10-09 15:09:57 -07:00
Andrzej Kapolka
dfa3ea78da
Reverse direction of eye offset.
2013-10-09 14:38:05 -07:00
Philip Rosedale
58d6c4c97a
Cleaning up particle code
2013-10-09 14:28:00 -07:00
Stephen Birarda
9112efaa36
move username change to Login, add lastPosition and lastDomain
2013-10-09 13:00:05 -07:00
Philip Rosedale
bcb3e082f6
Merge branch 'master' of https://github.com/worklist/hifi
2013-10-09 12:17:43 -07:00
Andrzej Kapolka
5511c02449
Merge branch 'master' of https://github.com/worklist/hifi
2013-10-09 11:53:08 -07:00
Andrzej Kapolka
0a54c2f1e9
Tweaking the growing heads.
2013-10-09 11:52:56 -07:00
Philip Rosedale
8dc84fc841
Merge branch 'master' of https://github.com/worklist/hifi
2013-10-09 11:44:56 -07:00
Stephen Birarda
f09888dd1b
Merge branch 'master' of github.com:worklist/hifi into nameserver
2013-10-09 10:21:25 -07:00
Philip Rosedale
afd553330a
Merge branch 'master' of https://github.com/worklist/hifi
2013-10-08 22:24:34 -07:00
Philip Rosedale
ce2e31ddd5
reconnecting particle cloud
2013-10-08 22:21:55 -07:00
Andrzej Kapolka
87bdd2fb1a
When in mirror mode and using a blend face, try to position the camera so as
...
to look directly into the face's eyes.
2013-10-08 15:09:56 -07:00
