Commit graph

52285 commits

Author SHA1 Message Date
Faye Li
1a46f18aa3 adding export button + hiding jump to selection 2017-03-17 15:56:55 -07:00
Seth Alves
d45266f28b Merge pull request #9931 from sethalves/tablet-ui
Tablet ui -- merge from upstream
2017-03-17 06:54:10 -08:00
Seth Alves
df84ff27e9 Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui 2017-03-17 07:52:22 -07:00
Seth Alves
9292cabe10 Merge pull request #9904 from druiz17/tablet-notifcation
Added tablet notifications.
2017-03-17 06:50:24 -08:00
Seth Alves
5aacc13429 Merge pull request #9925 from ctrlaltdavid/21230
Fix tablet settings dialogs' titles
2017-03-17 06:44:23 -08:00
Seth Alves
a5d19439f9 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-16 16:32:07 -07:00
Seth Alves
9ae5c24d1b Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui 2017-03-16 16:31:33 -07:00
Clément Brisset
21c5e7b0b2 Merge pull request #9880 from Atlante45/feat/sit
Fix avatars stuck in the sitting position after a domain disconnect
2017-03-16 15:42:29 -07:00
David Rowe
07e4b0ce41 Fix title menu icon getting stuck on white 2017-03-17 11:28:14 +13:00
David Rowe
069e66b875 Fix stack functions 2017-03-17 11:19:50 +13:00
David Rowe
f1947769d6 Fix tablet settings dialogs' titles and make QML consistent 2017-03-17 11:15:56 +13:00
Brad Hefta-Gaub
455920b869 Merge pull request #9918 from sethalves/atp-get
command-line utility for fetching an asset from a remote asset-server
2017-03-16 14:42:53 -07:00
Brad Hefta-Gaub
3fe4d6e733 Merge pull request #9910 from jherico/vs2017
Fix build problems on VS 2015 and VS 2017
2017-03-16 14:41:33 -07:00
Brad Hefta-Gaub
49bd3bd408 Merge pull request #9894 from Atlante45/new-stable
Cancel reverts from last hotfix and pull them to master
2017-03-16 13:43:12 -07:00
Stephen Birarda
a69cf76d06 Merge pull request #9879 from birarda/bug/no-unload
make sure deleted entities are unloaded first
2017-03-16 13:29:36 -07:00
Zach Pomerantz
2059c58c23 Merge pull request #9896 from zzmp/agent/noise-gate
Add AudioNoiseGate to Agent
2017-03-16 16:28:17 -04:00
Andrew Meadows
6f4d9bfba3 Merge pull request #9858 from kunalgosar/logBolding
Change to Log Font and Formatting
2017-03-16 13:09:37 -07:00
kunalgosar
0cee9ee172 font change 2017-03-16 11:57:46 -07:00
Zach Pomerantz
abac14ee19 Merge branch 'master' of https://github.com/highfidelity/hifi into agent/noise-gate 2017-03-16 18:48:09 +00:00
Zach Pomerantz
3b8c82491a add AudioNoiseGate to Agent 2017-03-16 18:47:58 +00:00
Seth Alves
eba2417f41 Merge pull request #9912 from AndrewMeadows/model-cleanup-4
minor cleanup of render pipeline for models and avatars
2017-03-16 10:39:43 -08:00
kunalgosar
e7a16d4294 code standard fixes 2017-03-16 10:53:35 -07:00
Seth Alves
c472016a8d Merge pull request #9920 from ctrlaltdavid/21226
Fix tablet asset browser's add-to-world dialog
2017-03-16 09:08:57 -08:00
Seth Alves
31e0cfe296 Merge pull request #9825 from thoys/record-fixes
Avatar Recorder and Playback Fixes
2017-03-16 07:27:42 -08:00
David Rowe
1080e21afd Tidying 2017-03-16 19:28:28 +13:00
David Rowe
89eb073855 Fix dialog height changing as drop-down value is changed 2017-03-16 19:28:12 +13:00
David Rowe
74db9dc573 Fix drop-down hiding behind buttons 2017-03-16 19:27:47 +13:00
David Rowe
3c1506237a Fix not all warning text displaying 2017-03-16 19:27:27 +13:00
David Rowe
7efda8bead Make clicking on dialog background defocus current control 2017-03-16 19:27:06 +13:00
David Rowe
9e458fd180 Fix keyboard in tablet custom query dialog 2017-03-16 19:26:41 +13:00
Seth Alves
438fb42da4 oops 2017-03-15 20:54:08 -07:00
Seth Alves
60d10f3374 command-line utility for fetching an asset from a remote asset-server 2017-03-15 20:44:19 -07:00
Brad Davis
4367e3d036 PR comments 2017-03-15 18:13:10 -07:00
Seth Alves
fc0c36d0c0 Merge pull request #9907 from vladest/tablet-ui-domain-connection
Implemented Domain Connection statistics for Tablet UI
2017-03-15 16:12:15 -08:00
Andrew Meadows
361e03fc78 remove unused variable 2017-03-15 16:57:31 -07:00
Andrew Meadows
d3fa28d4bc remove cruft and fix indentation 2017-03-15 16:17:59 -07:00
Brad Davis
2837ae9183 More VS 2017/2015 fixes 2017-03-15 16:13:15 -07:00
Andrew Meadows
cf848d73e4 don't updateClusterMatrices() in render() 2017-03-15 16:03:36 -07:00
Brad Davis
b8ded015c6 Fix packetlist compilation on VS 2017 2017-03-15 15:20:41 -07:00
Andrew Meadows
f250c0d298 simpler bindTransform() for ModelMeshPartPayload 2017-03-15 14:41:13 -07:00
Brad Davis
3e68018a12 Fix node persmissions hash 2017-03-15 14:33:32 -07:00
Vladyslav Stelmakhovskyi
a4c0ce4240 Typo fix 2017-03-15 22:13:37 +01:00
Brad Hefta-Gaub
ed380a7738 Merge pull request #9895 from zzmp/clean/noise-gate
Strip AudioNoiseGate of dead code
2017-03-15 13:21:56 -07:00
Vladyslav Stelmakhovskyi
856e15060d Implemented Domain Connection statistics for Tablet UI 2017-03-15 21:05:13 +01:00
Dante Ruiz
a5f1fb9e9a fixed notification spelling error 2017-03-15 19:45:30 +01:00
Dante Ruiz
dac16af1df Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-notifcation 2017-03-15 19:27:11 +01:00
Dante Ruiz
4bc050e583 added tablet notification 2017-03-15 19:26:50 +01:00
Stephen Birarda
0c657a1d55 add parameter to unload to remove entityID from map 2017-03-15 10:57:12 -07:00
Seth Alves
a9160eb19f Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui 2017-03-15 09:54:07 -08:00
Seth Alves
af8478ada5 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-15 09:53:58 -08:00