Seth Alves
29baca20e3
Merge branch 'master' of github.com:highfidelity/hifi into faster-getters-on-avatar-for-scripts
2017-07-07 09:10:47 -07:00
Seth Alves
e4aa4823f9
Merge branch 'master' of github.com:highfidelity/hifi into dont-think-during-mouse-move
2017-07-07 08:51:38 -07:00
Zach Fox
ea77557e38
Correctly close PAL when switching domains
2017-07-07 08:09:19 -07:00
Seth Alves
fc8b7c7cc5
Merge pull request #10904 from druiz17/window-root-spam
...
fixed log spamming from windowRoot.qml in toolbar mode
2017-07-07 07:17:08 -07:00
Seth Alves
81cc46beb4
Merge pull request #10909 from jherico/overlay_crashes
...
Fixing overlay crashes, for real
2017-07-07 07:11:52 -07:00
Sam Gateau
d15c4ea2d3
Merging with the stage branch
2017-07-07 15:12:40 +02:00
Sam Gateau
a8086764da
REmoving warnings for unused var
2017-07-07 12:19:22 +02:00
Sam Gateau
4c1bf6af47
REmoving comments
2017-07-07 11:38:25 +02:00
Sam Gateau
156c20d01e
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-07-07 10:58:05 +02:00
Zach Fox
ee9cdaff90
Set admin status even if QML can't find user in PAL
2017-07-06 23:26:40 -07:00
Seth Alves
baf63181d2
Merge pull request #10900 from hyperlogic/bug-fix/pucks-in-desktop
...
Can now use chest, hips, shoulder & feet pucks in desktop mode.
2017-07-06 19:53:44 -07:00
Seth Alves
ddabe940d6
dry up some code
2017-07-06 18:42:00 -07:00
Atlante45
0c18f04e58
Fix Audio Mixer crash
2017-07-06 18:41:25 -07:00
Seth Alves
801c45898f
dry up some code
2017-07-06 18:41:11 -07:00
Seth Alves
57ba2c5cd6
add invalidateJointIndicesCache method
2017-07-06 18:16:41 -07:00
David Kelly
93840bf936
hack to not switch display to hmdPreviewFrame texture (temporary)
2017-07-06 18:13:24 -07:00
Seth Alves
ef4a04b9cf
code style
2017-07-06 18:01:58 -07:00
Brad Davis
f8b76d65ab
Fixing overlay crashes, for real
2017-07-06 18:01:26 -07:00
Seth Alves
ab8d9f4885
check for faux joints before heading into code that needs to lock
2017-07-06 18:00:11 -07:00
Seth Alves
a543b957ef
fix a race
2017-07-06 17:45:57 -07:00
Seth Alves
fc61fcf494
coding style
2017-07-06 17:40:41 -07:00
Seth Alves
15d379cc5a
coding style
2017-07-06 17:36:28 -07:00
Seth Alves
4505b8cedf
Merge branch 'master' of github.com:highfidelity/hifi into faster-getters-on-avatar-for-scripts
2017-07-06 17:35:11 -07:00
Seth Alves
0d3412bd97
Merge branch 'faster-getters-on-avatar-for-scripts' of github.com:sethalves/hifi into faster-getters-on-avatar-for-scripts
2017-07-06 17:35:07 -07:00
Seth Alves
b8875a8902
Merge branch 'master' of github.com:highfidelity/hifi into atp-client
2017-07-06 17:28:55 -07:00
Stephen Birarda
d22b146370
Merge pull request #10845 from birarda/bug/domain-cookie-restart
...
fix for OAuth OPTIONS firing every XHR 302
2017-07-06 17:22:03 -07:00
Zach Fox
ee4ef14152
Merge pull request #10907 from zfox23/spectatorCamera_icon
...
Spectator Camera app icon
2017-07-06 17:04:10 -07:00
Seth Alves
2e88eca2b9
oopsy crazy
2017-07-06 16:33:37 -07:00
Zach Fox
1afa2d3775
Spectator camera icon
2017-07-06 16:24:50 -07:00
Stephen Birarda
6d98d20b12
cleanup bad QEventLoop::exec() OAuth handling code
2017-07-06 16:19:47 -07:00
Seth Alves
62b7ba6446
Merge branch 'master' of github.com:highfidelity/hifi into faster-getters-on-avatar-for-scripts
2017-07-06 16:01:42 -07:00
Seth Alves
5645870f0a
Merge branch 'master' of github.com:highfidelity/hifi into faster-getters-on-avatar-for-scripts
2017-07-06 16:00:52 -07:00
David Kelly
b41c470064
first cut, still stereo
2017-07-06 15:59:24 -07:00
Dante Ruiz
1ac415aa14
dynamic listview height
2017-07-06 23:50:32 +01:00
Seth Alves
e03b902a15
change when joint cache is copied
2017-07-06 15:42:24 -07:00
druiz17
b4182fe7ac
Merge pull request #10899 from druiz17/calibration-update-2.0
...
Updates to the Calibration UI
2017-07-06 14:24:45 -07:00
utkarshgautamnyu
d961a0c4ad
Merge pull request #10887 from highfidelity/bug/5950
...
Bug/5950
2017-07-06 14:04:38 -07:00
Seth Alves
0ac8f6efa3
cache the jointnames and indexes from FBXGeometry for out-of-thread access
2017-07-06 14:02:59 -07:00
Clément Brisset
34e3f56002
Merge pull request #10843 from birarda/bug/user-activities-interface-only
...
disable user activity logger in DS/AC/ac-client
2017-07-06 14:01:49 -07:00
Dante Ruiz
b0130896d1
fixed spamming from windowRoot.qml
2017-07-06 22:01:08 +01:00
Zach Fox
8945b75cda
Merge pull request #10903 from zfox23/PAL_fixAdminColumn
...
Ensure admins see PAL admin column
2017-07-06 13:38:10 -07:00
Seth Alves
18b7e6aecd
Merge branch 'master' of github.com:highfidelity/hifi into faster-getters-on-avatar-for-scripts
2017-07-06 13:22:37 -07:00
Seth Alves
24c8267030
in Rig joint accessors, if on the Rig's thread use internalPoseSet, else use external
2017-07-06 13:22:14 -07:00
Dante Ruiz
1fcb3b32d6
fixed letter cap
2017-07-06 20:55:19 +01:00
utkarshgautamnyu
d5c88bc6de
Merge branch 'master' into bug/5950
2017-07-06 12:52:13 -07:00
Seth Alves
0374d24b15
Merge pull request #10901 from druiz17/goto-keyboard-fix
...
Fixed the keyboard not showing up for goto in HMD mode
2017-07-06 12:46:13 -07:00
Stephen Birarda
29d7784fef
Merge pull request #10895 from highfidelity/bug/5976
...
Bug/5976
2017-07-06 12:43:15 -07:00
LaShonda Hopper
85111131da
[Worklist #21420 ] Resolves issue where domain changes didn't refresh the icon (details below).
...
* Adds a local message/event: "Toolbar-DomainChanged"
** This message is sent by the application via its registered domain handlers:
*** hostnameChanged
*** connectedToDomain
*** disconnectedFromDomain
* edit.js subscribes to the "Toolbar-DomainChanged" event and updates the Create
button icon as long as there's a valid known valid create button.
Item Ticket Link: https://worklist.net/21420
Changes to be committed:
modified: interface/src/Application.cpp
modified: scripts/system/edit.js
2017-07-06 15:27:15 -04:00
Zach Fox
a5c7324ec5
Ensure admins see PAL admin column
2017-07-06 12:15:44 -07:00
Dante Ruiz
2d876377d5
keyboard know disappears when you click of the address line
2017-07-06 20:04:44 +01:00
