Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 07:53:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
60486 commits 25 branches 0 tags 1.1 GiB
Commit graph

1077 commits

Author SHA1 Message Date
Zach Fox
3a05219c59 Closer still 2017-07-26 14:10:41 -07:00
Zach Fox
65c28ca821 Bugfixes 2017-07-26 13:17:51 -07:00
Zach Fox
62f6c10b2b Renaming things; bugfixes; improvements 2017-07-26 12:45:10 -07:00
Zach Fox
9147bc21d0 Getting there. 2017-07-26 11:41:27 -07:00
Zach Fox
9020607ccf First pass 2017-07-25 17:54:46 -07:00
Zach Fox
7702bfceaa Big cleanup and preparation; Actually fix desktop tablet 2017-07-25 16:12:32 -07:00
SamGondelman
658acd91f2 experimenting with drawHUDLayer depth testing 2017-07-25 14:17:39 -07:00
SamGondelman
0117950546 can edit drawHUDLayer property 2017-07-25 12:57:52 -07:00
Zach Fox
c71dca5b4b Missed a magic number 2017-07-25 11:15:44 -07:00
Zach Fox
256b7efdd2 Handle the case when the camera is inside the bounding box of an entity 2017-07-25 11:06:54 -07:00
SamGondelman
3149c3e16c warnings 2017-07-25 10:16:50 -07:00
SamGondelman
3c8b964cc9 replace setHandLasers with drawHUDLayer overlay property 2017-07-24 18:16:40 -07:00
Zach Fox
c22798a8e6 Offset tablet position to left of screen per feedback 2017-07-24 17:16:07 -07:00
Zach Fox
223ed5b59a Hack to mod tablet orientation when clicking context overlay 2017-07-24 14:29:06 -07:00
David Kelly
e7c6ba9ae2 unused var 2017-07-21 14:44:45 -07:00
Zach Fox
811be15bbc Another attmept to fix the tablet 2017-07-21 14:02:19 -07:00
David Kelly
8de09affad Merge pull request #11025 from davidkelly/dk/contextOverlayPositioning 
reposition context overlay when far away
 2017-07-21 13:35:57 -07:00
