Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-09 10:22:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
78843 commits 67 branches 56 tags 1.2 GiB
Commit graph

7817 commits

Author SHA1 Message Date
r3tk0n
2a04d2b9c5 Closer... 2019-02-26 12:39:51 -08:00
r3tk0n
0b651a8d63 Fix fargrab rotation with dominant hand, need to fix activation criteria next. 2019-02-26 11:29:06 -08:00
Shannon Romano
badd0b8bd3
Merge pull request #14968 from davidkelly/dk/20726 
Guard against accidentally calling wrong api/v1/places endpoint
 2019-02-25 17:16:33 -08:00
r3tk0n
52b62784d6 Incremental, broken progress. 2019-02-25 14:10:48 -08:00
amer cerkic
0775392759 adding market place back to the default scripts 2019-02-25 14:05:54 -08:00
r3tk0n
a66c76bf38 Fixing typos. 2019-02-25 13:47:31 -08:00
r3tk0n
5d3a778b0b Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco-fargrab-rotation 2019-02-25 13:10:47 -08:00
r3tk0n
d79681470e Saving changes before merging master... 2019-02-25 13:10:25 -08:00
r3tk0n
c6a3496b25 Add utility functions for adjusting target rotation and position. 2019-02-24 12:36:44 -08:00
Sam Gateau
dab0df1113 Trying to fix the damn gamma 2019-02-22 18:03:23 -08:00
amer cerkic
f04fdb2187 added esc key event to fire for the away animation when cycling pause/resume. Reverted change on surface destroy that nullified the surface. Forgot to remove that during testin. Removed comment in away.js with syntax error. Setting cpu/gpu levels back to 1/1 after vr mode is released. Noticed that OS stays in same cpu/gpu level after app closes. Hoping this will help reduce battery drain for user 2019-02-22 09:11:24 -08:00
amer cerkic
9097d9c57c working on pause -> away mode. Even doesn't seem to be firing. Also found a spot where I left commented out code from lifecycle testing. 2019-02-21 16:33:25 -08:00
r3tk0n
58906d84eb Add grip button polling. 2019-02-21 15:22:21 -08:00
shanzzam
adb6f559dc Changing twitter handle from inc to VR 2019-02-20 18:31:32 -08:00
John Conklin II
87556059d3
Merge pull request #13901 from Cristo86/android_handshake 
case 20058: Android - Handshake implementation
 2019-02-20 13:33:52 -08:00
David Kelly
2202b69575 Guard against accidentally calling wrong api/v1/places endpoint 
spaces
 2019-02-20 13:09:29 -07:00
r3tk0n
7092513b7d Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco 2019-02-19 17:42:58 -08:00
Simon Walton
8033e93eda Add avatar-priority boolean to zone entities 
RC-79 version
 2019-02-19 17:38:37 -08:00
Dante Ruiz
6189aff6b3
Merge pull request #14933 from danteruiz/pick-manager-perf 
Case 21271: Remove unnessary picks for quest
 2019-02-19 14:20:56 -08:00
r3tk0n
ebbf48a11b Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco 2019-02-19 12:02:50 -08:00
r3tk0n
03058775f6 Remove debug prints. 2019-02-19 11:27:13 -08:00
r3tk0n
f52b096bb9 Change far grab to chorded input 'superpower' 2019-02-19 11:26:42 -08:00
John Conklin II
051ab61b66
Merge pull request #14951 from SamGondelman/ssao 
Case 20993: Fix AO
 2019-02-19 11:19:03 -08:00
SamGondelman
27f05db825 fix ao 2019-02-18 01:12:00 -08:00
SamGondelman
1163cbea70 improving web surface interaction and tablet hiding 2019-02-16 22:03:55 -08:00
SamGondelman
7677e3bf44 just in case 2019-02-16 20:41:57 -08:00
SamGondelman
71653f95d7 working on overlay bugs 2019-02-16 20:08:36 -08:00
danteruiz
b00746c096 Trim picks in use during quest: 2019-02-15 16:24:17 -08:00
Thijs Wenker
46768c2a6e remove the code that prevented the crash from happening, since it is not reproducible anymore 2019-02-16 00:42:19 +01:00
David Back
e46b947913 properly disable draggable numbers, fix disable script and collision sound 2019-02-15 15:31:11 -08:00
Roxanne Skelly
1154414a07 remove unneeded marketplaceInject.js 2019-02-15 12:36:35 -08:00
David Back
158e255319
Merge pull request #14902 from huffman/fix/duplicating-grabbed-entities 
Case 21029: Fix duplicating non-dynamic grabbed entities in edit.js
 2019-02-15 11:25:42 -08:00
David Back
af25a7bf6e
Merge pull request #14919 from dback2/selectAllClearAll 
Case 19930: Entity List - add select/clear all to entity type dropdown
 2019-02-15 10:12:30 -08:00
David Back
e944e284a6 design feedback 2019-02-14 17:37:58 -08:00
David Back
f6baa2432a design feedback 2019-02-14 17:27:05 -08:00
David Back
46ff3a8405 add select/clear all buttons to entity type dropdown 2019-02-14 16:16:33 -08:00
Ryan Huffman
e800a6e030 Update hard-coded vec3 zero with Vec3.ZERO 2019-02-14 15:56:17 -08:00
Shannon Romano
453c081d9b
Merge pull request #14901 from huffman/fix/dropdown-close-on-click 
Case 19999: Update edit.js to auto close dropdowns when clicking outside
 2019-02-14 14:48:03 -08:00
