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

186 commits

Author SHA1 Message Date
Anthony J. Thibault
28162915fd Re-styled keyboard, now with working shift key 2016-09-06 15:21:58 -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
3d5e8fc213 First pass of keyboard raising and lowering 2016-09-02 12:15:30 -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
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
Anthony J. Thibault
e82f6a90af Improved web entity rendering 
* fading now works properly
* web browsers are now fully opaque.
 2016-08-25 11:04:23 -07:00
Anthony J. Thibault
b2dff8aa77 Easier to click buttons on web entities with shaky hand controllers 
There is an angular and time dead spot on webEntity for scrolling vs clicking.
Currently, it's 150 ms and 3 degrees.  See POINTER_PRESS_TO_MOVE_DELAY and POINTER_PRESS_TO_MOVE_DEADSPOT_ANGLE

* Fix for warnings when clicking on window.open() links in WebEntity
 2016-08-23 10:19:49 -07:00
Anthony J. Thibault
d607abc8f7 Add dpi to edit.js 
Also, cap the maximum webEntity texture size to 4096
 2016-08-23 10:10:27 -07:00
Anthony J. Thibault
6704ae9ad4 Added dpi parameter to userData (this is temporary) 2016-08-23 10:09:17 -07:00
Anthony J. Thibault
c407818d63 send pointer events from handControllerGrab.js to webEntities 2016-08-16 15:26:14 -07:00
Anthony J. Thibault
1be434342b Work In Progress snapshot 
* Added new PointerEvent type.
* Mouse events are still sent from Application to EntityTreeRenderer, however, EntityTreeRenderer converts them to PointerEvents
* All outgoing signals from EntityTreeRenderer use PointerEvents instead of MouseEvents
* Associated JavaScript entity methods will receive PointerEvents instead of MouseEvents
* Events from handControllerGrab.js to entities are currently broken.
 2016-08-12 17:11:59 -07:00
Anthony J. Thibault
8dac45c99e Merge branch 'master' into feature/hand-controller-web-entity-integration 2016-08-10 11:27:21 -07:00
SamGondelman
36d9f92101 performance optimization to minimize calling usecTimestampNow 2016-08-09 13:10:02 -07:00
SamGondelman
b13edc7b6a fixed web fade fo' real 2016-08-05 10:48:09 -07:00
SamGondelman
3107d63ad8 one more warning 2016-08-04 14:31:44 -07:00
SamGondelman
b6e73e06a2 merge from master 2016-08-04 13:34:38 -07:00
SamGondelman
ac9a80131a refactoring _fadeStartTime and isTransparent, make simple renderables switch to transparent when fade finishes 2016-08-04 12:34:46 -07:00
SamGondelman
7713c1f4bf try to fade in web entities 2016-08-03 15:56:41 -07:00
SamGondelman
2eb0c7735f working on fading shape entities 2016-08-03 13:30:05 -07:00
Anthony J. Thibault
75b88b0794 WebEntities now support custom hifi url handling 
WebEntities now use qml/controls/WebView.qml instead of qml/WebEntity.qml.
marketplace urls and hifi urls should work properly in web entities.
 2016-08-03 10:20:15 -07:00
Anthony J. Thibault
6d768d8327 hand controllers send touch events instead of mouse events to web entities 
This gives a much better experience when scrolling web content.
 2016-08-02 15:23:46 -07:00
Anthony Thibault
cf7450beb7 handControllerGrab and web entity input integration 2016-07-29 17:50:45 -07:00
Anthony Thibault
8e3bc97ef9 fix for unused variable warnings 2016-07-29 08:10:10 -07:00
Anthony Thibault
ea310bcc43 Web Entities now render correctly as well 2016-07-28 14:11:19 -07:00
Brad Davis
cc85ce9c01 fix crash on click on non-visible web-entity 2016-06-02 16:37:45 -07:00
samcake
1ec9ef560e Fixing the srgb color format conversion for web entities 2016-05-11 10:46:54 -07:00
Seth Alves
cb523a3a71 disable webSurface differently 2016-05-05 16:01:05 -07:00
Seth Alves
b5a3baf322 Merge branch 'master' of github.com:highfidelity/hifi into linux-qol 2016-05-05 15:55:37 -07:00
Andrew Meadows
b5ad989811 more optimized uses of EntityItem::getDimensions() 2016-04-27 11:04:22 -07:00
Seth Alves
c9df446879 web-entities don't yet work right on Linux 2016-04-24 08:15:10 -07:00
Zach Pomerantz
ad9027f9d6 Log OffscreenQml lifetime 2016-03-29 15:26:22 -07:00
Brad Hefta-Gaub
2c7c6be6a6 fix build buster 2016-02-21 10:40:11 -08:00
Brad Davis
786747c2d7 Properly preserve and restore the GL context after building a web entity 2016-02-20 12:01:34 -08:00
Brad Davis
021b86c3fe Cap the max concurrent webviews, and deallocate unrendered views after 30 seconds 2016-02-19 15:41:40 -08:00
Atlante45
11dc3cd261 Move primitive rendering out of DeferredLightingEffect 2016-01-13 11:47:43 -08:00
Atlante45
981c6c7af5 Cleanup web entity connections 2016-01-05 16:08:25 -08:00
Seth Alves
c74f8bca49 location getters also return a success boolean so that callers can know if the value they are receiving is bad due to lack of information about an object's parent 2015-12-14 09:13:36 -08:00
Seth Alves
3ac0fef1ea merge from upstream 2015-11-01 15:22:57 -08:00
Brad Davis
5cbb2562cd Move GL utilities out to their own library 2015-10-27 15:53:42 -07:00
Seth Alves
61269c3ce8 fix up entity constructors so that setProperties isn't called during the constructor 2015-10-23 13:52:50 -07:00
ZappoMan
ae9ccb79ed cleanup debugging and dead code 2015-08-17 15:58:51 -07:00
ZappoMan
b7d9dc444b more work on clicking focus 2015-08-17 13:06:32 -07:00
Brad Davis
208e41efd1 WebEntity keyboard input with mouse hover 2015-08-14 16:18:38 -07:00
Brad Davis
0fa3044231 QML framerate improvments 2015-08-12 16:24:34 -07:00
Sam Gateau
d84e2d31ea Merge with master 2015-07-30 11:20:00 -07:00
Andrew Meadows
77a12eb50e compile on linux with GLEW 2015-07-28 17:53:01 -07:00
Sam Gateau
f525a8a245 Removing all the unecessary calls of Batch from the gl legacy time 2015-07-27 17:17:56 -07:00
Atlante45
59acfc9f47 Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers 2015-07-20 13:51:51 -07:00
Brad Davis
d68618e206 Removing GL headers from most files, and some naked GL from application.cpp 2015-07-18 00:46:09 -07:00
Atlante45
256c786e28 Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers 2015-07-17 17:59:19 -07:00
Brad Davis
89faf85ad9 Working on text rendering overlays 2015-07-16 15:56:01 -07:00
ZappoMan
819fa852b8 first pass at GlowEctomy 2015-07-15 12:47:59 -07:00
Atlante45
80fe090a94 Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers 2015-07-10 20:20:03 -07:00
Atlante45
7b5a5a339a Use make_shared/create to make shared pointers 2015-07-01 19:46:06 -07:00
Atlante45
d02c69111b Fix compile error in text shader 2015-06-26 16:56:47 -07:00
Atlante45
efd805bea7 Introduce new emissive simple program 
Also fixes the shading on web entities using that program
 2015-06-26 16:17:41 -07:00