Zach Fox
796292dd4c Fix the tablet 2017-07-21 13:21:13 -07:00
David Kelly
9e31024a0e merged with new stuff too 2017-07-21 13:16:41 -07:00
Zach Fox
a346e5ccf6 New inspect icon 2017-07-21 11:56:06 -07:00
Zach Fox
a800f6c05a No magic numbers; Move (i) based on laser hand; Tablet to Tab key 2017-07-21 11:48:19 -07:00
Zach Fox
7d125f44e4 Set parentID even when overlay already exists 2017-07-21 09:35:49 -07:00
Zach Fox
e68f9499fa Add hover/unhover handlers to context overlays 2017-07-20 16:51:00 -07:00
David Kelly
c8015e4eb6 cleanup, fixed build issue 2017-07-20 14:52:58 -07:00
David Kelly
c1de09c7f6 whitespace issue 2017-07-20 14:24:16 -07:00
David Kelly
10503c3a16 registration point 2017-07-20 14:18:07 -07:00
Dante Ruiz
3c862c34b2 disable reload default scripts by default 2017-07-20 21:15:00 +01:00
Zach Fox
e18fec140a Merge branch 'context-overlays' of https://github.com/highfidelity/hifi into contextOverlays_improvements2 2017-07-20 13:03:34 -07:00
Zach Fox
a1a7ab945a Make dimensions better 2017-07-20 12:58:15 -07:00
Zach Fox
f515a24568 UX improvements 2017-07-20 12:00:13 -07:00
David Kelly
b7be727b4c turn off ContextOverlay for pal, edit. Improve clicks too 2017-07-20 11:30:55 -07:00
David Kelly
0544c1e561 build issue 2017-07-20 08:18:37 -07:00
David Kelly
110efd63c8 enabled property so we can turn it off during edit, etc... 2017-07-20 08:08:49 -07:00
David Kelly
b236a21adc no clicks on 'highlight' overlay 2017-07-20 07:28:45 -07:00
David Kelly
0023832938 simple fixes 2017-07-19 17:38:19 -07:00
David Kelly
ebce1ce9de Merge branch 'context-overlays' of https://github.com/highfidelity/hifi into dk/placeholderHighlighting 2017-07-19 17:13:11 -07:00
Zach Fox
2dce254928 Actually increase target size 2017-07-19 17:11:45 -07:00
David Kelly
40ec770bc1 Highlight using simple yellow bounding box 2017-07-19 17:06:17 -07:00
David Kelly
920ac17caf minor renaming 2017-07-19 15:46:28 -07:00
David Kelly
5f82a76cc9 Merge branch 'context-overlays' of https://github.com/highfidelity/hifi into dk/marketplaceItemsOnly 2017-07-19 15:41:36 -07:00
David Kelly
ecd419e0d3 cr feedback 2017-07-19 15:32:03 -07:00
Zach Fox
4374d4d1e5 Small improvements to overlay 2017-07-19 15:27:48 -07:00
David Kelly
44c9f0e65e Overlay appears only on marketplace items 2017-07-19 15:13:26 -07:00
David Kelly
f0091f16a1 cr feedback 2017-07-19 14:46:10 -07:00
David Kelly
a8ab115b12 Open marketplace when we know the marketplaceID of an entity 2017-07-19 14:11:14 -07:00
Zach Fox
c866bd814d Make clicks work right 2017-07-19 12:24:20 -07:00
Zach Fox
f06ec715f2 Quick bugfix 2017-07-19 09:59:44 -07:00
Zach Fox
761d35d633 Getting there! 2017-07-18 17:10:23 -07:00
Zach Fox
8f6af3a1ab ContextOverlay 2017-07-18 16:28:24 -07:00
Zach Fox
265f978a06 It's working! 2017-07-18 15:57:26 -07:00
Zach Fox
084f4d2ab0 Why were Web3DOverlays done this way? 2017-07-18 14:42:59 -07:00
Zach Fox
2b1a0921da Initial work on clickable overlays 2017-07-18 14:01:16 -07:00
Zach Fox
96f52a9812 First pass at getting overlays to show up on hover 2017-07-17 17:05:16 -07:00
Olivier Prat
82da9fb537 Merge branch 'master' of git://github.com/highfidelity/hifi into fade 2017-07-14 17:28:35 +02:00
Olivier Prat
2d2722bfc5 Added async transition query on scene 2017-07-13 11:05:04 +02:00
Zach Fox
d786820670 Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-07-11 16:16:37 -07:00
Dante Ruiz
2f192fd48a added scroll fix for qt 5.6 2017-07-11 21:19:06 +01:00
Dante Ruiz
01ca192613 fixed tablet scrolling 2017-07-11 21:16:13 +01:00
David Kelly
4843b91f47 Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-07-10 09:50:17 -07:00
Andrew Meadows
96b88dccd7 Merge pull request #10913 from samcake/orange 
Introducing the Stages to the render::Scene, Better scene update phase and getting away from the singleton model
 2017-07-10 09:46:09 -07:00
Sam Gateau
4edea433ce Rename the _pipeline into _shapePipeline in the render::Args 2017-07-10 12:16:53 +02:00
Brad Davis
cd11f5cfa6 More tweaks for improved script performance 2017-07-07 22:02:56 -07:00
Brad Davis
7e9ea596a0 Add more efficient overlay getters, don't use blocking calls 2017-07-07 21:00:31 -07:00
Zach Fox
d0c521d7b4 Add clarifying comment. 2017-07-07 19:19:48 -07:00
Zach Fox
e537c494e5 Prevent Image3DOverlays from drifting 2017-07-07 16:04:08 -07:00
Sam Gateau
156c20d01e Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2017-07-07 10:58:05 +02:00
Brad Davis
f8b76d65ab Fixing overlay crashes, for real 2017-07-06 18:01:26 -07:00
Brad Davis
7f1bc07d04 Trying to fix overlay crashes again 2017-07-05 14:30:01 -07:00
Seth Alves
fad686571a Merge pull request #10874 from jherico/overlay_mutex 
Restore mutex in overlay interface
 2017-07-03 17:25:42 -07:00