Bradley Austin Davis
d45d87031d
Merge pull request #14782 from SamGondelman/NOverlaysFinal 
Case 20723, Case 20334: Internally, replace all overlays with local entities
 2019-02-14 13:49:47 -08:00
SamGondelman
b418e43ef2 ctrlaltdavid's minitablet fix 2019-02-12 13:15:58 -08:00
Ryan Huffman
2728654d35 Fix duplicating non-dynamic grabbed entities in edit.js 2019-02-12 10:09:28 -08:00
Ryan Huffman
fcfb1b7a4a Update edit.js to auto close dropdowns when clicking outside 2019-02-12 10:06:25 -08:00
Sam Gateau
afb6c838eb REverting all the changes from the brown branch not used 2019-02-11 20:13:37 -08:00
Sam Gateau
8a4f7fe2b6 Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2019-02-11 18:57:33 -08:00
SamGondelman
a9767e4c22 working on mini tablet 2019-02-11 15:46:29 -08:00
Ryan Huffman
16b48046c6 Fix not being able to type text into particle url field 2019-02-11 15:27:30 -08:00
SamGondelman
f53ccf7363 fix create, working on mini tablet 2019-02-11 14:54:53 -08:00
SamGondelman
d988de4a17 Merge remote-tracking branch 'upstream/master' into NOverlaysFinal 2019-02-11 10:27:12 -08:00
Brad Hefta-Gaub
8faff57033
Merge pull request #14830 from thoys/fix/create/zoneShapeVisualizersIgnorePickray 
MS20909: ignore pickRay for zone shape visualizers
 2019-02-08 19:12:58 -08:00
John Conklin II
b46fb7cfe7
Merge pull request #14860 from thoys/fix/create/entityListUnderscoreFirstSorting 
Case 19385: local compare in entity list sorting
 2019-02-08 14:56:32 -08:00
Sam Gateau
48d671c6c3 Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2019-02-07 18:54:19 -08:00
SamGondelman
e74ff18bef Merge remote-tracking branch 'upstream/master' into NOverlaysFinal 2019-02-07 09:49:27 -08:00
SamGondelman
25ca52d892 Merge remote-tracking branch 'upstream/master' into NOverlaysFinal 2019-02-07 09:48:13 -08:00
Cristian Duarte
babb972d89 Merge remote-tracking branch 'hifi/master' into android_handshake 2019-02-07 14:44:22 -03:00
Sam Gateau
632d6e8a73
Merge pull request #14863 from danteruiz/android-apps-directories 
Case 20877: Support CMake time configuration of QmlFileSelectors
 2019-02-07 09:30:49 -08:00
Dante Ruiz
f07b5c8490 update urls 2019-02-06 14:25:25 -08:00
Sam Gateau
8ec9c8502d Merge branch 'master' of github.com:highfidelity/hifi into brown 2019-02-06 12:09:38 -08:00
danteruiz
d0fecac0d8 +android -> +android_interface 2019-02-06 11:37:52 -08:00
Shannon Romano
61459d5756
Merge pull request #14775 from roxanneskelly/QmlMarketplace 
Qml marketplace
 2019-02-06 11:20:49 -08:00
Thijs Wenker
2247dd3471 local compare in entity list sorting 2019-02-06 18:24:40 +01:00
Sam Gateau
d8f6583047 Merge branch 'master' of github.com:highfidelity/hifi into brown 2019-02-06 09:01:38 -08:00
Sam Gateau
35491bf5b0 Multisampling works in 4.1 2019-02-06 00:05:17 -08:00
danteruiz
30bd9774b2 script engine to load platform specific files 2019-02-05 13:11:54 -08:00
Sam Gateau
4089f8c5b0 Adding Color filter to the tone mapper 2019-02-04 23:45:35 -08:00
Roxanne Skelly
78aa1783a0 Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace 2019-02-04 15:04:55 -08:00
Roxanne Skelly
e23c589de7 QmlMarketplace - fix issue with footer not appearing in marketplaces list 2019-02-04 15:04:18 -08:00
Roxanne Skelly
39ad36a4d0 QmlMarketplace - bugfixes and Markup rendering of descriptions 
* Render markup in descriptions (bold, italic, quote, etc.)
* Back button from marketplaces list now works properly
* Layout fixes
 2019-02-01 15:27:17 -08:00
SamGondelman
c6080d0795 fix edit selection + log problem 2019-02-01 14:37:42 -08:00
SamGondelman
ba8320f561 fix 2d overlay deletion 2019-02-01 14:31:26 -08:00
SamGondelman
b80d2a9b06 Merge remote-tracking branch 'upstream/master' into NOverlaysFinal 2019-02-01 13:33:04 -08:00
Thijs Wenker
80f5cbc8ab also ignore picking on the material entity 2019-01-31 22:14:15 +01:00
Thijs Wenker
ca4695377f also ignore picking on the material entity 2019-01-31 22:12:35 +01:00
Thijs Wenker
15066faaf7 ignore pickRay for zone shape visualizers 2019-01-31 19:45:29 +01:00
Thijs Wenker
fbdae18245 ignore pickRay for zone shape visualizers 2019-01-31 19:38:20 +01:00
Gabriel Calero
6a665835e7 Merge remote-tracking branch 'upstream/master' into android_handshake 2019-01-30 17:06:41 -03:00
SamGondelman
7d47bfa2e4 david's comments 2019-01-30 11:50:32 -08:00
SamGondelman
834e44dd3a make polyline's with faceCamera not depend on normal 2019-01-30 11:02:24 -08:00
Ryan Huffman
9c8e21ec6b
Merge pull request #14806 from thoys/fix/create/mismatchingEntityHostTypeChildren 
MS20893 [CreateApp] Ignore children of mismatching entityHostTypes
 2019-01-30 09:55:39 -08:00
