Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 00:43:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
62519 commits 76 branches 59 tags 1.2 GiB
Commit graph

22977 commits

Author SHA1 Message Date
Brad Hefta-Gaub
1de6ecec30
Merge pull request #11830 from ElderOrb/FB8244 
8244 Rename captionColorOverride to captionColor
 2017-11-18 14:28:32 -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
28b75abcee
Merge pull request #11816 from druiz17/fix-bringing-up-logs 
Fix issue of User is unable to bring up the High Fidelity Interface log.
 2017-11-17 17:02:50 -08:00
Brad Hefta-Gaub
0678a7c9df
Merge pull request #11718 from kencooke/audio-louder-mastergain 
Adjustable master avatar volume
 2017-11-17 16:58:27 -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
SamGondelman
393ad0079c home button is circle instead of sphere, fixed positioning, fix lasers on tablet 2017-11-17 15:24:21 -08:00
Zach Fox
ec16f16757 Remove debug buttons from wallet 2017-11-17 15:21:18 -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
Zach Fox
4cc8db8aff
Merge pull request #11843 from zfox23/commerce_fixMyItems 
Fix 'My Items' display
 2017-11-17 12:59:51 -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
Zach Fox
f570e3c874 Fix 'My Items' display 2017-11-17 11:27:00 -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
11112bc2c5 syncing 
Merge branch 'master' of https://github.com/highfidelity/hifi into ECWallet
 2017-11-17 08:00:35 -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
Zach Fox
57c86c3035
Merge pull request #11836 from zfox23/commerce_fixStepSkip 
Fix skipping wallet setup step in certain cases
 2017-11-16 16:01:10 -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
Zach Fox
7f64ede940 Fix skipping wallet setup step in certain cases 2017-11-16 11:44:52 -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
Alexander Ivash
c5d2f598d7 8244 Rename captionColorOverride to captionColor 2017-11-16 15:46:49 +03: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
Zach Fox
9f80a5f081
Merge pull request #11817 from zfox23/commerce_rezFix 
Fix rezzing non-JSON marketplace items
 2017-11-15 14:17:05 -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
Zach Fox
e8c4878c8f Fix rezzing non-JSON marketplace items 2017-11-15 11:25:18 -08:00
Atlante45
e68ce97697 Remove the number of socket change tracking 2017-11-15 11:19:54 -08:00
Dante Ruiz
d83f3152dd
Merge pull request #11809 from ElderOrb/FB8984 
8984 Opening tablet with "Enter" key displays the audio menu
 2017-11-15 11:16:49 -08:00
Dante Ruiz
b633968865 fix-bringing-up-logs 2017-11-15 10:47:06 -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
samcake
78ac609752 Merge branch 'master' of https://github.com/highfidelity/hifi into light 2017-11-15 09:12:18 -08:00
samcake
d4f93b9203 Adding style from VariantMap 2017-11-14 18:21:02 -08:00
Howard Stearns
1c293c4c48
Merge pull request #11813 from zfox23/commerce_removeEditJSDependency 
Remove Marketplace's dependency on Edit.js for REZ/WEAR
 2017-11-14 16:33:35 -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
f5994375cf Remove Marketplace's dependency on Edit.js for rez 2017-11-14 14:29:49 -08:00
Zach Fox
c42003a374
Merge pull request #11794 from ElderOrb/FB4684_3 
4684 Add collapse button on the virtual keyboard
 2017-11-14 12:22:42 -08:00
Alexander Ivash
e201e203b8 8984 Opening tablet with "Enter" key displays the audio menu 2017-11-14 22:18:48 +03: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
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
Zach Fox
641c4656c4 Fix bug with disappearing certificate info 2017-11-13 10:53:16 -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
Ryan Downe Karpf
f8b1c7978c
Merge pull request #11772 from 1P-Cusack/FogBugz/Case_6569 
[Case 6569]: Silent failure is possible during Model Creation
 2017-11-12 08:36:10 -08: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