Brad Davis
97edbb7f37 Restore mutex in overlay interface 2017-07-03 14:49:57 -07:00
Brad Davis
6c86c297cb Don't use a blocking connection for a high-frequency function like editOvleray 2017-07-03 12:40:52 -07:00
Brad Davis
6fc82bb351 Switch to preprocessor macro for blocking invokes to capture function information 2017-06-30 11:36:24 -07:00
Brad Davis
8372d73fec Additional thread safety 2017-06-30 09:15:06 -07:00
samcake
17e2140826 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2017-06-23 13:28:58 -07:00
samcake
20d8c11e28 ALmost there, getting eback everything to work with the light and background stages in the scene, not in deferredLighting Effect anymore 2017-06-22 17:54:16 -07:00
Brad Davis
4439de240a Trying to fix QtQml/QtScript crashes 2017-06-22 16:39:57 -07:00
Dante Ruiz
b7286db523 fixed merge conflict 2017-06-21 01:10:54 +01:00
Zach Pomerantz
7e84f67391 Merge pull request #10744 from zzmp/audio/output-sample 
Add "Play sample sound" to audio setting
 2017-06-20 15:32:57 -07:00
Zach Pomerantz
f55d842fac add SoundCache to tablet for PlaySampleSound 2017-06-20 12:16:08 -07:00
Dante Ruiz
cfffb74a29 Merge branch 'master' of github.com:highfidelity/hifi into hand-pucks 2017-06-19 21:40:26 +01:00
Brad Davis
ed6620fc51 Merge pull request #10718 from jherico/frame_thread 
Cleanup and refactoring
 2017-06-19 13:31:44 -07:00
Vladyslav Stelmakhovskyi
f34faa3ee7 Fix backward compatibility with Qt 5.6 2017-06-18 10:54:59 +02:00
Vladyslav Stelmakhovskyi
a1475bc65f Forgot if statement 2017-06-17 23:02:52 +02:00
Vladyslav Stelmakhovskyi
b8bb8026ca Merge branch 'master' into fix_tablet_buttons_qt59 2017-06-17 22:30:00 +02:00
Vladyslav Stelmakhovskyi
5a0783c38c Send mouse events before touch event. It seems the order is important for Qt 5.9 2017-06-17 22:24:27 +02:00
Dante Ruiz
da29157a3c fixed merge conflict' 2017-06-17 00:40:50 +01:00
Brad Davis
fece438602 Cleanup and refactoring 2017-06-15 18:58:56 -07:00
Zach Pomerantz
a8f69bb2e0 Merge branch 'master' of github.com:highfidelity/hifi into audio/parity 2017-06-13 17:41:52 -04:00
Dante Ruiz
1b13cd6d45 saving work 2017-06-12 17:31:02 +01:00
Dante Ruiz
067fc9bb98 fixed merge conflict 2017-06-12 16:45:34 +01:00
David Kelly
06527ac0a2 Merge pull request #10611 from davidkelly/dk/4873 
protect _text member of Text3DOverlay with mutex
 2017-06-06 16:50:57 -07:00