Atlante45
017b4045e5 Fix web entity texture not displayed 2015-06-26 16:17:41 -07:00
Atlante45
078a5a8439 Formatting 2015-06-26 16:17:40 -07:00
Atlante45
e6cdd4a9ff Fix web entities back culled 2015-06-26 16:17:40 -07:00
Atlante45
f753a54494 Fix web entities incorrect dimensions 2015-06-26 16:17:39 -07:00
Atlante45
bf56ee49a6 Print new URL only when it actually changes 2015-06-09 16:37:48 +02:00
ZappoMan
35f40df6e2 fix build buster 2015-06-05 12:06:13 -07:00
ZappoMan
f8a2fff5a7 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-06-05 11:06:10 -07:00
Brad Davis
7f0a7b4f7e Fixing web entity glow and 'back' behavior 2015-06-03 17:15:50 -07:00
Atlante45
1d336b76de Web entities render in Batch 2015-05-29 16:51:48 +02:00
ZappoMan
9988f2d1cd EnitityItem smart pointers 2015-05-22 22:38:02 -07:00
ZappoMan
8b78fc4190 EnitityItem smart pointers 2015-05-22 17:57:50 -07:00
ZappoMan
160898ce96 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-05-22 14:55:29 -07:00
David Rowe
a01830f8f8 Fix some double to float conversion warnings in Windows builds 2015-05-22 12:32:02 -07:00
ZappoMan
c7fb8fab85 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching-scene-api 2015-05-21 10:36:22 -07:00
Seth Alves
782402b4c8 Merge branch 'master' of github.com:highfidelity/hifi into no-id-swap-redux 2015-05-20 14:53:05 -07:00
Seth Alves
f522334c99 sort out script interface changes 2015-05-20 12:30:06 -07:00
Seth Alves
a769cfdaf2 client decides on new entity-ids, keep EntityItemID class 2015-05-20 10:42:19 -07:00
Seth Alves
f9d46b0cb5 interface decides on entityIDs rather than bouncing a temporary id through the entity server 2015-05-19 14:25:23 -07:00
Atlante45
cb02ef9277 Remove warnings 2015-05-15 21:35:47 +02:00
Atlante45
02f89bc680 Remove warnings 2015-05-15 17:36:58 +02:00
Atlante45
d0cd18d6c0 Replace entities pos/rot/dim with transform 
Removed _position, _rotation, _dimensions
Added Transform _transform
 2015-05-15 17:35:24 +02:00
Brad Davis
a77816617d Make web entities interactive (via the mouse) if they're not locked. 2015-05-14 01:15:20 -07:00
Brad Davis
3b7e8a69b5 Attempting to fix threading issues with web entities 2015-05-13 14:00:41 -07:00
Brad Davis
ad5f1214bf Fix error when deleting web item 2015-05-13 11:58:18 -07:00
Brad Davis
a8d343bbf1 Working on web entities 2015-05-13 00:27:57 -07:00
Brad Davis
e9b83e1c02 Working on web entities 2015-05-12 21:15:54 -07:00
Brad Davis
8c4f802dbf Merge remote-tracking branch 'upstream/master' into web-entity 
Conflicts:
	libraries/entities/src/EntityItemProperties.h
	libraries/entities/src/EntityTypes.h
 2015-05-12 15:56:02 -07:00
Brad Davis
745182a963 Working on web entities 2015-05-12 14:39:54 -07:00