Anthony J. Thibault
ec38c4e319
Merge remote-tracking branch 'upstream/tablet-ui' into tablet-ui
2016-12-20 13:43:06 -08:00
Anthony J. Thibault
84db58dbc6
Make tablet.qml work on Web3DOverlay
2016-12-20 12:16:11 -08:00
Brad Davis
d0d6b1f87e
tracing polish
2016-12-20 07:45:35 -08:00
Andrew Meadows
e03e57a480
adding profile stats relating to avatar CPU costs
2016-12-20 07:45:35 -08:00
Ryan Huffman
21bab49f79
Add chrome tracing support
2016-12-20 07:45:35 -08:00
David Rowe
5b8a9c0bcd
Add extra logging for Clara.io asset resizing
2016-12-20 07:43:48 -08:00
David Rowe
e85bc50333
Tidying
2016-12-20 07:38:25 -08:00
David Rowe
e0922cdf4d
Add missing entity hover signal
2016-12-20 07:38:25 -08:00
Anthony J. Thibault
a791ddcc22
Tablet can switch to a web url.
...
Help button has been updated to switch to the help.html. It doesn't look good because
the content was authored expecting landscape window, not portrait.
The API is by no means final. But it exposes two methods to JS.
* Tablet.gotoHomeScreen() - Used to forcefully go back to the home tablet "springboard", eventually this will
hooked up to the tablet button.
* Tablet.gotoWebScreen(url) - Causes the tablet to switch from the home "springboard" and load a web url.
tabletTest.js and help.js have been updated to use this functionality.
2016-12-19 17:52:19 -08:00
Anthony J. Thibault
856791c11d
Made TabletRoot.qml the main tablet qml file.
...
This file uses a Loader node to load, Tablet.qml.
2016-12-19 15:15:16 -08:00
Anthony J. Thibault
5d1ccfbccc
Tablet#removeButton now works properly
2016-12-15 15:49:37 -08:00
Anthony J. Thibault
d2c4417b24
Hook up Help button to the new Tablet interface
2016-12-14 17:05:47 -08:00
Anthony J. Thibault
d4f9d21ce8
Pass tablet QQuickItem to TabletScriptingInterface
...
Also, moved TabletScriptingInterface to script-engine library for easy access, baby.
2016-12-14 14:04:48 -08:00
Seth Alves
819e3dc41d
remove some unneeded html special-casing
2016-12-09 10:18:30 -08:00
Seth Alves
6c99b5e9ca
code review
2016-12-09 06:50:10 -08:00
Seth Alves
369f61e172
bring over some previous tablet-ui work
2016-12-08 16:54:39 -08:00
Anthony J. Thibault
319bb9ce78
Prototype of Tablet.qml hacked to appear on ALL web entities.
2016-12-08 15:31:00 -08:00
Brad Davis
12ccbdac0b
Actually render polylines
2016-12-01 19:46:08 -08:00
Brad Davis
5bade2ef9a
Add locking around the code that reads polyline entity data and builds GPU structures for them
2016-12-01 14:14:17 -08:00
samcake
9478f242d8
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-11-23 10:35:32 -08:00
samcake
3d0b557af6
Fix the bad binding for polyline
2016-11-22 13:01:02 -08:00
samcake
dfc0b7beac
adressed reveiw comments
2016-11-22 10:15:49 -08:00
samcake
31232a1078
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-11-21 11:30:26 -08:00
Seth Alves
8ee1fac367
don't try to render until mesh is ready
2016-11-18 16:33:48 -08:00
Seth Alves
b2a28147c0
more time
2016-11-18 15:36:29 -08:00
Seth Alves
47062d29f5
cleanups
2016-11-18 15:27:45 -08:00
Seth Alves
3278478a60
cleanups
2016-11-18 15:26:16 -08:00
Seth Alves
a66a1d392e
hack to avoid crash
2016-11-18 15:24:19 -08:00
Seth Alves
1714d4fe06
fix build
2016-11-18 05:40:57 -08:00
samcake
a07523ca31
Merge with Upstream
2016-11-17 18:31:05 -08:00
Seth Alves
8530156227
experimenting
2016-11-17 16:06:35 -08:00
Seth Alves
028be0f830
Merge branch 'master' of github.com:highfidelity/hifi into fix-polyvox-buffer-size
2016-11-17 14:14:08 -08:00
Seth Alves
1eb17b9786
fix bug that caused polyvox rendering to mishandle its gpu buffers
2016-11-17 14:11:09 -08:00
Brad Hefta-Gaub
36d8e6d64d
Merge pull request #9074 from hyperlogic/bug-fix/web-entity-limit-fix
...
Bug fix for blank webEntities during long sessions
2016-11-17 13:02:18 -08:00
Brad Hefta-Gaub
91f90400a9
Merge pull request #9088 from sethalves/fix-polyvox-memory-leak
...
fix polyvox memory leak
2016-11-17 12:23:13 -08:00
Seth Alves
1f9598f295
Merge branch 'master' of github.com:highfidelity/hifi into fix-polyvox-memory-leak
2016-11-17 08:44:52 -08:00
samcake
7c003ce865
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-11-16 19:13:22 -08:00
Seth Alves
697369dece
avoid crash on startup
2016-11-16 16:11:17 -08:00
Seth Alves
a14ff22df3
update render-land bounds when polyvox moves
2016-11-16 15:10:43 -08:00
Seth Alves
d097fa7982
fix polyvox memory leak
2016-11-16 14:10:50 -08:00
Anthony J. Thibault
066ddad25a
Reduced MAX_CONCURRENT_WEB_VIEWS from 100 to 20.
2016-11-16 09:39:55 -08:00
Brad Davis
fda2cde006
Fix buffer leak in line entity
2016-11-15 14:16:54 -08:00
Anthony J. Thibault
eb401c125a
Bug fix for blank webEntities during long sessions
...
In prolonged sessions _currentWebCount would reach MAX_CONCURRENT_WEB_VIEWS and prevent new webEntities from being properly created and initialized.
The _currentWebCount inside of RenderableWebEntityItem would become inflated when buildWebSurface is called without a currentContext.
The early return did not properly take this into account. Instead we move the increment after the early return and right before the _webSurface is actually created.
2016-11-14 18:01:47 -08:00
samcake
00addcad9e
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-11-10 17:57:34 -08:00
samcake
e12040a98a
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-11-04 14:54:18 -07:00
Seth Alves
689fdfb35f
implement RenderableModelEntityItem::setAbsoluteJointRotationInObjectFrame and RenderableModelEntityItem::setAbsoluteJointTranslationInObjectFrame
2016-11-04 11:44:42 -07:00
Seth Alves
e41fa94958
implement RenderableModelEntityItem::setAbsoluteJointRotationInObjectFrame and RenderableModelEntityItem::setAbsoluteJointTranslationInObjectFrame
2016-11-04 11:42:31 -07:00
Seth Alves
727fe4bc21
Merge branch 'master' of github.com:highfidelity/hifi into fix-setLocalJointRotation-name
2016-11-04 10:04:56 -07:00
Brad Hefta-Gaub
961e17bc48
Merge pull request #8989 from sethalves/fix-polyvox-bitrot
...
fix a couple of minor polyvox problems
2016-11-03 13:43:52 -07:00
Seth Alves
339d6a55cf
getLocalJointRotation getLocalJointTranslation, started on getLocalJointTranslation getLocalJointRotation
2016-11-03 10:06:07 -07:00