Zach Pomerantz
d416464b62 add Audio to tablet context 2017-06-06 17:55:19 -04:00
Bradley Austin Davis
995fe11c05 Migrate to single QML engine 2017-06-05 15:14:44 -07:00
Dante Ruiz
f0f10f74c6 inpput configutration stub 2017-06-03 00:30:00 +01:00
David Kelly
12cbc206d2 cr feedback 2017-06-02 15:59:15 -07:00
David Kelly
9b34abeb40 oops initializer order... 2017-06-02 15:43:29 -07:00
David Kelly
f9e1f02888 protect _text member of Text3DOverlay with mutex 2017-06-02 14:59:27 -07:00
Zach Pomerantz
b2eda7cf22 rm AudioDevice interface 2017-05-28 19:04:51 -04:00
volansystech
8d9cfbdf31 Resolve comments of @sethalves . Remove whitespaces. 2017-05-26 11:41:35 +05:30
volansystech
cab6f3f7c3 Solve Jitteriness while scrolling. 2017-05-25 17:28:19 +05:30
volansystech
aab80629ea Merge branch 'master' into Wl-21298 2017-05-25 15:44:17 +05:30
volansystech
6da46c2d4c Resolve Mouse hover issue. 2017-05-22 10:53:58 +05:30
Andrew Meadows
7b879a7964 Model has a Rig rather than a RigPointer 2017-05-19 13:24:16 -07:00
volansystech
b2ac4381eb Solve Jitteriness when scrolling the content in HMD mode -> Marketplace using the scrollbar. 2017-05-18 19:13:59 +05:30
Seth Alves
e1c805e76f lock in Overlays::findRayIntersectionInternal 2017-05-11 17:02:00 -07:00
Ryan Huffman
bddfdfa838 Adjust Web3DOverlay to load QML even if not visible 2017-05-09 16:01:20 -07:00
Chris Collins
820ed5049b Merge pull request #10365 from sethalves/fix-dont-send-non-entity-edits-over-wire 
Fix -- dont send non-entity edits to entity-server
 2017-05-05 16:37:27 -07:00
Chris Collins
8d49540f3a Merge pull request #10380 from vladest/rightclick-fix 
Rightclick fix
 2017-05-05 10:01:11 -07:00
Seth Alves
92966377fb Merge branch 'fix-dont-send-non-entity-edits-over-wire' of github.com:sethalves/hifi into fix-dont-send-non-entity-edits-over-wire 2017-05-04 19:05:57 -07:00
Seth Alves
0406cc41e0 if model-overlay has no name, use its url 2017-05-04 18:37:04 -07:00
Seth Alves
c04c0c5b13 if model-overlay has no name, use its url 2017-05-04 18:36:51 -07:00
Seth Alves
960bab6e4e Merge branch 'master' of github.com:highfidelity/hifi into fix-dont-send-non-entity-edits-over-wire 2017-05-04 16:42:57 -07:00
Vladyslav Stelmakhovskyi
c8a9b02c7a Block only secondary button 2017-05-04 20:26:02 +02:00
Vladyslav Stelmakhovskyi
99ed2556f2 Do not send non primary button events to Tablet window 2017-05-04 16:11:07 +02:00
Seth Alves
69944cc76d add a way to get a SpatiallyNestable's name without knowing what its type is 2017-05-03 21:32:49 -07:00
Seth Alves
dc569051f9 Merge branch 'master' of github.com:highfidelity/hifi into grab-try-timer-instead-of-update 2017-05-02 09:50:13 -07:00
Zach Fox
3ce81844da Snapshot JS interface for better Settings handling 2017-04-27 14:01:08 -07:00
Seth Alves
93f9716557 merge from upstream 2017-04-27 10:17:00 -07:00
Seth Alves
15661987be load tablet overlay models with higher priority 2017-04-27 10:16:08 -07:00
humbletim
f8bbd9174c Merge remote-tracking branch 'upstream/master' into 21281 2017-04-26 18:26:15 -04:00
Atlante45
ad16a935e9 Texture::create returns shared pointer 2017-04-25 15:56:23 -07:00
humbletim
3641ca3816 add support for jointRotations/jointTranslations to ModelOverlay 2017-04-24 19:24:54 -04:00
Andrew Meadows
31bfc98b87 use const reference for ScenePointer when possible 2017-04-18 11:52:22 -07:00
Andrew Meadows
1137bd1436 pull qApp spaghetti out of Avatar class 
some ends of spaghetti get pushed into AvatarManger class
split Camera class into Camera base and FancyCamera derivation
Application::getCamera() returns Camera by refence instead of pointer
 2017-04-18 11:52:21 -07:00
