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

444 commits

Author SHA1 Message Date
unknown
f94c78e15d fix avatar/shape material targets, refresh material target when parent changes 2019-04-11 12:05:28 -07:00
unknown
4f4ec064e4 add dynamic multiselect for material targets 2019-04-05 15:35:37 -07:00
Ryan Huffman
bcb38b6626 Add damping to new dynamic entities in Create 2019-03-29 09:01:42 -07:00
Thijs Wenker
9a14cfc7df make sure that onWebEventReceived has the correct context in VR 2019-03-21 23:46:33 +01:00
Thijs Wenker
19c51b25d1 don't ignore updates that originate from entityPropertiesTool itself 2019-03-20 00:18:21 +01:00
Simon Walton
83c9381575 Convert avatarPriority to trivalued (inherit, crowd, hero) 
Also tweaks from original reviewer comments.
 2019-03-01 17:25:46 -08:00
Simon Walton
8033e93eda Add avatar-priority boolean to zone entities 
RC-79 version
 2019-02-19 17:38:37 -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
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
93516423bb zone visualizer prototype 2019-01-21 17:25:06 +01:00
Jamil Akram
4c6b14bf72
Merge pull request #14642 from dback2/propertyRangeAudit 
Entity property range/step audit
 2019-01-08 09:42:59 -08:00
David Back
5ea84fb952 CR fixes 2019-01-04 15:39:27 -08:00
Andrew Meadows
a642af23b7 enable shapeType=ellipsoid and expose zone shapeType to UI 2019-01-04 12:37:23 -08:00
David Back
937aa718ae remove selected particle property defaults 2019-01-02 18:22:55 -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
Sam Gondelman
e890fc6980
Merge branch 'master' into NOverlays3 2018-12-19 11:37:10 -08:00
Sam Gondelman
d30dd4c26c
Merge branch 'master' into NOverlays3 2018-12-06 11:23:50 -08:00
Wayne Chen
30f1016f1c Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-12-06 09:55:00 -08:00
SamGondelman
3ce6f7f3d6 real image entities 2018-12-03 11:50:59 -08:00
David Back
e5f4f67c10 RC76 draggable number fixes 2018-11-28 17:30:18 -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 Back
dff4e34e7b CR changes 2018-11-19 16:59:33 -08:00
David Back
ff6d43d0e4 block updates during dragging 2018-11-19 16:15:11 -08:00
Wayne Chen
c85b840db0 Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-11-14 14:47:56 -08:00
Thijs Wenker
cd12dd8f6d fix OSX shortcut inconsistencies 2018-11-14 19:28:57 +01:00
Thijs Wenker
2c715bf592 make window shortcuts work on OSX 2018-11-14 01:05:39 +01:00
Thijs Wenker
e890228fc7 Make shortcuts work in edit windows 2018-11-14 01:05:36 +01:00
Ryan Huffman
8c9015b224 Remove redundant dimensions in default entity properties 2018-11-13 13:45:27 -08:00
Howard Stearns
66ae01e0c3 Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging 2018-11-12 12:55:20 -08:00
Thijs Wenker
9005efb639 style fixes 2018-11-09 01:30:05 +01:00
Thijs Wenker
08da8c4190 createApp - world/local switch 2018-11-09 01:28:37 +01:00
Wayne Chen
e266532888
Merge branch 'master' into loginInitiative2 2018-11-08 11:17:24 -08:00
Jeff Clinton
62e3e87ba6
Merge pull request #14325 from huffman/fix/new-model-dynamic 
Fix new models not obeying dynamic checkbox
 2018-11-08 10:22:12 -08:00
Jeff Clinton
30ff3f676a
Merge pull request #14310 from thoys/fix/create/tooltips-refinement 
Create APP tooltip / Adressed CR comments / Regression
 2018-11-08 10:03:17 -08:00
Zach Fox
1ab1cb95d8 Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging 2018-11-08 09:57:10 -08:00
Wayne Chen
bd11825f3d removing debug print statement 2018-11-07 09:40:01 -08:00
Wayne Chen
fc32ba9ce3 fixing create app window on desktop 2018-11-07 09:26:34 -08:00
Zach Fox
e80468e423 Remove URL logging from JS and QML 2018-11-06 15:09:24 -08:00
Ryan Huffman
4593b33435 Fix new models not obeying dynamic checkbox 2018-11-01 14:38:55 -07:00
Ryan Huffman
01b29185ca Update the default edit.js collidesWith to include myAvatar 2018-11-01 12:04:20 -07:00
Thijs Wenker
92888e9d3e tooltip CR changes 2018-10-31 18:26:23 +01:00
Thijs Wenker
83051940a8 Fix QA feedback 2018-10-25 02:46:15 +02:00
Thijs Wenker
a3b874f9aa property tooltips 2018-10-25 02:46:14 +02:00
David Back
b3e0d51260 Merge branch 'master' of https://github.com/highfidelity/hifi into entityPropertiesRefactor 2018-10-24 11:48:56 -07:00
Ryan Huffman
6221b9ee59
Merge pull request #14149 from thoys/feat/create/entityList-autoScroll 
MS19054: [CreateApp/EntityList] auto scroll
 2018-10-24 10:36:21 -07:00
Brad Hefta-Gaub
f8e38e98e1
Merge pull request #14214 from huffman/feat/edit-defaults 
Update default entity properties in Create
 2018-10-24 10:00:46 -07:00
Thijs Wenker
776b8b8fc7 CR and style fixes 2018-10-24 17:58:06 +02:00
unknown
c7ba386be1 darn prints somehow slipping past me 2018-10-23 20:56:53 -07:00
David Back
2b9dcd0875 fix particle properties and keylight direction, remove columns, fix orderings, fix sliders 2018-10-23 18:38:05 -07:00
David Back
9df8ea35bb Merge branch 'master' of https://github.com/highfidelity/hifi into entityPropertiesRefactor 2018-10-23 13:28:35 -07:00