Andrzej Kapolka
aca15d4aef
Disable specular highlights for ground and voxels.
2013-08-08 10:59:01 -07:00
ZappoMan
647c176631
make voxel server fades slightly smaller than bounds to prevent z-fighting
2013-08-08 09:57:48 -07:00
Andrzej Kapolka
9dbec35f6a
Merge pull request #823 from ZappoMan/master
...
Display Frustum and resizeGL() cleanup
2013-08-07 16:29:34 -07:00
ZappoMan
cb211fbb04
CR feedback
2013-08-07 16:27:43 -07:00
ZappoMan
9f5f7d96da
Merge pull request #820 from Atlante45/master
...
Display leap hand and rave glove in first person mode
2013-08-07 16:17:37 -07:00
ZappoMan
f4820143d7
cleanup resizeGL, and Display Frustum menus
2013-08-07 16:12:03 -07:00
Philip Rosedale
a4d1bc5b6e
Merge branch 'master' of https://github.com/worklist/hifi
2013-08-07 14:43:49 -07:00
Philip Rosedale
0445da3221
Stop rotating more quickly, display avatar position and yaw stats
2013-08-07 14:42:57 -07:00
atlante45
6fb76d3dfe
Merge branch 'master' of https://github.com/worklist/hifi
2013-08-07 14:30:18 -07:00
atlante45
c48652c2c3
Display leap hand and rave glove in first person mode
2013-08-07 14:28:21 -07:00
Andrzej Kapolka
e9b3cca3de
OpenGL fields of view are vertical, not horizontal.
2013-08-07 14:26:22 -07:00
Andrzej Kapolka
597842eba2
Starting on glow effect.
2013-08-07 14:17:52 -07:00
ZappoMan
153e8afd44
Merge pull request #816 from Atlante45/master
...
Fix objects coming into near clip
2013-08-07 12:39:01 -07:00
ZappoMan
393723d8fb
changed delete voxel fade color
2013-08-07 12:36:26 -07:00
atlante45
19b9be3361
- Now P switch between first and third person view
2013-08-07 12:24:13 -07:00
ZappoMan
451b2bc595
added Sending Mode to on screen stats
2013-08-07 12:07:39 -07:00
ZappoMan
11b7e84a80
Merge pull request #811 from ey6es/master
...
Several minor fixes for depth camera code.
2013-08-07 12:01:01 -07:00
Andrzej Kapolka
377adb30ae
Merge branch 'master' of https://github.com/worklist/hifi
2013-08-07 11:14:48 -07:00
atlante45
ce12c51fce
Merge branch 'master' of https://github.com/worklist/hifi
2013-08-07 11:13:26 -07:00
ZappoMan
96e6c2f9bd
Merge pull request #810 from ZappoMan/master
...
quick fix crash in parseVoxelStats()
2013-08-07 11:11:46 -07:00
atlante45
08309e3aac
Merge branch 'master' of https://github.com/worklist/hifi
2013-08-07 11:11:29 -07:00
ZappoMan
ccf3498ae5
quick fix crash in parseVoxelStats()
2013-08-07 11:11:03 -07:00
atlante45
f151b2cfc1
- Don't render body when in first person view
2013-08-07 10:58:30 -07:00
atlante45
132d03e291
Moved string when following to chest
2013-08-07 10:56:32 -07:00
ZappoMan
d893d4cf16
Merge pull request #807 from machinelevel/dev4
...
Rave tweaks: change the look of the hands, fix screen-darken
2013-08-07 10:49:59 -07:00
Eric Johnston
1fc4f17f7a
Rave tweaks: change the look of the hands, fix screen-darken
...
Screen-darken is now a simple fullscreen draw
Leap hands are now visible and match body lighting
Fingertips are hidden and hand coloring matches body and arm
"fake hands" aren't active unless they're chosen from the Debug menu.
2013-08-07 10:29:31 -07:00
Andrzej Kapolka
ca939fb6b8
Merge branch 'master' of https://github.com/worklist/hifi
2013-08-07 10:18:45 -07:00
Jeffrey Ventrella
b007ab11d4
Merge remote-tracking branch 'upstream/master' into particles
2013-08-07 10:18:32 -07:00
Jeffrey Ventrella
253154ce6d
fixed mohawk physics bug
2013-08-07 10:17:53 -07:00
Andrzej Kapolka
f20ac7f4bc
Include received video data in bandwidth usage, clear webcam bits when it's
...
been turned off.
2013-08-07 10:17:04 -07:00
Philip Rosedale
cdfabd7647
Merge pull request #805 from ZappoMan/master
...
Tweaks for Grayson
2013-08-07 10:01:58 -07:00
ZappoMan
61560af28f
cleanup
2013-08-06 19:21:46 -07:00
ZappoMan
a5f472254d
removed ground plane grid, and changed start position
2013-08-06 19:15:26 -07:00
Philip Rosedale
7583e1cd14
Merge pull request #802 from ey6es/master
...
Added a textured rendering mode for depth data that doesn't use video input; rather, it computes normals from the depth and uses local lighting.
2013-08-06 17:13:50 -07:00
Eric Johnston
378cb343ae
Rave tweaks per Ryan's request: Mood lighting for the avatars. This also sets us up to have light coming from the effects, if we want.
2013-08-06 16:45:15 -07:00
Andrzej Kapolka
2f2eaf8ae5
Merge branch 'master' of https://github.com/worklist/hifi
2013-08-06 16:28:22 -07:00
Andrzej Kapolka
63aeb4df75
Merge branch 'master' of https://github.com/worklist/hifi
...
Conflicts:
interface/src/Application.cpp
2013-08-06 16:28:14 -07:00
Andrzej Kapolka
bd3c235fe4
Switching between textured and untextured modes.
2013-08-06 16:23:58 -07:00
atlante45
558255ca3d
- Made collision On by default
2013-08-06 16:13:31 -07:00
Philip Rosedale
426abbb55a
Merge pull request #799 from ZappoMan/fun_fade
...
add fade effect to voxel add and delete, fix crash with audio injector
2013-08-06 15:09:43 -07:00
ZappoMan
634b69b545
Merge pull request #797 from machinelevel/dev4
...
Rave demo changes per Ryan's request: Darken the world when you're in ra...
2013-08-06 15:00:26 -07:00
ZappoMan
05452dc2aa
Merge pull request #796 from PhilipRosedale/touchLook
...
Tune gyros, always fly in direction of sight, head always moves with gyros, adjustable view sensitivity
2013-08-06 14:59:28 -07:00
ZappoMan
facc9e1ee7
add fade effect to voxel add and delete, fix crash with audio injector
2013-08-06 14:55:40 -07:00
Eric Johnston
2e5dade413
Rave demo changes per Ryan's request: Darken the world when you're in rave mode, but leave the avatars and effects un-darkened.
...
Also fixed a warning in AvatarData.cpp initialization
2013-08-06 14:29:30 -07:00
ZappoMan
6cf87fc120
Merge branch 'master' of https://github.com/worklist/hifi into multiple_voxel_servers
...
Conflicts:
interface/src/Application.cpp
2013-08-06 13:49:42 -07:00
Philip Rosedale
ebd5c4832a
Merge branch 'master' of https://github.com/worklist/hifi into touchLook
2013-08-06 12:34:55 -07:00
Philip Rosedale
120bbbd506
Tuned gyro look, added better preferences
2013-08-06 12:34:45 -07:00
ZappoMan
c93ed450a2
Merge pull request #791 from Atlante45/stalking_indicator
...
Stalking indicator
2013-08-06 12:33:26 -07:00
Philip Rosedale
abf64f3e7f
Merge pull request #792 from Atlante45/turn_off_collisions
...
Add option to turn collisions on and off
2013-08-06 12:27:27 -07:00
ZappoMan
88e2e3dd3f
added visulization for voxel add/kill
2013-08-06 12:05:43 -07:00
atlante45
ddf1b06bf9
Add option to turn collisions on and off
2013-08-06 11:33:59 -07:00
atlante45
eb9f32b7cb
Merge branch 'master' of https://github.com/worklist/hifi into stalking_indicator
2013-08-06 11:07:58 -07:00
atlante45
32c155ef71
Render a string to show who is following who
2013-08-06 10:53:10 -07:00
ZappoMan
73510ec975
added notifications with jurisdiction details for when voxel servers come and go
2013-08-06 10:33:09 -07:00
Philip Rosedale
58cb852597
Touch-driven pitch happens immediately even when wearing gyros
2013-08-06 10:06:40 -07:00
Philip Rosedale
e5de67152e
Merge pull request #786 from Ventrella/particles
...
Added member variables to Hand.cpp to manage rave glove mode switching
2013-08-05 19:26:55 -07:00
Philip Rosedale
d7dc07502c
Merge pull request #787 from machinelevel/dev4
...
Rave glove demo: network-glove fixes
2013-08-05 18:58:04 -07:00
Eric Johnston
d85ce81313
Rave glove demo: network-glove fixes
...
After this change, people can see each other's rave glove performances.
1. Moved hand->simulate call into avatar->simulate so that it gets called on all avatars, not just mine.
2. Hide the rave stage, so it's out of the way while we figure out the best way to darken the world, if that's still desired.
2013-08-05 17:27:42 -07:00
ZappoMan
b016c08578
Merge branch 'master' of https://github.com/worklist/hifi into multiple_voxel_servers
...
Conflicts:
libraries/avatars/src/HandData.h
2013-08-05 16:53:41 -07:00
ZappoMan
acd3acb81e
correctly handle freeing of memory for _jurisdictionRoot in VoxelSceneStats
2013-08-05 16:51:01 -07:00
Jeffrey Ventrella
2dbd0f7f31
Merge branch 'master' of https://github.com/worklist/hifi into particles
2013-08-05 16:31:49 -07:00
Jeffrey Ventrella
f51db292a4
ya
2013-08-05 16:26:32 -07:00
ZappoMan
07a61a3c8e
Merge pull request #782 from Atlante45/master
...
few fixes on rescaling and following
2013-08-05 15:44:15 -07:00
atlante45
55e34558cb
Merge branch 'master' of https://github.com/worklist/hifi
2013-08-05 15:26:43 -07:00
Andrzej Kapolka
36ae7dbd48
Normalize when we render the ground. This shouldn't be necessary, but it
...
looks like various parts of the code rely on RESCALE_NORMAL, which is set but
not unset in avatar/Head/Hand. We'll have to look at that more closely later
on.
2013-08-05 15:24:21 -07:00
atlante45
29062c51b2
- changed according to review comments
...
- added reset scale option
2013-08-05 15:23:40 -07:00
ZappoMan
f1a0edb471
Merge branch 'master' of https://github.com/worklist/hifi into multiple_voxel_servers
2013-08-05 14:57:10 -07:00
ZappoMan
7ccab1a32c
Merge pull request #783 from LionTurtle/master
...
Render other avatar's lookat to point at my camera if the other avatar is looking at my head.
2013-08-05 14:53:27 -07:00
Mark Peng
1790b0595c
Render other avatar's lookat to point at my camera if the other avatar
...
is looking at my head.
2013-08-05 14:26:39 -07:00
atlante45
6c0ea0cf9c
Merge branch 'master' of https://github.com/worklist/hifi
2013-08-05 14:11:14 -07:00
atlante45
3d853f5b90
- Smooth rescaling
...
- stop following when leading avatar disconnect
- set max far clip for no more crash with really big avatars
2013-08-05 14:05:58 -07:00
ZappoMan
14b7f58fef
Kills local voxels if voxel server is removed from NodeList
...
- added notification hooks to NodeList
- implemented hooks in VoxelSystem to kill local voxels when
voxel server is killed
2013-08-05 13:47:18 -07:00
ZappoMan
fe877b0ec8
Merge pull request #779 from birarda/rave-audio
...
fix resetting of song mix menu item after import is done
2013-08-05 12:27:47 -07:00
Stephen Birarda
25537f78a1
reset the song mix menu item after clip is done
2013-08-05 12:18:59 -07:00
Andrzej Kapolka
e8365c6b04
Merge branch 'master' of https://github.com/worklist/hifi into pointy
2013-08-05 11:42:17 -07:00
Andrzej Kapolka
03de2f3ea7
Render a green plane with fog, per Grayson's request.
2013-08-05 11:41:42 -07:00
Stephen Birarda
035f1c81b9
Merge pull request #770 from ZappoMan/tile_import
...
made import work better when tile locations not included in file name
2013-08-05 10:56:53 -07:00
atlante45
1ee870be38
Fix pie menu appearing in selection mode
2013-08-05 10:35:10 -07:00
ZappoMan
cc9e4eaf45
CR feedback
2013-08-05 10:24:52 -07:00
ZappoMan
abc8bc332c
made import work better when tile locations not included in file name
2013-08-02 20:12:13 -07:00
ZappoMan
ce937247d1
added back getUprightEyeLevelPosition()
2013-08-02 18:47:21 -07:00
Mark Peng
5ef965018c
Fix bug where the lookatIndicator would draw and no longer update.
2013-08-02 18:13:49 -07:00
Mark Peng
da31cd441e
Merge remote-tracking branch 'upstream/master'
2013-08-02 18:08:28 -07:00
Mark Peng
26d6e826c5
Merge remote-tracking branch 'upstream/master'
2013-08-02 18:03:34 -07:00
Mark Peng
71a919f226
Switch back to avatar.getEyePosition() rather than
...
avatar.getHead().getEyePosition() because of mysterious lag.
2013-08-02 18:02:37 -07:00
atlante45
ff27ee1c53
Merge branch 'master' of https://github.com/worklist/hifi into fix_key_press_event
2013-08-02 18:00:42 -07:00
Stephen Birarda
8704964a0f
resolve conflicts on merge with upstream master
2013-08-02 17:56:19 -07:00
Stephen Birarda
d259180778
add option to audio menu to stop the mixed audio
2013-08-02 17:46:23 -07:00
atlante45
84eae284ea
Changed shifted and meta variable name
2013-08-02 17:44:21 -07:00
Mark Peng
ff67367221
Remove extra parenthesis.
2013-08-02 17:42:12 -07:00
Mark Peng
e0b7773521
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
interface/src/Application.cpp
interface/src/avatar/Head.cpp
2013-08-02 17:35:29 -07:00
Stephen Birarda
d56b715432
add menu option to mix RAW audio with microphone audio
2013-08-02 17:30:49 -07:00
Mark Peng
d7cd88a9a7
Fix camera positioning so that it is in between avatar's eyes. Plus
...
some code clean up.
2013-08-02 17:30:26 -07:00
atlante45
d765b58551
Merge branch 'master' of https://github.com/worklist/hifi into fix_key_press_event
2013-08-02 17:17:35 -07:00
atlante45
e9a53ed9b4
Changed avatar resizing shortcuts to plus and minus.
2013-08-02 17:14:57 -07:00
Stephen Birarda
447e332b6f
Merge pull request #760 from Atlante45/fix_key_press_event
...
Fix key press event
2013-08-02 16:45:25 -07:00
Philip Rosedale
936209fd31
When no hovered voxel, lookAt vectors point to distant horizon
2013-08-02 16:37:49 -07:00
atlante45
8c112cbec3
Merge branch 'master' of https://github.com/worklist/hifi into fix_key_press_event
2013-08-02 16:37:18 -07:00
atlante45
1b4cdc003d
Fix shortcuts : done
2013-08-02 16:36:53 -07:00
Philip Rosedale
639b6be01a
Merge branch 'master' of https://github.com/worklist/hifi into Remove-body
2013-08-02 16:08:16 -07:00
Philip Rosedale
8aa8b5dbfe
Marker lines all the way out to 128Meters
2013-08-02 16:03:34 -07:00
Philip Rosedale
b9a8d6080e
Render world box goes out to edge of world.
2013-08-02 15:43:37 -07:00
atlante45
eb2a1ecedd
merge
2013-08-02 15:41:32 -07:00
atlante45
2e150b97de
Fixed shortcuts issues on mac
2013-08-02 15:24:09 -07:00
ZappoMan
db55160f9a
Merge branch 'master' of https://github.com/worklist/hifi into multiple_voxel_servers
2013-08-02 14:40:39 -07:00
atlante45
f441295eb1
Merge branch 'pie_menu' of https://github.com/Atlante45/hifi into stalking_option
2013-08-02 14:15:07 -07:00
atlante45
1cae9fc6c7
merge
2013-08-02 14:14:21 -07:00
ZappoMan
55f7028726
Merge pull request #744 from PhilipRosedale/master
...
Smoother movement, rotation, less distracting collision noises. Play sound on click voxel
2013-08-02 14:03:51 -07:00
Jeffrey Ventrella
28dd38c013
Merge remote-tracking branch 'upstream/master' into particles
2013-08-02 13:36:01 -07:00
ZappoMan
4c15964cdc
Merge branch 'master' of https://github.com/worklist/hifi into multiple_voxel_servers
2013-08-02 11:44:09 -07:00
Jeffrey Ventrella
6ebe33bb0b
Merge remote-tracking branch 'upstream/master' into particles
2013-08-02 11:00:10 -07:00
Mark Peng
6cf42674d5
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
interface/src/Application.cpp
interface/src/Webcam.cpp
interface/src/Webcam.h
2013-08-02 11:00:05 -07:00
Jeffrey Ventrella
8fc800acff
some work on hands
2013-08-02 10:59:04 -07:00
Andrzej Kapolka
11664f9446
Have the particle system default to off.
2013-08-02 10:12:21 -07:00
Philip Rosedale
1b5c79aa8a
Merge branch 'master' of https://github.com/worklist/hifi into Remove-body
2013-08-02 09:37:08 -07:00
ZappoMan
983db5f70d
Merge branch 'master' of https://github.com/worklist/hifi into multiple_voxel_servers
2013-08-01 20:50:24 -07:00
Philip Rosedale
8f95534644
Fix jittering in view from body slowly following head
2013-08-01 16:04:38 -07:00
Andrzej Kapolka
0052221c33
Merge branch 'master' of https://github.com/worklist/hifi into pointy
2013-08-01 15:52:58 -07:00
atlante45
fdd01a6551
merge
2013-08-01 15:48:57 -07:00
ZappoMan
0a4fcdccb5
Merge branch 'master' of https://github.com/worklist/hifi into tile_import
...
Conflicts:
interface/src/Application.cpp
2013-08-01 15:44:28 -07:00
ZappoMan
a0ba788679
implement grid landscape import
2013-08-01 15:40:39 -07:00
Andrzej Kapolka
12f42358d5
Allow cycling between video send modes.
2013-08-01 15:39:53 -07:00
Philip Rosedale
9defa6255a
disable mouse wheel voxel scale change
2013-08-01 15:31:09 -07:00
atlante45
b6049c9a10
Merge branch 'master' of https://github.com/worklist/hifi into pie_menu
2013-08-01 15:28:35 -07:00
Mark Peng
6a6c51f80e
Add skeleton tracking toggle in options menu in interface.
2013-08-01 15:04:58 -07:00
Philip Rosedale
ef8daffa4d
Merge branch 'master' of https://github.com/worklist/hifi
2013-08-01 15:00:27 -07:00
Philip Rosedale
fcf20a7ebc
Sound on click, but not on hover
2013-08-01 15:00:08 -07:00
Mark Peng
9ba0e3bb0c
Add reference lines to mouse voxel when adding/deleting voxels.
2013-08-01 13:03:17 -07:00
Philip Rosedale
bc1ac6b455
turn down collision sounds
2013-08-01 12:49:10 -07:00
Philip Rosedale
ba2c98a3eb
Merge branch 'master' of https://github.com/worklist/hifi
2013-08-01 10:12:13 -07:00
Stephen Birarda
71ab8ae4f8
some necessary changes for AvatarData transmission
2013-08-01 10:07:10 -07:00
Jeffrey Ventrella
6c1cc911d5
Merge remote-tracking branch 'upstream/master' into particles
2013-07-31 15:12:54 -07:00
Jeffrey Ventrella
89f36a7eb7
cleanup
2013-07-31 12:38:40 -07:00
Stephen Birarda
9e63b78a69
Merge branch 'master' of github.com:worklist/hifi into qt5
2013-07-31 11:35:24 -07:00
Philip Rosedale
98ec2efc01
Merge branch 'master' of https://github.com/worklist/hifi
2013-07-30 14:55:33 -07:00
ZappoMan
c7e3fe5ef6
Added false colorization by voxel server source
...
- switched readBitstreamToTree() to take params struct for future expansion
- switched readNodeData() to take params for future expansion
- added sourceID to VoxelNode
- fixed false colorize routines to correctly redraw by marking tree as dirty
2013-07-30 11:08:48 -07:00
ZappoMan
620fe12358
support for multiple voxel servers in ping stats
2013-07-29 16:31:14 -07:00
ZappoMan
c5ab321bd9
Merge branch 'master' of https://github.com/worklist/hifi into multiple_voxel_servers
2013-07-29 15:54:52 -07:00
Jeffrey Ventrella
a1eba53678
cleanup
2013-07-29 15:09:38 -07:00
Jeffrey Ventrella
f8392c0843
Merge remote-tracking branch 'upstream/master' into particles
2013-07-29 15:07:56 -07:00
ZappoMan
86bf268eef
first cut at multiple voxel servers
2013-07-29 14:56:33 -07:00
Mark Peng
bfd7f3a6c9
Remove rendering of your own avatar's lookatVectors. This fixes the
...
behavior where if you are moving and jumping, you will occasionally see
your own lookatVectors on your screen.
2013-07-29 12:25:01 -07:00
Mark Peng
bd663a8c22
Merge remote-tracking branch 'upstream/master'
2013-07-29 12:09:27 -07:00
Andrzej Kapolka
20360ad3e9
Make particle system update/render toggleable, fix GCC compile warnings.
2013-07-29 10:41:45 -07:00
Mark Peng
dd2655825a
Fix first person camera positioning to correspond to eyelevel.
...
This makes sure the lookatVectors don't seem to point upwards when
looking at you.
2013-07-26 16:08:17 -07:00
Jeffrey Ventrella
937574a6b5
cleanup
2013-07-26 15:25:13 -07:00
Jeffrey Ventrella
05e0bf3e84
added collision plane
2013-07-26 15:21:10 -07:00
Jeffrey Ventrella
8cecd67731
cleanup
2013-07-26 12:46:27 -07:00
Jeffrey Ventrella
ad00747c29
cleanup
2013-07-26 12:44:17 -07:00
Jeffrey Ventrella
9890cf72ce
added keyboard mode switching for rave glove effects
2013-07-26 12:37:37 -07:00
atlante45
f3c87b81ec
Avatar can follow but don't look at the same point for the moment
2013-07-25 16:14:47 -07:00
Stephen Birarda
08b94d731f
merge branch qt5 with upstream/master
2013-07-25 10:23:22 -07:00
Jeffrey Ventrella
5e2dcfee53
cleaned up some magic numbers
2013-07-24 16:52:37 -07:00
Jeffrey Ventrella
aee29a0ab1
cleaning up the particle system more
2013-07-24 16:37:13 -07:00
atlante45
68194f2037
Slot calling when pie menu on avatar.
2013-07-24 13:50:00 -07:00
Jeffrey Ventrella
288a218ae2
Merge remote-tracking branch 'upstream/master' into particles
2013-07-24 12:41:32 -07:00
atlante45
d165891fe6
New design for pie menus
2013-07-24 12:38:35 -07:00
Stephen Birarda
f27eb5e1d8
small code changes for qt5 compatibility
2013-07-24 12:06:55 -07:00
atlante45
177471e83b
First step toward follow mode
2013-07-24 11:24:28 -07:00
atlante45
fec25d374f
merge
2013-07-24 10:35:57 -07:00
ZappoMan
31a1e3e7b5
Merge pull request #720 from LionTurtle/master
...
Fix eyePosition so that lookatVectors point directly to eyes,
2013-07-24 01:19:49 -07:00
Mark Peng
7177b71bc7
Replace var in renderLookatIndicator with const IDENTITY_UP
2013-07-24 00:19:25 -07:00
Jeffrey Ventrella
f85690c1c4
Merge remote-tracking branch 'upstream/master' into particles
2013-07-23 20:46:34 -07:00
ZappoMan
e7fb392f38
Merge branch 'master' of https://github.com/worklist/hifi into audio_select
2013-07-23 20:20:49 -07:00
ZappoMan
eb8c565350
dry up code
2013-07-23 20:08:57 -07:00
ZappoMan
a162643e1e
more removing of SourceID from classes
2013-07-23 19:21:43 -07:00
ZappoMan
c969570e8c
working on selected audio
2013-07-22 23:05:42 -07:00
Mark Peng
4e641eed2f
LookatIndicator now scales with the avatar's scale.
2013-07-22 17:11:11 -07:00
Mark Peng
0f1ac2b226
Fix eyePosition so that lookatVectors point directly to eyes,
...
even when looking at someone from above.
2013-07-22 16:46:06 -07:00
ZappoMan
c301b799c5
first cut at selecting audio sources
2013-07-22 13:54:47 -07:00
Jeffrey Ventrella
8a55db53ce
merge
2013-07-22 10:42:18 -07:00
atlante45
13952a6f24
Merge with pie_menu
2013-07-21 15:22:43 -07:00
ZappoMan
c3fa37019e
replaced old voxel stats with new voxel stats
2013-07-21 05:18:35 -07:00
ZappoMan
86ad0da09f
Merge branch 'master' of https://github.com/worklist/hifi into voxel_stats
2013-07-20 11:35:10 -07:00
ZappoMan
e0f115298d
additional stats items
2013-07-20 11:28:12 -07:00
Jeffrey Ventrella
ad0ca748bb
added extra mode and improved particle system
2013-07-20 09:48:55 -07:00
Eric Johnston
0cdad1a313
Merge branch 'master' of https://github.com/worklist/hifi into dev4
2013-07-19 19:48:52 -07:00
Jeffrey Ventrella
05039b4e3e
adding rave glove modes and changing API of particle system to accommodate
2013-07-19 18:02:48 -07:00
ZappoMan
83290bc8b7
first cut at real voxel stats dialog box
2013-07-19 17:28:37 -07:00
atlante45
72774a5e20
First step toward pie menus
2013-07-19 17:01:38 -07:00
Jeffrey Ventrella
6e84481931
Merge remote-tracking branch 'upstream/master' into particles
2013-07-19 16:08:43 -07:00
Jeffrey Ventrella
7f3750f1f0
clean up
2013-07-19 16:08:19 -07:00
ZappoMan
2cc42f6773
support piggybacking voxel and voxel stats messages into single packet
2013-07-19 15:59:47 -07:00
Andrzej Kapolka
353f16b2d0
Style fixes.
2013-07-19 15:56:04 -07:00
Jeffrey Ventrella
d2d8019e73
Merge remote-tracking branch 'upstream/master' into particles
2013-07-19 15:51:14 -07:00
Jeffrey Ventrella
87d9aae328
improvements to particle system
2013-07-19 15:50:40 -07:00
Andrzej Kapolka
f70b4dcab2
Merge branch 'master' of https://github.com/worklist/hifi into pointy
2013-07-19 15:49:07 -07:00
ZappoMan
d9c8a59929
send voxel scene stats from server to client
2013-07-19 15:09:38 -07:00
Eric Johnston
262851346c
Rave Glove Demo: Leap Rework (simplification and elimination of redundant data passing)
...
This version matches fingers based on Leap serialized ID's, avoiding finger-replacement-crosstalk.
2013-07-19 09:31:45 -07:00
Mark Peng
ceb743a65d
Remove unncessary import math.h (for reals).
2013-07-19 00:56:12 -07:00
Mark Peng
fc22240525
Remove unnecessary import math.h.
2013-07-19 00:55:31 -07:00
Mark Peng
a84c1c9e21
Merge remote-tracking branch 'upstream/master'
2013-07-19 00:46:52 -07:00
Mark Peng
927aea8bb4
Bug fix on lookatVectors (fixed scale in head.cpp). Added bool
...
isLookingAtOtherAvatar. Basic halo indicator in Application.cpp.
2013-07-19 00:44:23 -07:00
Mark Peng
cfcb31172c
Merge remote-tracking branch 'upstream/master'
2013-07-18 21:08:08 -07:00
Andrzej Kapolka
b5a8c2710c
Merge branch 'master' of https://github.com/worklist/hifi into pointy
...
Conflicts:
interface/src/Application.h
interface/src/Audio.h
interface/src/Webcam.cpp
2013-07-18 18:09:57 -07:00
Stephen Birarda
ef7dc4a39a
if the hostname field is left blank reset to DEFAULT_DOMAIN_HOSTNAME
2013-07-18 17:42:25 -07:00
Stephen Birarda
01e6891fd3
save custom domain server hostname to QSettings
2013-07-18 17:23:52 -07:00
Philip Rosedale
c74287160f
merged
2013-07-18 16:52:56 -07:00
Philip Rosedale
4af92d46f3
Set lookAt to hovered voxel
2013-07-18 16:50:37 -07:00
Stephen Birarda
a00b95666a
don't listen to VS packets not from current VS
2013-07-18 15:49:07 -07:00
Stephen Birarda
45d82dc97c
correct reference to new hostname for Qt temp variable changes
2013-07-18 15:20:05 -07:00
Stephen Birarda
4dd6afc08f
fix grabbing of domain server hostname from QString
2013-07-18 14:59:11 -07:00
Stephen Birarda
04a2dd3b86
clear environment data on domain server switch
2013-07-18 14:36:55 -07:00
Mark Peng
fe01067473
Merge remote-tracking branch 'upstream/master'
2013-07-18 14:35:41 -07:00
Mark Peng
7ee0d8da2e
Render circle in 3D space for lookatIndicator. Still not normal to the screen.
2013-07-18 14:34:51 -07:00
Philip Rosedale
0b10169915
More audio collision on hover experiments
2013-07-18 11:13:16 -07:00
Philip Rosedale
e6cd90fa37
Merge pull request #704 from Ventrella/particles
...
more code cleanup
2013-07-18 11:08:18 -07:00
Stephen Birarda
2ad99f3129
point to stars file on non-SSL for easier RV redirect
2013-07-18 10:26:08 -07:00
Jeffrey Ventrella
f89b1fcd4c
more clean up of particle system
2013-07-17 18:10:30 -07:00
Andrzej Kapolka
8863645dc9
Working on transmitting and receiving the face video.
2013-07-17 18:02:27 -07:00
Mark Peng
6006b8e96b
Merge remote-tracking branch 'upstream/master'
2013-07-17 17:28:12 -07:00
Mark Peng
125bcc46f4
Circle drawn with camera orientation as its normal for lookatIndicator.
2013-07-17 17:27:15 -07:00
Philip Rosedale
3111303c32
Merge branch 'master' of https://github.com/worklist/hifi
2013-07-17 17:15:25 -07:00
Philip Rosedale
5f51464230
Start clicking on voxels makes sound
2013-07-17 17:15:19 -07:00
Jeffrey Ventrella
9c2ea6e7e4
more clean up
2013-07-17 17:07:53 -07:00
Jeffrey Ventrella
ea7e16660c
Merge remote-tracking branch 'upstream/master' into particles
2013-07-17 16:43:57 -07:00
Jeffrey Ventrella
be5612711b
clean up of particle system
2013-07-17 16:43:34 -07:00
Eric Johnston
57c2f16894
Merge branch 'master' of https://github.com/worklist/hifi into dev4
...
Conflicts:
interface/src/Hand.cpp
2013-07-17 16:42:11 -07:00
Jeffrey Ventrella
1f1259cec5
added particle life stages
2013-07-17 16:03:10 -07:00
Jeffrey Ventrella
d0dffb464b
added emitter particle
2013-07-17 14:51:11 -07:00
Mark Peng
0bbea078b5
Merge remote-tracking branch 'upstream/master'
2013-07-17 13:52:46 -07:00
Mark Peng
5ffe3fa4b4
Rendering of indicator circle in 3D space. Spacing edits in util.
2013-07-17 13:52:05 -07:00
Jeffrey Ventrella
202fb95102
turned off setShowingEmitter
2013-07-17 13:51:00 -07:00
Jeffrey Ventrella
5a0fcb7f6c
adding more behavior to the particle system
2013-07-17 13:47:18 -07:00
Jeffrey Ventrella
98dd83dde8
ahibfasubhdf
2013-07-17 10:02:23 -07:00
Jeffrey Ventrella
0be15231b9
ahibfasubhdf
2013-07-17 10:01:23 -07:00
Eric Johnston
39130aef58
Rave Glove demo: activation mode and stage (dark backdrop) drawing.
2013-07-16 18:10:54 -07:00
Stephen Birarda
7cec2f5ffd
use fprintf instead of printf and flush for qDebug
2013-07-16 15:27:14 -07:00
Stephen Birarda
1e0f3e4d1c
Merge pull request #686 from Atlante45/few_avatar_resizing_correction
...
Few avatar resizing correction
2013-07-16 14:31:27 -07:00
Stephen Birarda
8464a013fe
fix format string warnings in Application
2013-07-16 13:39:24 -07:00
Stephen Birarda
c78759da16
cleanup printLogs reintroduce on merge with upstream master
2013-07-16 13:37:16 -07:00
Stephen Birarda
9d62e7f187
Merge remote-tracking branch 'upstream/master' into qdebug
2013-07-16 13:34:42 -07:00
Stephen Birarda
ce0c9e2e1a
flush stdout in case non new-line output is received
2013-07-16 12:58:16 -07:00
Stephen Birarda
16d603e203
clean up extra new lines and LogDisplay line break
2013-07-16 12:53:43 -07:00
Andrzej Kapolka
fd1671a44f
Merge branch 'master' of https://github.com/worklist/hifi into pointy
2013-07-16 12:48:24 -07:00
Stephen Birarda
1b48d4f0fc
revert removal of extraneous newlines
2013-07-16 12:46:32 -07:00
atlante45
13762da7d8
Changed shortcuts to ALT+ +/-
2013-07-16 12:03:07 -07:00
Stephen Birarda
51d1e6ae80
add a message handler to send messages over to LogDisplay
2013-07-16 11:50:40 -07:00
Stephen Birarda
89d3cfdb6f
remove now extraneous newlines after switch to QDebug
2013-07-16 11:16:51 -07:00
Stephen Birarda
afe49bc756
switch calls to printLog to QDebug
2013-07-16 11:07:22 -07:00
Stephen Birarda
3f9865759c
Merge pull request #682 from ZappoMan/bug_fixes
...
Import Voxels and Paste Bug fixes
2013-07-16 10:11:11 -07:00
ZappoMan
440352c584
white space
2013-07-16 10:02:27 -07:00
ZappoMan
42e5440b7b
CR feedback
2013-07-16 10:00:55 -07:00
Eric Johnston
802abade4f
Fixed problem in idle(), causing events to stack up.
...
The problem was that idle() was set on a zero-ms timer (using idleTimer->start(0)), and the time is then self-regulated by returning early if it's not time yet.
Because of this, Qt stays perpetually in the timer servicing, instead of processing events. This causes keys and menu items to be delayed if the user drags the mouse before activating them, especially at low frame rates. It also causes very-delayed multitouch response.
The fix I've applied is to reset the idle timer after servicing the idle. I've set it to 2ms because I noticed that 1ms didn't always clear out all of the events. We can tune it to whatever we need, or even calculate it based on the time it took us to service the idle.
2013-07-15 18:16:50 -07:00
ZappoMan
e4b7ba7428
Merge branch 'master' of https://github.com/worklist/hifi into bug_fixes
2013-07-15 17:58:45 -07:00
Jeffrey Ventrella
b765de6990
Merge remote-tracking branch 'upstream/master' into particles
2013-07-15 17:58:38 -07:00
Jeffrey Ventrella
0481a81ca7
moved finger particles over to hand.cpp
2013-07-15 17:58:17 -07:00
ZappoMan
a3009981d0
added Import Voxels to Clipboard
2013-07-15 17:54:50 -07:00
Stephen Birarda
9f9d8e59bd
don't accept voxel packet if rendering is turned off, correct boolean for kill
2013-07-15 17:12:44 -07:00
Stephen Birarda
38d8041bfb
kill local voxels when voxel rendering is turned off
2013-07-15 17:12:24 -07:00