Zach Fox
d9dc8ebc41 More improvements 2017-04-13 15:48:51 -07:00
samcake
6122155880 Renaming the PendingCHanges class to Transaction 2017-04-05 13:10:31 -07:00
Anthony Thibault
999bd0d339 Merge pull request #10075 from sethalves/tablet-ui 
Tablet ui -- misc changes + landscape mode
 2017-04-03 10:43:34 -07:00
Seth Alves
43e1cec8a3 merge from upstream 2017-04-03 06:28:59 -07:00
David Rowe
2b4afdb987 Fix tablet window getting stuck to pointer if release mouse off tablet 2017-04-02 12:58:11 +12:00
Chris Collins
3c62826ef9 Merge pull request #10091 from ctrlaltdavid/21248 
Fix HTML controls not working properly in the tablet
 2017-04-01 08:41:44 -07:00
Zach Fox
8a96969471 Merge pull request #9873 from highfidelity/PAL_v2 
PAL v2.0
 2017-03-31 17:00:41 -07:00
David Rowe
25ac82f162 Don't send "move" events for non-move events 2017-04-01 10:47:04 +13:00
David Rowe
b03fd44240 Fix controls in HTML pages not responding to mouse events on tablet 2017-04-01 10:40:06 +13:00
Seth Alves
c62b07d26f add setLandscape call to tablet 2017-03-30 11:36:21 -07:00
David Rowe
06910d1881 Add comment re scrollbar stability in tablet 2017-03-30 14:20:02 +13:00
David Rowe
f954767b84 Get entities list and entity properties scrollbars working on tablet 2017-03-30 14:04:03 +13:00
Zach Fox
b776f25b3b Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2 2017-03-28 18:09:17 -07:00
Zach Fox
81264c998b Revert "Merge from upstream/master" 
This reverts commit b5ba4a109d.
 2017-03-28 17:39:45 -07:00
Zach Fox
b5ba4a109d Merge from upstream/master 2017-03-28 17:37:34 -07:00
Seth Alves
39ec53d69a Merge pull request #10032 from hyperlogic/bug-fix/null-tablet-proxy 
Mark the system TabletProxy object as Cpp ownership.
 2017-03-28 10:08:05 -07:00
Seth Alves
9e675d4c93 Merge pull request #9990 from hyperlogic/bug-fix/sliders 
Added inputMode property to Web3DOverlay
 2017-03-28 10:07:37 -07:00
Anthony J. Thibault
ec6ef01600 Mark the system TabletProxy object as Cpp ownership. 
This should prevent the problem where the QML engine erroneously thinks the QObject has been collected/destroyed.
 2017-03-28 09:53:00 -07:00
Zach Fox
e1a880a5d4 Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2 2017-03-27 09:10:12 -07:00
Seth Alves
bb28976d0e Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-26 09:32:35 -07:00
Vladyslav Stelmakhovskyi
edb66ae704 Merge branch 'tablet-ui' into tablet-ui-audio-screen 2017-03-25 13:20:43 +01:00
Vladyslav Stelmakhovskyi
fc23c348cb Implemented Audio settings screen for Tablet UI 2017-03-25 13:17:38 +01:00
Zach Fox
e88895935b Revert "Actually merge from master" 
This reverts commit 056d6fbe4f.
 2017-03-24 17:56:48 -07:00
