Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-30 08:53:21 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
76550 commits 71 branches 59 tags 1.2 GiB
Commit graph

7562 commits

Author SHA1 Message Date
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
15066faaf7 ignore pickRay for zone shape visualizers 2019-01-31 19:45:29 +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
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
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
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
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