SamGondelman
cbf0543646 deadspot 2017-11-10 13:22:38 -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
beholder
d1969d649a fix not collapsing keyboard 2017-11-10 21:20:00 +03:00
beholder
0bc95998c4 a few more adjustments based on discussion with Mukul 2017-11-10 21:20:00 +03:00
beholder
4d11f9a434 increase font pixel size for 'collapse keyboard' to 34px 2017-11-10 21:20:00 +03:00
beholder
db3ed81513 adjust to changed requirements: 
1. The keyboard collapse button is moved to the lower right, replacing the keys there
2. The button next to m is a hyphen instead of a underscore, it turns to a underscore when the user clicks on shift
3. The input text at the top occupies the full width and is center aligned, when you start typing the text moves in both directions the left and the right
 2017-11-10 21:20:00 +03:00
beholder
eb4214fb4c add API for unfocusing input fields in HTML, unfocus WebEngine-based QML items on lowering keyboard 2017-11-10 21:20:00 +03:00
beholder
fb14e4dc4d Fixed programmatical lowering of 'TabletAddressDialog' 2017-11-10 21:20:00 +03:00
beholder
a9fe3596cf 4684 Add collapse button on the virtual keyboard 2017-11-10 21:20:00 +03: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
beholder
87519cd26f use conditional bindings to avoid intermediate binding states 2017-11-10 19:53:54 +03:00
beholder
908faa1334 refactoring: simplify code & fix the issue with menu-es sometimes losing checked state 2017-11-10 19:53:54 +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
LaShonda Hopper
0e90c92cf5 [Case 6569] Minor: Break up line to pass column count guidelines. 
Changes Committed:
    modified:   interface/resources/qml/hifi/tablet/NewModelDialog.qml
 2017-11-08 18:35:12 -05:00
LaShonda Hopper
a057cb914f [Case 6569] Fixes clipping of cancel button by window edge. 
Changes Committed:
    modified:   interface/resources/qml/hifi/tablet/NewModelDialog.qml
 2017-11-08 18:27:25 -05:00
LaShonda Hopper
dac2ae19a4 [Case 6569] Add protection for dynamic vs static collision type (details below). 
When creating a model, it was possible to elect Exact collision with the dynamic
property even though this combination is prohibited.  This combination would silently
fail rather than notifying the user of the error.

This commit implements safeguards against the invalid combination:
    * If the user elects the Exact collision type and the dynamic field is unchecked, then dynamic field is disabled.
    * If the user elects a different collision type and the dynamic filed is unchecked, then the dynamic field is enabled.
    * If the user has checked the dynamic field and subsequently elects the Exact collision type, then the selection is
      void and the previous collision selection is retained; however, an error dialog is presented informing the user of the error.

Changes Committed:
    modified:   interface/resources/qml/hifi/tablet/NewModelDialog.qml
 2017-11-08 18:27:24 -05: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
Ken Cooke
addcb51ed9 Change slider label from "master gain" to "master volume" 2017-11-08 07:50:35 -08:00
Olivier Prat
f996435ac8 Merge branch 'master' of git://github.com/highfidelity/hifi into highlight 2017-11-08 11:41:21 +01:00
David Rowe
0d21e0be11 Delete old, no longer used file 2017-11-08 17:14:17 +13:00
David Rowe
055470296d Move current location in GOTO dialog and add placeholder text to input 2017-11-08 17:13:40 +13: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
Zach Fox
f248eb5518 Change wallet home when 0 transactions 2017-11-07 11:30:09 -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
Stephen Birarda
99552910f7
Merge pull request #11754 from ctrlaltdavid/21591 
Fix Asset Browser's "Copy URL" context menu
 2017-11-06 13:42:22 -08:00
SamGondelman
7d420f5242 isLeftHand, isRightHand, isMouse 2017-11-06 12:29:21 -08:00
Brad Davis
544c54b8ee Merge remote-tracking branch 'upstream/master' into HEAD 2017-11-06 10:07:22 -08:00
Howard Stearns
0898ad8b25
Merge pull request #11745 from zfox23/commerce_receiveAtFingerprint 
Add Machine Fingerprint to receive_at endpoint txn
 2017-11-06 09:06:01 -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