Thijs Wenker
132d293c3c skip child entities of mismatching entityHostType when copy/delete/duplication of entities 2019-01-30 03:15:32 +01:00
r3tk0n
1751864042 Fix this references in module run function. 2019-01-29 16:13:11 -08:00
Roxanne Skelly
0fdbca8ade QmlMarketplace Bugfixes 
* Fix upgrades
* Certificate 'View in Marketplace' wasn't working
* command-line hifiapp:MARKET wasn't launching
* Home link wasn't disappearing where it should
* Log In button on marketplace wasn't working
* Other minor UI bugfixes
 2019-01-29 16:07:27 -08:00
Jeff Clinton
08a3e65f66
Merge pull request #14789 from danteruiz/recenter-hmd-log-window 
Case 20771: Make sure that the script log is in the correct location when switching to and from HMD
 2019-01-29 13:03:43 -08:00
r3tk0n
4d2ee07512 Change deactivation criteria as per conversation between Joshua and Mukul. 2019-01-29 12:02:23 -08:00
SamGondelman
9aae9d13f6 fix tablet home button 2019-01-28 22:19:31 -08:00
SamGondelman
a8dbe5e761 working on build errors 2019-01-28 21:10:24 -08:00
SamGondelman
6ad0b3412a showKeyboardFocusHighlight + fixes 2019-01-28 20:43:47 -08:00
SamGondelman
0d1e4bed66 merge with master 2019-01-28 18:13:05 -08:00
SamGondelman
445608e163 fix entity selection tool 2019-01-28 15:30:19 -08:00
Roxanne Skelly
a4d105f24f Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace 2019-01-28 15:17:08 -08:00
Roxanne Skelly
2fe78383ed QmlMarketplace - Fix issues found during test 
* command line --url hifiapp:MARKET was not bringing up correct
marketplace
* Search field was not being cleared when 'home' button was clicked
after a search
* tablet button was not lit when marketplace was launched
 2019-01-28 15:14:49 -08:00
Shannon Romano
1aa6221f57
Merge pull request #14779 from thoys/fix/create/AddMissingMaterialTooltips 
MS20333: [CreateApp] add missing Material Entity tooltips
 2019-01-28 14:18:46 -08:00
Dante Ruiz
20d933ce6e recenter log window when enter and exiting hmd mode 2019-01-28 13:58:29 -08:00
John Conklin II
c95b681092
Merge pull request #14696 from thoys/feat/create/showZonesInCreate 
MS20292 - [CreateApp] Make it easier to see zones while you're editing them
 2019-01-28 11:41:42 -08:00
Jeff Clinton
9d09c777d2
Merge pull request #14778 from thoys/fix/create/ignoreScriptedKeyEventsFromJSONEditor 
MS20501 [CreateApp/Properties] ignore scripted key events from the JSON Editors
 2019-01-28 11:40:48 -08:00
Thijs Wenker
b75c4ae3b6 fix spelling 2019-01-28 20:26:04 +01:00
Roxanne Skelly
d3cffa50d6 Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace 2019-01-28 11:11:28 -08:00
Jeff Clinton
a80d842107
Merge pull request #14777 from thoys/fix/create/entityListColumnSortOrder 
MS19766: [CreateApp/Entity List] Default column order, always move empty values to bottom on initial sort of column
 2019-01-28 09:25:33 -08:00
Thijs Wenker
bfb93e67b7 materialRepeat will clamp when disabled. 2019-01-28 16:46:35 +01:00
Thijs Wenker
ef1018c49b - EntityShapeVisualizer.updateSelection -> EntityShapeVisualizer.setEntities (for a more generic use) 
- GridPattern -> Material
- Replaced stringified compare with deep compare
- Copied+modified zone icon (consistent color, removed sharp edges)
 2019-01-28 16:10:29 +01:00
Thijs Wenker
c1eeab6542 Merge branch 'master' of github.com:highfidelity/hifi into feat/create/showZonesInCreate 2019-01-28 14:32:27 +01:00
Shannon Romano
1584311689
Merge pull request #14745 from sabrina-shanman/material-inspector 
(case 20748) Add material inspector to Luci.js
 2019-01-25 17:35:07 -08:00
Shannon Romano
f084021fdf
Merge pull request #14678 from hyperlogic/feature/hmd-avatar-alignment-type 
Added HMD Avatar Alignment Type
 2019-01-25 17:32:41 -08:00
Roxanne Skelly
dfac0d88a2 QmlMarketplace - Add 'logged out' behavior, fix issue with search scope 
display
 2019-01-25 16:41:13 -08:00
Roxanne Skelly
6123c4ec96 Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace 2019-01-25 13:45:04 -08:00
Jeff Clinton
efb278b258
Merge pull request #14707 from thoys/fix/create/activeColorPickerDoesNotUpdateOnEntitySwitch 
fix for continuous color picker update loop
 2019-01-25 10:38:14 -08:00
Thijs Wenker
e2dc86261e add missing Material Entity tooltips 2019-01-25 05:16:04 +01:00
Thijs Wenker
992ce9f875 ignore scripted key events from the JSON Editors 2019-01-25 04:41:36 +01:00
Thijs Wenker
85e26e949b fix issue where empty values are always on bottom on default ascending columns 2019-01-25 04:02:19 +01:00
Thijs Wenker
ae2e85d802 entity list, default column sort orders, when in default order always move empty values to bottom 2019-01-25 03:22:27 +01:00
Roxanne Skelly
cfaf01b22a Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace 2019-01-24 17:21:16 -08:00
Roxanne Skelly
c1ff51a02d QML Marketplace 
Checkpoint full functionality
 2019-01-24 17:20:42 -08:00
