Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-10 16:58:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
67294 commits 25 branches 0 tags 1.1 GiB
Commit graph

20585 commits

Author SHA1 Message Date
Atlante45
bc819c698e Merge branch 'stable' of https://github.com/highfidelity/hifi into merge-back 2018-01-30 16:09:30 -08:00
Sam Gateau
9ea6c78ac2 fix stupid copy paste 2018-01-30 15:31:34 -08:00
John Conklin II
215d03c4ce
Merge pull request #12269 from sethalves/backtrace-for-rc-63 
Backtrace for rc 63
 2018-01-30 15:13:01 -08:00
John Conklin II
0b03632437
Merge pull request #12289 from hyperlogic/bug-fix/mac-os-shader-compile-too-slow-rc63 
RC63: 8x shader compilation optimization and watchdog disable
 2018-01-30 13:26:49 -08:00
samcake
2dcedf9f39 cherry picking Tony's fix for shader compilation time not taking soo long and adding better feedback from shader compilation 2018-01-30 12:52:05 -08:00
Atlante45
019a2d346c Fix spaces 2018-01-30 12:04:01 -08:00
Atlante45
db08f1dda6 Move backtrace to interface 2018-01-30 11:39:48 -08:00
Anthony Thibault
1e8a5485c1 8x shader compilation optimization and watchdog disable 
addPlumberPipeline in RenderPipelines.cpp would recompile
a single program 7 more times then necessary.  This was
causing startup times on Mac OS X to trigger the deadlock
watchdog.

Even with this fix, compiling shaders is still too slow,
As a workaround, we disable the  watchdog thread during
rendering pipeline setup.
 2018-01-30 10:27:06 -08:00
Gabriel Calero
a5a36b4b8f Don't show help on android. Hide menu bar 2018-01-30 14:48:37 -03:00
Gabriel Calero
07a542e35d Add bottom bar and address dialog (Android) 2018-01-30 14:48:37 -03:00
Seth Alves
7d1eb5fef8 Merge branch 'RC63' of github.com:highfidelity/hifi into backtrace-for-rc-63 2018-01-30 09:13:02 -08:00
Liv Erickson
8b7c989508 move emit signals to wallet interface 2018-01-29 16:34:44 -08:00
Liv Erickson
ce8159340b fix vs autoformatting 2018-01-29 15:51:09 -08:00
MiladNazeri
3585bead96
Merge pull request #12037 from humbletim/Leopoly_Phase1_004_RayPick-Changes 
Leopoly_Phase1_004_RayPick-Changes
 2018-01-29 14:02:38 -08:00
Dante Ruiz
264aa7f4d2
Merge pull request #12191 from druiz17/entity-attachment-bookmark 
Bookmark avatar entities
 2018-01-29 12:55:35 -08:00
Liv Erickson
634bc83ed5 fix elses 2018-01-29 12:54:52 -08:00
Liv Erickson
f8f76d6757 changing back to avatar only and making some changes to avoid multiple calls to dependency manager 2018-01-29 12:46:00 -08:00
Seth Alves
98e0e663e7 Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1 2018-01-29 12:36:37 -08:00
John Conklin II
e01bbcf10b
Merge pull request #12264 from sethalves/warn-for-head-position-nan 
print warnings if head position contains not-a-number
 2018-01-29 12:25:23 -08:00
samcake
1fd4c5c1a4 Integrating the tag flags to the render item key and adding configration of the render pipelien with the Tag information 2018-01-29 12:20:51 -08:00
MiladNazeri
9baf02b7a1
Merge pull request #12036 from humbletim/Leopoly_Phase1_003_Asset-Request 
Leopoly_Phase1_003_Asset-Request
 2018-01-29 11:40:41 -08:00
Liv Erickson
6a971e1362 remove restriction to be avatar only 2018-01-29 11:27:30 -08:00
Dante Ruiz
a637bac2fe remove debug statement 2018-01-29 11:26:28 -08:00
Dante Ruiz
a670a0b9a2 Merge branch 'master' of github.com:highfidelity/hifi into entity-attachment-bookmark 2018-01-29 11:25:26 -08:00
Liv Erickson
a10f7932bd Merge branch 'master' of https://github.com/highfidelity/hifi into feat/expose-identity-verification 2018-01-29 11:07:38 -08:00
Liv Erickson
0e3a01f1e8 it's working! removed my null pointer and just get it from the dependency manager when required 2018-01-29 10:20:16 -08:00
Andrew Meadows
c2817fc091 HMD low LOD threshold changed: 42 --> 34 2018-01-29 10:18:08 -08:00
Andrew Meadows
6acec39e92 HMD low LOD threshold changed: 45 --> 42 2018-01-29 10:05:23 -08:00
samcake
8dfa3aace3 cleaning en route 2018-01-26 17:34:37 -08:00
Liv Erickson
20635acf27 moving logic to wallet, crashes currently 2018-01-26 17:13:39 -08:00
humbletim
e2afcac534 include .extraInfo as part of RayPick API constructors 2018-01-26 18:34:13 -05:00
Seth Alves
b7303414f2 unmangle merges 2018-01-26 11:57:30 -08:00
Seth Alves
19409cc6ce fix merge/cherry-pick error 2018-01-26 10:45:18 -08:00
Seth Alves
3be42fe79a Merge branch 'master' of github.com:highfidelity/hifi into warn-for-head-position-nan 2018-01-26 10:36:26 -08:00
Seth Alves
17ec79f182 add breaks in case statements that used to have returns 2018-01-26 10:36:16 -08:00
Seth Alves
b8f3d8140d add breaks in case statements that used to have returns 2018-01-26 10:34:43 -08:00
Seth Alves
2962c8979c print warnings if head position contains not-a-number 2018-01-26 09:49:21 -08:00
Seth Alves
dbe9fd290e comment out code that would set annotations after StartHandler is called 2018-01-26 09:23:29 -08:00
Seth Alves
c550620cb4 backtrace for rc-63 2018-01-26 09:23:24 -08:00
Atlante45
df62ba88cb Fix rebase error 2018-01-26 09:22:37 -08:00
Seth Alves
9eb10c09da oops 2018-01-26 09:22:33 -08:00
Seth Alves
e32089d3dd only start crash hanlder if UserActivityLogger::isEnabled() is true 2018-01-26 09:22:22 -08:00
Atlante45
39f26e35f0 backtrace for rc-63 2018-01-26 09:22:14 -08:00
Seth Alves
6c04431636 call startCrashhandler from interface 2018-01-26 09:20:29 -08:00
Seth Alves
47f44eb21f extirpate bugsplat 2018-01-26 09:20:23 -08:00
Thijs Wenker
08b712281f Merge branch 'master' of github.com:highfidelity/hifi into feat/js-script-console-auto-complete 2018-01-26 18:10:47 +01:00
Olivier Prat
1aa41918d0 Merge branch 'master' of http://github.com/highfidelity/hifi into taa 2018-01-26 15:01:30 +01:00
Sam Gateau
51dac04374 Introducing the tag in lieu of the vsisiblity mask 2018-01-26 02:59:43 -08:00
Sam Gateau
23b99f04cd Merge branch 'master' of https://github.com/highfidelity/hifi into seth-branch 2018-01-25 18:33:37 -08:00
samcake
2f4e61888f Making it work maybe 2018-01-25 16:57:35 -08:00
Seth Alves
b6f7d2eb89 print warnings if head position contains not-a-number 2018-01-25 15:15:59 -08:00
Liv Erickson
3a6f184278 make clear function is for avatar entities only, add error handling in non-client entity cases 2018-01-25 15:13:14 -08:00
Liv Erickson
7e5684c439 use signals 2018-01-25 15:04:12 -08:00
Brad Davis
361b767586 Merge branch 'fix/render_config' into android 2018-01-25 14:50:41 -08:00
Thijs Wenker
45487a1e45 Merge branch 'master' of github.com:highfidelity/hifi into feat/js-script-console-auto-complete 
# Conflicts:
#	interface/CMakeLists.txt
 2018-01-25 22:51:35 +01:00
Thijs Wenker
179c21acf4 jsdoc info on selected auto-complete entry 2018-01-25 22:46:30 +01:00
Brad Davis
ab4e2d99f1 Don't try to set the current directory to a QRC path 2018-01-25 13:04:54 -08:00
Brad Davis
867bb99b51 Fix help screen URL 2018-01-25 13:04:08 -08:00
Brad Davis
ac94327ec7 Fix loading of the context overlay information icon 2018-01-25 12:44:55 -08:00
Liv Erickson
7ee5608992 initial first pass of exposing headless verification 2018-01-25 12:02:26 -08:00
Andrew Meadows
289356dfe7
Merge pull request #12227 from ZappoMan/sendDataDescription 
some settings cleanup
 2018-01-25 11:30:14 -08:00
ZappoMan
cb01bd14b9 Merge branch 'master' of https://github.com/highfidelity/hifi into sendDataDescription 2018-01-25 10:39:43 -08:00
John Conklin II
e081808ace
Merge pull request #12235 from luiscuenca/assetBrowserFix 
RC63 Fix Edit/Asset Browser in HMD mode
 2018-01-25 09:38:23 -08:00
Olivier Prat
5af4337b0e Merged with master 2018-01-25 10:11:53 +01:00
Olivier Prat
f3aac2a7b5 Merged with samcake/black 2018-01-25 09:27:48 +01:00
samcake
ae6a95ec0d fixing my bugs on vissibility 2018-01-24 18:07:35 -08:00
Zach Fox
94e1c425ab Fix MacOS Security Pic visibility; fix incorrect button state when changing pic 2018-01-24 17:03:16 -08:00
John Conklin II
1529fea983 Revert "Display both lasers on tablet and Web surfaces" 
(cherry picked from commit 455090d2b9)
 2018-01-24 14:51:42 -08:00
Andrew Meadows
a0e07a2c4b
Merge pull request #12232 from luiscuenca/showHelp 
Fix Interface first launch should show help
 2018-01-24 12:11:34 -08:00
Dante Ruiz
2cbcc28bd4 only call init animGraph once 2018-01-24 10:44:04 -08:00
samcake
38242072e5 Merge branch 'cauterize-head-av-entities-1' of https://github.com/sethalves/hifi into seth-branch 2018-01-23 16:30:54 -08:00
Seth Alves
1cbc2e31cf merge from upstream 2018-01-23 15:21:03 -08:00
Dante Ruiz
071f7d54d9 Merge branch 'master' of github.com:highfidelity/hifi into fix-camera-update 2018-01-23 14:44:26 -08:00
Dante Ruiz
6a03557801 don't override sensorToWorldMatrix 2018-01-23 14:44:10 -08:00
humbletim
65455e7b50 Merge remote-tracking branch 'upstream/master' into Leopoly_Phase1_004_RayPick-Changes 2018-01-23 14:57:33 -05:00
Brad Davis
5bf2bda96d Merge branch 'android' into android_new 2018-01-23 08:17:46 -08:00
luiscuenca
3c12ae8925 Fix Edit/Asset Browser in HMD mode 2018-01-22 20:52:18 -07:00
luiscuenca
6d6950deca Fix Interface first launch should show help 2018-01-22 16:25:58 -07:00
Brad Davis
6a91d549ce Fix stylus overlay 2018-01-22 15:08:26 -08:00
Brad Davis
8ae0b09ea2 Merge remote-tracking branch 'upstream/master' into android 2018-01-22 15:07:30 -08:00
Thijs Wenker
e8955fcd32 Merge branch 'master' of github.com:highfidelity/hifi into feat/js-script-console-auto-complete 2018-01-22 23:37:24 +01:00
Sam Gondelman
bdef05a326
Merge pull request #12221 from highfidelity/revert-12203-21703 
Revert "Display both lasers on tablet and Web surfaces"
 2018-01-22 12:27:00 -08:00
John Conklin II
4697c5f92c
Merge pull request #12225 from hyperlogic/bug-fix/sassy-avatar 
Fix for avatars with crooked spine/head when exiting HMD mode
 2018-01-22 11:50:44 -08:00
John Conklin II
22ee57db74
Merge pull request #12214 from 1st-BrainStormer/master 
Fix lockup when no midi devices present.
 2018-01-22 11:25:46 -08:00
Thijs Wenker
f4e6606c8d fix MyAvatar JS API typo 2018-01-22 19:01:13 +01:00
Seth Alves
f6b4cf4c60 Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1 2018-01-22 07:13:41 -08:00
Sam Gateau
d38d13cbb9 Trying to address the overlays to not be visisble in 2nd camera 2018-01-21 23:47:45 -08:00
ZappoMan
4ad5d34a10 more preferences cleanup, removing some dead code from ScriptEngines/ScriptModel 2018-01-20 17:20:42 -08:00
Bruce Brown
f7caba5295 de-bounce Midi::USBchanged signal. 
Debounced USBchanged signal to prevent pauses.
 2018-01-20 11:17:47 -08:00