Anthony J. Thibault
f7de74109b Added jsdoc documentation for some of MyAvatar properties and methods 2017-03-24 15:10:26 -07:00
Zach Fox
056d6fbe4f Actually merge from master 2017-03-24 10:10:17 -07:00
Zach Fox
915ace0087 Revert "Merge from Master" 
This reverts commit e48123b5bb.
 2017-03-24 10:04:51 -07:00
Anthony J. Thibault
bab9890fea Added inputMode property to Web3DOverlay. 
This allows user to switch between Touch messages and Mouse messages.
Added a sliderTestMain.js script which demonstrates this behavior.
 2017-03-23 13:54:18 -07:00
Anthony J. Thibault
8915ecd23d compile time option to switch from touch to mouse events for web tablet 2017-03-23 13:54:17 -07:00
Zach Fox
e48123b5bb Merge from Master 2017-03-23 09:54:14 -07:00
Seth Alves
ff3fc244d1 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-23 09:50:53 -07:00
Brad Davis
85c80f3be8 Merge remote-tracking branch 'upstream/master' into smarter_textures 
Conflicts:
	libraries/gpu/src/gpu/Texture.cpp
 2017-03-22 14:25:23 -07:00
Seth Alves
1da6349505 merge from upstream 2017-03-21 10:26:02 -07:00
Ryan Huffman
13222468e3 Merge pull request #9712 from huffman/feat/edit-particle-icon 
Add particle system overlay in edit.js
 2017-03-21 10:02:52 -07:00
Zach Fox
0506fc0033 New goTo() behavior; Fix goBack 2017-03-20 12:55:38 -07:00
Zach Fox
fc2a501474 Cleanup JS<->QML messaging 2017-03-16 15:38:39 -07:00
Zach Fox
05fec328c0 Make tablet popups work like they should 2017-03-16 10:38:46 -07:00
Vladyslav Stelmakhovskyi
856e15060d Implemented Domain Connection statistics for Tablet UI 2017-03-15 21:05:13 +01:00
Seth Alves
563d59bda9 Merge pull request #9886 from vladest/tablet-ui-entity-statistics 
Tablet ui entity statistics
 2017-03-15 08:40:52 -08:00
Seth Alves
b5919d89a5 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-15 08:26:10 -08:00
Vladyslav Stelmakhovskyi
99c74cec41 Merge branch 'tablet-ui' into tablet-ui-entity-statistics 2017-03-14 15:59:27 +01:00
Ryan Huffman
8a1bd781f0 Fix overlay findRayIntersection not properly handing multiple drawInFront overlays 2017-03-13 14:44:14 -07:00
Brad Davis
3bef5ad528 Merge remote-tracking branch 'upstream/master' into smarter_textures 2017-03-13 14:30:25 -07:00
David Rowe
4dd7667fd7 Merge branch 'tablet-ui' into 21209 
# Conflicts:
#	interface/resources/qml/hifi/tablet/tabletWindows/TabletPreferencesDialog.qml
#	interface/src/ui/overlays/Web3DOverlay.cpp
 2017-03-14 08:50:01 +13:00
Vladyslav Stelmakhovskyi
9e9c64021c Merge branch 'tablet-ui' into tablet-ui-entity-statistics 2017-03-13 19:54:40 +01:00
Andrew Meadows
6e7f4b0418 Merge pull request #9829 from ZappoMan/addDoubleClick 
Add double click message support to entities and overlays
 2017-03-13 10:44:54 -07:00
Vladyslav Stelmakhovskyi
49055cfa5c Some statistics showed 2017-03-13 16:31:29 +01:00
Vladyslav Stelmakhovskyi
81bc56f124 Fixed slider groove size calculation. Added LOD Tools to Tablet UI 2017-03-11 14:44:33 +01:00
David Rowe
71713b10f3 Merge remote-tracking branch 'upstream/tablet-ui' into 21209 
# Conflicts:
#	interface/src/ui/overlays/Web3DOverlay.cpp
 2017-03-11 09:14:06 +13:00