r3tk0n
80abfbab5e Modify teleport to 'superpower' spec. 2019-01-24 14:22:01 -08:00
r3tk0n
690f67c9d9 Add variable for teleport deadzone on y-axis. 2019-01-24 14:21:18 -08:00
Anthony Thibault
a7a71e4286 Merge branch 'master' into feature/hmd-avatar-alignment-type 2019-01-23 15:52:20 -08:00
Thijs Wenker
b2f1657096 grid pattern 2019-01-23 19:28:34 +01:00
David Back
89032698eb newline 2019-01-22 18:24:09 -08:00
David Back
ea5705907b fix shape type and compound shape URL properties/tooltips 2019-01-22 18:22:13 -08:00
Jeff Clinton
3776472550
Merge pull request #14731 from AndrewMeadows/fix-mexico-hats 
cases 20709 and 20715: wear and see mexico hats
 2019-01-22 12:58:56 -08:00
r3tk0n
d3c1843d45 Disable toggleAdvancedMovementForHandControllers.js until such time the Controller.Standard.RY binding can be fixed. 2019-01-21 15:40:12 -08:00
Roxanne Skelly
8010d86210 QML Marketplace support 
Support QML UI for the Marketplace as some devices do not handle
web on 3d surfaces.
Checkpoint code
 2019-01-21 13:39:16 -08:00
Thijs Wenker
93516423bb zone visualizer prototype 2019-01-21 17:25:06 +01:00
sabrina-shanman
556a2ec3b6 Add material inspector to Luci.js 2019-01-18 18:15:44 -08:00
Shannon Romano
11b8ae6d44
Merge pull request #14710 from sethalves/mouse-grab-with-traits 
case 15962: case 20481: Mouse grab with traits
 2019-01-18 11:56:41 -08:00
Seth Alves
c8e9bff03a fix releaseGrab call on grabbed entity when a nearGrab ends 2019-01-17 13:34:36 -08:00
Seth Alves
b1c34eb9ec update queryAACube during grab rather than only when grab is released 2019-01-15 16:01:44 -08:00
Seth Alves
b5326936d8 grab.js will now ignore click-to-equip entities 2019-01-15 14:17:51 -08:00
Seth Alves
e8676f63c6 release grab if scripts are reloaded before grab is released 2019-01-15 13:44:03 -08:00
Seth Alves
2515c7f73e remove old-style grabbing scripts 2019-01-15 13:43:52 -08:00
Seth Alves
174c79d66d use new-style far-grabbing code for mouse grabs 2019-01-15 13:43:51 -08:00
SamGondelman
68e15c6c07 fixes from 78 2019-01-14 13:36:21 -08:00
Thijs Wenker
6cabc86130 fix for continuous color picker update spam / only update color picker from properties when entity selection has changed 2019-01-14 18:54:28 +01:00
Anthony Thibault
5d606981de Added HMD Avatar Alignment Type 
Adds a new API to set this type, and an option to the Avatar App.

* "eye" - Match the user eyes with the avatar eyes. The previous default behavior.
  If the avatar skull is larger then the user, it can cause the avatars body to lift off of the ground when the user looks down.
* "head" - Match the user head with the avatar head.  The new default behavior.
  This prevents the body from lifting off of the ground while wearing a large headed avatar.  But can cause an offset between the users eyes and the avatars eyes.
 2019-01-08 18:35:28 -08:00
Thijs Wenker
24022f0ccc add missing Text properties to Create App 2019-01-08 20:38:31 +01:00
John Conklin II
00a9367f14
Merge pull request #14662 from dback2/addGridEntitiesToCreate 
Add grid entities to create
 2019-01-08 10:12:34 -08:00
Jamil Akram
4c6b14bf72
Merge pull request #14642 from dback2/propertyRangeAudit 
Entity property range/step audit
 2019-01-08 09:42:59 -08:00
John Conklin II
ed4f2d9c10
Merge pull request #14439 from AndrewMeadows/shaped-zones 
Case 15518: shaped zones
 2019-01-08 09:06:45 -08:00
David Back
d9e229d38e remove add Grid entity button, fix color 2019-01-07 18:20:20 -08:00
David Back
90e2feb977 replace placeholder icon with real icon from Alan 2019-01-07 18:20:20 -08:00
David Back
7581c77be8 update tooltips, use Cube icon for now 2019-01-07 18:20:20 -08:00
David Back
e0e9a7de15 tabs 2019-01-07 18:20:20 -08:00
David Back
9013eee352 add grid entities to create - icons pending 2019-01-07 18:20:19 -08:00
David Back
3aa245036b
Merge branch 'master' into propertyRangeAudit 2019-01-07 15:36:18 -08:00
Thijs Wenker
7823b3d4a3 clarifying comments 2019-01-07 21:08:41 +01:00
Thijs Wenker
7d9cad3e8e CreateApp - Fix active colorPicker to update on selection update 2019-01-07 20:35:09 +01:00
David Back
5aa5b997fe remove logs 2019-01-07 11:33:08 -08:00
David Back
2f99729905 add rect case, fix step rounding 2019-01-07 11:31:04 -08:00
David Back
56007c8512 Merge branch 'master' of https://github.com/highfidelity/hifi into propertyRangeAudit 2019-01-07 10:50:45 -08:00
Shannon Romano
8acae02203
Merge pull request #14660 from thoys/feat/create/newFirstClassImageProperties 
MS20170: Update Image/Text Entity properties in Create with new properties
 2019-01-07 10:45:15 -08:00