ZappoMan
ab9041bcab remove LOAD DEFAULT SCRIPTS from General Preferences, since it already exists on Running Scripts 2018-01-20 00:14:44 -08:00
ZappoMan
027a1e69f4 some settings cleanup, adding description to Send Data 2018-01-20 00:08:06 -08:00
Anthony J. Thibault
cd4d9255bd Added defaultPoseFlags to avatar protocol 
Change rotationSet to rotationIsDefaultPose for JointData
Also for translation.  Fixed all code to flip boolean value.
Created EntityJointData so that the ModelEntity stuff doesn't need to change.
 2018-01-19 15:34:27 -08:00
John Conklin II
455090d2b9
Revert "Display both lasers on tablet and Web surfaces" 2018-01-19 15:15:52 -08:00
John Conklin II
db5bf68431
Merge pull request #12203 from ctrlaltdavid/21703 
Display both lasers on tablet and Web surfaces
 2018-01-19 15:15:44 -08:00
Brad Davis
3e7872637d Merge branch 'android' into android_new 2018-01-19 14:40:01 -08:00
Brad Davis
d53b8b38ac Merge remote-tracking branch 'upstream/master' into android 2018-01-19 14:35:20 -08:00
Brad Davis
686393d62f Load built-in resources earlier 2018-01-19 14:35:04 -08:00
Seth Alves
9be2c67f00 Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1 2018-01-19 11:46:34 -08:00
Zach Fox
9d6e62d6bf
Merge pull request #12163 from ElderOrb/FB11109 
FB11109 Preview disabled image swap (Commerce only)
 2018-01-19 11:40:05 -08:00
Dante Ruiz
c71fa110db update file dates and remove debug state 2018-01-19 11:31:13 -08:00
Dante Ruiz
139266fe80 remove unneeded code 2018-01-19 11:24:06 -08:00
Ryan Downe Karpf
f1b18ccc00
Merge pull request #12184 from ctrlaltdavid/21700 
Add Window browseChanged signal as replacement for openFileChanged
 2018-01-19 10:45:27 -08:00
Thijs Wenker
a31fe7546a - remove debug 
- fix API export JSON filename
- fix warnings
 2018-01-19 19:45:25 +01:00
Brad Davis
3dba928b72 Merge remote-tracking branch 'upstream/android' into android_new 2018-01-19 10:36:46 -08:00
Thijs Wenker
0f7f58417b JS scripting console auto-complete 2018-01-19 19:11:12 +01:00
Seth Alves
bce9b5f459 Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1 2018-01-19 09:53:54 -08:00
Seth Alves
6aa389cad0 trying to now show overlays in mirrors 2018-01-19 09:53:41 -08:00
David Rowe
fb684909ce Merge branch 'master' into 21703 2018-01-19 17:25:12 +13:00
David Rowe
e0e6fc711b Replace Pointers API function setNonHoverItems() with setDoesHover() 2018-01-19 16:05:09 +13:00
humbletim
dfb1619dc6 CR feedback; using namespace AssetUtils => inline AssetUtils:: 2018-01-18 21:49:53 -05:00
Brad Davis
bdfa1273ba Merge remote-tracking branch 'upstream/master' into android 2018-01-18 17:33:10 -08:00
David Kelly
2e4fc5e58c
Merge pull request #12207 from davidkelly/dk/placesInHfcTransferHistory 
nearby hfc transfers should send the location
 2018-01-18 16:46:34 -08:00
David Kelly
844ec6a863 eliminate dash in history, replace with 0 HFC 2018-01-18 16:02:40 -08:00
Clément Brisset
37504eca15
Merge pull request #12186 from ctrlaltdavid/21702 
Add Window.protocolSignature() as a replacement for location.protocolVersion()
 2018-01-18 15:20:03 -08:00
Brad Hefta-Gaub
f3dfad6c59
Merge pull request #12155 from ctrlaltdavid/21689 
Remove unused "anchor" Overlays property
 2018-01-18 15:04:41 -08:00
Sam Gateau
aec99db4fc
Merge pull request #12157 from AndrewMeadows/lod-debug-ui 
add scripted/qml debug UI for render LOD
 2018-01-18 15:00:50 -08:00
Brad Hefta-Gaub
c9cedcb2c0
Merge pull request #12183 from SamGondelman/pointerCrash 
Destroy PointerManager before PickManager
 2018-01-18 14:58:20 -08:00
David Kelly
21cc6ee8dd fix marketplace txn display (memo only) 2018-01-18 14:28:25 -08:00
Seth Alves
31c007d167 more backwards logic, added withViewVisibilityMask call in ItemKey 2018-01-18 14:15:30 -08:00
Seth Alves
7c32d3c536 flip logic back around 2018-01-18 13:49:17 -08:00
David Kelly
2b7576cef5 Merge branch 'master' of github.com:highfidelity/hifi into dk/placesInHfcTransferHistory 2018-01-18 13:00:07 -08:00
David Kelly
9a523ead31 fix link 2018-01-18 12:44:45 -08:00
Alexander Ivash
a74b093b60 FB11109 Preview disabled image swap (Commerce only) 2018-01-18 23:26:43 +03:00
David Rowe
8c2427dd58 Rename Window.protocolVersion() to Window.protocolSignature() 2018-01-19 09:06:16 +13:00
David Kelly
2cdbc1159e nearby hfc transfers should send the location too 2018-01-18 11:15:32 -08:00
Seth Alves
fb974b0b9c attempt to straighten out use of view-visibility masks 2018-01-18 10:09:23 -08:00
Brad Davis
d3c4b0ef45 Merge remote-tracking branch 'gcalero/android_virtual_touchpad' into android_new 2018-01-18 10:04:03 -08:00
Anthony J. Thibault
c5efcf5d6a Bug fix for cocked head after playing an input recording. 
I thought this was the cause of the Manuscript case 11454 but apparently not.
 2018-01-18 09:21:15 -08:00
Andrew Meadows
2c43138e14 slightly faster auto LOD adjust 2018-01-18 08:53:45 -08:00
Andrew Meadows
80c43bd0f7 fix typo in variable name 2018-01-18 08:53:45 -08:00
Andrew Meadows
9a1a10b4e1 remove cruft and use more correct names 2018-01-18 08:53:45 -08:00
Andrew Meadows
82cab5e4a1 add scripted/qml debug UI for render LOD 2018-01-18 08:53:45 -08:00
Seth Alves
d897b1c1eb Merge branch 'visible-perview' of github.com:samcake/hifi into cauterize-head-av-entities-1 2018-01-18 07:02:20 -08:00
Seth Alves
76ef3d7c7d pull from upstream 2018-01-18 07:01:50 -08:00
Sam Gateau
7a9740d258 visible-perview 2018-01-18 02:18:46 -08:00
Brad Davis
cbb2d9d854 Merge remote-tracking branch 'upstream/master' into android 2018-01-17 17:51:39 -08:00
David Kelly
c661bec8fd whitespace 2018-01-17 17:15:14 -08:00
David Rowe
ee2936d133 Add Pointers API function that disables hover events for nominated items 2018-01-18 14:07:07 +13:00
David Kelly
1dde25e38f Don't make links in txn history for highfidelity and marketplace 2018-01-17 16:51:38 -08:00
Zach Fox
5ce768f402
Merge pull request #12151 from zfox23/commerce_sendMoney1 
Commerce: P2P Transfer Iteration 1
 2018-01-17 16:41:56 -08:00
Dante Ruiz
eadd3b48bd bookmark avatar-entities-done 2018-01-17 15:42:07 -08:00
Zach Fox
16d51986a9 Make the call to receiveAt more robust 2018-01-17 15:11:58 -08:00
Dante Ruiz
8f22c719b3
Merge pull request #12099 from sethalves/run 
allow avatar walk-speed to be set from javascript
 2018-01-17 13:53:13 -08:00
Seth Alves
7af90d5429
Merge pull request #12171 from mnafees/21671 
CR for Job #21671 - Window.copyToClipboard() doesn't work in .js files
 2018-01-17 13:42:47 -08:00
Seth Alves
33c586de60
Merge pull request #12188 from hyperlogic/feature/small-anim-refactor 
Remove dangerous "Use Anim Pre and Post Rotations" menu item
 2018-01-17 13:41:51 -08:00
Zach Fox
1d747bc0e4 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1 2018-01-17 11:56:00 -08:00
Bradley Austin Davis
9f6c2c3cdd Merge remote-tracking branch 'upstream/master' into android 2018-01-17 11:44:00 -08:00
Dante Ruiz
3ba0eaa13d fix typo 2018-01-17 11:05:55 -08:00
Dante Ruiz
ebb09f4271 Merge branch 'master' of github.com:highfidelity/hifi into entity-attachment-bookmark 2018-01-17 11:04:46 -08:00
Dante Ruiz
3abb3d6fcc trying to add offset 2018-01-17 11:04:32 -08:00
David Back
92c0fd4877
Merge pull request #12116 from dback2/deleteAccount_renameGS_addAS 
Merge Account & GlobalServices follow-up
 2018-01-17 10:50:54 -08:00
Gabriel Calero
970ca5e08f Add virtual pad for android 2018-01-17 15:00:43 -03:00
Seth Alves
1e847cf32e Merge branch 'master' of github.com:highfidelity/hifi into run 2018-01-17 08:08:13 -08:00
Seth Alves
69a33428c0
Merge pull request #12078 from druiz17/soft-entities 
Soft Entities
 2018-01-17 08:02:37 -08:00
Seth Alves
d3084dc0df defang 2018-01-17 07:11:27 -08:00
Seth Alves
bfccb52b7a Merge branch 'master' of github.com:highfidelity/hifi into run 2018-01-17 07:02:14 -08:00
Brad Davis
6a06bf405a Merge remote-tracking branch 'upstream/master' into android 2018-01-16 18:24:44 -08:00
Sam Gateau
d4571bd86a
Merge pull request #12181 from humbletim/rename-model-graphics 
Rename libraries/model -> libraries/graphics
 2018-01-16 18:12:25 -08:00
Anthony J. Thibault
51ea2632c0 Remove Avatar UseAnimPreAndPostRotations option. 
This should always be true and can lead to hard to diagnose bugs if it is ever set to false.
 2018-01-16 17:27:19 -08:00
Dante Ruiz
92a259fd63 fix setting correct joint index 2018-01-16 16:41:06 -08:00
Zach Fox
e700ff91d0 Remove warning 2018-01-16 15:58:17 -08:00
Dante Ruiz
7707e68234 bookmarks add back avatar-entities 2018-01-16 15:37:03 -08:00
Zach Fox
8cc427a374 Merge branch 'dk/senderAndRecipientInTxnHistory' of https://github.com/davidkelly/hifi into commerce_sendMoney1 2018-01-16 15:07:53 -08:00
David Rowe
2883e24285 Add Window.protocolVersion() as a replacement for location's 2018-01-17 12:00:35 +13:00
David Kelly
929760c226 fix time display 2018-01-16 14:52:26 -08:00
Bradley Austin Davis
b4223215ef Use old style resources on OSX for now 2018-01-16 14:44:05 -08:00
Seth Alves
511f94a4fc Merge branch 'master' of github.com:highfidelity/hifi into run 2018-01-16 14:01:54 -08:00
Zach Fox
d64b35729f Merge branch 'dk/senderAndRecipientInTxnHistory' of https://github.com/davidkelly/hifi into commerce_sendMoney1 2018-01-16 13:44:29 -08:00
David Rowe
85bda1da8e Add Window browseChanged signal as replacement for openFileChanged 2018-01-17 09:57:20 +13:00
David Kelly
d8f8f9ff1a First cut at alan's new design 2018-01-16 11:19:10 -08:00
Clément Brisset
1949471dad
Merge pull request #12182 from highfidelity/stable 
Merge stable (RC62) to master
 2018-01-16 11:01:07 -08:00
SamGondelman
c3eb4b5ecd destroy pointermanager before pickmanager 2018-01-16 10:31:42 -08:00
Mohammed Nafees
885801c5ca Fix copying to clipboard from JS scripts 2018-01-16 13:17:47 -05:00
humbletim
b91d536dd0 rename model:: -> graphics:: 2018-01-16 12:46:16 -05:00
humbletim
08ccda9cfc rename libraries/model(src/model) -> libraries/graphics(src/graphics) 2018-01-16 12:44:44 -05:00
Seth Alves
12db51728e Merge branch 'master' of github.com:highfidelity/hifi into run 2018-01-16 07:50:55 -08:00
Dante Ruiz
69389116f5 add menu option for AvatarEntitiesBookmarks 2018-01-15 16:47:48 -08:00
MiladNazeri
c7cdf6b8f6
Merge pull request #12145 from ctrlaltdavid/21684 
Update Window JSDoc per recent API changes
 2018-01-15 14:50:40 -08:00
Seth Alves
06dd680dc9 Merge branch 'master' of github.com:highfidelity/hifi into run 2018-01-15 13:48:10 -08:00
Brad Davis
d10d7026c5 Force Qt to use ANGLE when in GLES mode on Windows 2018-01-15 13:42:41 -08:00
Dante Ruiz
645f608814 fixing merge conflict 2018-01-15 10:45:51 -08:00
John Conklin II
c3648fb04c
Merge pull request #12168 from druiz17/RC62 
fix Asset browser for tablet (RC62)
 2018-01-15 10:16:56 -08:00
