Anthony J. Thibault
23ff1b9ead
Fixes for scaling controller display
...
Adds MyAvatar.sensorToWorldScaleChanged signal.
2017-09-05 15:03:41 -07:00
Anthony J. Thibault
f0912987a3
Fix ray picks against HUD sphere at different sensor scale factors
2017-09-05 10:03:19 -07:00
Anthony J. Thibault
26e9e6e580
Fixes for stylus ranges and grab radii
2017-09-01 11:19:51 -07:00
Anthony J. Thibault
6618ba12e9
Merge branch 'master' into feature/ant-man
2017-08-31 18:10:39 -07:00
Anthony J. Thibault
a1b94fd9d2
Bug fixes for laser offset and avatar hold action
2017-08-31 17:26:00 -07:00
Anthony J. Thibault
98c89cbe78
Fixes for stylus size and offset
2017-08-31 14:45:59 -07:00
Anthony J. Thibault
a0eb8152a6
fix for tablet spawn position
2017-08-31 13:15:46 -07:00
Anthony J. Thibault
1a01209020
Fixes for scaling tablet at high frame rates
2017-08-31 13:02:31 -07:00
druiz17
98b1fe6138
Merge pull request #11266 from ElderOrb/case6819
...
6819 - Create button not disabled
2017-08-31 12:36:08 -07:00
Anthony J. Thibault
9c6b8a6826
Fixes for scaling tablet
2017-08-31 11:28:05 -07:00
Zach Fox
4643a6bf5f
Merge pull request #11286 from zfox23/commerce_fixAdminMarketplaceButtons
...
Fix the duplicated buy buttons for admins on Marketplace
2017-08-31 10:53:48 -07:00
Zach Fox
164eeaae64
Fix the duplicated buy buttons for admins on Marketplace
2017-08-31 10:41:44 -07:00
Chris Collins
f41ca5ab6f
Merge pull request #11277 from Atlante45/new-master
...
Update master from stable
2017-08-31 09:48:20 -07:00
Zach Fox
9bbcf3e1ae
Merge pull request #11232 from zfox23/SelectionScriptingInterface
...
Selection Scripting Interface
2017-08-31 08:57:24 -07:00
Anthony J. Thibault
6e6687c3a6
Change tablet dimensions as sensorToWorldScale changes
2017-08-30 18:21:25 -07:00
Zach Fox
913618ded5
Merge branch 'master' of https://github.com/highfidelity/hifi into SelectionScriptingInterface
2017-08-30 16:13:50 -07:00
David Kelly
84e13c84ae
Merge pull request #11273 from howard-stearns/reset-wallet
...
reset wallet
2017-08-30 16:10:26 -07:00
Anthony J. Thibault
c9cdaadeb5
Better scale support in SpatiallyNestable class.
...
Previously avatar used SpatiallyNestable scale to keep track of model rendering scale.
It now uses a new member variable _modelScale instead. This is important because the
notion of "Avatar" space does NOT include scale, so this is now reflected correctly in
the SpatiallyNestable class.
Similarly, EntityItems no longer stuff dimensions into the SpatiallyNestable scale
field. a new _dimensions member variable is used instead. The SpatiallyNestable scale
field for entities should always be one.
Parent joints can now have scale if getAbsoluteJointScaleInObjectFrame() returns a non-zero scale.
This is used in the case of the faux SENSOR_TO_WORLD_MATRIX_INDEX joint.
Overlays now ignore the SpatiallyNestable scale, and render using only orientation, position and dimensions.
Added qDebug stream support for Transform class.
2017-08-30 15:46:36 -07:00
David Kelly
962d1fc81d
Merge branch 'master' of https://github.com/highfidelity/hifi into reset-wallet
2017-08-30 15:30:29 -07:00
Zach Fox
dbb7023fc1
Fix warnings
2017-08-30 15:26:25 -07:00
David Kelly
988ee8c8d1
fix image provider, couple other things
2017-08-30 15:23:54 -07:00
Zach Fox
3f0d44990a
Hook up bounding box rendering to Selection Scripting Interface
2017-08-30 14:54:23 -07:00
Zach Fox
fdcc149c34
Merge branch 'master' of https://github.com/highfidelity/hifi into SelectionScriptingInterface
2017-08-30 13:27:18 -07:00
Zach Fox
500427010d
Merge pull request #11276 from zfox23/commerce_polishTxnHistory
...
Polish transaction history and prepare for whatever new design
2017-08-30 13:25:55 -07:00
Zach Fox
17d999e721
Fixes
2017-08-30 13:25:34 -07:00
Atlante45
9de4c3d0af
Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master
2017-08-30 13:10:48 -07:00
Zach Fox
580865fa5a
Add skeleton for infinite scroll
2017-08-30 12:54:26 -07:00
Zach Fox
7a7d7f95d7
Polish transaction history and prepare for whatever new design
2017-08-30 12:45:13 -07:00
Zach Fox
6f6edf460e
Merge pull request #11274 from zfox23/commerce_zachsPunchlist3
...
Remove most dependencies on 'onVisibleChanged'
2017-08-30 12:30:09 -07:00
Zach Fox
fb4b0f60fa
Remove most dependencies on 'onVisibleChanged'
2017-08-30 11:55:29 -07:00
howard-stearns
b8da08ca42
reset wallet
2017-08-30 11:29:43 -07:00
Zach Fox
a73d548ffc
Merge pull request #11272 from zfox23/commerce_zachsPunchlist2
...
Commerce: Login; punctuationMode; new images
2017-08-30 11:12:38 -07:00
Zach Fox
e0878e7a3f
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_zachsPunchlist2
2017-08-30 11:07:24 -07:00
Zach Fox
f366743be7
Login; punctuationMode; new images
2017-08-30 11:07:03 -07:00
Zach Fox
271fcbf8b4
Merge pull request #11271 from davidkelly/dk/securityImageIssue
...
security image shows up in every qml engine now
2017-08-30 10:52:48 -07:00
Zach Fox
1b48319a3f
Merge pull request #11267 from zfox23/commerce_zachsPunchlist1
...
Commerce: Zachs Punchlist 01
2017-08-30 10:10:56 -07:00
Chris Collins
f0e699aecb
Merge pull request #11263 from highfidelity/RC-53
...
Beta Release 53 - Includes up to Developer Release 7053
2017-08-30 09:48:00 -07:00
Anthony J. Thibault
9cd8b6991e
Merge branch 'master' into feature/ant-man
2017-08-30 08:58:55 -07:00
Chris Collins
47a2e57e26
Merge pull request #10625 from humbletim/21180-C++
...
CR 21180-C++ Camera app -- core changes
2017-08-30 07:20:00 -07:00
David Kelly
72b15b4223
fix comment
2017-08-29 20:28:57 -07:00
Zach Fox
6ee634b90a
Lock overlay on top of security image
2017-08-29 17:19:34 -07:00
druiz17
2a97257698
Merge pull request #11140 from ElderOrb/case6788
...
6788: You can deselect your current view mode
2017-08-29 17:15:51 -07:00
David Kelly
a2b1cfc7ac
security image shows up in every qml engine now
2017-08-29 17:06:57 -07:00
Zach Fox
c0d9c06067
Merge pull request #11268 from howard-stearns/fix-wallet-login
...
fix wallet login (and share code with snapshot login)
2017-08-29 16:26:51 -07:00
Zach Fox
5d1170c5d6
Only make message appear after inventory received
2017-08-29 16:17:59 -07:00
Liv
492d053016
Create home path for new content sets loaded in
2017-08-29 16:11:16 -07:00
howard-stearns
5b264a867a
fix wallet login (and share code with snapshot login)
2017-08-29 16:05:01 -07:00
Zach Fox
a9c99854f9
Haven't purchased anything yet UI
2017-08-29 15:39:07 -07:00
Zach Fox
c7ad875485
Virtual keyboard and logic
2017-08-29 15:27:53 -07:00
Zach Fox
50241078ae
Buncha punchlist items checked off
2017-08-29 14:30:00 -07:00
