SamGondelman
1b85a453ab
working on text3d overlays and entities
2017-09-12 16:49:51 -07:00
David Kelly
187ed71a8a
more cleanup, plus now keyfile associated with user directly
2017-09-12 10:55:27 -07:00
David Kelly
61e8458d13
some cleanup
2017-09-12 08:08:41 -07:00
David Kelly
5c12403b7c
first working pass at single file. Cleanup needed
2017-09-11 16:40:21 -07:00
Anthony J. Thibault
b81f85e1ae
Merge branch 'master' into feature/ant-man
2017-09-11 15:14:03 -07:00
David Kelly
4acbc2bfba
Just write the image file in the format we will use later
2017-09-11 13:03:21 -07:00
Howard Stearns
54deef8f32
Merge pull request #11329 from davidkelly/dk/walletSSLFix
...
fix wallet for new openssl
2017-09-11 10:07:12 -07:00
Chris Collins
47a9337aa7
Merge pull request #11323 from jherico/mac_fixes
...
Mac fixes
2017-09-11 09:10:50 -07:00
Anthony J. Thibault
72e0c844e4
Merge branch 'master' into feature/ant-man
2017-09-08 14:08:26 -07:00
David Kelly
c142215935
oops -- this is a windows-only thing (like so many other problems)
2017-09-08 12:52:12 -07:00
David Kelly
3e0b222ec4
fix wallet for new openssl
2017-09-08 11:44:19 -07:00
David Kelly
db0ecb61fd
Merge pull request #11325 from davidkelly/dk/UserHfcAccountRework
...
Use new hfc account endpoint
2017-09-08 09:03:53 -07:00
Daniela
758f049f30
Correct offset for teleport pad.
2017-09-08 14:02:26 +01:00
Daniela
10e29d1cf0
Decrease offset for teleport pad. Add Bubble orientation and scale correction.
2017-09-08 12:45:29 +01:00
Daniela
fde5e14c04
Merge branch 'feature/ant-man' of https://github.com/hyperlogic/hifi into feature/ant-man
2017-09-08 11:54:43 +01:00
Daniela
9eb429b25a
Fix offset for teleport pad.
2017-09-08 11:23:19 +01:00
David Kelly
bb07a586ca
warning, plus salting passphrase now
2017-09-07 19:24:31 -07:00
David Kelly
efdc340c5c
Use new hfc account endpoint
2017-09-07 18:15:04 -07:00
Anthony J. Thibault
7ca498dc7f
Entities created from Google Blocks zip files now are positioned/scaled relative to the avatar.
2017-09-07 16:28:08 -07:00
Anthony J. Thibault
f4f9c29bff
Fix for avatar scale preferences
2017-09-07 15:30:16 -07:00
Anthony J. Thibault
d0f9a20a01
Fix for tablet grabbing at small scales
2017-09-07 15:10:15 -07:00
Bradley Austin Davis
eb8b892571
Various Mac fixes
2017-09-07 14:45:35 -07:00
Stephen Birarda
7859b3b11f
remove image compression choices from Interface settings
2017-09-07 12:07:57 -07:00
Stephen Birarda
5e1decb02b
Merge branch 'master' of github.com:highfidelity/hifi into feat/auto-bake
2017-09-07 12:06:53 -07:00
Chris Collins
12d720805c
Merge pull request #11319 from jherico/async_qml_load_crash
...
Fix potential crash on asynchronous QML loads
2017-09-07 12:03:10 -07:00
Brad Hefta-Gaub
c5098abfb9
Merge pull request #10937 from kencooke/zzmp-audio/peak-values
...
Add peak values for all input devices in selection dialog
2017-09-07 11:58:50 -07:00
Daniela
d11a749365
Refactor 1 line. Pad alignment is correct.
2017-09-07 19:28:36 +01:00
Daniela
94e26a554d
Add 180 degrees rotation so that pad faces the avatar
2017-09-07 18:48:20 +01:00
Brad Davis
cc3beb3d91
Fix potential crash on asynchronous QML loads
2017-09-07 09:53:21 -07:00
Daniela
4c302b899d
Fix teleport pad alignment
2017-09-07 17:52:09 +01:00
Daniela
3ff707f27e
Add Avatar resize compatible teleport pad alignment
2017-09-07 13:31:41 +01:00
Howard Stearns
a0ae9ee747
Merge pull request #11311 from davidkelly/dk/walletCleanup
...
wallet cleanup
2017-09-06 14:29:24 -07:00
Daniela
37f959d749
Add Avatar resize compatible teleport pad alignment
2017-09-06 19:45:58 +01:00
Anthony J. Thibault
2f850826f2
Allow override of near/far clip planes in Oculus and OpenVR plugins
2017-09-06 11:02:44 -07:00
Chris Collins
8563a05431
Merge pull request #11255 from misslivirose/feat/tablet-tutorial
...
Removing tutorial paths for first run experience
2017-09-06 09:23:45 -07:00
vladest
57643bd904
Merge branch 'master' into audio_devices_split
2017-09-06 14:20:41 +02:00
Liv
930243539c
add back first run to false and fix formatting
2017-09-05 17:50:25 -07:00
anshuman64
3a44c6977e
Merge pull request #11300 from ElderOrb/case7196
...
7196 Mouse pointer no longer visible in HMD mode
2017-09-05 17:42:36 -07:00
David Kelly
350cee5f35
Wallet cleanup
2017-09-05 16:33:16 -07:00
Dante Ruiz
fec8482b69
Merge branch 'master' of github.com:highfidelity/hifi into feature/ant-man
2017-09-05 16:26:51 -07:00
Thijs Wenker
08baa96dc9
Merge pull request #11296 from misslivirose/fix-content-message
...
More detailed domain replacement message
2017-09-06 00:44:48 +02:00
Anthony J. Thibault
23ff1b9ead
Fixes for scaling controller display
...
Adds MyAvatar.sensorToWorldScaleChanged signal.
2017-09-05 15:03:41 -07:00
Dante Ruiz
9f2bdce190
Merge pull request #11005 from Armads/WL21424
...
WL21424 hide head attachments when head joint is hidden
2017-09-05 13:04:14 -07:00
Dante Ruiz
e69227aef8
Merge pull request #11209 from vladest/tablet_login_button
...
Added login button to Tablet
2017-09-05 12:59:02 -07:00
David Kelly
3bc45aefb1
Reset passphrase fix
2017-09-05 10:04:16 -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
beholder
c62f9007e9
7196 Mouse pointer no longer visible in HMD mode
...
The issue was caused by creation of additional instances of 'Cursor::Manager' in plugins, which happened because
Cursor::Manager's code is inside static library so every module was getting its own copy of it. As the result cursor-related settings from Application never reached plugins.
The fix is based on converting 'Cursor::Manager' into 'Dependency' to avoid additional instances creation in plugins
2017-09-03 15:20:59 +03:00
Stephen Birarda
55d44a8c8f
Merge pull request #11285 from Atlante45/feat/baking-enabled
...
Wire "Use baked" checkbox
2017-09-01 16:25:49 -07:00
David Kelly
47cd47f819
log when no passphrase was set before trying to decrypt
2017-09-01 14:50:45 -07:00
David Kelly
feaa8d3120
Someday, a real rain will come and wash Wallet.cpp
...
Till then, this little change will have to do.
2017-09-01 14:06:43 -07:00
David Kelly
90316e275a
Merge branch 'commerce_walletPassphraseModal' of https://github.com/zfox23/hifi into commerce_walletPassphraseModal
2017-09-01 13:33:23 -07:00
Liv
7eab80e494
change message when permissions to replace domain content are not present
2017-09-01 13:17:37 -07:00
David Kelly
9fe6ce0337
working change passphrase. some cleanup to come
2017-09-01 13:11:56 -07:00
Zach Fox
3cf0df518f
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_walletPassphraseModal
2017-09-01 11:53:47 -07:00
David Kelly
655dc61ff2
doh
2017-09-01 10:16:45 -07:00
vladest
681fc529dc
Merge branch 'master' into modal_dialogs_async
2017-09-01 13:31:15 +02:00
Liv
8d21b286b4
string fix
2017-08-31 19:34:01 -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
David Kelly
451936214d
initial stab at changing passphrase
2017-08-31 17:05:55 -07:00
David Kelly
1eb503f526
we are qt5.6 on mac
2017-08-31 16:49:12 -07:00
Zach Fox
eab2947d40
Auth flow
2017-08-31 15:16:29 -07:00
David Kelly
f8341ce1da
warning
2017-08-31 13:24:07 -07:00
David Kelly
de2ce1cd5f
warning
2017-08-31 13:23:38 -07:00
Zach Fox
21a73b2f39
Changes in what I think are the right direction
2017-08-31 13:16:10 -07:00
Atlante45
a9cfc01df3
Set Baking Enabled API
2017-08-31 13:11:27 -07:00
Atlante45
764e5d2e4c
Move constant to central location
2017-08-31 13:08:18 -07:00
Atlante45
da2bede6fe
Hide .baked items from the Asset Browser
2017-08-31 13:08:18 -07:00
Zach Fox
914a6bae00
Commerce: Wallet Passphrase Modal
2017-08-31 12:18:38 -07:00
David Kelly
8fbdd207c8
display hfc in "pennies"
2017-08-31 12:10:12 -07:00
vladest
1b5e6fd5f8
Merge branch 'master' into modal_dialogs_async
2017-08-31 20:39:48 +02: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
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
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
vladest
b547b2573e
Added logged in property
2017-08-30 23:15:39 +02:00
Zach Fox
fdcc149c34
Merge branch 'master' of https://github.com/highfidelity/hifi into SelectionScriptingInterface
2017-08-30 13:27:18 -07:00
vladest
903036a709
Merge branch 'master' into tablet_login_button
2017-08-30 22:12:03 +02:00
howard-stearns
b8da08ca42
reset wallet
2017-08-30 11:29:43 -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
Liv
2f2b406047
Remove unneeded handcontrollertype code from handle first run checks
2017-08-30 09:23:33 -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
a2b1cfc7ac
security image shows up in every qml engine now
2017-08-29 17:06:57 -07:00
Liv
59deccaeb5
Remove unused skipTutorial code
2017-08-29 14:55:59 -07:00
Zach Fox
91f4e59f61
Misc fixes. Get started.
2017-08-29 12:33:44 -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
0cdef28cfd
Fixup after Merge branch 'master' of https://github.com/highfidelity/hifi into SelectionScriptingInterface
2017-08-28 14:55:18 -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
Atlante45
ca62e7168c
Merge branch 'master' of https://github.com/highfidelity/hifi into feat/auto-bake
2017-08-28 11:41:23 -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
vladest
d8fb7300c3
Merge branch 'master' into tablet_login_button
2017-08-28 16:59:35 +02:00
vladest
38295ab73f
Merge conflicts
2017-08-28 16:58:30 +02:00
vladest
78aa5820d0
Added proper destructor call for audio scripting interface. Save settings in destructor. Added logging to check readed audio settings
2017-08-27 11:56:28 +02:00
vladest
7796946343
Merge branch 'master' into audio_devices_split
2017-08-26 20:00:00 +02:00
Anthony J. Thibault
937f400534
Bug fixes for Avatar::getEyeHeight() when no feet joints are present
2017-08-25 18:23:19 -07:00
Liv
59fe5ffdc1
Initial attempt at changing first run behavior
2017-08-25 17:48:35 -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
Atlante45
8a291f16ff
Merge branch 'master' of https://github.com/highfidelity/hifi into feat/auto-bake
2017-08-25 15:26:38 -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
Atlante45
9e6502fe92
More UI work
2017-08-25 10:54:34 -07:00
Atlante45
28c9aa031c
Setup script model status
2017-08-25 10:54:34 -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
vladest
26026cb2b5
Added logout. Truncate username to 8 characters
2017-08-25 17:37:10 +02:00
Armads
b30562b9ce
Adding checks to hide avatar attachments to other head and facial joints
2017-08-25 10:25:34 -04:00
vladest
be56cab8e1
Merge branch 'master' into tablet_login_button
2017-08-25 15:50:10 +02: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
Zach Fox
3c7fadb1ce
Final touch
2017-08-24 14:30:42 -07:00
SamGondelman
4a49801217
web overlays and entities are always nonAA
2017-08-24 14:23:21 -07:00
Zach Fox
56950e4614
It's working!
2017-08-24 14:17:39 -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
Zach Fox
baad5f195e
I'm locking something wrong
2017-08-24 12:53:48 -07:00
David Kelly
a299aa7e24
initialize ptr!
2017-08-24 11:37:44 -07:00
Zach Fox
d370eeea2f
Just gotta test
2017-08-24 11:07:58 -07:00
Zach Fox
e834e9d7a7
Progress
2017-08-24 10:46:18 -07:00
Zach Fox
92e8f84dc5
I understood last night at midnight
2017-08-24 09:43:35 -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
Zach Fox
657beef70f
I understand again...getting started again
2017-08-23 17:42:02 -07:00
Liv
1050141b11
Create home path for new content sets loaded in
2017-08-23 17:38:24 -07:00