Zach Fox
f7ed8c10fa Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1 2018-01-15 10:13:07 -08:00
Brad Davis
58530c595a Pre-merge cleanup 2018-01-14 19:48:12 -08:00
Seth Alves
a7d658c857 Merge branch 'master' of github.com:highfidelity/hifi into run 2018-01-14 12:34:31 -08:00
Brad Davis
55bfdc105b Switch android to GLAD 2018-01-14 10:22:18 -08:00
Brad Davis
acb95d1355 GLAD polish 2018-01-14 00:10:05 -08:00
Brad Davis
24b83aa0f1 Merge remote-tracking branch 'sam/android-gles' into windows_gles 2018-01-13 11:36:31 -08:00
Brad Davis
17899d5e07 Don't create share context for web while running nsight 2018-01-13 11:32:23 -08:00
Sam Gateau
df0660f823 Merge branch 'master' of https://github.com/highfidelity/hifi into android-gles 2018-01-13 01:00:41 -08:00
Sam Gateau
331a8f3094 fixing the stencil not clearing correctly and shaders not compiled correctly in main thread 2018-01-13 01:00:10 -08:00
Brad Davis
ab7aa52a10 GLES emulaton on windows 2018-01-12 19:17:35 -08:00
Dante Ruiz
8e4bd2d662 fix asset browser for tablet 2018-01-12 17:11:02 -08:00
Dante Ruiz
a48304b104 fix Asset browser for tablet 2018-01-12 17:06:07 -08:00
Zach Fox
e627925bd3 Fix 'Browse Avatars' button from Avatar Settings 2018-01-12 15:14:42 -08:00
David Kelly
6cedc016c4 Adding sender/recipient to transaction history for hfc transfers 2018-01-12 16:08:52 -07:00
David Kelly
579a4d85b3 Merge branch 'commerce_sendMoney1' of https://github.com/zfox23/hifi into dk/senderAndRecipientInTxnHistory 2018-01-12 14:37:46 -07:00
Zach Fox
6920e57613 Fix 'Browse Avatars' button from Avatar Settings 2018-01-12 13:31:58 -08:00
Dante Ruiz
5b82c7bc41 fix merge conflict 2018-01-12 11:00:19 -08:00
Brad Davis
7579451c24 Merge remote-tracking branch 'upstream/master' into android 2018-01-11 23:31:45 -08:00
Brad Davis
22d133c71f Allow GLES client on desktop builds 2018-01-11 23:31:34 -08:00
Seth Alves
e7a3d98ae5 don't draw head-descendent entities when in 1st-person camera mode 2018-01-11 19:34:54 -08:00
Dante Ruiz
96a97b5938 added model transform override 2018-01-11 16:41:45 -08:00
David Rowe
5dca387055 Remove old, unused overlay panel code 2018-01-12 12:47:22 +13:00
David Rowe
9b0fb19cfa Remove unused "anchor" Overlays property 2018-01-12 12:16:58 +13:00
howard-stearns
2987d21f66 remove some more 2018-01-11 13:15:34 -08:00
Zach Fox
81ab5ac81c hfc_key -> public_key 2018-01-11 12:50:25 -08:00
Zach Fox
d25ef074e1 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1 2018-01-11 12:35:18 -08:00
howard-stearns
c39771d995 do not delete wallet file when things go wrong, and remove obsolete 
reset machinery
 2018-01-11 11:50:23 -08:00
Seth Alves
c09f644612 Merge branch 'master' of github.com:highfidelity/hifi into run 2018-01-11 09:09:11 -08:00
Sam Gateau
9bc02ec564 simple changes to try debugging the stereo rendering 2018-01-10 21:01:26 -08:00
David Rowe
a543d90090 Miscellaneous fixes 2018-01-11 15:53:45 +13:00
David Rowe
7ba42f0e76 Update JSDoc per recent changes in Window API 2018-01-11 15:52:56 +13:00
Seth Alves
568c27d6e0
Merge pull request #12039 from luiscuenca/currentAPI 
Fix and improve currentAPI.js
 2018-01-10 17:55:08 -08:00
Seth Alves
aefd294bf2
Merge pull request #12107 from hyperlogic/bug-fix/better-third-person-camera 
Improve stability for HMD third person avatars
 2018-01-10 17:46:47 -08:00
Brad Davis
560fd38547 Merge remote-tracking branch 'upstream/master' into android 2018-01-10 17:31:50 -08:00
Andrew Meadows
b3fcca8446
Merge pull request #12132 from hyperlogic/bug-fix/prevent-hands-from-entering-body 
Bug fix to prevent wrists entering the avatar's torso.
 2018-01-10 17:22:50 -08:00
Brad Davis
97593bc4d8 Fixing compiled resource access 2018-01-10 17:18:12 -08:00
MiladNazeri
301731554f
Merge pull request #12102 from cain-kilgore/21664 
WL 21664 - Window.innerHeight should not include the menu bar
 2018-01-10 17:10:14 -08:00
Zach Fox
939012a2d0 Hook up the endpoints! 2018-01-10 17:10:05 -08:00
Zach Fox
c15b1669b1 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1 2018-01-10 15:53:23 -08:00
Triplelexx
24f1fc3546 fix Ui keyboard navigation 
various fixes to allow some support for keyboard navigation in message boxes and dialogs
 2018-01-10 22:30:43 +00:00
Seth Alves
ddc730f49f Merge branch 'master' of github.com:highfidelity/hifi into run 2018-01-10 13:49:07 -08:00
Brad Davis
2c35242af1 Merge remote-tracking branch 'upstream/master' into android_nov 2018-01-10 13:40:12 -08:00
Brad Davis
7a7aee770c Switching to binary resources 2018-01-10 13:39:56 -08:00
MiladNazeri
b73106fa7e
Merge pull request #12120 from cain-kilgore/21666 
WL 21666 - Window.domainChanged() isn't emitted if domain isn't running
 2018-01-10 12:30:21 -08:00
Cain Kilgore
b26e31a362
Copy paste? Never! 2018-01-10 20:27:19 +00:00
MiladNazeri
2220b976dc
Merge pull request #12130 from cain-kilgore/21665 
WL 21665 - Window.takeSecondaryCameraSnapshot() should emit a stillSnapshotTaken signal
 2018-01-10 12:06:58 -08:00
Anthony J. Thibault
250e4032b0 Bug fix to prevent wrists entering the avatar's torso. 
This was inadvertently disabled in PR #11978.

(cherry picked from commit ae997928c1)
 2018-01-10 12:04:50 -08:00
MiladNazeri
bf61d8c7b3
Merge pull request #12115 from ctrlaltdavid/deprecations 
Update JSDoc with some deprecations
 2018-01-10 12:04:21 -08:00
Anthony J. Thibault
ae997928c1 Bug fix to prevent wrists entering the avatar's torso. 
This was inadvertently disabled in PR #11978.
 2018-01-10 11:51:44 -08:00
Anthony J. Thibault
220b7f5e55 Merge branch 'master' into bug-fix/better-third-person-camera 2018-01-10 10:14:09 -08:00
Dante Ruiz
d0bff29471 fixing merge conflict 2018-01-10 10:11:53 -08:00
Zach Fox
e5abdc77d9 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1 2018-01-10 10:02:56 -08:00
Andrew Meadows
7060cd9a90
Merge pull request #12122 from druiz17/fix-double-set-tablet-root 
don't call setQmlTabletRoot twice
 2018-01-10 09:53:09 -08:00
Sam Gateau
d4dc1e352f
Merge pull request #12124 from AndrewMeadows/no-misc-stats 
more context for update performance stats
 2018-01-10 09:10:26 -08:00
Sam Gateau
8c80247925
Merge pull request #12123 from SamGondelman/meta 
Model meta render item is only withTypeShape if visual geometry request fails
 2018-01-10 09:09:19 -08:00
Seth Alves
3816c732c0 Merge branch 'run' of github.com:sethalves/hifi into run 2018-01-10 08:11:55 -08:00
Seth Alves
8cf94547e4 Merge branch 'master' of github.com:highfidelity/hifi into run 2018-01-10 08:11:46 -08:00
Cain Kilgore
330b266ca8 Merge branch 'master' of https://github.com/highfidelity/hifi into 21665 2018-01-10 11:33:06 +00:00
Cain Kilgore
38afc5a25b WL 21665 - Window.takeSecondaryCameraSnapshot() should emit a stillSnapshotTaken signal 2018-01-10 11:31:46 +00:00
Brad Davis
b1e95681a9 Cleanup android 2018-01-09 23:30:31 -08:00
Brad Davis
fb59a0a56f Merge remote-tracking branch 'upstream/master' into android_nov 2018-01-09 20:02:55 -08:00
Brad Davis
105dffebaf Fixing UI 2018-01-09 18:36:42 -08:00
Zach Fox
928e3d2ef7
Merge pull request #12108 from zfox23/commerce_pagination 
Commerce: Support pagination at History endpoint; improve Purchases scrolling
 2018-01-09 15:57:34 -08:00
Dante Ruiz
c4253f3b3b Merge branch 'master' of github.com:highfidelity/hifi into soft-entities 2018-01-09 15:31:38 -08:00
vladest
075bcba49f AddressBar trigger implemented. Fixed warnings on non existing context properties. Fixed warnings about non notifyable property 2018-01-09 23:48:40 +01:00
Zach Fox
edf25c3e4e Remove code duplication... 2018-01-09 14:14:54 -08:00
Zach Fox
a6259a5ef5 Initial progress 2018-01-09 13:39:28 -08:00
Andrew Meadows
8c6edc749a provide more context for update perf stats 2018-01-09 12:59:32 -08:00
SamGondelman
7c56a9ffb2 model meta is only withTypeShape if visual geometry request fails 2018-01-09 12:43:43 -08:00
Zach Fox
d31dec7acb Fix unix build errors 2018-01-09 12:41:56 -08:00
John Conklin II
b1790cccbe
Merge pull request #12113 from druiz17/fix-double-set-tablet-root 
Don't call setQmlTabletRoot twice for Web3dOverlays RC62
 2018-01-09 12:25:00 -08:00
Brad Davis
d6dd29b952 Merge remote-tracking branch 'upstream/master' into android_nov 2018-01-09 11:43:03 -08:00
Brad Davis
bd5af2b493 Working on android avatar rendering 2018-01-09 11:40:32 -08:00
Zach Fox
360a7cc4c6 CR feedback 2018-01-09 11:08:18 -08:00
Anthony J. Thibault
e28f13c1db Merge branch 'master' into bug-fix/better-third-person-camera 2018-01-09 10:34:04 -08:00
Cain Kilgore
0e3913baff Removed Window.menuHeight 2018-01-09 09:07:26 +00:00
Cain Kilgore
773461bd30 Merge branch 'master' of https://github.com/highfidelity/hifi into 21666 2018-01-09 08:33:44 +00:00
Cain Kilgore
46de7ed83b WL 21666 - Window.domainChanged() isn't emitted if domain isn't running 2018-01-09 08:32:59 +00:00
Sam Gateau
3fd319abec Merge branch 'master' of https://github.com/highfidelity/hifi into black 2018-01-08 21:11:17 -08:00
luiscuenca
9a81410762 refactor 2018-01-08 20:51:15 -07:00
luiscuenca
319913e6af Fix toolbar appears on HMD mode 2018-01-08 20:37:07 -07:00
David Back
13c34b2d33 add AccountServices context 2018-01-08 17:37:48 -08:00
David Rowe
3d9d2a1859 Filed overlay property has been removed 2018-01-09 14:35:02 +13:00
David Back
43cd5586f3 nuke AccountScriptingInterface, rename GlobalServicesScriptingInterface to AccountServicesScriptingInterface 2018-01-08 17:25:58 -08:00
Seth Alves
d0ddbc0092 fix warning 2018-01-08 16:52:07 -08:00
Dante Ruiz
4cf40554c0 don't call setQmlTabletRoot twice 2018-01-08 16:06:31 -08:00
Seth Alves
8ed72dd276 Merge branch 'master' of github.com:highfidelity/hifi into run 2018-01-08 15:53:21 -08:00
David Rowe
8016ae1bf3 Fix typo 2018-01-09 12:47:12 +13:00
David Rowe
ceb2d38103 Deprecate Overlays.getOverlayObject() 2018-01-09 12:45:12 +13:00
Seth Alves
e0bbf9ee41 Merge branch 'master' of github.com:highfidelity/hifi into run 2018-01-08 15:28:02 -08:00
Seth Alves
ad389e5072 make avatar walk-speed adjustable from js. add a tablet button to control walking vs running 2018-01-08 15:27:41 -08:00
Brad Davis
a2c2e7d9ff Fixes to load cubemap 2018-01-08 14:43:54 -08:00
Anthony Thibault
f4c38b91b3
Merge pull request #12071 from luiscuenca/handTouch 
Touch feeling for near grab
 2018-01-08 12:50:30 -08:00
