Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-08 04:34:38 +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
Roxanne Skelly
efffb8b819
Merge pull request #15239 from roxanneskelly/Case20617 
Case 20617 - People app filter bar breaks when deleting connections
 2019-03-22 11:31:46 -07:00
r3tk0n
86ffa44771 Swap flying binding to other hand. 2019-03-21 17:05:20 -07:00
Thijs Wenker
9a14cfc7df make sure that onWebEventReceived has the correct context in VR 2019-03-21 23:46:33 +01:00
r3tk0n
108e8b9994 Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco 2019-03-21 15:17:56 -07:00
r3tk0n
08bc47d722 Disable tablet button on off hand (translation hand). 2019-03-21 15:06:03 -07:00
r3tk0n
8f5a8d0caa Fix typo that broke fargrab. Grip or Trigger on off hand will now manipulate. 2019-03-21 14:38:11 -07:00
Roxanne Skelly
87d75ec75c Case 20617 - People app filter bar breaks when deleting connections 2019-03-21 12:08:42 -07:00
John Conklin II
4483e3c069
Merge pull request #15168 from danteruiz/fix-notifications-scaling 
Case 21501: Notification bar text fails to render when avatar is scaled very small
 2019-03-21 09:47:55 -07:00
SamGondelman
3ff0770441 model emitters! 2019-03-20 21:25:14 -07:00
Thijs Wenker
20c3a36308
Merge pull request #15227 from thoys/fix/create/dontIgnoreAllUpdatesWhenFocussed 
Case 21816: don't ignore updates that originate from entityPropertiesTool itself [master]
 2019-03-20 19:43:37 +01:00
Roxanne Skelly
640b05304a Case 21392 - Excise unneeded code from marketplacesInject.js 2019-03-19 16:24:07 -07:00
Thijs Wenker
19c51b25d1 don't ignore updates that originate from entityPropertiesTool itself 2019-03-20 00:18:21 +01:00
r3tk0n
c9ade7ccb8 Add grip to fargrab. 2019-03-15 16:09:01 -07:00
danteruiz
5dab4c0010 remove white-space 2019-03-15 10:47:48 -07:00
Thijs Wenker
aeb56ff22a EntityList -> re-focus the rename field rather then re-selecting the text fully 
EntityProperties -> ignore selection updates when nothing is changed and window is focused
 2019-03-14 01:26:06 +01:00
danteruiz
1e354fb280 fix notications scaling 2019-03-12 17:18:15 -07:00
Sam Gateau
f2fc9c0102 Multiple task view 2019-03-12 16:40:28 -07:00
Wayne Chen
0279373d11
Merge branch 'master' into ptt 2019-03-11 17:09:37 -07:00
Wayne Chen
84b177996b removing dead code 2019-03-11 16:43:26 -07:00
r3tk0n
39342b9771 Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco 2019-03-11 16:27:05 -07:00
Wayne Chen
36c2358dc0
Merge branch 'master' into muteWarningModified 2019-03-11 14:35:13 -07:00
Shannon Romano
864c37d310
Merge pull request #15155 from sethalves/fix-clonables 
Fix cloneables
 2019-03-11 14:17:20 -07:00
Seth Alves
e515e9cc66 fix cloneEntity function 2019-03-11 12:38:54 -07:00
Seth Alves
2fb5e1ebc2 quiet some logging 2019-03-11 12:36:29 -07:00
Roxanne Skelly
e4e8a61328 Case 21326 - missing marketplaceInject.js 
The re-addition of marketplaceInject.js didn't merge from 80
for some reason.
 2019-03-11 10:46:51 -07:00
r3tk0n
ec0cf3ee3a Fix typo. 2019-03-11 09:58:20 -07:00
Sam Gateau
530b871eef Getting the group styled and scrollview working all together 2019-03-11 00:08:31 -07:00
Wayne Chen
3dcc53a945
Merge branch 'master' into ptt 2019-03-10 17:14:54 -07:00
Sam Gateau
6da3165754 Merge branch 'master' of https://github.com/highfidelity/hifi into blackProp 2019-03-08 18:45:36 -08:00
Sam Gateau
a303f803eb BReaking group 2019-03-08 18:14:38 -08:00
Shannon Romano
ca87e217bd
Merge pull request #15097 from wayne-chen/audioSettingsModified 
Case 21562: Audio settings screen
 2019-03-08 16:22:52 -08:00
