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
Author: Zach Fox <fox@highfidelity.io>
Date: Fri Aug 25 10:56:53 2017 -0700
Huge cleanup!
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
Zach Fox
52ef0f2037
More progress
2017-08-23 16:37:13 -07:00
Zach Fox
88c24c16d7
I finally understand - initial progress
2017-08-23 15:02:07 -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
Zach Fox
f01d9ddbe7
Merge branch 'master' of https://github.com/highfidelity/hifi into SelectionScriptingInterface
2017-08-23 11:22:28 -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
Zach Fox
69364f2ecd
Initial progress
2017-08-22 17:10:57 -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
Zach Fox
edb64b047f
It compiles!
2017-08-22 16:00:44 -07:00
Zach Fox
ec2a27e68c
Progress
2017-08-22 15:02:06 -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
Zach Fox
2a75d97006
First steps
2017-08-22 12:56:16 -07:00
SamGondelman
b8a7fce201
boop
2017-08-22 11:54:55 -07:00
Zach Fox
f1da7a6381
Checkpoint
2017-08-22 11:53:37 -07:00
vladest
e403f7266a
Merge branch 'master' into audio_devices_split
2017-08-22 20:46:03 +02:00
Anthony J. Thibault
d62a0ea8ff
Correct controller offsets with sensor scaling
2017-08-22 11:43:39 -07:00
SamGondelman
a904ae1a8a
can set precision picking on lasers/raypicks, EntityTreeRender uses ray pick API
2017-08-22 11:41:20 -07:00
Anthony J. Thibault
ffdb10681e
Fix for laser rendering and positioning with sensor scale
2017-08-22 11:07:04 -07:00
Anthony J. Thibault
de2262968e
Fix for CAMERA_RELATIVE controllers with sensor scale
2017-08-22 09:44:32 -07:00
SamGondelman
3a80c6cbe2
fix alpha issues, pipeline issue, clamping issue
2017-08-21 18:09:25 -07:00
Anthony J. Thibault
8e56404c40
Fixes for flying and rotation re-centering in wikiplanet
2017-08-21 17:42:25 -07:00
Anthony J. Thibault
963ddce7bc
Use eye-height to match user and avatar scales, follow fixes
...
Fix postPhysicsUpdate to properly transform follow displacement into sensor frame.
2017-08-21 17:42:24 -07:00
Anthony J. Thibault
80b660b258
Added userHeight accessors and preference
...
Also made Avatar::getHeight thread-safe
2017-08-21 17:42:23 -07:00
Anthony J. Thibault
d196743986
Added Avatar::getHeight() method
2017-08-21 17:42:22 -07:00
Anthony J. Thibault
a0d72f08ac
Fix for incorrectly scaled avatar collision on startup
2017-08-21 17:42:21 -07:00
Zach Fox
ed5445ec51
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_walletApp
2017-08-21 13:09:41 -07:00
SamGondelman
8ebaeddbc4
Merge remote-tracking branch 'upstream/master' into image3DFix
2017-08-21 11:05:44 -07:00
Ken Cooke
099723fe4d
Use RAII to avoid deletion of extended argv while in use
2017-08-20 13:49:26 -07:00
vladest
3783b8a57c
Merge branch 'master' into tablet_login_button
2017-08-19 17:27:46 +02:00
Zach Fox
512a08f67f
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_walletApp
2017-08-18 17:05:56 -07:00
David Kelly
1904bd3f2b
encrypting image, rough first pass, lots left
2017-08-18 16:14:10 -07:00
Howard Stearns
188cbee781
Merge pull request #11212 from howard-stearns/asynchronous-commerce-2
...
Asynchronous Ledger Interactions with Server
2017-08-18 15:40:24 -07:00
Elisa Lupin-Jimenez
44f1f340e1
Merge pull request #11147 from elisa-lj11/blocks
...
Adding Blocks Tablet App to Marketplace
2017-08-18 15:06:18 -07:00
Chris Collins
2456126bcc
Merge pull request #11157 from SamGondelman/tabletLayer
...
Render non-AA overlays correctly
2017-08-18 14:59:20 -07:00
SamGondelman
f56e952253
properly update image3d render item
2017-08-18 14:21:46 -07:00
howard-stearns
29b717e22d
remove dead code
2017-08-18 14:08:04 -07:00
Sam Gondelman
cbf2bb3a61
Merge pull request #10980 from SamGondelman/sharks
...
Reduce laser pointer lag
2017-08-18 13:14:38 -07:00
Elisa Lupin-Jimenez
65f876acf3
enabled version check
2017-08-18 10:49:40 -07:00
howard-stearns
6e34ab45d6
Merge branch 'master' of https://github.com/highfidelity/hifi into asynchronous-commerce-2
2017-08-18 10:03:33 -07:00
howard-stearns
3d401129fb
checkpoint
2017-08-18 10:03:00 -07:00
vladest
2e5e0c94f1
Added login button to Tablet
2017-08-18 15:34:15 +02:00
Elisa Lupin-Jimenez
4c28b9f09a
attempt to check version of interface
2017-08-17 18:16:41 -07:00
Zach Fox
ccf81f801d
All the pieces!
2017-08-17 17:06:48 -07:00
Zach Fox
9135e37078
Go go go go gog o
2017-08-17 15:20:17 -07:00
Zach Fox
eab16fc28c
Initial progress
2017-08-17 15:01:25 -07:00
Elisa Lupin-Jimenez
2b44608ece
Merge branch 'master' of https://github.com/highfidelity/hifi into blocks
2017-08-17 10:18:40 -07:00
vladest
1a32a6fac3
Merge branch 'master' into audio_devices_split
2017-08-17 17:20:11 +02:00
Zach Fox
a4123e3024
Merge pull request #11201 from zfox23/sam_is_cool
...
Allow users to take a snapshot from the Secondary Camera!
2017-08-16 17:03:15 -07:00
Zach Fox
ecd1f13197
Allow users to take a snapshot from the secondary camera
2017-08-16 15:34:06 -07:00
vladest
2cca584e58
Merge branch 'master' into audio_devices_split
2017-08-16 22:47:06 +02:00
vladest
15f8bc0141
Keep old function names for compatibility
2017-08-16 22:17:34 +02:00
vladest
4e5c650621
Modified some usecases for async dialogs
2017-08-16 21:41:18 +02:00
David Kelly
73e943daaf
Merge branch 'master' of https://github.com/highfidelity/hifi into dk/makeMeSomeKeys
2017-08-16 10:13:08 -07:00
Zach Fox
c024bd2d83
Merge pull request #11195 from zfox23/commerce_securityImage1
...
Commerce: First pass at security images (NOT FINAL)
2017-08-16 09:57:55 -07:00
SamGondelman
86cc938a47
Merge remote-tracking branch 'upstream/master' into sharks
2017-08-16 09:54:12 -07:00
vladest
8326600274
Merge branch 'master' into modal_dialogs_async
2017-08-16 13:48:47 +02:00
SamGondelman
a641fb7a7f
rename qvector findRayIntersection to avoid script conflicts
2017-08-15 18:03:52 -07:00
Zach Fox
d376630bde
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_securityImage1
2017-08-15 15:03:02 -07:00
vladest
273261ee57
Reworked WindowScriptingInterface browse method for async methods
2017-08-15 23:12:35 +02:00
Liv
aea5f170f2
Merge branch 'master' of https://github.com/highfidelity/hifi into feat/domain-setup
2017-08-15 13:58:22 -07:00
Liv
49eab847fd
Refactor handleOctreeFileReplacement, style changes, align with handler for other file types
2017-08-15 13:58:02 -07:00
vladest
8afdb27c1b
Reworked WindowScriptingInterface save method for async methods
2017-08-15 22:55:44 +02:00
Liv
c0fa446b75
Remove domain management scripting interface
2017-08-15 13:49:13 -07:00
Zach Fox
b7282cc776
Lots of fixes
2017-08-15 13:46:20 -07:00
Anthony Thibault
342f8acff5
Merge pull request #11176 from hyperlogic/feature/improve-hand-body-collision
...
Improve avatar hand vs body collision
2017-08-15 13:43:21 -07:00
SamGondelman
9bb7e66859
separate raypickscriptinginterface, cleanup
2017-08-15 13:36:41 -07:00
Zach Fox
528d2072f9
Bugfixes and improvements
2017-08-15 12:14:32 -07:00
Anthony J. Thibault
6e0ddadb29
Fix for array size.
2017-08-15 11:45:22 -07:00
David Kelly
0f7db74ef1
missed a couple warnings
2017-08-15 11:44:15 -07:00
Anthony J. Thibault
04006a9f76
code review feedback
2017-08-15 11:19:41 -07:00
Zach Fox
bddce9328b
V1
2017-08-15 11:08:03 -07:00
David Kelly
a6390edf46
ugh
2017-08-15 10:10:48 -07:00
Elisa Lupin-Jimenez
3d7995da34
Merge branch 'master' of https://github.com/highfidelity/hifi into blocks
2017-08-15 10:01:24 -07:00
Sam Gateau
2a75cde48a
Merge pull request #11185 from samcake/blue
...
Fixing the graphics setting for Ambient Occlusion
2017-08-15 09:26:45 -07:00
Sam Gateau
d624413c14
Merge pull request #11189 from SamGondelman/line3DFix
...
Fix drawInFront overlays only rendering in left eye
2017-08-15 09:26:18 -07:00
David Kelly
c08fce967f
forgot a warning
2017-08-15 08:58:16 -07:00
vladest
51a5c30353
Reimplement asset browsing for async
2017-08-15 17:05:55 +02:00
vladest
e9ed05c3ba
Reimplement snapshot dir browser for async
2017-08-15 15:55:36 +02:00
vladest
9aace9e67d
Merge branch 'master' into modal_dialogs_async
2017-08-15 14:57:13 +02:00
vladest
757af1e2e5
Added Save, Directory and Assets async methods
2017-08-15 14:44:01 +02:00
David Kelly
ef5863d169
warnings squashed
2017-08-14 16:24:50 -07:00
SamGondelman
8163430282
fix depth buffer issue that was messing with drawInFront, plus some small fixes to line3ds
2017-08-14 15:03:14 -07:00
David Kelly
170d2b186b
url encode the base64 signature/key
2017-08-14 13:48:09 -07:00
Zach Fox
c1d771842d
Remove context overlay (if present) when removing entity
2017-08-14 13:37:50 -07:00
David Kelly
803a5c6690
Merge branch 'master' of https://github.com/highfidelity/hifi into dk/makeMeSomeKeys
2017-08-14 13:15:04 -07:00
David Kelly
b4b592cc00
one key file with (for now) both public and private keys in there
2017-08-14 12:53:10 -07:00
Zach Fox
199ba3bff0
Use new JSON inventory format
2017-08-14 11:55:21 -07:00
samcake
db1536c521
Reactivate watch dog exit
2017-08-14 10:47:58 -07:00
samcake
05b78b0df0
Just fixing the ao combo box field
2017-08-14 10:46:33 -07:00
vladest
ac7aa609f2
Open file async implemented
2017-08-14 16:23:53 +02:00
vladest
63e907e7b6
Merge branch 'master' into modal_dialogs_async
2017-08-12 13:04:52 +02:00
samcake
ff98dedbb2
Debugging the graphics fields activation
2017-08-11 18:10:44 -07:00
Anthony J. Thibault
cd57c0706a
more warning fixes
2017-08-11 17:46:50 -07:00
David Kelly
f784bc42de
Initial cut using RSA keys for now
2017-08-11 16:54:04 -07:00
Anthony J. Thibault
9e1218b4a4
Use k-dop collision to prevent hands from entering body.
2017-08-11 14:50:00 -07:00
howard-stearns
8ee54c7b36
Merge branch 'master' of https://github.com/highfidelity/hifi into asynchronous-commerce
2017-08-11 11:46:20 -07:00
howard-stearns
551ea921cd
Make API asynchronous, for communicating with server
2017-08-11 11:45:40 -07:00
vladest
af39b5660b
Merge branch 'master' into audio_devices_split
2017-08-11 20:42:49 +02:00
vladest
560696e41c
Split logic and interface for HMD and desktop devices. Added CheckBox control based on QQC2
2017-08-11 20:39:17 +02:00
SamGondelman
f058781f49
just kidding shared_mutexes are c++17
2017-08-11 10:07:20 -07:00
Anthony J. Thibault
49adf04913
Added Developer > Avatar > Show Detailed Collision menu option
2017-08-10 16:36:09 -07:00
SamGondelman
e4c954e862
merge from master
2017-08-10 16:30:33 -07:00
SamGondelman
353a3e8c68
properly fix AA stenciling
2017-08-10 16:07:40 -07:00
SamGondelman
96b179386f
working on fixing non-AA overlays
2017-08-10 16:07:40 -07:00
Seth Alves
972a24fea9
Merge pull request #11169 from anshuman64/new-branch
...
High Fidelity Interface Application Rename
2017-08-10 15:57:10 -07:00
Anthony J. Thibault
ae98974d79
improve 14-dop generation for avatar joint collision
...
Also added debug rendering functionality.
2017-08-10 15:52:51 -07:00
SamGondelman
4c55849290
merge from master
2017-08-10 15:43:23 -07:00
SamGondelman
d0d5ac8dd1
switch to stl wherever possible, use bitset instead of unsigned ints
2017-08-10 15:33:55 -07:00
Brad Davis
eb143c42d0
Merge pull request #11168 from sethalves/avatar-url-command-line-flag
...
cancel effects of --replaceAvatarURL when avatar is changed with preference dialog
2017-08-10 15:18:21 -07:00
Seth Alves
1d07bc3b4e
try, try again
2017-08-10 14:32:52 -07:00
Elisa Lupin-Jimenez
b0c91547b4
Fixed WebGL rendering
2017-08-10 14:14:09 -07:00
Seth Alves
ff83a8158b
cancel effects of --replaceAvatarURL when avatar is changed with preference dialog
2017-08-10 13:49:48 -07:00
Sam Gateau
79f3be1efe
Merge pull request #11021 from Zvork/fade2
...
Fade dissolve effect JUST AVATARS
2017-08-10 13:48:30 -07:00
Anshuman Dewangan
f79bf4e009
High Fidelity Interface rename
2017-08-10 13:40:00 -07:00
Zach Fox
334f71e4fb
Merge pull request #11166 from howard-stearns/commerce-blance-inventory
...
balance and inventory stubs
2017-08-10 13:33:56 -07:00
howard-stearns
8f0fd10e2b
fix
2017-08-10 12:51:05 -07:00
howard-stearns
ca13d58b0b
blance and inventory stubs
2017-08-10 12:44:50 -07:00
Seth Alves
d812c293e8
Merge pull request #11120 from mukulHF/bug-lock-default-scripts
...
Disable the ability for a user to edit default scripts if developer settings is not enabled - adjusting values
2017-08-10 12:29:23 -07:00
Elisa Lupin-Jimenez
af95d7f892
Merge branch 'master' of https://github.com/highfidelity/hifi into blocks
2017-08-10 10:13:27 -07:00
vladest
b780d4bce3
Merge branch 'master' into modal_dialogs_async
2017-08-10 10:52:35 +02:00
vladest
68e9d335cd
Added async information and critical dialogs
2017-08-10 10:46:06 +02:00
Liv
6bde4db0d7
wrap in marketplace check and change landing point
2017-08-09 16:35:25 -07:00
Elisa Lupin-Jimenez
a2e407f786
fixed merge conflicts in marketplacesInject.js
2017-08-09 15:59:20 -07:00
Elisa Lupin-Jimenez
1ac9536f95
Downloading blocks from marketplace in own asset folder
2017-08-09 15:56:07 -07:00
Anthony J. Thibault
4d845bd208
Bug fix for HMD roll causing avatar yaw when standing still
...
HMD roll should only cause the avatar to yaw when actively driving.
2017-08-09 15:52:27 -07:00
Sam Gondelman
85c3f94976
Merge branch 'master' into sharks
2017-08-09 13:36:18 -07:00
howard-stearns
f1ab91edd1
PR feedback
2017-08-09 12:41:16 -07:00
howard-stearns
7414bf0d9a
oops. didn't test what I thought I did
2017-08-09 12:09:03 -07:00
howard-stearns
1cf81495ab
basic commerce infrastructure
2017-08-09 11:50:52 -07:00
Elisa Lupin-Jimenez
17acf0520d
Download from blocks in marketplace working
2017-08-09 11:08:14 -07:00
Liv
0784686450
small typo fix
2017-08-09 10:17:31 -07:00
howard-stearns
9349e72eeb
Merge branch 'master' of https://github.com/highfidelity/hifi into buy
2017-08-09 10:00:36 -07:00
Liv
bd1619b1b2
update error message wording
2017-08-09 09:14:46 -07:00
vladest
616f15864a
Ported an some currently not used code
2017-08-09 14:49:15 +02:00
vladest
556569819d
1st stage of moving to async dialogs
2017-08-09 14:00:19 +02:00
Elisa Lupin-Jimenez
d599753771
Started blocks download catch, fixed a debug typo
2017-08-08 18:43:35 -07:00
SamGondelman
3645bf04b6
possibly fix most annoying crash
2017-08-08 18:10:53 -07:00
Zach Fox
03729bf165
Actually fix context menu
2017-08-08 16:38:12 -07:00
Zach Fox
871a5ff1ab
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_CheckoutQMLInvestigation
2017-08-08 15:53:22 -07:00
Zach Fox
69fc69cffb
Comment fix and overlay click fix
2017-08-08 15:52:59 -07:00
Zach Fox
7d26d2d88b
Switch and fix overlay clicks
2017-08-08 14:29:44 -07:00
Liv
ab8f5c1288
add user logging detail message
2017-08-08 13:55:07 -07:00
SamGondelman
684001a756
workaround deadlock in editRenderState
2017-08-08 11:11:19 -07:00
Liv
3f30162215
Make spawning point not 0,0,0 and change error message
2017-08-08 09:44:36 -07:00
SamGondelman
6d253fcc5f
cleaning up
2017-08-07 18:37:55 -07:00
SamGondelman
42147640e2
remove LaserPointerManager as a dependency
2017-08-07 14:18:56 -07:00
SamGondelman
489e08aef0
Merge branch 'master' of https://github.com/highfidelity/hifi into sharks
2017-08-07 13:29:00 -07:00
Seth Alves
af1e27dc36
Merge pull request #11053 from hyperlogic/feature/secondary-pose-support
...
Improved support for Vive Trackers on biceps
2017-08-07 13:11:48 -07:00
howard-stearns
9bad26c2db
stub files
2017-08-07 12:51:30 -07:00
Zach Fox
07a4beac73
Fix the crash
2017-08-07 10:28:36 -07:00
Liv Erickson
da70071b5a
Merge branch 'master' into feat/domain-setup
2017-08-07 10:04:54 -07:00
Ken Cooke
1fc050fdef
Fix _devices access via shared_ptr
2017-08-07 08:11:43 -07:00
Seth Alves
c570d483d8
Merge pull request #11113 from elisa-lj11/zip_drag
...
Zip drag (needs review)
2017-08-07 03:17:31 -07:00
Seth Alves
8798e47f99
Merge pull request #11117 from hyperlogic/bug-fix/misc-crash-fixes
...
Crash fixes for avatars without Hips, and web overlays
2017-08-06 18:48:07 -07:00
Brad Davis
1ecca9fd29
Merge branch 'master' into zzmp-audio/peak-values
2017-08-06 17:21:00 -07:00
vladest
134bad9534
fixed typo leads to lost touch or mouse release events
2017-08-06 19:09:40 +02:00
SamGondelman
8b1c24e636
added setLockEndUUID, update handControllerGrab and grab
2017-08-04 18:26:11 -07:00
Elisa Lupin-Jimenez
a246c59277
changed debug print for unsupported entity files
2017-08-04 16:59:21 -07:00
Elisa Lupin-Jimenez
8c9ce82986
Fixed Mac and Ubuntu platform build issue (hopefully)
2017-08-04 16:58:33 -07:00
Elisa Lupin-Jimenez
ebc28a6557
Renamed isBlocks to isZip, added debug print for non-entity files
2017-08-04 16:58:33 -07:00
Elisa Lupin-Jimenez
06ff766952
Drag zip cleaned up, marketplaces stylized, back button fixed
2017-08-04 16:58:33 -07:00
Elisa Lupin-Jimenez
692aa4c4b9
Clara download working again, still can drag in Blocks zip
2017-08-04 16:58:15 -07:00
Elisa Lupin-Jimenez
c6d5b1a5e6
Removed extraneous print statements
2017-08-04 16:58:15 -07:00
Elisa Lupin-Jimenez
c3d943ff72
Drag zip folder works
2017-08-04 16:57:48 -07:00
Elisa Lupin-Jimenez
ed1ed4f3e0
Blocks drag does not work yet
2017-08-04 16:57:48 -07:00
Elisa Lupin-Jimenez
ca6a323d54
Can drag blocks zip folder into hifi and upload the .obj
2017-08-04 16:57:48 -07:00
Anthony J. Thibault
98bbe887b9
Merge branch 'master' into feature/secondary-pose-support
2017-08-04 16:11:13 -07:00
Brad Davis
86e3489167
Updates from Threaded Rendering project
2017-08-04 15:22:14 -07:00
Brad Hefta-Gaub
57f62f59fb
Merge pull request #11110 from Armads/WL21423
...
Camera mode on startup is determined by user settings and HMD status
2017-08-04 13:16:34 -07:00
SamGondelman
bd942ec406
merge from master
2017-08-04 12:17:54 -07:00
Brad Hefta-Gaub
0d0a1af166
Merge pull request #11085 from jherico/script_console_crash
...
Fix for potential crash in JS console
2017-08-04 11:44:20 -07:00
Anthony J. Thibault
9fdc044ae1
Crash fix for web3d overlays that are not the tablet.
2017-08-04 11:19:59 -07:00
Anthony J. Thibault
85500841fb
Crash fix for avatars that are missing "Hips", "Head" and other required joints.
2017-08-04 11:19:09 -07:00
Dante Ruiz
b72ac63662
Merge branch 'master' of github.com:highfidelity/hifi into bug-lock-default-scripts
2017-08-04 17:19:06 +01:00
Howard Stearns
71ce5a6494
Merge pull request #11016 from highfidelity/context-overlays
...
Context Overlays
2017-08-03 16:28:14 -07:00
Armads
dff4e6e32c
WL21423 Changing order of camera setup steps
2017-08-03 15:40:38 -04:00
David Kelly
4b7779f0f5
add flag to outline render flags, fix pal.js/edit.js interaction
2017-08-03 07:57:21 -07:00
Armads
24718e2424
WL21423 Camera mode on startup is determined by user settings and HMD status
2017-08-03 09:03:23 -04:00
Dante Ruiz
90db4aa9c0
Merge branch 'master' of github.com:highfidelity/hifi into bug-lock-default-scripts
2017-08-02 18:18:17 +01:00
David Kelly
588afaaa85
unused variable...
2017-08-01 16:59:42 -07:00
Anthony Thibault
8a87ebd2a8
Merge pull request #11036 from AndrewMeadows/walkabout
...
fix bugs preventing avatar from walking on spherical planet
2017-08-01 16:36:35 -07:00
David Kelly
762b409814
unused variable
2017-08-01 16:20:33 -07:00
David Kelly
479d6abc58
Merge remote-tracking branch 'upstream/context-overlays' into contextOverlays_renderMOde
2017-08-01 16:18:20 -07:00
David Kelly
6ae516c46a
Merge remote-tracking branch 'upstream/context-overlays' into contextOverlays_renderMOde
2017-08-01 15:45:34 -07:00
anshuman64
9bf4977e09
Merge pull request #11096 from humbletim/21487
...
WL 21487: Fix Camera behavior in Mirror mode
2017-08-01 14:59:06 -07:00
Dante Ruiz
51652482a4
Merge branch 'master' of github.com:highfidelity/hifi into bug-lock-default-scripts
2017-08-01 20:51:56 +01:00
anshuman64
97b4fd4032
Merge pull request #11071 from vladest/fix_menu_landscape
...
Fix Landscape mode, when menu pushed in Create mode
2017-08-01 11:29:15 -07:00
humbletim
3a9b8c02a6
* disable Avatar "follow" / recentering behavior when using HMD + "View > Mirror"
...
* restore access to "View > Mirror" from HMD mode
2017-08-01 13:41:28 -04:00
Brad Davis
bea91be521
Fix for potential crash in JS console
2017-07-31 17:50:30 -07:00
David Kelly
43c8079f03
temporary inspectionMode setting to turn ContextOverlays completely off/on
2017-07-31 13:55:43 -07:00
David Kelly
bd7c4b3b26
Merge remote-tracking branch 'upstream/master' into context-overlays
2017-07-31 13:14:53 -07:00
Anthony J. Thibault
2383933252
Merge branch 'master' into feature/secondary-pose-support
2017-07-31 10:55:40 -07:00
Olivier Prat
490aad2a06
Merged from master
2017-07-31 12:00:35 +02:00
humbletim
3bcbec87e0
Merge remote-tracking branch 'upstream/master' into 21180-C++
2017-07-30 16:15:34 -04:00
Brad Davis
7d18d2e017
Restore corrected touch event simulation
2017-07-29 08:51:51 -07:00
vladest
3c9ab36416
Remove already already implemented fix
2017-07-29 12:00:41 +02:00
vladest
0333849aa8
Merge branch 'master' into fix_menu_landscape
2017-07-29 11:44:58 +02:00
Brad Davis
5946a965da
Disable touch event emulation for tablet until we fix crash
2017-07-28 18:54:16 -07:00
Chris Collins
cfd9f8b64e
Merge pull request #11077 from jherico/overlay_event_crashes
...
Fix overlay event handling thread issues
2017-07-28 15:56:09 -07:00
anshuman64
e11388f7f7
Merge pull request #11068 from ctrlaltdavid/dominant-hand-signal
...
Add a "dominant hand changed" signal
2017-07-28 15:17:50 -07:00
Brad Davis
d42052a299
Fix overlay event handling thread issues
2017-07-28 14:56:21 -07:00
Stephen Birarda
17dd028ec7
make Paths available to desktop and tablet QML context
2017-07-28 14:23:18 -07:00
Andrew Meadows
d4e72df928
Merge pull request #10711 from burtsloane/midi
...
Midi support for Entities
2017-07-28 10:51:43 -07:00
Andrew Meadows
3ec9640ea1
fix calculation of walk motor for HMD
2017-07-28 09:22:47 -07:00
vladest
45934cb53e
Fix Landscape mode, when menu pushed in Create mode. Fix pages gets white in Create mode
2017-07-28 18:04:29 +02:00
Brad Davis
bb57504498
Prevent deadlocks from Overlays update logic recursing into other Overlays calls
2017-07-27 19:39:22 -07:00
David Rowe
c1d179eba1
Add "dominant hand changed" signal
2017-07-28 14:20:49 +12:00
Brad Hefta-Gaub
d572510770
Merge pull request #11009 from AndrewMeadows/fix-QueryAACube
...
update EntityItem bounding cube when on changed dimensions
2017-07-27 18:21:06 -07:00
Brad Hefta-Gaub
9b3be6d164
Merge pull request #10808 from humbletim/21400
...
WL 21400 -- Setting that lets you switch from cursor to reticle
2017-07-27 13:16:58 -07:00
SamGondelman
e3288a9004
fix flicker, scissor warning, and handControllerGrab sphere size
2017-07-27 11:17:30 -07:00
Anthony J. Thibault
bcb4cc32d2
another clang error fix
2017-07-27 10:26:10 -07:00
Anthony J. Thibault
778c8bf9a7
clang build error fix
2017-07-27 10:08:35 -07:00
Anthony J. Thibault
8f5c41af2d
changed _controllerPoseMap from unordered_map to map
2017-07-27 09:44:37 -07:00
Anthony J. Thibault
78c6564174
Merge branch 'master' into feature/secondary-pose-support
2017-07-27 09:09:32 -07:00
Sam Gondelman
fcaa39b245
Merge branch 'master' into sharks
2017-07-26 18:18:09 -07:00
SamGondelman
5e4a83dad9
defaultRenderStates, handControllerGrab.js, fix teleport.js a little
2017-07-26 17:58:39 -07:00
Zach Fox
8a7561d61b
IT'S WORKING SOB SOB SOB
2017-07-26 16:35:55 -07:00
Zach Fox
39cb0bc357
WHYYYY DOESN'T THIS WORK
2017-07-26 16:14:35 -07:00
Seth Alves
9c9cfad4c4
use ctrl rather than alt to activate camera-mode shortcuts
2017-07-26 15:56:08 -07:00
Seth Alves
71023bcb1b
Merge branch 'master' of github.com:highfidelity/hifi into bug-camera-mode-mods
2017-07-26 15:54:57 -07:00
Zach Fox
3a05219c59
Closer still
2017-07-26 14:10:41 -07:00
burtsloane
d4ae298a8d
Merge branch 'master' into midi
2017-07-26 13:59:07 -07:00
Burt Sloane
4f7243e444
Merge branch 'master' of https://github.com/burtsloane/hifi into midi
2017-07-26 13:30:57 -07:00
Zach Fox
65c28ca821
Bugfixes
2017-07-26 13:17:51 -07:00
Zach Fox
62f6c10b2b
Renaming things; bugfixes; improvements
2017-07-26 12:45:10 -07:00
Zach Fox
24ddbb4b22
Silly bug preventing the whole thing from working
2017-07-26 12:08:55 -07:00
Zach Fox
9147bc21d0
Getting there.
2017-07-26 11:41:27 -07:00
Liv
be860d6c87
small string fix
2017-07-26 10:20:29 -07:00
Liv
63d637c4db
Add line to move user back to origin to be near new content
2017-07-26 10:02:21 -07:00
Liv
57b27a7bb7
change packet type to be sourced, change from packet list to single packet
2017-07-25 20:17:20 -07:00
Zach Fox
9020607ccf
First pass
2017-07-25 17:54:46 -07:00
Zach Fox
7702bfceaa
Big cleanup and preparation; Actually fix desktop tablet
2017-07-25 16:12:32 -07:00
SamGondelman
3a8ad8b631
switch to QUuids
2017-07-25 15:11:44 -07:00
SamGondelman
658acd91f2
experimenting with drawHUDLayer depth testing
2017-07-25 14:17:39 -07:00
SamGondelman
0117950546
can edit drawHUDLayer property
2017-07-25 12:57:52 -07:00
Liv
9458e4a1eb
Merge branch 'master' of https://github.com/highfidelity/hifi into feat/domain-setup
2017-07-25 11:32:13 -07:00
Liv
2377e4a5db
fix message formatting
2017-07-25 11:32:02 -07:00
Liv
89a1c7a697
code cleanup
2017-07-25 11:24:57 -07:00
Zach Fox
c71dca5b4b
Missed a magic number
2017-07-25 11:15:44 -07:00
Zach Fox
256b7efdd2
Handle the case when the camera is inside the bounding box of an entity
2017-07-25 11:06:54 -07:00
SamGondelman
3149c3e16c
warnings
2017-07-25 10:16:50 -07:00
Zach Fox
40038ce54b
Merge branch 'master' of https://github.com/highfidelity/hifi into context-overlays
2017-07-25 09:33:07 -07:00
Andrew Meadows
9d1fba3a3b
Merge pull request #10821 from ctrlaltdavid/21418
...
Don't execute body of controllers' plugin update methods if not enabled
2017-07-25 08:51:17 -07:00
Ryan Huffman
9421e6ebb6
Merge pull request #11029 from cain-kilgore/dominant-hands
...
WL 21453 - Add a "Dominant Hand" setting
2017-07-25 08:01:31 -07:00
SamGondelman
3c8b964cc9
replace setHandLasers with drawHUDLayer overlay property
2017-07-24 18:16:40 -07:00
Liv
32ddffd9c8
Move logic for confirmation into Application.cpp for handling files directly
2017-07-24 18:09:32 -07:00
Cain Kilgore
280a7a7e42
Fixing Styling, added Preference to Tablet, Moved Location to Avatar Tuning
2017-07-25 01:48:55 +01:00
Seth Alves
766c6f48c3
third person camera is alt+G rather than alt+O
2017-07-24 17:43:01 -07:00
Anthony J. Thibault
33a1d6e225
Merge branch 'master' into feature/secondary-pose-support
2017-07-24 17:27:33 -07:00
Anthony J. Thibault
9f6641ed10
Shoulder puck calibration work in progress
...
* AnimInverseKinematics: debug draw for secondary targets
* AnimInverseKienmatics: better clean up of ik target debug draw
* GeometryUtil: added findPlaneFromPoints()
* ViveControllerManager: external dependency on eigen
* ViveControllerManager: record history of left/right hand controllers
* ViveControllerManager: use history to determine user shoulder location for better calibration
* ViveControllerManager: pass defaultToReferenceMat by const ref to calibrate functions.
* CMake: added external depenency to eigen linear algebra library.
2017-07-24 17:22:48 -07:00
Zach Fox
c22798a8e6
Offset tablet position to left of screen per feedback
2017-07-24 17:16:07 -07:00
Seth Alves
97756e6140
accidently deleted a break
2017-07-24 16:12:03 -07:00
Seth Alves
82a787a753
use alt+h for mirror-mode
2017-07-24 16:04:11 -07:00
Andrew Meadows
8c55476c65
fix motor direction when walking upside down
...
also maintain worldUp and remove unnecessary cruft
2017-07-24 16:00:13 -07:00
Andrew Meadows
f598b1f1f5
fix spelling typo in comment
2017-07-24 16:00:13 -07:00