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
Andrew Meadows
cd5826e2ce
load model of new entity with unknown dimensions
2016-11-03 09:03:04 -07:00
Seth Alves
d0c0cdd82f
polyvox corners stitch together reliably. surface-extractor dropdown in edit.js works again
2016-11-02 16:31:34 -07:00
Seth Alves
3ad748cfe2
Merge branch 'master' of github.com:highfidelity/hifi into possible-fix-for-2068
2016-10-28 16:41:39 -07:00
Zach Pomerantz
be23668ca8
delete websurfaces on shutdown
2016-10-28 14:29:52 -07:00
Seth Alves
e15043754c
Merge branch 'master' of github.com:highfidelity/hifi into possible-fix-for-2068
2016-10-28 11:36:09 -07:00
Anthony J. Thibault
1fc310434e
Fix for crash in QtWebEngineCore when rapidly switching domains
...
Call stop on the QWebEngineView before destroying OffscreenQMLSurface.
2016-10-27 18:55:24 -07:00
Seth Alves
f47aeae2a7
stop passing bare pointers to EntityTreeRenderer all around
2016-10-27 10:10:22 -07:00
Anthony Thibault
23aa626755
Destroy render scene & engine before Application is destroyed
...
Many render items/payloads contain smart pointers back to the
objects that added them to the scene, including entity and avatar
objects. Currently, those render items are destroyed when the
scene is destroyed very late in the application life-cycle.
There are rare crashes that can occur when these render items are
destroyed. Possibly, due to them referencing objects that have
already been destroyed via raw pointers. In an effort to
eliminate these crashes, we now destroy the scene earlier, within
Application::aboutToQuit() which is connected to the
QCoreApplication::aboutToQuit signal. Also, we guard against null
scene pointer dereferences. Any location that accesses the scene
off the main thread, now checks the validity of the scene pointer.
2016-10-25 15:28:37 -07:00
Brad Davis
9523660027
Fix offscreen QML texture leak, improve texture sharing for same size surfaces
2016-10-20 11:55:25 -07:00
Brad Hefta-Gaub
bf732127ca
Merge pull request #8856 from jherico/geometry_ids
...
Remove the use of implicit ids in geometry cache
2016-10-20 08:14:49 -07:00
Brad Davis
2705ee7030
Remove the use of implicit ids in geometry cache
2016-10-19 11:18:25 -07:00
Brad Davis
61e5e2861e
Rate limit QML web surfaces
2016-10-18 19:29:11 -07:00
David Rowe
e269a84d0e
Add placeholder "FIXME"s for making Web entity keyboard HMD-only
2016-10-13 09:35:39 +13:00
Brad Hefta-Gaub
798a5cfc9d
Merge pull request #8768 from ZappoMan/nestedSkyboxes
...
fix skybox changing when going between zones
2016-10-10 15:13:33 -07:00
Anthony J. Thibault
e76a7fc577
Crash fix for RenderableWebEntityItem::buildWebSurface
...
Gracefully handle the absence of a gl context. We will continue to retry every render call.
2016-10-10 13:57:54 -07:00
Brad Hefta-Gaub
db5edb530a
fix skybox changing when going between zones
2016-10-09 15:22:35 -07:00
Ryan Downe Karpf
ed2571704f
Merge pull request #8735 from huffman/feat/teleport-improvements
...
Update teleport.js to ignore invisible or collisionless objects and disallow teleporting to certain surfaces
2016-10-07 09:56:30 -07:00
David Rowe
1a745094e2
Merge branch 'master' into 21055
...
Conflicts:
libraries/entities-renderer/src/RenderableWebEntityItem.cpp
libraries/gl/src/gl/OffscreenQmlSurface.h
2016-10-06 09:29:09 +13:00
Ryan Huffman
ee50469213
Add collidableOnly arg to findRayIntersection
2016-10-04 20:19:54 -07:00
Ryan Huffman
17c63eb722
Add the ability to ignore invisible entities in findRayIntersection
2016-10-04 20:19:32 -07:00
Brad Davis
8c5028158f
Fix crash on destroying web entities and overlays
2016-10-03 18:02:21 -07:00
Brad Davis
ca3572f991
Support external GL textures with proper fencing
2016-10-03 17:09:10 -07:00
David Rowe
caf1a93354
Merge branch 'master' into 21055
...
Conflicts:
libraries/entities-renderer/src/RenderableWebEntityItem.cpp
2016-10-04 10:51:14 +13:00
Anthony Thibault
a79485f8c2
Fix for crash bug in web entities
...
Guard against nullptrs in RenderableWebEntitItem and WebEntityAPIHelper.
These pointers can go null if the webEntity is deleted on the main thread.
Also, the backing offscreen qml surface can be destroyed if the webEntity has not been rendered for 30 seconds
due to frustum culling.
2016-10-01 13:43:49 -07:00
Seth Alves
dc5e63c4f1
re-enable web entity-items on linux
2016-09-22 10:25:26 -07:00
Seth Alves
8899c0b790
Merge branch 'master' of github.com:highfidelity/hifi into qml-keyboard
2016-09-10 10:43:07 -07:00
Seth Alves
dd39d46883
fold WebEntityAPIHelper members into OffscreenQmlSurface
2016-09-09 13:41:09 -07:00
Seth Alves
123ac541ea
started to move WebEntityAPIHelper from RenderableWebEntityItem to OffscreenQmlSurface
2016-09-09 11:31:48 -07:00
Seth Alves
02dba2fe49
started to move WebEntityAPIHelper from RenderableWebEntityItem to OffscreenQmlSurface
2016-09-09 11:23:37 -07:00
Seth Alves
ef8c2a2888
started to move WebEntityAPIHelper from RenderableWebEntityItem to OffscreenQmlSurface
2016-09-09 10:46:54 -07:00
Brad Davis
ecfe56085d
GLM update and GLI integration
2016-09-09 10:18:15 -07:00
Anthony J. Thibault
594640f8b4
coding standard fixes
2016-09-08 11:53:23 -07:00
Anthony J. Thibault
ebb4c0990b
Removed local copy of qtwebchannel.js, use qt resource version instead
2016-09-07 17:14:33 -07:00
Anthony J. Thibault
41e0b8732f
fix for occasional crash when deleting web entity
2016-09-07 10:59:16 -07:00
Anthony J. Thibault
774509ba9e
Changed punctuation button to &123
2016-09-06 17:41:56 -07:00
Anthony J. Thibault
28162915fd
Re-styled keyboard, now with working shift key
2016-09-06 15:21:58 -07:00
Anthony J. Thibault
787bb58c1a
osx warning fix
2016-09-02 17:22:13 -07:00
Anthony J. Thibault
9122a33fff
only raise the webEntity virtual keyboard in HMD mode
2016-09-02 16:53:40 -07:00
Anthony J. Thibault
a54c3bf8c0
support for backspace, carriage return, space and period.
2016-09-02 16:23:46 -07:00
Anthony J. Thibault
0128d7c61b
Merge branch 'master' into feature/tablet-ui-foundation
2016-09-02 12:16:25 -07:00
Anthony J. Thibault
3d5e8fc213
First pass of keyboard raising and lowering
2016-09-02 12:15:30 -07:00
Brad Hefta-Gaub
667137f951
Merge pull request #8552 from AndrewMeadows/invoke-updateModel
...
eliminate log warning about invokeMethod of EntityTreeRenderer::updateModel()
2016-09-02 09:17:57 -07:00
Brad Hefta-Gaub
e3bad8e8f4
Merge pull request #8556 from ZappoMan/renderStats
...
add support for renderInfo properties to model entities
2016-09-02 09:04:56 -07:00
Anthony J. Thibault
21bf931559
eventBridge for web entities.
2016-09-01 16:32:06 -07:00
Anthony J. Thibault
823420ae0a
Working web entity keyboard
...
* Missing many keys
* Does not dynamically appear and disappear
2016-08-31 17:57:13 -07:00
Brad Hefta-Gaub
e1845e2c3f
add support for renderInfo properties to model entities
2016-08-31 15:00:21 -07:00
Anthony J. Thibault
2c5bdecca9
Bug fix for touch event crash in qt.
...
This was due to a missing touchDevice().
Also, touch events work for non-full screen qml widgets.
2016-08-31 11:11:49 -07:00
Andrew Meadows
e5b63aa18f
remove cruft from updateModel() arguments
2016-08-31 10:54:02 -07:00
Zach Pomerantz
0e9ff04c4c
fix layered zone applications
2016-08-30 17:00:02 -07:00