Wayne Chen
18b86d550d adding PushToTalk action 2019-03-08 16:07:48 -08:00
r3tk0n
5f48a6d104 Fix typo. 2019-03-08 16:07:47 -08:00
r3tk0n
24d6646e8d Fix activation / deactivation criteria for PTT controller module. 2019-03-08 16:07:47 -08:00
r3tk0n
3b274c2b6e Enable pushToTalk.js controller module. 2019-03-08 16:02:16 -08:00
r3tk0n
f6add9cafd Add pushToTalk.js controllerModule. 2019-03-08 16:02:15 -08:00
Wayne Chen
b7d44403e1 updating compile failure + icons/settings update 2019-03-08 16:02:15 -08:00
Wayne Chen
7cb17b2d6e laying groundwork for audio app + fixing deadlocks 2019-03-08 16:02:14 -08:00
r3tk0n
15d49fd9a9 Initial implementation (deadlocks still occurring in Audio.cpp) 2019-03-08 16:02:14 -08:00
Roxanne Skelly
e94d248ac5
Merge pull request #15126 from howard-stearns/domainUnlimited 
unlimited certified copies in a domain
 2019-03-08 10:23:42 -08:00
Sam Gateau
1b371c07ff Merge branch 'master' of github.com:highfidelity/hifi into blackProp 2019-03-08 09:47:59 -08:00
Sam Gateau
5b8116bec4 make the group foldable 2019-03-07 17:52:11 -08:00
Shannon Romano
e776cf2627
Merge pull request #15127 from danteruiz/fix-websurface-module 
Case 20734: HMD lasers on 3D overlay do not appear + trigger event does not get called
 2019-03-07 16:04:57 -08:00
Shannon Romano
45ab5efcef
Merge pull request #15121 from danteruiz/fix-stylus-gizmo 
Case 21603: Tablet x button is nearly impossible to hit with stylus
 2019-03-07 16:03:13 -08:00
Shannon Romano
b567fd6cac
Merge pull request #15105 from danteruiz/disable-entity-scaling 
Case 20830: Disable entity scaling while grabbing
 2019-03-07 16:01:34 -08:00
Shannon Romano
37727c8b60
Merge pull request #14938 from dback2/draggableNumberDisabled 
Case 20662: Entity Properties - fix disabling draggable numbers
 2019-03-07 15:33:21 -08:00
danteruiz
87cfbe48d1 fix webSurfaceIntersection 2019-03-07 13:11:18 -08:00
danteruiz
05dc30a740 more requested changes 2019-03-07 10:49:37 -08:00
danteruiz
9ca3805499 making requested changes 2019-03-07 10:27:16 -08:00
Howard Stearns
97bfa538ff unlimited certified copies in a domain 2019-03-07 09:51:20 -08:00
Sam Gateau
f7896b6407 Better propGroup 2019-03-06 22:24:43 -08:00
Sam Gateau
26b581fc74 Merge branch 'master' of https://github.com/highfidelity/hifi into blackProp 2019-03-06 18:42:11 -08:00
SamGondelman
96eb137df2 fix debugAvatarMixer.js 2019-03-06 15:53:25 -08:00
Roxanne Skelly
a54171d60c
Merge pull request #15104 from roxanneskelly/79hero-master 
merge PR 15026 15051 15067 15070 from v0.79.HERO-rc into master
 2019-03-06 13:06:45 -08:00
Shannon Romano
fc2f1ff994
Merge pull request #14955 from thoys/fix/create/reloadCrash 
Case 18299: Remove workaround for Interactive window crash now that it is fixed
 2019-03-06 12:46:00 -08:00
Sam Gateau
c540016af6 This is working !!!! 2019-03-05 20:22:19 -08:00
Sam Gateau
206bc0addb Merge branch 'master' of https://github.com/highfidelity/hifi into blackProp 2019-03-05 17:48:58 -08:00
danteruiz
272ca5dc1c disable entity scaling 2019-03-05 16:23:40 -08:00
Roxanne Skelly
fae6393663 Merge commit '743d1a58e2c4d07fa26f61b1512190263225fa42' 2019-03-05 15:11:25 -08:00
Roxanne Skelly
3ef02085ff Merge commit '041a561dbcaa7280fd2c14ba2051b2add756ca6f' 2019-03-05 15:07:49 -08:00
Sam Gateau
4959452c79 Dynamic creation of the propItem in the propGRoup! 2019-03-05 14:27:32 -08:00
Sam Gateau
e4518ba234 Fixing the bins and exploring the REpeater 2019-03-04 23:44:14 -08:00
Sam Gateau
3d2614498b ANd fuck 2019-03-04 18:07:02 -08:00
Wayne Chen
19ac8cae31 culling mute state 2019-03-04 14:18:10 -08:00
Wayne Chen
4187104b17 culling mute state 2019-03-04 14:12:09 -08:00
Seth Alves
216b53dcb0 attempt to take background noise into account when triggering mute warning 2019-03-04 13:47:55 -08:00
Seth Alves
f83f2b8226 keep muted warning in center of view for HMD 2019-03-04 13:47:55 -08:00
Seth Alves
3ecd86caee add a way to disble muted warning from audio panel. 
fix positioning of warning.  hide warning when removing timer.
 2019-03-04 13:47:55 -08:00
