Zach Fox
|
1ed53113a9
|
Commit for birarda - testing QSharedPointer instead; doesn't work right now
|
2017-04-10 22:15:44 -07:00 |
|
Zach Fox
|
6ddd7a612c
|
Initial pass at fix looks promising
|
2017-04-10 22:15:44 -07:00 |
|
Ryan Huffman
|
af11f5f327
|
Update avatar mixer packet version for stick+ball avatar
|
2017-04-10 21:27:47 -07:00 |
|
Sam Cake
|
5d7accca2b
|
Avoiding the mac compilation problem maybe
|
2017-04-10 21:12:00 -07:00 |
|
David Rowe
|
86baf785aa
|
Add "Load" button
|
2017-04-11 15:23:09 +12:00 |
|
samcake
|
4a47737d0b
|
REfining the Config behavior, trying to pr next
|
2017-04-10 19:01:49 -07:00 |
|
Dante Ruiz
|
daf25c1fe8
|
fix crashes when clicking in the homebutton
|
2017-04-11 00:25:08 +01:00 |
|
Chris Collins
|
d8581c1026
|
Merge pull request #10176 from vladest/snaps_hover
Added hover to Snaps and Places
|
2017-04-10 16:09:43 -07:00 |
|
Stephen Birarda
|
602d65a71a
|
Merge pull request #10001 from birarda/cleanup-ebp
cleanup EncodeBitstreamParams to use nodeData when possible
|
2017-04-10 15:54:30 -07:00 |
|
Howard Stearns
|
7ad185ddfe
|
Merge pull request #10186 from sethalves/fix-all-places
fix includeActions so places show up in All
|
2017-04-10 15:35:17 -07:00 |
|
Ryan Huffman
|
8463fffc8c
|
Merge pull request #10185 from highfidelity/revert-10116-bug/rel-ext-textures
Revert "fix relative/absolute path handling for external FBX textures"
|
2017-04-10 15:30:40 -07:00 |
|
Seth Alves
|
b9afcd3f0a
|
Merge pull request #10178 from sethalves/fix-compound-collision-hulls
Fix compound collision hulls
|
2017-04-10 15:28:48 -07:00 |
|
David Rowe
|
559fba39ab
|
Remove avatar after stopping recording
|
2017-04-11 10:17:52 +12:00 |
|
Seth Alves
|
eb281389f5
|
fix includeActions so places show up in All
|
2017-04-10 14:46:31 -07:00 |
|
David Rowe
|
9a9bcaf2ae
|
Stop button stops playing recording
|
2017-04-11 09:37:57 +12:00 |
|
Dante Ruiz
|
382204a9a9
|
open feed after logging in
|
2017-04-10 22:33:07 +01:00 |
|
Stephen Birarda
|
e86db26224
|
Revert "fix relative/absolute path handling for external FBX textures"
|
2017-04-10 14:31:02 -07:00 |
|
Brad Hefta-Gaub
|
04ebdf14a2
|
Merge pull request #10180 from birarda/bug/add-plugin-dependency-to-AC
make the server plugins a dependency of AC too
|
2017-04-10 14:26:41 -07:00 |
|
Dante Ruiz
|
df6498c67c
|
fix snapshot login for toolbar-mode
|
2017-04-10 21:59:37 +01:00 |
|
Seth Alves
|
8a3a52cbcf
|
make getCollisionGeometryResource a separate call from getGeometryResource rather than passing a bool
|
2017-04-10 13:54:24 -07:00 |
|
Seth Alves
|
6bd841857f
|
added a comment
|
2017-04-10 13:50:36 -07:00 |
|
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 |
|
David Rowe
|
bd63960876
|
Add table of recordings currently being played
|
2017-04-11 07:23:52 +12:00 |
|
David Rowe
|
0a19b502fd
|
Merge branch 'master' into 21249
|
2017-04-11 07:04:05 +12: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 |
|
David Rowe
|
9495bf6a47
|
Fix auto-playback logic
|
2017-04-10 19:56:46 +12:00 |
|