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
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
a7af114144
fix wallet, use text from server in history (for now)
2017-08-28 17:04:19 -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
1c1b841a86
Fix security images; actually do the right thing when wallet not set up
2017-08-28 12:18:53 -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
Anthony J. Thibault
573985c7c9
Merge branch 'master' into feature/ant-man
2017-08-28 09:27:04 -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
druiz17
06ab8ddbb2
Merge pull request #11251 from elisa-lj11/blocks
...
Blocks app accommodates updated Blocks website
2017-08-25 16:32:14 -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
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
e606e3dfb3
Squashed commit of the following:
...
commit 453897b9e2
2017-08-25 11:45:37 -07:00
David Kelly
0f722992a5
add delete to client of decryptFile
2017-08-25 11:24:37 -07:00
Elisa Lupin-Jimenez
4c40e3bdf4
fixed weird info box display of filenames
2017-08-25 11:21:07 -07:00
Elisa Lupin-Jimenez
7cee80f0cf
my own objects (or rather objects with low poly count) download now
2017-08-25 11:09:11 -07:00
Zach Fox
453897b9e2
Huge cleanup!
2017-08-25 10:56:53 -07:00
Anthony J. Thibault
e0ff7f5f40
Moved speed constants into AvatarConstants.h
2017-08-25 10:47:54 -07:00
David Kelly
c316e50f0f
security image bug
2017-08-25 10:29:40 -07:00
Anthony J. Thibault
dd9ee28b18
Adjust avatar walking and flying speed based on sensor scale factor
2017-08-25 10:10:23 -07:00
Andrew Meadows
4d7700b774
Merge pull request #11243 from SamGondelman/sharks
...
Fix ray pick crash on shutdown
2017-08-25 09:01:14 -07:00
Sam Gondelman
4e7818180b
Merge branch 'master' into tabletLayer2
2017-08-24 17:56:44 -07:00
Sam Gateau
c5fbd5a2a5
Merge pull request #11131 from jherico/threaded_render_entities
...
Threaded rendering of Entities
2017-08-24 17:34:49 -07:00
beholder
cbbe03cee7
6788: You can deselect your current view mode
2017-08-25 02:33:11 +03:00
Chris Collins
43b1e67e4a
Merge pull request #11238 from misslivirose/set-home-with-sandbox-starter
...
Create home bookmark for new content sets loaded in
2017-08-24 16:25:04 -07:00
SamGondelman
abaccf9edd
crash on shutdown
2017-08-24 16:00:36 -07:00
SamGondelman
4a49801217
web overlays and entities are always nonAA
2017-08-24 14:23:21 -07:00
Brad Davis
e817d3ced4
Threaded rendering & entity rendering refactor
2017-08-24 13:34:34 -07:00
humbletim
9348048387
Merge remote-tracking branch 'upstream/master' into 21180-C++
2017-08-24 16:23:47 -04:00
David Kelly
eb9436ba96
Merge pull request #11235 from davidkelly/dk/encryptFile
...
Initial wallet app plus some encryption of security image
2017-08-24 13:17:14 -07:00
David Kelly
a299aa7e24
initialize ptr!
2017-08-24 11:37:44 -07:00
Sam Gateau
4a18c5c80e
Merge pull request #11214 from SamGondelman/image3DFix
...
Fix Image3DOverlays with fractional alpha
2017-08-24 09:04:02 -07:00
David Kelly
d398adc195
warnings
2017-08-24 08:48:26 -07:00
Brad Hefta-Gaub
5c832eae9c
Merge pull request #11226 from SamGondelman/miceWithLasers
...
EntityTreeRender uses RayPick API with precision picking
2017-08-24 08:10:21 -07:00
David Kelly
c77dafdf12
fix warnings, prepare a bit for hooking up the passphrase
2017-08-23 17:43:37 -07:00
Liv
1050141b11
Create home path for new content sets loaded in
2017-08-23 17:38:24 -07:00
David Kelly
138534c3ff
encrypt security image
2017-08-23 15:01:09 -07:00
SamGondelman
206862a90f
fix flag bits
2017-08-23 12:20:30 -07:00
SamGondelman
d7b3686364
include noncollidable entities
2017-08-22 17:37:51 -07:00
Brad Davis
0a5bef22fc
Allow asynchronous editing of non-QML overlays
2017-08-22 17:12:18 -07:00
David Kelly
8bb7ea900a
Merge branch 'commerce_walletApp' of https://github.com/zfox23/hifi into dk/encryptFile
2017-08-22 16:23:23 -07:00
David Kelly
0bd3f1728d
Merge branch 'master' of https://github.com/highfidelity/hifi into dk/encryptFile
2017-08-22 14:40:10 -07:00