David Rowe
9db0dd6fea Fix Asset Browser's "Copy URL" context menu 2017-11-05 20:38:37 +13:00
Menithal
ac1df7b815 21539: Allow HMD to turned off in Desktop Mode 2017-11-05 01:02:08 +02:00
Brad Hefta-Gaub
c1dfa24c12
Merge pull request #11743 from kencooke/audio-peakmeters-bugfix 
Fix the audio input device peak meters
 2017-11-04 13:55:08 -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
Melissa Brown
a14e98053e
Merge pull request #11138 from Nex-Pro/21466 
Fix Avatar Rotation upon Teleporting Using PAL
 2017-11-03 11:58:15 -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
Nex-Pro
3171418173
Update NameCard.qml 2017-11-03 17:21:35 +00: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
Ken Cooke
babaef8399 Fix the audio input device peak meters 2017-11-03 05:59:59 -07:00
Zach Fox
6f3c61c4e0 Slightly modify invalid cert language 2017-11-02 17:59:36 -07: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
Seth Alves
12792c3821 stop drawing ignored avatars, even if PAL is still open 2017-11-01 17:26:00 -07:00
Zach Fox
72d61f1825 Remove unnecessary log - static verif isn't working 2017-11-01 12:03:44 -07:00
Zach Fox
56cb98d96f Make inspection cert work 2017-11-01 12:02:57 -07:00
Zach Fox
b335ba9a75 Timeout timer 2017-11-01 11:34:29 -07:00
Brad Davis
f061b9c2da Add stylus functionality to pointer manager 2017-11-01 11:27:57 -07:00
Zach Fox
8a6a744099 It's working 2017-11-01 10:46:13 -07:00
Ken Cooke
82d9827571 Merge branch 'master' into audio-louder-mastergain 2017-11-01 08:10:55 -07:00
SamGondelman
657a0fb036 Merge remote-tracking branch 'upstream/pointers' into ui 2017-10-31 17:41:14 -07:00
SamGondelman
64665c87b2 replace ids with unsigned ints 2017-10-31 17:07:48 -07:00
Zach Fox
93308dfcd3 Why did I think this would work before? 2017-10-31 16:21:10 -07:00
SamGondelman
3c779f1528 HUD events WIP, fix entity/overlay hover, no hover for empty renderState 2017-10-31 14:42:31 -07:00
Zach Fox
d49e281fab Add RSA error handling 2017-10-31 14:12:30 -07:00
Zach Fox
e9c144892a Fixes 2017-10-31 13:11:32 -07:00
Zach Fox
f5ada4fe62 Will it compile? 2017-10-31 12:33:28 -07:00
Zach Fox
6f96e0c7bd More progress 2017-10-31 12:14:12 -07:00
Zach Fox
90e9251176 It's a start 2017-10-31 11:28:19 -07:00
Bradley Austin Davis
55d819d7e3
Merge pull request #11699 from SamGondelman/ui 
Pointers generate PointerEvents (WIP)
 2017-10-31 10:01:15 -07:00
SamGondelman
76eb4c656e fix multi-touch and keyboard on web entities 2017-10-30 16:41:59 -07:00
vladest
aa9ae6c838 License header fix 2017-10-30 20:29:44 +01:00
vladest
ea55b5407e bracket fix 2017-10-30 20:22:47 +01:00
vladest
7b57fe1a5d type fixed 2017-10-30 20:21:34 +01:00
vladest
d9c6f17e42 Coding standards 2017-10-30 20:06:17 +01:00
Ken Cooke
3a2780bdf6 Enable gain slider in PAL menu to control Avatar MASTER Gain 2017-10-30 10:42:26 -07:00
SamGondelman
e9a5acda06 control hovering, preset buttons for clicking, constness, scroll off 
surface
 2017-10-30 10:28:43 -07:00
vladest
d3c62db65d Merge branch 'master' into webbrowser_updates 2017-10-30 18:17:19 +01:00
vladest
586dde7dd7 Removed GPL code. Added own implementation of suggestions engine. Fixed Google maps different issues 2017-10-30 18:15:42 +01:00
Brad Davis
23653f08ca Merge remote-tracking branch 'upstream/master' into HEAD 2017-10-30 09:20:58 -07:00
Ryan Downe Karpf
28a99fe685
Merge pull request #11655 from dback2/tabletcontextualmode 
add a tablet contextual mode flag to HMDScriptingInterface used to keep tablet in place
 2017-10-30 08:56:26 -07:00