Gabriel Calero
7fbd23f36b Merge branch 'android_render_pr' of https://github.com/gcalero/hifi into android_render_pr 2018-01-08 17:38:28 -03:00
Gabriel Calero
6050737e7c Resolving comments in PR 2018-01-08 17:36:08 -03:00
Seth Alves
1c94c9c11d Merge branch 'master' of github.com:highfidelity/hifi into run 2018-01-08 12:27:42 -08:00
Seth Alves
f1c03b2d40 adjust RENDER_HEAD_CUTOFF_DISTANCE so that I don't see my head when I run 2018-01-08 12:27:35 -08:00
Zach Fox
dcfceab078 Remove all work done on paginating purchases 2018-01-08 12:03:56 -08:00
MiladNazeri
56d4429a8b
Merge pull request #12020 from ctrlaltdavid/21646 
Window JSDoc
 2018-01-08 11:53:34 -08:00
Zach Fox
2231bf2bdd Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_pagination 2018-01-08 11:45:20 -08:00
Zach Fox
cdd62c7119 I don't think auto-refresh and pagination of inventory is possible 2018-01-08 11:29:41 -08:00
Anthony J. Thibault
61edd83987 Improve stability for HMD third person avatars 
Previously there was a hack where the sensor to world matrix was NOT updated in HMD mode if the camera was third person.
The reason the hack existed was to make third person camera less nauseating for users.
However this had a major drawbacks.
It led to avatar hip spasms when the user turned around in the tracked volume, while in third person camera.

To fix this issue properly, the hack which prevented updating the sensor to world matrix was removed, and now the third person camera is now computed in sensor space relative to the hmd.
 2018-01-08 11:26:29 -08:00
David Rowe
7a971b2d26 Fix typo 2018-01-09 08:17:15 +13:00
John Conklin II
d660bbf6e5
Merge pull request #12101 from hyperlogic/bug-fix/avatar-sit 
Bug fix for sit script.
 2018-01-08 09:59:17 -08:00
Bradley Austin Davis
68cd768a65
Merge branch 'android' into android_render_pr 2018-01-08 12:49:52 -05:00
Seth Alves
f6fed444b0 Merge branch 'master' of github.com:highfidelity/hifi into run 2018-01-08 07:49:09 -08:00
Sam Gateau
a9f1e4102b Merge branch 'master' of https://github.com/highfidelity/hifi into black 2018-01-07 22:19:38 -08:00
Howard Stearns
724db93389
Merge pull request #12002 from howard-stearns/consistent-goToUser 
Consistent go to user
 2018-01-07 11:07:39 -08:00
luiscuenca
8a7c68829d Optimizations, cleanings and globals 2018-01-07 11:56:30 -07:00
Cain Kilgore
47038e4349 WL 21664 - Window.innerHeight should not include the menu bar 2018-01-07 08:31:36 +00:00
Seth Alves
fdead46642 Merge branch 'master' of github.com:highfidelity/hifi into run 2018-01-06 08:07:28 -08:00
David Rowe
673bc7de38 Update Window JSDoc 2018-01-06 16:05:55 +13:00
Anthony J. Thibault
243dcb88ee Bug fix for sit script. 2018-01-05 16:20:44 -08:00
Zach Fox
0c38a5598f
Merge pull request #12085 from zfox23/commerce_fixHandControllerInspection 
Fix bugs related to inspecting entities with hand controllers
 2018-01-05 15:50:00 -08:00
luiscuenca
4f6a804fd1 Fix magic numbers 2018-01-05 16:27:48 -07:00
Andrew Meadows
b28684f15e
Merge pull request #12087 from ctrlaltdavid/21661 
Laser auto-on with tablet and Web overlays
 2018-01-05 14:08:01 -08:00
Brad Hefta-Gaub
aebd098e6e
Merge pull request #12072 from Triplelexx/21654_assetbrowser_sorting 
WL#21654: Make the Asset Browser Sort Case Insensitive
 2018-01-05 13:34:39 -08:00
Seth Alves
3cd0ec3336 default run speed is faster, advanced movement on by default 2018-01-05 13:20:41 -08:00
samcake
abc029fd41 Merge branch 'master' of https://github.com/highfidelity/hifi into black 2018-01-05 12:28:12 -08:00
Sam Gateau
91eb718074
Merge pull request #12091 from SamGondelman/overlayFix 
Update model render items on texture load and fix no haze issue
 2018-01-05 12:26:56 -08:00
samcake
50c97ede2b Merge branch 'master' of https://github.com/highfidelity/hifi into black 2018-01-05 11:55:43 -08:00
David Back
b165eac6a0
Merge branch 'master' into mergeAccountGlobalServices 2018-01-05 10:54:59 -08:00
Melissa Brown
eb83c68d46
Merge pull request #12094 from ctrlaltdavid/resolution-removed 
Delete web3d overlay "resolution" property JSDoc
 2018-01-05 10:38:07 -08:00
Andrew Meadows
c33c637f07
Merge pull request #12041 from vladest/case_10854_fix_not_loading_dialogs 
Adopt path to certain Tablet dialogs to new loading subsystem and pat…
 2018-01-05 09:07:54 -08:00
Ryan Downe Karpf
a3245aec57
Merge pull request #12079 from RebeccaStankus/log-filtering 
Log filtering
 2018-01-05 08:40:41 -08:00