Seth Alves
d54d0280c2 rework audioMuteOverlay.js 2019-03-04 13:47:54 -08:00
Wayne Chen
90a6e0d9b0 changing mute warning position 2019-03-04 11:42:43 -08:00
Seth Alves
bbad6af0d6 attempt to take background noise into account when triggering mute warning 2019-03-04 11:08:07 -08:00
Seth Alves
76aa6fb1b9 keep muted warning in center of view for HMD 2019-03-04 11:08:06 -08:00
Seth Alves
38256df0f2 add a way to disble muted warning from audio panel. 
fix positioning of warning.  hide warning when removing timer.
 2019-03-04 11:08:06 -08:00
Seth Alves
3f52361753 rework audioMuteOverlay.js 2019-03-04 11:08:06 -08:00
Shannon Romano
6d297d91f6
Merge pull request #15073 from danteruiz/fix-tablet-button-rotation 
Case 21512: Very difficult to use the close button on the tablet (0.81.0)
 2019-03-04 10:49:16 -08:00
Sam Gateau
fe23ef1485 Adding the prop library 2019-03-03 23:35:40 -08:00
r3tk0n
12ffa41984 Prevent HUD and Web Surface lasers from interrupting FarGrab. 2019-03-02 13:55:06 -08: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
Sam Gateau
cc9a3e2541
Merge pull request #15052 from amerhifi/quest-demo 
case 21485: removing quest-demo specific changes
 2019-03-01 15:03:44 -08:00
Jason Najera
d41c2d296b
Merge pull request #15043 from r3tk0n/fargrab-manipulation 
FarGrab Entity Rotation with Off-Hand
 2019-03-01 14:42:59 -08:00
danteruiz
618a1d5b83 fix tablet button and gizmos rotation 2019-03-01 14:31:12 -08:00
Jason Najera
6346df54af
Merge pull request #15061 from r3tk0n/away_bubble_protection 
[MS#21495] Enable Bubble/Shield on Away
 2019-03-01 11:17:48 -08:00
amer cerkic
6ebc57994b Merge branch 'master' into quest-demo 2019-03-01 10:23:41 -08:00
Shannon Romano
33e061b09b
Merge pull request #15022 from danteruiz/fix-tablet-scaling 
Case 21424: Tablet does not properly resize when scaling avatar.
 2019-03-01 09:37:47 -08:00
SamGondelman
8d5a3debfa fix chat.js textSize 2019-02-28 15:28:18 -08:00
r3tk0n
1476251dcb Enable bubble on AFK, respect user setting upon return from AFK. 2019-02-28 15:21:24 -08:00
amerhifi
35dc13e06a
Merge branch 'master' into quest-demo 2019-02-28 14:06:47 -08:00
danteruiz
f715dbe243 fix tablet scaling 2019-02-28 13:32:12 -08:00
r3tk0n
a72b02cd25 Clean up code and add comments. 2019-02-28 13:08:05 -08:00
r3tk0n
3a5698236b Swap FarGrab from superpower to alternative version from PR#15043 2019-02-27 10:57:35 -08:00
r3tk0n
1ec887ffc2 Fix teleportation play area indicator not hiding on cancel. 2019-02-27 10:51:38 -08:00
r3tk0n
fcdfae5a67 Fix notion of hand dominance. 2019-02-27 08:39:35 -08:00
r3tk0n
7c515ccd45 Add 2x rotation multiplier. 2019-02-26 19:16:45 -08:00
r3tk0n
ca740c6254 Add a 2x multiplier for controller movement to entity rotation when manipulating with fargrab. 2019-02-26 18:44:00 -08:00
r3tk0n
52d80476a8 Fix activation criteria. 2019-02-26 17:55:16 -08:00
r3tk0n
9559f9ffd3 Add off-hand controller manipulation to fargrab. 2019-02-26 17:52:18 -08:00
SamGondelman
4d591e0624 fix web interaction and debug print filling logs 2019-02-26 16:30:31 -08:00
r3tk0n
a093fe5c4f Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco 2019-02-26 15:08:57 -08:00
r3tk0n
2077e012db Fix case of repeated manipulations with fargrab. 2019-02-26 15:00:44 -08:00
r3tk0n
f3b65d06ad Fix frame of reference for rotations. 2019-02-26 12:46:46 -08:00
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