Anthony J. Thibault
6e6687c3a6
Change tablet dimensions as sensorToWorldScale changes
2017-08-30 18:21:25 -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
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
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
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
howard-stearns
5b264a867a
fix wallet login (and share code with snapshot login)
2017-08-29 16:05:01 -07:00
beholder
a0a43ebf26
show checkbox or radiobutton dependently on exclusiveGroup presence
2017-08-29 23:23:16 +03:00
Chris Collins
c309258c8d
Merge pull request #11259 from sethalves/fix-bs-7240
...
possible fix for fogbugz 7240
2017-08-29 09:06:26 -07:00
David Kelly
1eb5b9e75d
Merge pull request #11260 from davidkelly/dk/transactionHistoryDisplay
...
display transaction history
2017-08-29 08:46:58 -07:00
David Kelly
84126d8f95
cr feedback
2017-08-29 08:46:13 -07:00
David Kelly
67f25adac0
Merge branch 'master' of https://github.com/highfidelity/hifi into dk/transactionHistoryDisplay
2017-08-29 08:02:53 -07:00
David Kelly
2564442817
Merge pull request #11252 from zfox23/commerce_checkoutAndInventory
...
Commerce Checkout and Purchases
2017-08-29 08:02:22 -07:00
Seth Alves
7220a6998a
remove unneeded bind-by-ref thing from lambdas
2017-08-28 17:08:59 -07:00
David Kelly
a7af114144
fix wallet, use text from server in history (for now)
2017-08-28 17:04:19 -07:00
Seth Alves
b9c68f9156
give MouseRayPickResultOperator and SetPrecisionPickingOperator default values to avoid crash on startup
2017-08-28 17:01:01 -07:00
Zach Fox
22d3857501
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_checkoutAndInventory
2017-08-28 15:10:17 -07:00
Zach Fox
37b6099f36
Hook up root_file_url
2017-08-28 12:46:01 -07:00
Zach Fox
1c1b841a86
Fix security images; actually do the right thing when wallet not set up
2017-08-28 12:18:53 -07:00
Zach Fox
ceb38e261d
HMD Keyboard for purchases filterBar
2017-08-28 10:45:08 -07:00
Anthony J. Thibault
5230b03f4f
clang warning fixes
2017-08-28 10:35:03 -07:00
David Kelly
3955624e63
Merge branch 'master' of https://github.com/highfidelity/hifi into dk/transactionHistoryDisplay
2017-08-28 10:13:21 -07:00
Zach Fox
ea00668725
Again to Another
2017-08-28 10:04:26 -07:00
Zach Fox
67f3b5c027
Remove quantity
2017-08-28 09:58:45 -07:00
Zach Fox
52cb1dd893
Correctly handle non-JSON items
2017-08-28 09:54:51 -07:00
Zach Fox
e293d122b1
Add security image to Checkout and Purchases
2017-08-28 09:33:30 -07:00
Anthony J. Thibault
573985c7c9
Merge branch 'master' into feature/ant-man
2017-08-28 09:27:04 -07:00
Chris Collins
d675ee9427
Merge pull request #11250 from jherico/thread_safety
...
Additional locking in model entities
2017-08-28 09:22:30 -07:00
Sam Gateau
a98d861600
Merge pull request #11242 from SamGondelman/tabletLayer2
...
Web overlays and entities are always non anti-aliased
2017-08-28 09:10:14 -07:00
Anthony J. Thibault
937f400534
Bug fixes for Avatar::getEyeHeight() when no feet joints are present
2017-08-25 18:23:19 -07:00
Zach Fox
4c16366562
Ints aren't floats, silly!
2017-08-25 16:55:50 -07:00
Zach Fox
50f7f91d4e
Close the loop.
2017-08-25 16:49:02 -07:00
Zach Fox
a03f9592c1
Inventory to Purchases
2017-08-25 16:34:48 -07:00
druiz17
06ab8ddbb2
Merge pull request #11251 from elisa-lj11/blocks
...
Blocks app accommodates updated Blocks website
2017-08-25 16:32:14 -07:00
Zach Fox
b1378816d5
Revert "MUCH faster filter!"
...
This reverts commit 5173774db0
2017-08-25 16:23:36 -07:00
Zach Fox
5173774db0
MUCH faster filter!
2017-08-25 16:15:07 -07:00
Zach Fox
ee8f5d6e7b
Filter
2017-08-25 16:08:32 -07:00
Zach Fox
d19377d2d4
Saving
2017-08-25 15:56:30 -07:00
Anthony J. Thibault
3ac09b7716
Fix run blends and removed debug draws
2017-08-25 15:48:53 -07:00
Anthony J. Thibault
4f830cf1dc
Calculate jump speed based on canonical jump height.
2017-08-25 15:34:51 -07:00
Zach Fox
153c131482
Initial inventory progress
2017-08-25 15:28:35 -07:00
Zach Fox
5487179a79
So much progress
2017-08-25 15:06:14 -07:00
David Kelly
b942faa60e
Merge branch 'master' of https://github.com/highfidelity/hifi into dk/transactionHistoryDisplay
2017-08-25 14:16:31 -07:00
David Kelly
5bbe3c5a94
Merge pull request #11246 from davidkelly/dk/encryptionBug
...
security image bug
2017-08-25 14:14:22 -07:00
David Kelly
f015ac3c68
get transaction history into qml
2017-08-25 13:55:38 -07:00
Zach Fox
a024e82c5a
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_checkoutAndInventory
2017-08-25 13:53:48 -07:00
Zach Fox
3fdfe3fe68
Merge pull request #11249 from zfox23/commerce_walletStatus
...
Huge cleanup of Wallet logic
2017-08-25 13:53:17 -07:00
Zach Fox
dd9bb17791
Progress!
2017-08-25 12:13:51 -07:00
Brad Davis
3ad32af975
Additional locking in model entities
2017-08-25 11:49:45 -07:00
Zach Fox
e606e3dfb3
Squashed commit of the following:
...
commit 453897b9e2
2017-08-25 11:45:37 -07:00