vladest
950ac3540a Fix mute unmute. Scrolling thru suggestions popup now set popup's contains into url. Fixed reload timer 2017-10-29 14:05:47 +01:00
ZappoMan
f63db42c0e migrate SpatiallyNestable::getOrientation to getWorldOrientation, remove redundant getRotation 2017-10-28 10:14:25 -07:00
vladest
865c241a13 Merge branch 'master' into webbrowser_updates 2017-10-28 12:31:26 +02:00
vladest
b1601dcd4c fix typo in tablet avatar browser 2017-10-28 12:07:29 +02:00
vladest
567a219e9c Cleanup. Remove unused functionality 2017-10-28 12:01:37 +02:00
vladest
6fb1a9954e Merge branch 'master' into fix_google_vr_height 2017-10-28 10:35:29 +02:00
ZappoMan
a7a0f03ede rename SpatiallyNestable::getPosition() to SpatiallyNestable::getWorldPosition() 2017-10-27 18:39:17 -07:00
Andrew Meadows
f958829d00
Merge pull request #11708 from samcake/blue 
Expose the Render api to the tablet js context and update render engine tool
 2017-10-27 17:12:36 -07:00
Brad Hefta-Gaub
8322631a6d
Merge pull request #11695 from luiscuenca/case6719 
6719 Avatar attachment window will update when attachments are modified
 2017-10-27 17:01:05 -07:00
samcake
8a3b1a20cc merge with upstream 2017-10-27 14:57:25 -07:00
Brad Hefta-Gaub
d61ede2a4e
Merge pull request #11697 from ElderOrb/FB8211 
8211 Add very short haptic feedback when highlighting letters on keyboard
 2017-10-27 13:26:41 -07:00
Zach Fox
5ab737f66d
Merge pull request #11658 from zfox23/pop_dynamicTestsMaster 
Commerce: Owner Verification for Certified Entities
 2017-10-27 12:28:04 -07:00
Zach Fox
3fae121335
Merge pull request #11670 from zfox23/stagingSetting 
Make it easier to switch between STABLE and STAGING Metaverses
 2017-10-27 12:03:29 -07:00
luiscuenca
70b37f2e8a Cleaning some old tabs 2017-10-27 11:32:44 -07:00
luiscuenca
f32282afdd Clean update bug 8027 2017-10-27 11:03:02 -07:00
samcake
55f6ecb070 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-10-27 09:29:41 -07:00
Olivier Prat
bced566510 Merged from master and disable scissor testing with define macro until I figure out how to make it work in stereo 2017-10-27 10:45:43 +02:00
samcake
0636a2db06 removing historic changes 2017-10-26 19:19:52 -07:00
Zach Fox
9481824d0a Fix enabled status of wear button 2017-10-26 17:02:09 -07:00
SamGondelman
7951826e49 more advanced laser focusing 2017-10-26 16:10:27 -07:00
beholder
6093cef6f0 add comments to explain '-1' 2017-10-27 01:25:26 +03:00
beholder
f6fa85fed2 adjust to coding standards 2017-10-27 01:25:25 +03:00
SamGondelman
f0c15e874c merge with master 2017-10-26 14:52:17 -07:00
samcake
b9112024b8 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-10-26 14:27:23 -07:00
SamGondelman
755ce183e0 fix is facing avatar 2017-10-26 14:16:31 -07:00
Zach Fox
002141724b Return to using NetworkingConstants 2017-10-26 14:12:36 -07:00
Zach Fox
3e95484c4c Merge branch 'master' of https://github.com/highfidelity/hifi into stagingSetting 2017-10-26 13:58:50 -07:00
Brad Hefta-Gaub
e6dca8de86 Merge pull request #11698 from kencooke/audio-sample-sound-fix 
Tighter version of sample sound
 2017-10-26 13:45:19 -07:00