Howard Stearns
|
99ba07dcb2
|
Merge pull request #10181 from davidkelly/dk/infoButtonFix
re-enable the info button for user images on nearby tab
|
2017-04-10 13:27:33 -07:00 |
|
Dante Ruiz
|
6922ba5c77
|
removed unnessary prints
|
2017-04-10 21:08:40 +01:00 |
|
Dante Ruiz
|
e0f19944bc
|
Merge branch 'master' of github.com:highfidelity/hifi into snapshot-fix
|
2017-04-10 20:58:46 +01:00 |
|
Dante Ruiz
|
4e94aaa9e8
|
finished allowing to go back to previous app
|
2017-04-10 20:58:10 +01:00 |
|
Seth Alves
|
05bf1930ca
|
Merge pull request #10169 from hyperlogic/feature/absolute-default-joints-in-object-frame
Added accessor to get Avatar default pose in avatar space
|
2017-04-10 12:55:02 -07:00 |
|
Howard Stearns
|
8682df6bb7
|
Merge pull request #10154 from davidkelly/dk/3995
updated connection instructions
|
2017-04-10 12:43:20 -07:00 |
|
David Kelly
|
5fc4bbc260
|
re-enable the info button for user images on nearby tab
|
2017-04-10 12:26:34 -07:00 |
|
Andrew Meadows
|
e20fcca959
|
Merge pull request #10179 from jherico/avatar_rendering
Creating new avatar rendering library, prepping for crowd rendering project
|
2017-04-10 11:29:08 -07:00 |
|
Stephen Birarda
|
b57bf956e2
|
make server plugins a dependency of AC too
|
2017-04-10 11:23:43 -07:00 |
|
David Kelly
|
082d0964d2
|
oops
|
2017-04-10 11:08:45 -07:00 |
|
Howard Stearns
|
d59b93e713
|
Merge pull request #10168 from davidkelly/dk/4036
username stays around now when tabbing to connections
|
2017-04-10 11:05:59 -07:00 |
|
Bradley Austin Davis
|
0ca0874c52
|
Creating new avatar rendering library, prepping for crowd rendering project
|
2017-04-10 10:55:04 -07:00 |
|
Seth Alves
|
717436e0fd
|
use QUrl rather than just munging the url with a string-append
|
2017-04-10 10:54:30 -07:00 |
|
Seth Alves
|
554b23357c
|
add combineParts flag to getGeometryResource. append ?collsion-hull to urls that are used as compound collision hulls
|
2017-04-10 10:14:36 -07:00 |
|
samcake
|
16e6f0900d
|
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient-bis
|
2017-04-10 10:12:23 -07:00 |
|
David Kelly
|
cd55728490
|
Merge branch 'master' of https://github.com/highfidelity/hifi into dk/4036
|
2017-04-10 10:09:27 -07:00 |
|
David Kelly
|
46b6903b93
|
Merge branch 'master' of https://github.com/highfidelity/hifi into dk/3995
|
2017-04-10 10:08:17 -07:00 |
|
Seth Alves
|
5893b0b489
|
Merge pull request #10177 from sethalves/fix-send-to-script
revert commit that broke sendToScript
|
2017-04-10 10:03:50 -07:00 |
|
Seth Alves
|
d7dd2bce72
|
Merge branch 'master' of github.com:highfidelity/hifi into fix-compound-collision-hulls
|
2017-04-10 09:28:48 -07:00 |
|
David Kelly
|
333f950512
|
Merge pull request #10172 from howard-stearns/fix-multi-line-session-display-name
fix multi-line sessionDisplayName
|
2017-04-10 09:13:50 -07:00 |
|
Seth Alves
|
36940b4dfe
|
revert commit that broke sendToScript
|
2017-04-10 09:11:23 -07:00 |
|
Howard Stearns
|
54888f85be
|
strip more
|
2017-04-10 08:41:50 -07:00 |
|
Vladyslav Stelmakhovskyi
|
393b24452d
|
Added hover to Snaps and Places
|
2017-04-10 17:07:59 +02:00 |
|
David Kelly
|
3ea6cac45a
|
HMD.mounted instead of HMD.isMounted
|
2017-04-10 08:05:01 -07:00 |
|
Sam Cake
|
e7fb18bd2f
|
MOving forward with the TaskConcept and TaskModel, all working
|
2017-04-10 02:51:19 -07:00 |
|
Sam Cake
|
a458828590
|
MOving forward with the TaskConcept and TaskModel, all working
|
2017-04-10 02:30:13 -07:00 |
|
Seth Alves
|
da3968f0a2
|
Merge branch 'master' of github.com:highfidelity/hifi into fix-compound-collision-hulls
|
2017-04-09 20:44:07 -07:00 |
|
Anthony Thibault
|
746b7aadbd
|
Merge pull request #10133 from sethalves/fix-teleport-which-something-equipped
Fix teleport when something equipped
|
2017-04-09 19:00:21 -07:00 |
|
druiz17
|
92bb7f2329
|
saving work
|
2017-04-09 18:55:53 -07:00 |
|
Seth Alves
|
0ae8a20b53
|
Merge branch 'master' of github.com:highfidelity/hifi into fix-compound-collision-hulls
|
2017-04-09 18:08:02 -07:00 |
|
Philip Rosedale
|
c74778116a
|
Merge pull request #10156 from Triplelexx/21256
21256 - Add packet loss % to stats
|
2017-04-09 18:00:01 -07:00 |
|
Seth Alves
|
a1cab2c0d1
|
working toward fixing compound hulls
|
2017-04-09 17:23:56 -07:00 |
|
Vladyslav Stelmakhovskyi
|
7628916db6
|
Check if dialog was opened from StackView and then pop or just go to home menu
|
2017-04-09 20:09:15 +02:00 |
|
Sam Cake
|
b65448bcbe
|
Trying to improve the Job/Task classes and testing it with the ZoneRenderer
|
2017-04-09 11:08:35 -07:00 |
|
Triplelexx
|
7936637e9c
|
and tired..
|
2017-04-09 11:02:35 +01:00 |
|
Triplelexx
|
54eb7c10c6
|
distracted
|
2017-04-09 10:50:22 +01:00 |
|
Triplelexx
|
ec6885a2fb
|
change audioPacketLoss stat to display largest of upstream/downstream loss
|
2017-04-09 09:49:41 +01:00 |
|
Seth Alves
|
aa89903a9f
|
Merge pull request #10160 from vladest/tabletwebview-yahoo-fix
Yahoo, Reddit etc now works correctly
|
2017-04-08 20:25:18 -07:00 |
|
Howard Stearns
|
c32879d807
|
fix multi-line sessionDisplayName
|
2017-04-08 15:41:11 -07:00 |
|
Brad Hefta-Gaub
|
0d4649ded8
|
Merge pull request #10079 from jherico/entity_thread_safety
Thread safety for property getter/setters on entities
|
2017-04-07 19:01:07 -07:00 |
|
samcake
|
e6844f4294
|
Cleaning up the basic jobs of render
|
2017-04-07 18:35:27 -07:00 |
|
Dante Ruiz
|
86c67a3017
|
tablet pages
|
2017-04-08 02:01:21 +01:00 |
|
Chris Collins
|
8e12f62cbb
|
Merge pull request #10153 from druiz17/goto-fix
Ability to toggle goto with the crt-l and enter keys
|
2017-04-07 16:36:41 -07:00 |
|
Faye Li
|
d53b5b9c8c
|
Merge pull request #10137 from fayeli/handheld-cam
Selfie Stick Script
|
2017-04-07 16:12:23 -07:00 |
|
Seth Alves
|
8d00f0ab8f
|
allow obj reader to either combine meshes or keep parts separate
|
2017-04-07 15:59:01 -07:00 |
|
Chris Collins
|
1175f65cb0
|
Merge pull request #10162 from vladest/goto-white-buttons-fix
Check if offset outside image, set to last image
|
2017-04-07 15:58:48 -07:00 |
|
David Kelly
|
948a821824
|
Merge branch 'master' of https://github.com/highfidelity/hifi into dk/3995
|
2017-04-07 14:30:22 -07:00 |
|
Anthony J. Thibault
|
a06df1a400
|
Bug fix for passing quats from script to C++ via the animationStateHandler
|
2017-04-07 14:13:00 -07:00 |
|
Anthony J. Thibault
|
e065c1bac4
|
Added jsdoc for new Avatar.getAbsoluteDefaultJoint*InObjectFrame API
|
2017-04-07 14:12:03 -07:00 |
|
Anthony J. Thibault
|
40844d2a49
|
Added getAbsoluteDefaultJoint*InOjbectFrame to Avatar API.
|
2017-04-07 14:03:31 -07:00 |
|