Seth Alves
fd8b521c50
Merge pull request #12038 from ElderOrb/audio_name_conflict_fix 
Audio name conflict fix (fix for https://github.com/highfidelity/hifi/issues/11963)
 2018-01-05 08:15:48 -08:00
David Rowe
5463f1ae6b Merge branch 'master' into 21646 2018-01-05 16:58:58 +13:00
David Rowe
d6a0457ee5 Delete web3d overlay "resolution" property JSDoc 2018-01-05 16:48:37 +13:00
Lexx
85b54f82d8
revert sorting change mistake 2018-01-05 01:58:23 +00:00
NissimHadar
43bc8bb948
Merge pull request #11939 from AndrewMeadows/dont-disable-default-motor 
defang accidental disable of MyAvatar's default motor
 2018-01-04 17:44:22 -08:00
Zach Fox
0388c183ab Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_pagination 2018-01-04 16:42:12 -08:00
SamGondelman
eb0d09360a Merge remote-tracking branch 'upstream/master' into overlayFix 2018-01-04 15:47:20 -08:00
Zach Fox
ea29d8bde0 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_fixHandControllerInspection 2018-01-04 15:41:27 -08:00
Zach Fox
4232bc0200 Bump per_page to 100 2018-01-04 14:42:05 -08:00
Dante Ruiz
b526842a46 Merge branch 'master' of github.com:highfidelity/hifi into soft-entities 2018-01-04 14:23:10 -08:00
Zach Fox
14447c26a0 Prevent visual data loss 2018-01-04 13:47:31 -08:00
David Back
81f3590954 Merge branch 'master' of https://github.com/highfidelity/hifi into mergeAccountGlobalServices 2018-01-04 13:17:07 -08:00
SamGondelman
6a19b0e0b6 update render items on texture load 2018-01-04 13:10:46 -08:00
RebeccaStankus
9ba324b85f "Clear Filter" button instead of "Show All" 2018-01-04 12:51:11 -08:00
RebeccaStankus
3e8063f80a Merge branch 'master' of https://github.com/highfidelity/hifi into log-filtering 2018-01-04 12:48:09 -08:00
Gabriel Calero
8cac98545a Fixes for Android 2018-01-04 17:36:10 -03:00
Zach Fox
10d494b51d Pagination for Recent Activity 2018-01-04 12:32:30 -08:00
Clément Brisset
efbff56f26
Merge pull request #11925 from Atlante45/feat/remove-jurisdiction-listener 
Remove legacy jurisdiction code
 2018-01-04 11:52:38 -08:00
RebeccaStankus
f52a6d8eae Merge branch 'master' of https://github.com/highfidelity/hifi into log-filtering 2018-01-04 10:49:32 -08:00
luiscuenca
ef0164c272 Fix tabs 2018-01-04 11:43:51 -07:00
luiscuenca
28d9409bf0 Fix default hand poses 2018-01-04 11:37:37 -07:00
David Rowe
7236ac17e2 Merge branch 'master' into 21661 2018-01-04 15:21:00 +13:00
David Rowe
138092ac37 Remove "Prefer Avatar Finger Over Stylus" setting 2018-01-04 15:12:34 +13:00
Zach Fox
ff4f582c7d Thanks Howard 2018-01-03 17:23:35 -08:00
David Back
6c8987d75f Merge branch 'master' of https://github.com/highfidelity/hifi into mergeAccountGlobalServices 2018-01-03 14:44:52 -08:00
Cristian Luis Duarte
da28e0a8cb Implement generateAssetsFileList in build.gradle (same work as assets file generation by androiddeployqt) + Copy assets at startup 2018-01-03 16:42:18 -03:00
Gabriel Calero
fc62b2d34a Fix ktx_cache path for android. Load the least js scripts for android 2018-01-03 16:42:18 -03:00
Gabriel Calero
ef8ba1cad0 Include config.h in ResourceImageItem.cpp. Minor fixes 2018-01-03 16:40:14 -03:00
Gabriel Calero
78f2a8c566 Copy scripts from android assets at startup 2018-01-03 16:40:14 -03:00
Gabriel Calero
468fc89c3e Use forward pipeline for android 2018-01-03 16:38:23 -03:00
Gabriel Calero
76b38bebad Make Interface run in Android 2018-01-03 16:36:11 -03:00
RebeccaStankus
89138c9bd8 More filter choices, search will clear 2018-01-03 11:35:46 -08:00
Dante Ruiz
674e8e1ac2 Merge branch 'master' of github.com:highfidelity/hifi into soft-entities 2018-01-03 08:47:40 -08:00
humbletim
4021455058 placeholder PickResult.extraInfo documentation 2018-01-03 04:20:12 -05:00
David Rowe
901af8896f Add "Prefer Stylus Over Laser" setting 2018-01-03 17:54:43 +13:00
David Rowe
6e43497e14 Merge tag 'RELEASE-7602' into 21661 
Jenkins Git plugin tagging with RELEASE-7602
 2018-01-03 16:46:10 +13:00
RebeccaStankus
dd48972e44 Merge branch 'master' of https://github.com/highfidelity/hifi into log-filtering 2018-01-02 14:06:41 -08:00
RebeccaStankus
0b452a23dc forgot to add hifi.entities to filter selections 2018-01-02 14:04:30 -08:00
RebeccaStankus
bf59697aa5 better dropdown 2018-01-02 13:56:49 -08:00
Dante Ruiz
6fa3446c57 joints are being relayed to children 2018-01-02 13:54:13 -08:00
David Rowe
7013f64714 Remove erroneous "filed" Overlay property 2018-01-03 10:37:37 +13:00
RebeccaStankus
d08e97f9cc more filter options 2018-01-02 13:28:39 -08:00
RebeccaStankus
fe69498976 initial changes...ready for feedback 2018-01-02 13:04:52 -08:00
RebeccaStankus
0117750757 PR for Feedback 2018-01-02 12:28:31 -08:00
Elisa Lupin-Jimenez
a63538c4e9
Merge pull request #12021 from elisa-lj11/poly_api 
Google Poly API
 2018-01-02 10:28:17 -08:00
RebeccaStankus
fe82d33b76 couple small changes 2018-01-01 15:29:49 -08:00
Triplelexx
78a0175413 fix assetbrowser sorting case sensitivity 2017-12-29 23:16:12 +00:00
luiscuenca
49bd62ca29 Touch feeling for near grab 2017-12-29 14:04:36 -07:00
Atlante45
aec5ab5921 CR 2017-12-29 12:46:52 -08:00
Atlante45
06e2f394f9 Update Octree server stats to handle single server 2017-12-29 12:46:52 -08:00
Atlante45
28f164d7e5 Remove legacy jurisdiction code 2017-12-29 12:46:52 -08:00
RebeccaStankus
06def41764 Merge branch 'master' of https://github.com/highfidelity/hifi into log-filter2 2017-12-29 10:03:29 -08:00
Seth Alves
4bbce011a4
Merge pull request #11918 from sethalves/scale-wearables-with-avatar-3 
avatar-entities which are children of an avatar will scale with the avatar
 2017-12-29 09:12:17 -08:00
Elisa Lupin-Jimenez
84933131c4 changed api key variable name 2017-12-27 12:49:16 -08:00
Elisa Lupin-Jimenez
a428eb5b75 added const to several parameters 2017-12-27 12:47:04 -08:00
Elisa Lupin-Jimenez
01c1032540 fixed constant names, added another URL check 2017-12-27 10:51:58 -08:00
RebeccaStankus
296f0a323a saving for Wednesday 2017-12-26 15:56:05 -08:00
Elisa Lupin-Jimenez
03f06aadf4 keyword filters case insensitive now 2017-12-26 11:08:10 -08:00
Elisa Lupin-Jimenez
e1b344e36d handles empty json object return 2017-12-26 10:50:10 -08:00
Elisa Lupin-Jimenez
3e10d3b436 Merge branch 'master' of https://github.com/highfidelity/hifi into poly_api 2017-12-26 10:18:51 -08:00
Sam Gateau
6032ce39e9 Merge branch 'master' of https://github.com/highfidelity/hifi into black 2017-12-22 20:20:10 -08:00
David Back
ab5b238aea Merge branch 'mergeAccountGlobalServices' of https://github.com/dback2/hifi into mergeAccountGlobalServices 2017-12-22 17:00:17 -08:00
David Back
c620f3274c merge 2017-12-22 16:28:29 -08:00
John Conklin II
0dd5bbc2d6
Merge pull request #12057 from birarda/61-1-merge-back 
Merge stable back into master after RC61.1
 2017-12-22 16:26:08 -08:00
Stephen Birarda
e3cbfd92a0 Merge remote-tracking branch 'upstream/stable' into 61-1-merge-back 2017-12-22 15:48:04 -08:00
Seth Alves
96197e66bb Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3 2017-12-22 15:13:02 -08:00
Sam Gateau
a2c16ddf6a
Merge pull request #12026 from SamGondelman/burp3 
Remove _model from ModelMeshPartPayload
 2017-12-22 13:50:06 -08:00
RebeccaStankus
720f186bd7 Merge branch 'master' of https://github.com/highfidelity/hifi into log-filter 2017-12-22 13:47:42 -08:00
Howard Stearns
5767f5937e
Merge pull request #12046 from zfox23/commerce_fixEcdsaError1 
Commerce: Fix some rezzing errors; Fix ECDSA errors
 2017-12-22 09:56:22 -08:00
RebeccaStankus
1d4dedc1a1 Merge branch 'master' of https://github.com/highfidelity/hifi into log-filter 2017-12-22 07:52:31 -08:00
Seth Alves
897b96d092 Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3 2017-12-22 07:36:26 -08:00
John Conklin II
5a839ebd93
Merge pull request #12049 from zfox23/RC61.1_commerce_fixEcdsaError1 
RC61.1: Commerce: Fix some rezzing errors; Fix ECDSA errors
 2017-12-21 17:46:32 -08:00
Zach Fox
07a1cf434a IT'S WORKING!!! 2017-12-21 16:33:47 -08:00
Zach Fox
373ef6c6ce Progress? 2017-12-21 16:32:20 -08:00
Stephen Birarda
7bf0cc2f63 cleanup other ref returns of shared pointers from sortables 2017-12-21 15:39:14 -08:00
luiscuenca
38bfddf786 Added filter for QT autogenerated functions and integrated it to Developers menu 2017-12-21 16:26:06 -07:00
Zach Fox
73eb258e79 IT'S WORKING!!! 2017-12-21 15:17:52 -08:00
Zach Fox
e963673409 Progress? 2017-12-21 14:08:18 -08:00
vladest
7985c39f2a Adopt path to certain Tablet dialogs to new loading subsystem and path resolver 2017-12-21 22:14:15 +01:00
Alexander Ivash
bd3a056f4e rename exposed to QML "Audio" context object to "AudioScriptingInteface" to avoid naming conflict 
note: I'm not sure what exactly causes naming conflict - importing QtMultimedia in ForceLoad.qml, or the fact of existance of Audio.qml, but starting with Qt 5.10.0 'Audio' already exists in global scope
 2017-12-21 20:03:38 +00:00
humbletim
a146b778f7 support additional .extraInfo for ray intersections 2017-12-21 12:35:13 -05:00
samcake
403e77b023 Merge branch 'master' of https://github.com/highfidelity/hifi into black 2017-12-21 09:17:23 -08:00
unknown
be736373f2 fix if else convention 2017-12-20 17:52:27 -08:00
Andrew Meadows
c1906215ba add comments 2017-12-20 17:41:08 -08:00
Andrew Meadows
721e9d426a restore signals on LOD change 2017-12-20 17:41:08 -08:00
Andrew Meadows
5c11ae3469 bump desktop min FPS from 20 to 30 msec 2017-12-20 17:41:08 -08:00
Andrew Meadows
4fb9680f3b also consider GPU render time for LOD adjust 2017-12-20 17:41:08 -08:00
Andrew Meadows
9c4a0c8c70 tweak LOD adjustment logging 2017-12-20 17:41:08 -08:00
Andrew Meadows
8e0d367a2d use full 'present' time for FPS calculation 
also, refactor LOD adjust logic
 2017-12-20 17:41:08 -08:00
Andrew Meadows
7a9d566e02 remove unnecessary whitespace 2017-12-20 17:41:08 -08:00
unknown
dbbc87d72e merge 2017-12-20 17:40:11 -08:00
RebeccaStankus
95d94e1c8f UI Done 2017-12-20 16:52:56 -08:00
Elisa Lupin-Jimenez
7de2918b9b added newline to header 2017-12-20 12:44:47 -08:00
SamGondelman
bd06dc6443 cleaning up modelmeshpartpayload 2017-12-20 11:00:14 -08:00
Andrew Meadows
02e3b22621 remove hot-key for disable of scripted motor 2017-12-20 08:43:56 -08:00
Andrew Meadows
6ad3a0598c remove crufty comment 2017-12-20 08:42:42 -08:00
Andrew Meadows
f82de05f9c defang accidental disable of MyAvatar's default motor 2017-12-20 08:42:42 -08:00
Elisa Lupin-Jimenez
ca062f9232 changed qtglobal include 2017-12-19 15:41:42 -08:00
Elisa Lupin-Jimenez
14935e5924 added const to valid inputs 2017-12-19 15:11:24 -08:00
Elisa Lupin-Jimenez
1b6c85edb0 cleaned up code 2017-12-19 13:22:31 -08:00
David Rowe
e6c40f4aae Window JSDoc 2017-12-20 10:16:09 +13:00
Elisa Lupin-Jimenez
34d8fe307d fixed getAssetList() 2017-12-19 11:25:15 -08:00
howard-stearns
16a58ddf5a Merge branch 'master' of https://github.com/highfidelity/hifi into consistent-goToUser 2017-12-19 10:48:34 -08:00
Elisa Lupin-Jimenez
8a9e5bc39d Merge branch 'master' of https://github.com/highfidelity/hifi into poly_api 2017-12-19 10:41:39 -08:00
samcake
91e940dc3c Merge branch 'master' of https://github.com/highfidelity/hifi into black 2017-12-19 10:13:40 -08:00
Zach Fox
18d5be147c Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist 2017-12-19 09:48:15 -08:00
Elisa Lupin-Jimenez
1ee8445f43 added gltf import feature, getAssetList() not working 2017-12-18 17:47:21 -08:00
Seth Alves
ddbb7a4416 when an avatar-entity's lifetime expires, remove it from avatarEntityData 2017-12-18 14:26:25 -08:00
Elisa Lupin-Jimenez
e7fad05867 enabled fbx, obj, and blocks model url retrieval 2017-12-18 14:20:51 -08:00
samcake
df3b4421f4 Merging 2017-12-18 12:20:56 -08:00
Brad Davis
9f7b6f543d Merge remote-tracking branch 'upstream/master' into HEAD 2017-12-18 11:17:07 -08:00
Andrew Meadows
cfd2097f36
Merge pull request #11965 from AndrewMeadows/expose-physics-perf-stats-to-js 
Cleanup names of debug stats and trace contexts.
 2017-12-18 10:02:42 -08:00
Elisa Lupin-Jimenez
0e57ed5c12 Merge branch 'master' of https://github.com/highfidelity/hifi into poly_api 2017-12-18 10:00:18 -08:00
Olivier Prat
0fc496d44c Fixed merge conflicts with master 2017-12-18 15:23:11 +01:00
howard-stearns
d730b7b87b consistent goToUser behavior in PAL, and be able to go to flying user. 2017-12-15 17:00:54 -08:00
Anthony Thibault
f3fcac8e58
Merge pull request #11903 from Delanir/IPD8258 
8258 IPD Tertiary Task List: Changing to Smaller Avatar Does not Resize Tablet
 2017-12-15 15:37:27 -08:00
Brad Hefta-Gaub
c68bec175a
Merge pull request #11978 from hyperlogic/bug-fix/no-hip-glitches 
More stable hips IK
 2017-12-15 15:32:24 -08:00
SamGondelman
4fbf5db697 Merge remote-tracking branch 'upstream/master' into hysteresis 2017-12-14 09:55:46 -08:00
Elisa Lupin-Jimenez
264f362994 resolved merge conflict again 2017-12-13 17:54:30 -08:00
Elisa Lupin-Jimenez
e49181c3a2 added getAssetList() and getFBX() 2017-12-13 17:45:57 -08:00
Zach Fox
ed5082e5d4
Merge pull request #11974 from birarda/feat/staging-env-or-cl 
allow custom metaverse URL to be used with env var
 2017-12-13 17:29:45 -08:00
Elisa Lupin-Jimenez
f7be67b5b2 removed key 2017-12-13 16:19:36 -08:00
Elisa Lupin-Jimenez
392f290dd6 can fetch poly asset list synchronously 2017-12-13 16:19:36 -08:00
Elisa Lupin-Jimenez
dc999401d5 Created poly scripting interface template 2017-12-13 16:19:36 -08:00
Zach Fox
3764445272 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist 2017-12-13 14:12:08 -08:00
Zach Fox
f0507e1608
Merge pull request #11972 from zfox23/commerce_fixWalletStatus1 
Set Wallet Status to 'Ready' after correctly authenticating wallet
 2017-12-13 13:19:54 -08:00
Zach Fox
efd5c0ccb7 Add comment as per CR 2017-12-13 11:53:26 -08:00
Anthony J. Thibault
c4a7f4843a Much more stable hips IK target. 
Target is now estimated in sensor space from the head, which is very deterministic and not prone to feedback from the IK system.
Previous the hip was estimated from accumulated IK error deltas, which was not stable, as the error would tend to accumulate if the IK targets could not be reached.
 2017-12-13 11:12:32 -08:00
Sam Gateau
4e68663cfc
Merge pull request #11970 from SamGondelman/circleFix 
Fix Circle3DOverlays uninitialized member variables, cloning, getProperty
 2017-12-14 00:30:18 +07:00
Stephen Birarda
139976d8bb allow staging METAVERSE_SERVER_URL to be toggled by env 2017-12-12 16:22:08 -08:00
David Rowe
92be33da31 Web3d overlay's "resolution" property has been removed 2017-12-13 11:40:44 +13:00
Andrew Meadows
87fa919ac8 save files to Documents by default 2017-12-12 14:11:25 -08:00
David Rowe
650e7e1922 Document that getProperty() only works for 3D overlays 2017-12-13 10:34:33 +13:00
SamGondelman
16f545a9e8 fix circle3d overlays 2017-12-12 13:25:47 -08:00
Zach Fox
623e6395be Set Wallet Status to 'Ready' after correctly authenticating wallet 2017-12-12 13:01:14 -08:00
David Rowe
578c42b4ea Merge branch 'master' into 21624 2017-12-13 09:41:09 +13:00
MiladNazeri
16e16501cd
Merge pull request #11791 from ctrlaltdavid/21602 
JSDoc updates
 2017-12-12 12:18:02 -08:00
SamGondelman
ce96fa7078 change hysteresis values based on testing 2017-12-11 17:32:58 -08:00
SamGondelman
fba06a74aa fix laser and stylus deadspot 2017-12-11 15:51:22 -08:00
Andrew Meadows
74a1f5de96 remove bullet stats when physics stats disabled 2017-12-11 11:31:00 -08:00
Andrew Meadows
406bf7898d cleanup prof stats and trace context names 2017-12-11 11:31:00 -08:00
Andrew Meadows
2538204b1e expose physics simulation stats to Test JS API 2017-12-11 11:31:00 -08:00
Seth Alves
2cd64ccd2c merge from upstream 2017-12-11 10:14:30 -08:00
Sam Gateau
0ff91e5926
Merge pull request #11952 from samcake/light 
Exposing multi highlight and selection feature to js api
 2017-12-12 01:09:15 +07:00
Zach Fox
b81cdf49ef Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist 2017-12-11 09:52:32 -08:00
Zach Fox
006ea3342c
Merge pull request #11959 from zfox23/commerce_removeBuyEndpoint 
Remove useless Wallet.buy() scripting endpoint
 2017-12-11 09:33:18 -08:00
Sam Gateau
d1cd9f5c6b adding correct support for the meta item fetch subItems for Overlays and specifically for ModelOverlay which fixes the highlight on Overlays 2017-12-11 02:21:09 -08:00
Sam Gateau
cc4b266647 Add names to objects of the selection, remove comments in shader and fix one more warning on linux 2017-12-11 00:31:54 -08:00
Sam Gateau
bb888f2d4c Replace the name opacity for alpha 2017-12-10 23:07:06 -08:00
Sam Gateau
eec4e966a7 Fix the linux build and correct the name of the property Intensity to Opacity 2017-12-10 10:13:49 -08:00
Sam Gateau
429d54d65d Merge branch 'master' of https://github.com/highfidelity/hifi into light 2017-12-10 09:53:22 -08:00
Zach Fox
6f5028080b Remove useless Wallet.buy() scripting endpoint 2017-12-08 18:23:23 -08:00
Clément Brisset
18b9118518
Merge pull request #11935 from birarda/bug/atp-drop-actual-files-only 
only attempt default asset upload for local files
 2017-12-08 17:18:49 -08:00
Daniela Fontes
46583a90be Change abs to fabsf and other corrections requested. 2017-12-09 00:14:36 +00:00
Stephen Birarda
3265eb42f1 only attempt default asset upload for local files 2017-12-08 14:45:27 -08:00
Zach Fox
a81a981676 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist 2017-12-08 09:44:52 -08:00
Olivier Prat
92e1fe8e5c Removed jitter samples from shader and added name to batches in DEBUG mode to ease render debug 2017-12-08 18:02:27 +01:00
samcake
9a4f667059 Merge branch 'master' of https://github.com/highfidelity/hifi into light 2017-12-08 08:50:33 -08:00
Seth Alves
d095d4ef44 Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3 2017-12-08 07:19:33 -08:00
Seth Alves
a7a6dee8e0
Merge pull request #11950 from hyperlogic/bug-fix/hand-scaling 
Fix for hand controller avatar scaling.
 2017-12-08 07:17:59 -08:00
Seth Alves
91b2d8df8a
Merge pull request #11874 from luiscuenca/audioscope 
Improve Audio Scope
 2017-12-08 07:15:28 -08:00
Sam Gateau
d07cde3ecb Merge branch 'master' of https://github.com/highfidelity/hifi into light 2017-12-07 19:20:25 -08:00
samcake
7a9d77fed4 return a legit selectedItemsList js object as long as the list exist, only void if the list name is unknown 2017-12-07 17:53:30 -08:00
samcake
ace8e153c2 making sure the ID of an object in the Selection list is unique and more refined debugging 2017-12-07 17:45:40 -08:00
Anthony J. Thibault
542af47e9e Fix for hand controller avatar scaling. 
* Added getDomainMaxScale() and getDomainMinScale() to JS api.
* Updated scaleAvatar controller module to use this to prevent scaling past the limits.
* Made sure that getDomainMaxScale() getDomainMinScale() and getUnscaledEyeHeight are thread safe,
  so that they can be invoked on the script thread.
* Added signals to Model class that can be used to let observers know when the Rig has finished initializing it's skeleton.
  and also when the skeleton is no longer valid.  These hooks are used to cache the unscaled eye height of the avatar.
 2017-12-07 17:08:13 -08:00
Seth Alves
40412b80c6 Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3 2017-12-07 17:03:04 -08:00
Andrew Meadows
ed231fa4a1
Merge pull request #11894 from hyperlogic/bug-fix/flying 
Improvements to HMD flying
 2017-12-07 16:31:33 -08:00
Andrew Meadows
4691a98509
Merge pull request #11865 from hyperlogic/feature/domain-limited-height 
domain uses min/max avatar height instead of min/max scale
 2017-12-07 16:29:15 -08:00
samcake
6148458aeb Workable state, need final clean up and testing 2017-12-07 16:04:08 -08:00
Sam Gondelman
e7d7e9abb8
Merge pull request #11947 from ctrlaltdavid/21634 
Move mouse and hover slots out of Overlays API
 2017-12-07 14:47:01 -08:00
Zach Fox
4b3c61178c
Merge pull request #11944 from zfox23/commerce_dontSendEmptyPublicKeys 
Don't send commerce requests to backend if cached public keys is empty
 2017-12-07 14:31:09 -08:00
Sam Gondelman
b05e1f8a32
Merge pull request #11847 from SamGondelman/overlayFlash 
Cleanup Web3DOverlay and tablet home button
 2017-12-07 14:06:56 -08:00
David Rowe
fd38b89f35 Move mouse and hover slots out of Overlays API 2017-12-08 10:58:52 +13:00
Zach Fox
b2bafed2bb Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist 2017-12-07 11:21:24 -08:00
Anthony J. Thibault
47b52238d9 code review feedback 2017-12-07 10:49:23 -08:00
Anthony J. Thibault
68ad27a38d Merge branch 'master' into bug-fix/flying 2017-12-07 10:28:13 -08:00
David Back
46d265e3f1 Merge branch 'master' of https://github.com/highfidelity/hifi into mergeaccountglobalservices 2017-12-07 10:13:55 -08:00
Anthony J. Thibault
fbcecbfc89 Merge branch 'master' into feature/domain-limited-height 2017-12-07 10:01:33 -08:00
Zach Fox
21077da41a Don't send requests to backend if cached public keys is empty 2017-12-07 09:48:06 -08:00
Sam Gondelman
99c52f8602
coding standards 2017-12-07 09:38:14 -08:00
Brad Hefta-Gaub
4f8a2ea4be
Merge pull request #11934 from ctrlaltdavid/21630 
Fix cloned 3D overlays' dimensions
 2017-12-07 09:24:01 -08:00
samcake
e0110ff7e6 Merging with upstream 2017-12-07 09:23:38 -08:00
Brad Hefta-Gaub
a0457d2b5e
Merge pull request #11856 from AndrewMeadows/sort-and-throttle-avatars 
Use PrioritySortUtil for avatar updates from avatar-mixer
 2017-12-07 09:22:52 -08:00
Seth Alves
86f58c1353 Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3 2017-12-07 08:50:50 -08:00
samcake
5f85e8e2cb Merge branch 'master' of https://github.com/highfidelity/hifi into light 2017-12-07 08:48:12 -08:00
Olivier Prat
1ce1aca79f Merged with samcake's 'black' branch 2017-12-07 08:59:38 +01:00
Sam Gateau
0245a7005d Adding the query of a particular selection content 2017-12-06 22:44:58 -08:00
samcake
5500a6d11c More to come 2017-12-06 18:02:30 -08:00
Elisa Lupin-Jimenez
1d5875c45b removed key 2017-12-06 17:40:39 -08:00
Elisa Lupin-Jimenez
66b6be1302 fixed weird merge conflicts 2017-12-06 17:37:44 -08:00
John Conklin II
fffcf56904
Merge pull request #11892 from SamGondelman/snapshot 
Expose Window.getDeviceSize()
 2017-12-06 16:44:08 -08:00
Elisa Lupin-Jimenez
4ed689672e can fetch poly asset list synchronously 2017-12-06 16:07:29 -08:00
David Rowe
0146eca315 JSDoc review 2017-12-07 10:09:05 +13:00
samcake
1efddb8260 Merge branch 'master' of https://github.com/highfidelity/hifi into light 2017-12-06 10:21:45 -08:00
unknown
5e1064800a fix marketplace 2017-12-05 18:39:17 -08:00
samcake
1483195285 almost complete setup working, yeah 2017-12-05 18:27:53 -08:00
luiscuenca
8abe8b9879 move save logic to audioclient 2017-12-05 18:22:14 -08:00
David Rowe
cafebf6a7e Fix Unix build warnings and tidy initializers 2017-12-06 13:38:42 +13:00
luiscuenca
20d6615417 emit only when recording 2017-12-05 16:13:44 -08:00
David Rowe
e074bd85f9 Fix shape of cloned shape overlay 2017-12-06 12:29:09 +13:00
David Rowe
2752dc7cac Fix dimensions of cloned cube, sphere, shape, and model overlays 2017-12-06 12:28:55 +13:00
Seth Alves
390c11e0a0 Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3 2017-12-05 11:26:41 -08:00
Zach Fox
d59c9bd73a Fix gray/incorrect security image after relog 2017-12-05 10:27:40 -08:00
Elisa Lupin-Jimenez
d6e1a9defe Created poly scripting interface template 2017-12-05 09:43:01 -08:00
Seth Alves
73b21f7cd5 Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3 2017-12-05 06:55:10 -08:00
Sam Gateau
987246afb8 Merge branch 'master' of https://github.com/highfidelity/hifi into light 2017-12-04 19:11:42 -08:00
samcake
de410b6833 I need a color editor 2017-12-04 17:29:01 -08:00
Elisa Lupin-Jimenez
7bb44f4139 Created poly scripting interface template 2017-12-04 16:46:58 -08:00
luiscuenca
390c59b45c Change menu and minor fixes 2017-12-04 15:29:01 -08:00
David Back
3873a8f91e
Merge branch 'master' into mergeAccountGlobalServices 2017-12-04 14:46:59 -08:00
samcake
9fceaad38b Merging with master 2017-12-04 14:20:10 -08:00
Zach Fox
4c96fc2d9d
Merge pull request #11905 from zfox23/commerce_resetWalletBeforeCreation 
Call reset() on Wallet before creating new wallet
 2017-12-04 13:05:36 -08:00
Brad Hefta-Gaub
33adb0d76d
Merge pull request #11868 from ctrlaltdavid/21615 
Add "size" as synonym for "dimensions" in model overlay property setter
 2017-12-03 18:10:30 -08:00
luiscuenca
4030688e7a added record wav files 2017-12-03 11:54:37 -07:00
Brad Hefta-Gaub
314265fa86
Merge pull request #11891 from ctrlaltdavid/21625 
Add missing line3d overlay property getters and setters
 2017-12-02 12:52:44 -08:00
Seth Alves
b590cd5b89 avatar-entities which are children of an avatar will scale with the avatar 2017-12-02 09:31:43 -08:00
Zach Fox
24e5994f20 The nuclear option is a bad option. 2017-11-30 15:55:09 -08:00
Daniela Fontes
9bc165d8b4 Changing to Smaller Avatar Resizes Tablet 2017-11-30 18:49:53 +00:00
howard-stearns
55589312f1 new padding/initialization that matters on linux server 2017-11-29 09:53:48 -08:00
Anthony J. Thibault
a4d70e89df hmd turn roll tuning 
* Tighten action motor timescale while flying. This should cause less drift as the user
  changes direction and should lead to more comfort and control.
* Hmd head roll is only enabled if you are forward or backward faster then 2 meters per
  second. This should prevent un-intentional turning/rolling when hovering or moving at
  slow speeds.
* Documented hmdRoll tuning parameters accessible from JavaScript.
* Removed roll feathering code, because it is non-linear and can perhaps induce nausea.
* Tuned default dead spot and turning speeds to match Eagle Flight's defaults.
 2017-11-28 17:20:26 -08:00
SamGondelman
c5ebb8a279 expose Window.getDeviceSize() 2017-11-28 16:16:30 -08:00
David Rowe
b9ad15b19e Add missing line3d overlay property getters 2017-11-29 11:03:16 +13:00
David Rowe
3956b3b953 Fix missing line3d overlay property setter overrides of base class 2017-11-29 10:41:51 +13:00
David Rowe
76c934f012 Add missing line3d overlay property setters 2017-11-29 10:41:21 +13:00
Anthony J. Thibault
7327b79ce3 WIP 2017-11-28 11:37:58 -08:00
Andrew Meadows
e212ac67c1 enable custom avatar sort tuning 2017-11-28 11:30:06 -08:00
Andrew Meadows
d65101c4e9 sort and throttle avatar updates in interface 2017-11-28 09:07:17 -08:00
David Rowe
cd2922a560 Merge branch '21602' into 21624 
# Conflicts:
#	tools/jsdoc/plugins/hifi.js
 2017-11-28 17:04:59 +13:00
David Rowe
97b4dcaa5c Web3DOverlay's resolution property is deprecated 2017-11-28 16:31:13 +13:00
David Rowe
a6937d7c8b Add Overlays API examples JSDoc 2017-11-28 16:30:25 +13:00
David Rowe
92493f14d7 Miscellaneous JSDoc fixes 2017-11-28 16:30:09 +13:00
SamGondelman
52039e022b merge from master, get rid of resolution in RayPick 2017-11-27 13:11:35 -08:00
howard-stearns
1575119327 PR feedback 2017-11-27 10:46:57 -08:00
luiscuenca
ad02118588 fixed menu error 2017-11-26 23:43:13 -07:00
luiscuenca
027d2d323c Measure tool and corrections 2017-11-26 22:28:34 -07:00
David Rowe
de49fefc61 Merge branch 'master' into 21602 
# Conflicts:
#	libraries/shared/src/RegisteredMetaTypes.h
 2017-11-25 17:06:36 +13:00
David Rowe
4b5aa9bdec Add Overlays API functionality JSDoc 2017-11-25 16:18:14 +13:00
luiscuenca
69299bdd68 try to fix errors 2017-11-22 19:25:24 -07:00
luiscuenca
b481a6060e improve audio scope 2017-11-22 18:15:42 -07:00
howard-stearns
899999a4c6 fix up dynamic ownership challenge 2017-11-22 15:58:30 -08:00
Anthony J. Thibault
b3896f664d Made increaseScale and decreaseScale more responsive at limits 2017-11-22 14:45:52 -08:00
David Rowe
3535071178 Add "size" as synonym for "dimensions" in model overlay property setter 2017-11-22 21:04:04 +13:00
samcake
1514cdfb2f extend the set of interface for multi highlight 2017-11-21 17:59:45 -08:00
howard-stearns
16d6d8a361 Merge branch 'master' of https://github.com/highfidelity/hifi into MandatoryMania-ECWallet 2017-11-21 16:28:29 -08:00
howard-stearns
ca80c9b764 Merge branch 'ECWallet' of https://github.com/MandatoryMania/hifi into MandatoryMania-ECWallet 2017-11-21 16:28:08 -08:00
Sam Gateau
8389137caa
Merge pull request #11834 from highfidelity/pointers 
UI Pointer Optimization
 2017-11-21 16:01:52 -08:00
samcake
a0e40efdc8 Fixing all the changes of interface name coming from upstream 2017-11-21 14:55:58 -08:00
Dante Ruiz
767b0fa4af remove unused variable warning 2017-11-21 14:45:55 -08:00
samcake
ebd701a1ab Merging with master 2017-11-21 14:40:37 -08:00
samcake
84ff40c717 Merging with master 2017-11-21 14:12:47 -08:00
Dante Ruiz
c9ad7b1db5 Merge branch 'master' of github.com:highfidelity/hifi into fix-modal 2017-11-21 13:56:22 -08:00
Dante Ruiz
88c3adbff1 change askToReplaceDomainContent to use async question and warning 2017-11-21 13:56:11 -08:00
Anthony J. Thibault
9f54ce55f3 Change domain setting from min/max avatar scale to min/max avatar height 
* Domain settings version has been bumped from version 2.0 to 2.1
* Old domain settings for avatar scale will be auto-converted to avatar height
* Avatar code has been changed so that limitDomainScale() works with the new height limits
* Avatar getUnscaledEyeHeight() was added to C++.
* MyAvatar.getHeight() was added to JS.
 2017-11-21 13:25:47 -08:00
ZappoMan
3a967ca895 Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup 2017-11-21 10:53:29 -08:00
Brad Hefta-Gaub
4d1e90dfca
Merge pull request #11821 from dback2/mirrorfanciness3 
Mirror projection for Secondary Camera
 2017-11-21 07:59:07 -08:00
Brad Hefta-Gaub
5dadec0b93
Merge pull request #11845 from thoys/feat/parentJointName 
Import JSON parentJointName value
 2017-11-21 07:58:13 -08:00
samcake
aa163db4e6 Trying to make selection threadsafe 2017-11-20 17:21:15 -08:00
ZappoMan
b44ced4c21 Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup 2017-11-20 17:19:18 -08:00
Thijs Wenker
627fee80ec added support for exporting parentJointName 2017-11-21 01:49:56 +01:00
Howard Stearns
89425ca210
Merge pull request #11854 from howard-stearns/consolidated-blockchain-history-log 
consolidated blockchain history log
 2017-11-20 16:19:27 -08:00
Howard Stearns
4018b99118
Merge pull request #11848 from zfox23/commerce_flipTheSwitch 
Turn Commerce on by default!
 2017-11-20 16:18:53 -08:00
Elisa Lupin-Jimenez
3211aa7d13
Merge pull request #11849 from elisa-lj11/blocks 
Zip file structures replicated in asset server
 2017-11-20 16:13:51 -08:00
Elisa Lupin-Jimenez
fb6287503e hopefully fixed build error resulting from escape sequence 2017-11-20 15:12:11 -08:00
Thijs Wenker
c3754d6369 smart pointer 2017-11-20 23:24:03 +01:00
Elisa Lupin-Jimenez
a54f4eca93 simplified naming of zip folders 2017-11-20 14:02:46 -08:00
David Rowe
8e647fb32c Disable unused Overlays.panelDeleted signal 
#if'd out to match the other panel code that is disabled.
 2017-11-21 11:00:36 +13:00
Elisa Lupin-Jimenez
b6e75d1222 Merge branch 'master' of https://github.com/highfidelity/hifi into blocks 2017-11-20 10:07:11 -08:00
Elisa Lupin-Jimenez
3aa7cb440d file structures in zip files replicated, more useful unzip debug print, updated blocks tablet app url 2017-11-20 10:01:33 -08:00
Dante Ruiz
76935c1457 fixing merge conflict 2017-11-20 09:51:10 -08:00
Thijs Wenker
e94199acad Merge branch 'master' of github.com:highfidelity/hifi into feat/parentJointName 2017-11-20 18:29:54 +01:00
Thijs Wenker
84ec9890ca reverted special property case, parentJointName is now only parsed from the JSON import 2017-11-20 18:29:33 +01:00
samcake
a74372b233 Merge branch 'master' of https://github.com/highfidelity/hifi into light 2017-11-20 09:26:29 -08:00
Seth Alves
df07b66872 Merge branch 'master' of github.com:highfidelity/hifi into av-ent-misc-fixes 2017-11-20 07:47:19 -08:00
howard-stearns
07d52306c4 consolidated blockchain history log 2017-11-19 22:51:36 -08:00
ZappoMan
04ee1adabd Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup 2017-11-19 14:40:31 -08:00
Brad Hefta-Gaub
e070033ce4
Merge pull request #11793 from ElderOrb/FB9032 
9032 - Current display mode can be deselected in the toolbar/tablet menu
 2017-11-19 11:25:35 -08:00
David Rowe
27e3e0bf0b Merge branch 'master' into 21602 2017-11-20 08:12:19 +13:00
Brad Hefta-Gaub
ff8ca6da4c
Merge pull request #11303 from vladest/webbrowser_updates 
Webbrowser updates
 2017-11-19 11:11:09 -08:00
Brad Hefta-Gaub
e4a03a7d12
Merge pull request #11840 from ctrlaltdavid/21609 
Fix typo in overlay "filled" property
 2017-11-18 14:31:11 -08:00
David Rowe
b4bc8da20a Document deprecation of "filed" property 2017-11-19 08:44:00 +13:00
Sam Gateau
44f63ef802 Merge branch 'master' of https://github.com/highfidelity/hifi into light 2017-11-18 08:23:59 -08:00
Alexander Ivash
c4aa937108 adjust to coding standards 2017-11-18 11:16:40 +03:00
samcake
e0740b323d keep debuging the seelction highlight 2017-11-17 18:11:18 -08:00
Brad Hefta-Gaub
592f4921bc
Merge pull request #11825 from druiz17/fix-tablet-rez 
fix tablet rez point for commence button
 2017-11-17 16:51:52 -08:00
SamGondelman
033f658fff Merge remote-tracking branch 'upstream/master' into pointers 2017-11-17 16:10:20 -08:00
Zach Fox
7d34b3fe67 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist 2017-11-17 15:45:03 -08:00
SamGondelman
393ad0079c home button is circle instead of sphere, fixed positioning, fix lasers on tablet 2017-11-17 15:24:21 -08:00
David Back
4be29c5a7a Merge branch 'master' of https://github.com/highfidelity/hifi into mirrorfanciness3 2017-11-17 15:15:22 -08:00
Zach Fox
f47f259816 Turn Commerce on by default 2017-11-17 15:12:49 -08:00
Stephen Birarda
239b116874
Merge pull request #11835 from birarda/bug/octree-connection-id 
Reset EntityTreeSendThread known state if client disconnects from Entity Server
 2017-11-17 12:56:25 -08:00
SamGondelman
42d047c572 merge with master 2017-11-17 11:52:34 -08:00
SamGondelman
e38b0ab6b8 make web overlays match web entities more, remove resolution 2017-11-17 11:50:24 -08:00
Dante Ruiz
4de0fdf7d1
Merge pull request #11768 from ctrlaltdavid/21596 
Add instructions and cursor to GOTO dialog input
 2017-11-17 11:45:40 -08:00
SamGondelman
61c7ccde6e cleanup 2017-11-17 10:45:39 -08:00
samcake
45f14d0cd3 Merge branch 'master' of https://github.com/highfidelity/hifi into light 2017-11-17 08:50:44 -08:00
H Q
21a28827c9 Remaining coding style changes, other small fixes 2017-11-17 07:59:52 -08:00
David Rowe
a33162d7ff Fix typo in Base3DOverlay "filled" property 2017-11-17 21:07:43 +13:00
David Rowe
12e005f215 Initial update of Overlays JSDoc 2017-11-17 17:59:11 +13:00
samcake
08dd76c9a8 changes of the day 2017-11-16 17:52:12 -08:00
H Q
14890495a2 Merge branch 'master' of https://github.com/highfidelity/hifi into ECWallet 
Syncing
 2017-11-16 12:38:45 -08:00
H Q
27350ddbfc Coding style corrections 2017-11-16 12:35:00 -08:00
David Back
abba965328 todo comment 2017-11-16 11:41:28 -08:00
Stephen Birarda
eedb77dae9 add clearing of known state if client resets ES connection 2017-11-16 11:40:35 -08:00
SamGondelman
ac7242102c Merge remote-tracking branch 'upstream/pointers' into ui 2017-11-16 09:47:29 -08:00
SamGondelman
e3aa79990b merge with master 2017-11-16 09:45:32 -08:00
Brad Davis
7bbc719d79 Fix for black screen on HMD derived display plugins 2017-11-16 08:53:12 -08:00
Sam Gateau
3a0b2651d5 Keep spinning on the bridge between js interface and the highlighting feature 2017-11-16 00:55:51 -08:00
Seth Alves
93fd2a6a6b clear garbage out of avatar-entity settings array before writing it to disk. when changing domains, re-rez avatar-entities after octree is cleared 2017-11-15 20:10:05 -08:00
David Back
4b2ff68fa3 var name and empty line 2017-11-15 19:05:44 -08:00
Sam Gateau
6889c9d6d1 Merge branch 'master' of https://github.com/highfidelity/hifi into light 2017-11-15 18:49:30 -08:00
samcake
771c64fc97 Working on the selection highlight js interface 2017-11-15 18:21:07 -08:00
David Back
9bfbcb4434 code review updates 2017-11-15 18:06:49 -08:00
SamGondelman
3274c41aeb Merge remote-tracking branch 'upstream/pointers' into ui 2017-11-15 17:45:45 -08:00
David Rowe
6f82049021 Merge branch 'master' into 21602 2017-11-16 13:41:29 +13:00
David Rowe
4f083a1b20 Further Menu API JSDoc improvements 2017-11-16 13:39:14 +13:00
David Rowe
bdb1bbe88d Menu API JSDoc improvements 2017-11-16 13:34:50 +13:00
Dante Ruiz
dd8ea759d4 fix tablet rez for commence button 2017-11-15 15:48:39 -08:00
Ryan Huffman
60a222e4b4
Merge pull request #11810 from Atlante45/fix/stuck-acs 
Fix stuck ACs
 2017-11-15 14:59:51 -08:00
SamGondelman
7eb22b372f merge with master 2017-11-15 14:35:30 -08:00
SamGondelman
8730a26d20 use mouse events for offscreenui because touch events aren't working with the eventFilter, cleanup, documentation 2017-11-15 14:12:16 -08:00
David Back
e0ce154472 remove includes, fix comment 2017-11-15 13:37:15 -08:00
samcake
932089115e Merge branch 'master' of https://github.com/highfidelity/hifi into light 2017-11-15 12:51:01 -08:00
David Back
0b8f888d9b Merge branch 'master' of https://github.com/highfidelity/hifi into mirrorfanciness3 2017-11-15 12:50:03 -08:00
David Back
fee7701890 working mirror projection for secondary camera 2017-11-15 12:49:39 -08:00
Brad Davis
26a745be6f Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet 2017-11-15 11:59:06 -08:00
Brad Davis
1167be4102 Reverting tablet API rename, cleaning up duplicated code 2017-11-15 11:52:55 -08:00
Atlante45
e68ce97697 Remove the number of socket change tracking 2017-11-15 11:19:54 -08:00
John Conklin II
8592f3fd4d
Merge pull request #11764 from luiscuenca/case7587 
7587 Lasers resize with avatar
 2017-11-15 09:31:45 -08:00
Zach Fox
8f855c6c95 Update QUrls 2017-11-15 09:21:10 -08:00
samcake
d4f93b9203 Adding style from VariantMap 2017-11-14 18:21:02 -08:00
H Q
0db9e876d6 Merge branch 'master' of https://github.com/highfidelity/hifi into ECWallet 2017-11-14 15:40:44 -08:00
H Q
44f2c92d30 Final ECSDA and nonce modifications for this dev cycle 2017-11-14 15:40:29 -08:00
Zach Fox
5290ee3b4e Merge branch 'feature/qml_whitelist_tablet' of https://github.com/jherico/hifi into commerce_QmlWhitelist 2017-11-14 10:07:44 -08:00
luiscuenca
489e244342 More accurate scale from SensorToWorldScale 2017-11-14 09:56:23 -07:00
Sam Gateau
fc53c26190 drafting the interface 2017-11-14 00:40:37 -08:00
Sam Gateau
02c60c425e Merge branch 'master' of https://github.com/highfidelity/hifi into light 2017-11-13 18:40:51 -08:00
samcake
fd46aa15ff adding occluded/visisble to highlight outline 2017-11-13 17:23:21 -08:00
Brad Davis
d71fd151c5 Fixing button model exposure 2017-11-13 16:45:27 -08:00
Zach Fox
a3332e15b7 Merge branch 'feature/qml_whitelist_tablet' of https://github.com/jherico/hifi into commerce_QmlWhitelist 2017-11-13 15:01:26 -08:00
SamGondelman
60db24f2d3 merge with master 2017-11-13 14:36:24 -08:00
SamGondelman
2fb1981c4a merge with master 2017-11-13 14:34:39 -08:00
SamGondelman
2c0272f304 (mostly?) fix touch events 2017-11-13 12:58:31 -08:00
David Rowe
4a84116877 Merge branch 'master' into 21602 2017-11-14 08:27:13 +13:00
Brad Davis
5cf9c1bb33 Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet 2017-11-13 10:48:21 -08:00
Ryan Downe Karpf
3ea6ecf104
Merge pull request #11747 from luiscuenca/case8495 
8495 No mirror camera in HMD mode
 2017-11-13 09:09:34 -08:00
David Rowe
2119e01ac3 Tidying 2017-11-13 11:59:21 +13:00
David Rowe
9d9f684af5 Tidying 2017-11-12 11:44:51 +13:00
David Rowe
39ccd7d656 Update JSDoc for Camera API 2017-11-12 11:04:35 +13:00
David Rowe
f5e155bf94 Expand Menu's JSDoc 2017-11-11 17:01:55 +13:00
David Rowe
c8734ccd63 Menu JSDoc improvements 2017-11-11 16:18:05 +13:00
David Rowe
a576cc04e1 Clipboard JSDoc improvements 2017-11-11 16:16:24 +13:00
David Back
6466a05740 alternate approach to mirror projection wip 2017-11-10 17:15:47 -08:00
Sam Gateau
ecf67cc331
Merge pull request #11650 from Zvork/outline 
Multiple Outline Groups
 2017-11-10 15:45:03 -08:00
Brad Davis
7bf1b176d7 Renaming Tablet API to Tablets, supporting dev-mode QML loading from filesystem 2017-11-10 14:21:24 -08:00
SamGondelman
cbf0543646 deadspot 2017-11-10 13:22:38 -08:00
Brad Davis
92a3c209aa Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet 2017-11-10 11:44:29 -08:00
luiscuenca
d53a29b958 correction 2017-11-10 12:24:19 -07:00
David Rowe
c77a12f5fa Update Clipboard and Menu JSDoc to use JavaScript type names 2017-11-11 07:55:57 +13:00
luiscuenca
bf576e63fe move constant to class definition 2017-11-10 11:54:53 -07:00
Anthony J. Thibault
ba4c0f189e code review feedback 
removed discontinuity in safeDeltaTime, which is used to prevent division by zero.
 2017-11-10 10:25:29 -08:00
samcake
8d75e5e96a Merge branch 'master' of https://github.com/highfidelity/hifi into light 2017-11-10 10:24:56 -08:00
Anthony J. Thibault
4169e11e77 Merge branch 'master' into bug-fix/div-by-zero 2017-11-10 10:15:26 -08:00
beholder
da49ee8bee 9032 Current display mode can be deselected in the toolbar/tablet menu 2017-11-10 19:53:55 +03:00
David Rowe
036ac8de6d Update JSDoc for Menu JavaScript API 2017-11-10 21:55:42 +13:00
David Rowe
875b9846a0 Remove unused signal 2017-11-10 21:55:03 +13:00
David Rowe
7bbe5cdf70 Update JSDoc for Clipboard JavaScript API 2017-11-10 21:53:55 +13:00
luiscuenca
255a40ce31 Corrections 2017-11-09 18:38:04 -07:00
luiscuenca
055fe16677 Allow script to change to mirror camera in HMD 2017-11-09 18:27:16 -07:00
Sam Gondelman
9010a02bee
Merge pull request #11790 from SamGondelman/overlayFlash 
Fix laser end not disappearing
 2017-11-09 17:10:07 -08:00
luiscuenca
7dfdc8da59 Redesign and clean of unused lineWidths 2017-11-09 17:50:38 -07:00
Anthony Thibault
38cc56db7f
Merge pull request #11785 from luiscuenca/case6944 
6944 Avatar scale is preserved across domains
 2017-11-09 16:38:45 -08:00
SamGondelman
9188ae9fb5 fix laser end not disappearing 2017-11-09 16:26:37 -08:00
luiscuenca
355b465109 make leaveDomain slot private 2017-11-09 16:05:53 -07:00
David Kelly
31dc140ea6
Merge pull request #11771 from zfox23/commerce_seedingFrontend 
Commerce: Seeding Frontend
 2017-11-09 14:45:10 -07:00
Sam Gondelman
d1e41e6bf0
Merge pull request #11786 from SamGondelman/overlayFlash 
Fix overlay flash on visibility and position change
 2017-11-09 13:36:49 -08:00
SamGondelman
224386317d send overlay visibility through transaction 2017-11-09 12:14:40 -08:00
SamGondelman
5a78c9ebfe integrated stylus into pointer system, need to update controller module 2017-11-09 11:59:17 -08:00
luiscuenca
10f484c668 6944 Avatar scale is saved across domains 2017-11-09 12:21:23 -07:00
Sam Gateau
f9a1388de3 Merge branch 'master' of https://github.com/highfidelity/hifi into light 2017-11-08 19:48:23 -08:00
Elisa Lupin-Jimenez
1e526605ba
Merge pull request #11778 from elisa-lj11/blocks 
Fixed Blocks downloads (now Google Poly)
 2017-11-08 17:53:26 -08:00
luiscuenca
1791ed01ca add width param to vertex shader 2017-11-08 18:35:26 -07:00
Zach Fox
19b7c6e025 Remove machine fingerprint from receiveAt 2017-11-08 17:15:27 -08:00
Elisa Lupin-Jimenez
45b9a150dc updated blocks url refs in application to fix download issue 2017-11-08 15:21:48 -08:00
MissLiviRose
45e58b93e5 add skeleton scale change signal so scripts can detect scaling change 2017-11-08 14:23:49 -08:00
David Rowe
c5c1ead400 Fix GOTO dialog's connection status and location not always updating 2017-11-09 10:51:21 +13:00
Zach Fox
38fde43009 ...simplify your life 2017-11-08 13:19:47 -08:00
Zach Fox
7995f50fab Fix seeding 2017-11-08 12:52:53 -08:00
Zach Fox
3190fe1f32 Use keyfilepath instead of cached public keys 2017-11-08 12:30:48 -08:00
Zach Fox
72fa0823ba Logic changes 2017-11-08 11:01:54 -08:00
Zach Fox
b7163bb8fc Frontend changes 2017-11-08 10:25:11 -08:00
Zach Fox
085355222f Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist 2017-11-08 09:31:09 -08:00
Olivier Prat
f996435ac8 Merge branch 'master' of git://github.com/highfidelity/hifi into highlight 2017-11-08 11:41:21 +01:00
luiscuenca
8c5f97f3d1 More corrections 2017-11-07 20:25:24 -07:00
samcake
f5e1add694 Merge branch 'master' of https://github.com/highfidelity/hifi into light 2017-11-07 17:41:36 -08:00
luiscuenca
536bf6f81d Corrections 2017-11-07 18:34:33 -07:00
luiscuenca
ee3900be4f Corrections 2017-11-07 18:26:41 -07:00
Elisa Lupin-Jimenez
1ceec17405 missed an fbx block 2017-11-07 17:12:39 -08:00
Elisa Lupin-Jimenez
9a09ffe12f removed old fbx code 2017-11-07 17:10:57 -08:00
Elisa Lupin-Jimenez
e37010565f changed fileDialog return value to be compatible with musvis 2017-11-07 16:55:07 -08:00
Luis Cuenca
6fb47eef85
Merge branch 'master' into case7587 2017-11-07 17:19:39 -07:00
unknown
f997ad4628 changed Wallet from RSA to ECSDA cryto 2017-11-07 16:15:48 -08:00
luiscuenca
332cb48a41 Lasers and teleport scale with avatar 2017-11-07 16:57:55 -07:00
Zach Fox
8f54c106f6 Could it be this simple? 2017-11-07 12:12:27 -08:00
Elisa Lupin-Jimenez
89a9269982 synced up 2017-11-07 10:37:55 -08:00
Seth Alves
e9c0e53aa6
Merge pull request #11760 from druiz17/far-grab-parent 
Far grab rolls up parent tree when grabbing and add offset to LaserPointer::lockEndUUID
 2017-11-07 08:53:13 -08:00
Olivier Prat
9817cb4c44 Added highlight configuration in HighlightStageSetup job 2017-11-07 15:35:43 +01:00
Olivier Prat
3cc445ff02 Renamed outline to highlight 2017-11-07 11:07:25 +01:00
Olivier Prat
84be026e0b Merge branch 'master' of git://github.com/highfidelity/hifi into outline 2017-11-07 09:48:45 +01:00
Sam Gateau
e145e30049 Drafting the selection to highlight interface 2017-11-06 22:47:07 -08:00
Dante Ruiz
c9d67f762b made requested changes 2017-11-06 16:20:16 -08:00
Dante Ruiz
067ed2ffe0 apply coding standard 2017-11-06 16:09:31 -08:00
Dante Ruiz
646e5455ac forgot to remove unused variable 2017-11-06 16:05:44 -08:00
Dante Ruiz
41c6261b74 LaserPointer: made _objectLockEnd into a struct 2017-11-06 16:04:33 -08:00
Dante Ruiz
3b15897b12 fixed farGrab parent grabbing and laser LockEndUUID 2017-11-06 15:21:20 -08:00
Zach Fox
bb21c52783 Fix crash when logging out while Passphrase screen visible 2017-11-06 15:12:01 -08:00
SamGondelman
f970eb2302 merge with pointers branch 2017-11-06 14:49:50 -08:00
SamGondelman
7d420f5242 isLeftHand, isRightHand, isMouse 2017-11-06 12:29:21 -08:00
Zach Fox
8636a3396e Merge branch 'feature/qml_whitelist_tablet' of https://github.com/jherico/hifi into commerce_QmlWhitelist 2017-11-06 10:44:54 -08:00
Brad Davis
2cd76be6c4 Fix encoding for wallet scripting interface 2017-11-06 10:31:32 -08:00
Brad Davis
544c54b8ee Merge remote-tracking branch 'upstream/master' into HEAD 2017-11-06 10:07:22 -08:00
Zach Fox
b54627594b Merge branch 'feature/qml_whitelist_tablet' of https://github.com/jherico/hifi into commerce_QmlWhitelist 2017-11-06 09:29:26 -08:00
Zach Fox
149c8fbeb2 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist 2017-11-06 09:25:30 -08:00
Dante Ruiz
e432e62a39 Merge branch 'master' of github.com:highfidelity/hifi into far-grab-parent 2017-11-06 09:02:03 -08:00
luiscuenca
31b63ffbe6 Not posible to change to mirror mode using js 2017-11-06 08:03:07 -07:00
Olivier Prat
9e6472b577 Added OutlineStyleStage 2017-11-06 15:55:57 +01:00
Olivier Prat
09ee69db30 Merge branch 'master' of git://github.com/highfidelity/hifi into outline 2017-11-06 09:47:48 +01:00
Brad Davis
d162e1cff6 Whitelist functionality for tablet apps 2017-11-04 15:14:06 -07:00
SamGondelman
55ac585cd9 Merge remote-tracking branch 'upstream/master' into ui 2017-11-03 17:32:13 -07:00
SamGondelman
ce58b6c401 trying to fix HUD events, abstracting touch event logic (wip), seth's comments 2017-11-03 17:15:30 -07:00
Dante Ruiz
539cf35f30 saving work 2017-11-03 17:14:27 -07:00
luiscuenca
f226835876 8495 No mirror camera in HMD mode 2017-11-03 11:51:03 -07:00
Zach Fox
c496429a85 Add Machine Fingerprint to receive_at endpoint txn' 2017-11-03 10:40:25 -07:00
John Conklin II
ff36cbf45f
Merge pull request #11731 from sethalves/fix-ignore 
stop drawing ignored avatars, even if PAL is still open
 2017-11-03 09:45:03 -07:00
Olivier Prat
e0fd71f246 Merged from master 2017-11-03 14:39:42 +01:00
SamGondelman
dd4275430b fix hover events, working on HUD events 2017-11-02 17:48:37 -07:00
ZappoMan
b5199220ab cleanup SpatiallyNestable Velocity to match WorldVelocity naming 2017-11-02 17:07:53 -07:00
Zach Fox
6173ad810b Reset wallet passphrase when login username changes 2017-11-02 15:48:59 -07:00
Zach Fox
23e627a46f Send empty decrypted text if impossible to decrypt 2017-11-02 13:46:24 -07:00
ZappoMan
afaad5fcd7 Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup 2017-11-02 13:39:51 -07:00
Zach Fox
19945c5991 Update cert UI 2017-11-02 10:22:00 -07:00
Zach Fox
f8718efe25 Fix warnings 2017-11-02 09:42:33 -07:00
Olivier Prat
e9743d4c95 Added jsdoc to SelectionScriptingInterface 2017-11-02 10:00:30 +01:00
Olivier Prat
f2444f9a30 Merge branch 'master' of git://github.com/highfidelity/hifi into outline 2017-11-02 09:25:07 +01:00