David Back
d25948fbd3 Merge branch 'master' of https://github.com/highfidelity/hifi into propertyRangeAudit 2019-01-07 10:36:27 -08:00
Jeff Clinton
75d26dc45f
Merge pull request #14659 from luiscuenca/addAvatarToAvatarCollisionOption 
Add menu checkbox to toggle collisions with other avatars
 2019-01-07 08:58:09 -08:00
Thijs Wenker
26f46e87a3 new property tooltips 2019-01-05 02:16:12 +01:00
Thijs Wenker
48dc7ee938 New color/text entity properties 2019-01-05 01:56:28 +01:00
David Back
5ea84fb952 CR fixes 2019-01-04 15:39:27 -08:00
luiscuenca
d630fe9dbd Add menu checkbox to toggle collisions with other avatars 2019-01-04 16:38:48 -07:00
Andrew Meadows
a642af23b7 enable shapeType=ellipsoid and expose zone shapeType to UI 2019-01-04 12:37:23 -08:00
David Back
eff9d11437 Merge branch 'master' of https://github.com/highfidelity/hifi into propertyRangeAudit 2019-01-04 11:07:28 -08:00
SamGondelman
4cd1cd6606 merge with master 2019-01-03 12:56:41 -08:00
Seth Alves
b2f25629eb don't allow scaling of others' equipped entities 2019-01-03 08:19:18 -08:00
Seth Alves
306c54c060 fix code that allows adjusting of own avatar entities while forbidding adjusting those of others 2019-01-03 08:17:52 -08:00
Seth Alves
bf46960dc3 fix timing on startNearGrab entity-method call for cloned entities. Don't allow grabbing of other's equipped or worn entities 2019-01-03 08:17:52 -08:00
Seth Alves
54a5805b5c add final edit when dropping an avatar-entity. don't allow grabbing of other's avatar entities 2019-01-03 08:17:52 -08:00
Seth Alves
9bf9e379a3 fix far-grab initial rotation and entity-method call 2019-01-03 08:17:52 -08:00
Seth Alves
613f290226 don't attempt to grab other's avatar-entities 2019-01-03 08:17:52 -08:00
Seth Alves
895e8cdba1 fix off-hand adjustment of equipped entities. make traits-based grabbing be enabled by default, again 2019-01-03 08:17:52 -08:00
Seth Alves
0967a94557 get grabbing and scaling to get along better 2019-01-03 08:17:52 -08:00
Seth Alves
905af34564 disable traits-based grabbing by default 2019-01-03 08:17:52 -08:00
Seth Alves
6a547d042c port over PR-14276 2019-01-03 08:17:52 -08:00
Seth Alves
1c1e648b8b port over PR-14429 2019-01-03 08:17:52 -08:00
Seth Alves
9900040ece enable trait-based grabbing by default 2019-01-03 08:17:52 -08:00
Seth Alves
70b68294ff port over PR-14464 2019-01-03 08:17:52 -08:00
Seth Alves
6f25c59a0c turn-off nearEntityGrab when scaleEntity is active 2019-01-03 08:17:52 -08:00
Seth Alves
78aff6e95c grab js api; send grab information through trait system 2019-01-03 08:17:52 -08:00
David Back
937aa718ae remove selected particle property defaults 2019-01-02 18:22:55 -08:00
SamGondelman
ea11497a67 Merge remote-tracking branch 'upstream/master' into NOverlays7 2019-01-02 18:09:19 -08:00
Ryan Huffman
f3d2d7c95b
Merge pull request #14638 from huffman/fix/entity-list-text-mb 
Fix texture MB column not sorting correctly in entity list
 2019-01-02 13:32:05 -08:00