druiz17
0069569e96 Merge branch 'tablet-ui' into 21197 2017-03-09 09:31:15 -08:00
druiz17
8750982567 Merge pull request #9785 from druiz17/menuFix 
More dialog porting to tablet
 2017-03-09 09:29:31 -08:00
Dante Ruiz
b58a27cf10 Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix 2017-03-09 16:26:28 +00:00
Seth Alves
9435c58c2c Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into tablet-ui-quick-summon-1 2017-03-08 16:10:38 -08:00
Seth Alves
7f47835733 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-03-08 16:10:18 -08:00
David Rowe
1fc6d82456 Tablet and desktop versions of avatar attachments dialog 2017-03-09 13:04:57 +13:00
Seth Alves
28ade45f97 make maxFPS a property 2017-03-08 15:30:15 -08:00
David Rowe
950f91965d Merge branch 'tablet-ui-edit-js' into 21197 2017-03-08 17:35:58 +13:00
Seth Alves
adc3581d63 remove override of locationChanged which was keeping the render-bounds of Line3DOverlays from updating during calls to editOverlay 2017-03-07 19:32:34 -08:00
Brad Hefta-Gaub
8ae6f2727d add support for double click messages to overlays and entities 2017-03-07 17:52:55 -08:00
Vladyslav Stelmakhovskyi
a02807fb26 Merge branch 'menuFix' into menuFix_AssetServer 2017-03-07 21:07:53 +01:00
Seth Alves
f594689fa8 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-03-07 09:24:50 -08:00
Dante Ruiz
10ce732e91 Merge branch 'master' into menuFix 2017-03-07 16:15:54 +00:00
Brad Davis
8782fe1d93 Merge branch 'master' into smarter_textures 
Conflicts:
	libraries/model-networking/src/model-networking/TextureCache.cpp
 2017-03-06 15:29:41 -08:00
Vladyslav Stelmakhovskyi
6d9e7de6dc Implemented AssetBrowser in Tablet view 2017-03-06 21:45:55 +01:00
Seth Alves
4886f1cbfc don't run stylus-on-overlay code unless the overlay is a web3d overlay 2017-03-06 12:38:19 -08:00
David Rowe
09ecb12510 Merge branch 'tablet-ui-edit-js' into 21197 
# Conflicts:
#	interface/src/ui/overlays/Web3DOverlay.cpp
 2017-03-07 08:59:40 +13:00
Seth Alves
08e2e421e4 Merge branch '21199' of github.com:ctrlaltdavid/hifi into tablet-ui-edit-js 2017-03-06 11:08:27 -08:00
Seth Alves
93246b24b0 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-03-06 08:54:49 -08:00
Dante Ruiz
d5948079c7 Merge branch 'master' of github.com:highfidelity/hifi into menuFix 2017-03-06 16:29:37 +00:00
sam
cffd838d1d merging with master 2017-03-05 12:57:13 -08:00
David Rowe
0333122b23 Make Save and Cancel buttons close preferences dialog 2017-03-04 15:27:31 +13:00
Anthony J. Thibault
45febe8565 Merge branch 'master' into feature/fingers-on-tablet 2017-03-03 09:04:43 -08:00
Bradley Austin Davis
efad7da508 Merge remote-tracking branch 'upstream/master' into HEAD 2017-03-03 08:59:24 -08:00
Dante Ruiz
f867f4e739 Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix 2017-03-03 15:40:41 +00:00
David Rowe
9384dfd89c Merge branch 'tablet-ui-edit-js' into 21197 2017-03-03 18:05:18 +13:00
David Rowe
854292b193 Merge branch 'tablet-ui-edit-js' into 21199 2017-03-03 17:51:12 +13:00
David Rowe
b31cf23c8d Fix tablet QML fonts path 
This is the path for running scripts from build/install directory rather
than from source directory.
 2017-03-03 17:45:23 +13:00