Brad Davis
501eee8b10
Fix transform of polylines with high update rates
2017-09-14 08:45:37 -07:00
Brad Davis
75e7146c5b
Fix polyline crash and flicker
2017-09-14 08:45:36 -07:00
Thijs Wenker
523d099f70
Merge pull request #11355 from jherico/crash/zone-keylight
...
Fix race condition accessing QString sub-properties in zones
2017-09-14 16:03:05 +02:00
Thijs Wenker
ddb4b2d2be
Merge pull request #11354 from hyperlogic/bug-fix/good-riddance
...
Remove handControllerGrab.js, see controllerDispatcher.js instead.
2017-09-14 15:42:30 +02:00
vladest
7233c47257
use selection model of TreeView
2017-09-14 15:36:12 +02:00
Anthony J. Thibault
9a9f4a0d24
Fix controllerModules with appropriate IPD scale changes
2017-09-13 18:23:54 -07:00
Anthony J. Thibault
8fb69a9867
Merge branch 'master' into feature/ant-man
2017-09-13 18:23:11 -07:00
Brad Davis
f4d8216501
Fix race condition accessing QString sub-properties in zones
2017-09-13 18:06:21 -07:00
Anthony J. Thibault
745d2ff395
Remove handControllerGrab.js, see controllerDispatcher.js instead.
2017-09-13 17:36:56 -07:00
anshuman64
d3dbd431d6
Merge pull request #11279 from druiz17/controller-dispatcher-1
...
handControllerGrab Refactor -> controllerDispatcher
2017-09-13 16:56:57 -07:00
druiz17
1b288ef860
make garbbing radius the same as master
2017-09-13 16:15:36 -07:00
druiz17
310dbce65d
fixed merge conflict
2017-09-13 15:55:04 -07:00
Chris Collins
84998a3360
Merge pull request #11351 from Atlante45/new-master
...
Update master from stable
2017-09-13 14:28:44 -07:00
Anthony J. Thibault
a505a16232
Don't rescale tablet, in desktop mode, when sensorToWorldScale changes.
2017-09-13 14:22:49 -07:00
Anthony J. Thibault
ae2d0e89b4
Fixes for desktop tablet
2017-09-13 14:18:00 -07:00
LaShonda Hopper
33c8e90e34
[QML] Fixes FogBugz Case 6107: Can't sort on import menu (details below).
...
Looking through the log revealed the following warning:
".../qml/dialogs/FileDialog.qml:489: Error: Cannot assign to non-existent property 'sortOrder'"
There was some refactoring to address some HMD functionality in 51b44d9051b44d90https://highfidelity.fogbugz.com/f/cases/6107
Reviewed-by: Leander Hasty <leander@1stplayable.com>
Changes Committed:
modified: interface/resources/qml/dialogs/FileDialog.qml
2017-09-13 16:25:36 -04:00
Atlante45
d3966ce8c2
Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master
2017-09-13 13:14:25 -07:00
Melissa Brown
49ab8af428
Merge pull request #11344 from Menithal/21536
...
21536: Clap App!
2017-09-13 12:54:31 -07:00
Anthony J. Thibault
de5f0ad987
WebTablet.js: calcSpawnInfo works more consistently.
2017-09-13 12:01:41 -07:00
Menithal
59746c564b
21536: Applied forgotten beutify to file
2017-09-13 21:24:24 +03:00
David Kelly
030b39050a
Merge pull request #11343 from davidkelly/dk/oneFileWallet
...
Wallet updates
2017-09-13 11:15:03 -07:00
Chris Collins
1b608a7d35
Merge pull request #11315 from highfidelity/RC-54
...
Beta Release 54 - Includes up to Developer Release 7078
2017-09-13 10:36:28 -07:00
Anthony J. Thibault
9a1fa9b2f2
Fix for stylus intersection with tablet and home button for scaled tablets
2017-09-13 09:52:20 -07:00
David Kelly
bce92a622e
cr feedback
2017-09-13 09:45:02 -07:00
Andrew Meadows
50b94887fa
Merge pull request #11339 from ElderOrb/case7469
...
7469 Mouse Pointer Depth is Incorrect in HMD Mode
2017-09-13 08:33:09 -07:00
Andrew Meadows
5741699bab
Merge pull request #11301 from Menithal/21484-Fix
...
WL21484 _- Hotfix - Solve Joint array issues with Similar, but not same Skeletons
2017-09-13 08:05:53 -07:00
David Kelly
7550374f8f
Merge branch 'master' of https://github.com/highfidelity/hifi into dk/oneFileWallet
2017-09-13 04:49:13 -07:00
druiz17
b3ff5c86f7
fixed secondary triggers and chest lid
2017-09-12 14:43:06 -07:00
druiz17
0b360f455c
Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1
2017-09-12 14:38:07 -07:00
druiz17
cc7bb9a1bf
Merge branch 'master' of github.com:highfidelity/hifi into feature/ant-man
2017-09-12 13:16:03 -07:00
Daniela
6941a10639
Add SensorToWorldScale factor to the bounding box dimensions in AvatarMixerSlave.
2017-09-12 21:10:19 +01:00
Dante Ruiz
bf32f65efe
Merge pull request #11341 from vladest/flickable_off
...
Flickable off
2017-09-12 13:09:06 -07:00
Menithal
40beb4bca8
Some minor tweaks
2017-09-12 22:12:30 +03:00
Chris Collins
bb26cf2179
Merge pull request #11342 from Atlante45/RC-54
...
Fix RC-54 conflict with stable
2017-09-12 11:48:13 -07:00
Menithal
79603765c4
Removed unused check
2017-09-12 21:40:15 +03:00
Menithal
5aab3f3cf3
Switched from marketplace links to local
2017-09-12 21:24:14 +03:00
Menithal
ca2d22a192
Updated Scripts
2017-09-12 21:22:40 +03:00
Daniela
5a918a3033
Add SensorToWorldScale factor to the bounding box dimensions.
2017-09-12 19:00:57 +01:00
David Kelly
187ed71a8a
more cleanup, plus now keyfile associated with user directly
2017-09-12 10:55:27 -07:00
Dante Ruiz
d90f6320a9
Merge pull request #8 from sethalves/controller-dispatcher-1
...
Controller dispatcher 1
2017-09-12 10:54:10 -07:00
Atlante45
c170cc2eb1
Merge branch 'stable' of https://github.com/highfidelity/hifi into RC-54
2017-09-12 10:53:04 -07:00
druiz17
b634292261
fixing some small issues
2017-09-12 10:53:04 -07:00
Seth Alves
e9918ca599
add profiling to controller-dispatcher
2017-09-12 10:52:52 -07:00
Seth Alves
a9aa6df93e
Merge branch 'controller-dispatcher-1' of github.com:sethalves/hifi into controller-dispatcher-1
2017-09-12 10:44:29 -07:00
Seth Alves
315f874824
add profiling to controller-dispatcher
2017-09-12 10:44:09 -07:00
vladest
92a83328c0
Follow naming convention
2017-09-12 19:17:49 +02:00
Daniela
c88c70aa6f
Add SensorToWorldScale factor to the bounding box dimensions.
2017-09-12 18:11:45 +01:00
Seth Alves
2850029f26
add profiling to controller-dispatcher
2017-09-12 10:00:32 -07:00
Seth Alves
14965da1b2
Merge branch 'controller-dispatcher-1' of github.com:druiz17/hifi into controller-dispatcher-1
2017-09-12 09:23:39 -07:00
David Kelly
61e8458d13
some cleanup
2017-09-12 08:08:41 -07:00