unknown
f8f13e974d property range audit - add range info via macros accessible via API, tweak min/max/steps in entityProperties 2019-01-02 11:12:10 -08:00
Jeff Clinton
032178673a
Merge pull request #14634 from SamGondelman/NOverlays5 
Case 20200: Update EntityScriptingInterface to not find local entities (#2)
 2019-01-02 09:00:56 -08:00
Brad Hefta-Gaub
440f517b88
Merge pull request #14602 from samcake/punk 
Case 20303 : Cleaning up the render view tasks and jobs for better 2ndary camera
 2018-12-27 15:43:17 -08:00
Ryan Huffman
9c60b09c6b Fix texture MB column not sorting correctly in entity list 2018-12-27 14:50:12 -08:00
SamGondelman
b5a2642b6a updated entityscriptinginterface API and related functions 
(cherry picked from commit 6aac596698)
 2018-12-22 00:55:10 -05:00
Sam Gondelman
097d2d9503
Revert "Case 20200: Update EntityScriptingInterface to not find local entities" 2018-12-20 16:53:33 -08:00
sam gateau
26c9d7a94e Merge branch 'master' of github.com:highfidelity/hifi into punk 2018-12-20 13:22:19 -08:00
Shannon Romano
21ec4e0c53
Merge pull request #14524 from SamGondelman/NOverlays3 
Case 20132, Case 16928: First class Image Entities
 2018-12-20 21:20:49 +00:00
sam gateau
49df69e609 Merge branch 'master' of github.com:highfidelity/hifi into punk 2018-12-20 13:17:02 -08:00
Shannon Romano
b6d1607acd
Merge pull request #14547 from SamGondelman/NOverlays5 
Case 20200: Update EntityScriptingInterface to not find local entities
 2018-12-20 19:10:22 +00:00
Sam Gateau
8fba8062c3 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-12-19 20:01:48 -08:00
Wayne Chen
c36b3a4b07 fix 2018-12-19 12:46:41 -08:00
Sam Gondelman
e890fc6980
Merge branch 'master' into NOverlays3 2018-12-19 11:37:10 -08:00
sam gateau
d8e7305f4a Removing hili for now 2018-12-18 09:16:40 -08:00
Sam Gateau
76f204b5aa Exploring the hologram 2018-12-18 00:45:12 -08:00
sam gateau
237fb4dc4c Shadows are completely working with settings on both pipeline 2018-12-17 17:34:47 -08:00
Sam Gateau
318bf20ede Shadow is working correctly in both pipelines 2018-12-17 00:27:07 -08:00
Sam Gateau
30277213c6 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-12-13 20:40:50 -08:00
sam gateau
94ae345daf Merge branch 'master' of github.com:highfidelity/hifi into punk 2018-12-13 08:45:29 -08:00
Wayne Chen
4116f6ca9a
Merge branch 'master' into loginInitiative2 2018-12-12 18:00:07 -08:00
Jeff Clinton
5a81d8c093
Merge pull request #14453 from danteruiz/keyboard-menus 
Keyboard interaction menus
 2018-12-12 17:53:59 -08:00
SamGondelman
770da220d7 cleanup entity properties more and start polyline work, remove lines 2018-12-12 16:47:35 -08:00
Wayne Chen
0a0b7bf1ad removing onUsernameChanged signal to alter login settings 2018-12-12 16:26:35 -08:00
Dante Ruiz
089a223c2d more CR changes 2018-12-12 15:29:01 -08:00
Dante Ruiz
f3fad52e1d make CR changes 2018-12-12 13:29:32 -08:00
Dante Ruiz
51bdf1bf78 adding keyboards settings 2018-12-12 11:55:13 -08:00
Wayne Chen
2f07a0eb5d Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-12-11 20:01:19 -08:00
Sam Gateau
8599a340ed Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-12-11 19:02:48 -08:00
Shannon Romano
efedc1f0b5
Merge pull request #14563 from danteruiz/teleport-settings 
Adding menu settings to disable teleporting
 2018-12-11 21:08:23 +00:00
Zach Fox
826644ef08
Merge pull request #14559 from zfox23/MS20161_updatesDot 
Fix MS20161: Fix INVENTORY notification dot state
 2018-12-11 13:03:26 -08:00
Jeff Clinton
e88e15fd94
Merge pull request #14560 from zfox23/MS4382_handshakeSparkles 
Fix MS4382: Add a lifetime to handshake particle effects to prevent persistence
 2018-12-11 11:51:54 -08:00
Dante Ruiz
deaf3e8e44 adding option to disable teleportring 2018-12-11 11:06:13 -08:00
SamGondelman
fd8245e258 Merge remote-tracking branch 'upstream/master' into NOverlays6 2018-12-11 10:46:39 -08:00
Zach Fox
75ba1cb3c7 I forgot to clear dot immediately 2018-12-11 10:30:12 -08:00
sam gateau
9ffe38f40c Merge branch 'master' of github.com:highfidelity/hifi into punk 2018-12-10 15:13:58 -08:00
Zach Fox
3b9777d5d5 Fix MS4382: Add a lifetime to handshake particle effects to prevent persistence 2018-12-10 14:08:38 -08:00
Zach Fox
ab6aeae91a Fix MS20161: Fix INVENTORY notification dot state 2018-12-10 13:01:28 -08:00
Zach Fox
ed99da2165 Fix MS20215: Fix incorrect display of unavailable items on Marketplace main page 2018-12-10 11:15:27 -08:00
sam gateau
4ab003091a Merge branch 'master' of github.com:highfidelity/hifi into punk 2018-12-10 08:30:53 -08:00
Wayne Chen
4c9c785c24 Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-12-10 07:57:44 -08:00
Brad Hefta-Gaub
26ccfb2533
Merge pull request #14329 from ctrlaltdavid/mini-tablet-tuning 
Mini tablet tuning
 2018-12-09 17:23:59 -08:00
Brad Hefta-Gaub
1e9faa7754
Merge pull request #14276 from ctrlaltdavid/M19345 
Make create apps not grab tablet if editing an entity with hand
 2018-12-09 17:21:10 -08:00
Brad Hefta-Gaub
0425ae1231
Merge pull request #14239 from ElderOrb/FB19219 
FB19219 - Make avatarapp to handle wearables update via drag&drop
 2018-12-09 17:20:13 -08:00
Sam Gateau
79cad36c58 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-12-08 19:14:21 -08:00
SamGondelman
6aac596698 updated entityscriptinginterface API and related functions 2018-12-07 15:25:21 -08:00
Sam Gondelman
ccdf1c8614
Merge branch 'master' into NOverlays4 2018-12-07 14:27:34 -08:00
Sam Gondelman
4c5ff0dc3e
Merge branch 'master' into NOverlays3 2018-12-07 14:26:59 -08:00
John Conklin II
2d52fffa4b
Merge pull request #14460 from huffman/fix/lifetime-slider-alt 
Change lifetime back to a regular input field
 2018-12-07 13:43:08 -08:00
Ryan Huffman
a42a771df5
Merge pull request #14540 from huffman/feat/hide-certified-urls 
Add hiding of certified properties in Create
 2018-12-07 13:42:23 -08:00
Thijs Wenker
3a259d8525 Merge branch 'master' of github.com:highfidelity/hifi into fix/create/missingStartMiddleFinishTooltips2 
# Conflicts:
#	scripts/system/html/js/entityProperties.js
 2018-12-07 20:24:21 +01:00
Ryan Huffman
bf844e0472 Add hiding of certified properties in Create 2018-12-07 11:05:52 -08:00
Ryan Huffman
f42c31ca36 Update number property to reuse numberdraggable emit function 2018-12-07 11:02:31 -08:00
Ryan Huffman
c9ab5c23ea Add support for min/max/step/defaultValue on number field 2018-12-07 11:02:31 -08:00
Ryan Huffman
818339823c Add new number type in Create 2018-12-07 11:02:31 -08:00
John Conklin II
55f59a720f
Merge pull request #14501 from thoys/fix/create/userDataErrorMessagePopupInfiniteLoopFix 
MS19567 [CreateApp]: userData error message continues popup fix
 2018-12-07 10:59:34 -08:00
John Conklin II
d7e3935d57
Merge pull request #14421 from dback2/entityListReorderColumns 
Entity list - reorder columns
 2018-12-07 10:59:02 -08:00
John Conklin II
3a22299503
Merge pull request #14441 from dback2/preventDragDrop 
Prevent dragging and dropping files onto Create windows
 2018-12-07 10:58:42 -08:00
Wayne Chen
4e6f162e01 Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-12-07 10:12:46 -08:00
Alexander Ivash
72a91668a5 FB19219 Make avatarapp to handle wearables update via drag&drop 2018-12-07 11:23:17 +03:00
Sam Gateau
b24a2d33bf Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-12-06 19:51:05 -08:00
John Conklin II
88efaaa4c7
Merge pull request #14544 from huffman/fix/particle-property-layout 
Improve Create properties for particles + materials
 2018-12-06 16:45:44 -08:00
David Back
1a3708c49d better drag drop fix 2018-12-06 16:14:28 -08:00
Thijs Wenker
4f2289b347 CR fixes 2018-12-06 23:42:37 +01:00
Thijs Wenker
2771e2862e add missing material data json error clear on delete 2018-12-06 23:42:36 +01:00
Thijs Wenker
6d40bc9c2f userData error message continues popup fix 2018-12-06 23:42:36 +01:00
David Back
6a11766dbf Merge branch 'master' of https://github.com/highfidelity/hifi into preventDragDrop 2018-12-06 14:02:42 -08:00
David Back
8620a5a4c3 CR changes 2018-12-06 13:07:59 -08:00
David Back
a247e14f3d Merge branch 'entityListReorderColumns' of github.com:dback2/hifi into entityListReorderColumns 2018-12-06 13:06:49 -08:00
David Back
9fab86d972 Merge branch 'master' of https://github.com/highfidelity/hifi into entityListReorderColumns 2018-12-06 13:05:11 -08:00
David Back
e4efc90605 Merge branch 'master' of https://github.com/highfidelity/hifi into entityListReorderColumns 2018-12-06 13:04:53 -08:00
Sam Gondelman
d21d764131
Merge branch 'master' into NOverlays4 2018-12-06 12:48:05 -08:00
Sam Gondelman
2291c7e5fb
Merge branch 'master' into NOverlays3 2018-12-06 12:37:18 -08:00
Thijs Wenker
d25b5f054b
Merge branch 'master' into fix/create/missingStartMiddleFinishTooltips 2018-12-06 20:48:42 +01:00
Sam Gondelman
b690faeb12
Merge branch 'master' into NOverlays 2018-12-06 11:29:06 -08:00
Sam Gondelman
c38a6966a9
Merge branch 'master' into NOverlays4 2018-12-06 11:25:43 -08:00
Sam Gondelman
d30dd4c26c
Merge branch 'master' into NOverlays3 2018-12-06 11:23:50 -08:00
Adam Smith
08d6e35d4d
Merge pull request #14372 from SamGondelman/decals 
Case 19798: 3D projected Material Entities and materialRepeat option
 2018-12-06 11:13:46 -08:00
Wayne Chen
30f1016f1c Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-12-06 09:55:00 -08:00
Ryan Huffman
13c3b410d8
Merge pull request #14495 from dback2/draggableNumberFixes76-master 
Draggable numbers - RC76 fixes to master
 2018-12-06 09:47:38 -08:00
Jeff Clinton
e65e8d29a1
Merge pull request #14442 from hyperlogic/bug-fix/hand-grasp-during-desktop-handshake 
Ensure that hand is in grasp pose during desktop handshake animation
 2018-12-06 09:41:29 -08:00
Ryan Huffman
3160339551 Improve Create properties for particles + materials 
Sizing of input fields is now flexible.
Material scale field labels are no longer obscured.
Material tooltips are corrected.
 2018-12-06 09:41:10 -08:00
Jeff Clinton
7f242b8c0e
Merge pull request #14522 from thoys/fix/create/ignoreTextareaShortcuts-master 
[RC77] MS20114 [CreateApp] ignore createApp shortcut keys while TEXTAREA elements are in focus
 2018-12-06 09:11:49 -08:00
David Rowe
aa952e9142 Fix mini tablet visibility angle calculations 2018-12-06 15:24:03 +13:00
David Rowe
363e3ca32d Merge branch 'master' into mini-tablet-tuning 2018-12-06 13:55:24 +13:00
Sam Gateau
a295c6ffc8 scripts\developer\utilities\lib\jet\qml\TaskListView.qml 2018-12-04 22:41:36 -08:00
Wayne Chen
2d8b638370 Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-12-04 14:19:28 -08:00
Wayne Chen
1375e85f2c Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-12-04 10:21:12 -08:00
Sam Gateau
d2ff4d4674 Merge branch 'master' of https://github.com/highfidelity/hifi into one 2018-12-03 20:52:43 -08:00
sam gateau
0343983f31 Applying changes done in deferred to forward 2018-12-03 16:58:54 -08:00
SamGondelman
3ce6f7f3d6 real image entities 2018-12-03 11:50:59 -08:00
Thijs Wenker
f38f39c84d ignore shortcuts in TEXTAREA elements 2018-12-03 19:42:57 +01:00
Zach Fox
2776839dff
Merge pull request #14513 from zfox23/MS20117_rawHtmlRemoval 
Fix MS20117: Prevent HTML link from appearing in Wallet notification
 2018-12-03 10:27:32 -08:00
David Back
a05e831333
Merge branch 'master' into draggableNumberFixes76-master 2018-12-03 09:42:58 -08:00
sam gateau
5af24aa7d9 Merge branch 'master' of github.com:highfidelity/hifi into punk 2018-12-03 08:49:44 -08:00
Wayne Chen
ef12b1128b Merge branch 'master' of git://github.com/highfidelity/hifi into loginInitiative2 2018-11-30 20:18:04 -08:00
Shannon Romano
3c43f44119
Merge pull request #14462 from huffman/fix/key-light-angle 
Swap key light directions in Create
 2018-11-30 19:28:53 -08:00
Shannon Romano
0d2b0903d8
Merge pull request #14469 from huffman/fix/draggable-input-tabbable 
Fix draggable inputs not being tabbable
 2018-11-30 19:28:11 -08:00
Sam Gateau
80ec393f2e Merge branch 'master' of github.com:highfidelity/hifi into punk 2018-11-30 19:16:42 -08:00
Shannon Romano
5afff69b78
Merge pull request #14505 from huffman/fix/create-empty-rgb-field 
Fix empty rgb field in Create going black
 2018-11-30 18:19:44 -08:00
Zach Fox
051b7cfbb8 Fix MS20117: Prevent HTML link from appearing in Wallet notification 2018-11-30 16:12:21 -08:00
Wayne Chen
09bc886c20
Merge branch 'master' into loginInitiative2 2018-11-30 13:05:17 -08:00
Ryan Huffman
59b7cdf318 Fix empty rgb field in Create going black 2018-11-29 14:10:22 -08:00
David Rowe
dc05cdee5a Merge branch 'master' into M17406 
# Conflicts:
#	scripts/system/controllers/controllerModules/nearParentGrabEntity.js
 2018-11-30 09:44:09 +13:00
David Back
ec4726ad15 fix subproperty updates 2018-11-29 10:42:26 -08:00
David Back
859c0f3389 Merge branch 'master' of https://github.com/highfidelity/hifi into draggableNumberFixes76-master 2018-11-29 10:41:56 -08:00
David Back
006ba33352
Merge branch 'master' into entityListReorderColumns 2018-11-29 10:29:44 -08:00
Seth Alves
87e4c17194
Merge pull request #14429 from danteruiz/disable-highlighting 
Remove entity highlighting
 2018-11-29 09:04:56 -08:00
Sam Gateau
aa749b0980 adressing review comments 2018-11-28 21:46:13 -08:00
Sam Gateau
9353745054 MErge with master 2018-11-28 21:40:24 -08:00
Sam Gateau
fb47900e2f Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-11-28 19:12:29 -08:00
Wayne Chen
9deb15b9f6
Merge branch 'master' into loginInitiative2 2018-11-28 19:10:20 -08:00
David Back
e5f4f67c10 RC76 draggable number fixes 2018-11-28 17:30:18 -08:00
Sam Gateau
ba4aec2aff Fixing the issues with thte debug renderdeferredTask and investigating the avatars perf 2018-11-28 01:01:18 -08:00
Ryan Huffman
ec19d2f119 Fix Create tooltips getting pushed down for tall rows 2018-11-27 19:07:04 +01:00
Thijs Wenker
e193dcbc60 - add missing start/middle/finish tooltips 
- style updates
 2018-11-27 19:07:04 +01:00
Zach Fox
31f7d747c8 Bugfixes; enable purchase asset from marketplace screen raise 2018-11-26 15:48:49 -08:00
sam gateau
f348cc35c4 separting debug in its own task 2018-11-26 15:20:45 -08:00
Zach Fox
8df5db4239 Allow scripts to open SendAsset screen with pre-filled info 2018-11-26 13:26:17 -08:00
Ryan Huffman
a6e203e3e5 Fix draggable inputs not being tabbable 2018-11-26 11:12:14 -08:00
Wayne Chen
68834cb29f Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2 2018-11-26 10:11:41 -08:00
Wayne Chen
0d52566315 Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-11-26 09:13:35 -08:00
David Rowe
c96cd422e1 Fix near parent grab tear away calc for avatar scale 2018-11-24 11:58:40 +13:00
David Rowe
f2abf8e398 Debounce haptic pulses at start of near parent grab 2018-11-24 11:43:05 +13:00
David Rowe
29c268df5a Remove extraneous grab entity haptic pulses 2018-11-24 11:38:54 +13:00
David Rowe
f1dad3c465 Add hystersis between near parent grabbing and tearing away 2018-11-24 08:35:02 +13:00