Zach Fox
3764445272
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
2017-12-13 14:12:08 -08:00
David Rowe
92be33da31
Web3d overlay's "resolution" property has been removed
2017-12-13 11:40:44 +13:00
David Rowe
578c42b4ea
Merge branch 'master' into 21624
2017-12-13 09:41:09 +13:00
Zach Fox
a81a981676
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
2017-12-08 09:44:52 -08:00
Zach Fox
b2bafed2bb
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
2017-12-07 11:21:24 -08:00
David Rowe
0146eca315
JSDoc review
2017-12-07 10:09:05 +13:00
David Back
3873a8f91e
Merge branch 'master' into mergeAccountGlobalServices
2017-12-04 14:46:59 -08:00
David Rowe
cd2922a560
Merge branch '21602' into 21624
...
# Conflicts:
# tools/jsdoc/plugins/hifi.js
2017-11-28 17:04:59 +13:00
David Rowe
97b4dcaa5c
Web3DOverlay's resolution property is deprecated
2017-11-28 16:31:13 +13:00
SamGondelman
52039e022b
merge from master, get rid of resolution in RayPick
2017-11-27 13:11:35 -08:00
David Rowe
4b5aa9bdec
Add Overlays API functionality JSDoc
2017-11-25 16:18:14 +13:00
samcake
84ff40c717
Merging with master
2017-11-21 14:12:47 -08:00
ZappoMan
04ee1adabd
Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup
2017-11-19 14:40:31 -08:00
SamGondelman
393ad0079c
home button is circle instead of sphere, fixed positioning, fix lasers on tablet
2017-11-17 15:24:21 -08:00
SamGondelman
e38b0ab6b8
make web overlays match web entities more, remove resolution
2017-11-17 11:50:24 -08:00
SamGondelman
8730a26d20
use mouse events for offscreenui because touch events aren't working with the eventFilter, cleanup, documentation
2017-11-15 14:12:16 -08:00
SamGondelman
60db24f2d3
merge with master
2017-11-13 14:36:24 -08:00
SamGondelman
2fb1981c4a
merge with master
2017-11-13 14:34:39 -08:00
SamGondelman
2c0272f304
(mostly?) fix touch events
2017-11-13 12:58:31 -08:00
Brad Davis
7bf1b176d7
Renaming Tablet API to Tablets, supporting dev-mode QML loading from filesystem
2017-11-10 14:21:24 -08:00
SamGondelman
224386317d
send overlay visibility through transaction
2017-11-09 12:14:40 -08:00
SamGondelman
7d420f5242
isLeftHand, isRightHand, isMouse
2017-11-06 12:29:21 -08:00
SamGondelman
dd4275430b
fix hover events, working on HUD events
2017-11-02 17:48:37 -07:00
ZappoMan
afaad5fcd7
Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup
2017-11-02 13:39:51 -07:00
Bradley Austin Davis
55d819d7e3
Merge pull request #11699 from SamGondelman/ui
...
Pointers generate PointerEvents (WIP)
2017-10-31 10:01:15 -07:00
SamGondelman
76eb4c656e
fix multi-touch and keyboard on web entities
2017-10-30 16:41:59 -07:00
ZappoMan
f63db42c0e
migrate SpatiallyNestable::getOrientation to getWorldOrientation, remove redundant getRotation
2017-10-28 10:14:25 -07:00
ZappoMan
a7a0f03ede
rename SpatiallyNestable::getPosition() to SpatiallyNestable::getWorldPosition()
2017-10-27 18:39:17 -07:00
samcake
8a3b1a20cc
merge with upstream
2017-10-27 14:57:25 -07:00
Brad Hefta-Gaub
d61ede2a4e
Merge pull request #11697 from ElderOrb/FB8211
...
8211 Add very short haptic feedback when highlighting letters on keyboard
2017-10-27 13:26:41 -07:00
beholder
f6fa85fed2
adjust to coding standards
2017-10-27 01:25:25 +03:00
samcake
b9112024b8
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-10-26 14:27:23 -07:00
beholder
5969e0b118
8211 Add very short haptic feedback when highlighting letters on keyboard
2017-10-26 23:03:06 +03:00
Sam Gondelman
863a2041a6
Merge branch 'master' into pointerEvents
2017-10-25 17:22:19 -07:00
David Back
cffcf2d8df
point Account context to GlobalServices instead
2017-10-24 13:44:00 -07:00
Sam Gateau
50a3ccdbca
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-10-21 10:01:07 -07:00
SamGondelman
7f3268548c
direct connection to web3doverlay
2017-10-12 14:14:08 -07:00
vladest
f1d5df5926
Restore lost-in-merge context property
2017-10-12 18:26:50 +02:00
vladest
145149fedd
Merge branch 'master' into tablet_extended_sounds
2017-10-12 18:01:23 +02:00
samcake
480047548d
exposing the Render interface to the overlay web3d
2017-10-11 18:04:29 -07:00
Zach Fox
525e0d8f61
Make SettingsScriptingInterface accessible to tablet
2017-10-05 16:51:13 -07:00
vladest
e360c1363e
Merge branch 'master' into tablet_extended_sounds
2017-10-02 18:03:49 +02:00
Sam Gateau
9317ad38aa
Merge pull request #11462 from highfidelity/game-render-interface
...
Moving transform evaluation out from render loop to gameplay loop / fixing tablet tearing
2017-09-26 17:40:23 -07:00
samcake
badb45c921
fixing the web surface now getting scaled when the table t is grabbed is fixed
2017-09-26 15:20:45 -07:00
Brad Davis
40c42d35a5
Fix long tablet lag on first load
2017-09-25 17:50:04 -07:00
vladest
1a2d38e31f
Removed sounds for tablet in and out, added sounds for stylus instead. Added logging for testing semi-pressed laser and keyboard sounds
2017-09-25 17:11:44 +02:00
vladest
5202d024a7
Merge branch 'master' into tablet_extended_sounds
2017-09-19 15:55:37 +02:00
Anthony J. Thibault
7e2b2960ed
Fix for lighting as IPD scale changes.
...
(cherry picked from commit a260aaaae8
2017-09-18 12:15:32 -07:00
Anthony J. Thibault
0757f513af
Merge branch 'master' into feature/ant-man
2017-09-18 11:36:39 -07:00
vladest
e26118254f
Implemented Audio injector in Tablet scripting interface. Added missed sound events
2017-09-18 19:40:06 +02:00
samcake
19cd537e65
addressing review comments
2017-09-15 11:10:25 -07:00
Sam Gateau
30bf800963
Cleanup
2017-09-14 20:33:08 -07:00
samcake
ec7536db2c
Brining the changes just to fix the tablet issue
2017-09-14 18:36:20 -07:00
Anthony J. Thibault
6e6687c3a6
Change tablet dimensions as sensorToWorldScale changes
2017-08-30 18:21:25 -07:00
Anthony J. Thibault
c9cdaadeb5
Better scale support in SpatiallyNestable class.
...
Previously avatar used SpatiallyNestable scale to keep track of model rendering scale.
It now uses a new member variable _modelScale instead. This is important because the
notion of "Avatar" space does NOT include scale, so this is now reflected correctly in
the SpatiallyNestable class.
Similarly, EntityItems no longer stuff dimensions into the SpatiallyNestable scale
field. a new _dimensions member variable is used instead. The SpatiallyNestable scale
field for entities should always be one.
Parent joints can now have scale if getAbsoluteJointScaleInObjectFrame() returns a non-zero scale.
This is used in the case of the faux SENSOR_TO_WORLD_MATRIX_INDEX joint.
Overlays now ignore the SpatiallyNestable scale, and render using only orientation, position and dimensions.
Added qDebug stream support for Transform class.
2017-08-30 15:46:36 -07:00
Sam Gondelman
4e7818180b
Merge branch 'master' into tabletLayer2
2017-08-24 17:56:44 -07:00
SamGondelman
4a49801217
web overlays and entities are always nonAA
2017-08-24 14:23:21 -07:00
Brad Davis
e817d3ced4
Threaded rendering & entity rendering refactor
2017-08-24 13:34:34 -07:00
SamGondelman
3a80c6cbe2
fix alpha issues, pipeline issue, clamping issue
2017-08-21 18:09:25 -07:00
Seth Alves
d812c293e8
Merge pull request #11120 from mukulHF/bug-lock-default-scripts
...
Disable the ability for a user to edit default scripts if developer settings is not enabled - adjusting values
2017-08-10 12:29:23 -07:00
Seth Alves
8798e47f99
Merge pull request #11117 from hyperlogic/bug-fix/misc-crash-fixes
...
Crash fixes for avatars without Hips, and web overlays
2017-08-06 18:48:07 -07:00
vladest
134bad9534
fixed typo leads to lost touch or mouse release events
2017-08-06 19:09:40 +02:00
Anthony J. Thibault
9fdc044ae1
Crash fix for web3d overlays that are not the tablet.
2017-08-04 11:19:59 -07:00
Dante Ruiz
b72ac63662
Merge branch 'master' of github.com:highfidelity/hifi into bug-lock-default-scripts
2017-08-04 17:19:06 +01:00
Howard Stearns
71ce5a6494
Merge pull request #11016 from highfidelity/context-overlays
...
Context Overlays
2017-08-03 16:28:14 -07:00
Dante Ruiz
51652482a4
Merge branch 'master' of github.com:highfidelity/hifi into bug-lock-default-scripts
2017-08-01 20:51:56 +01:00
anshuman64
97b4fd4032
Merge pull request #11071 from vladest/fix_menu_landscape
...
Fix Landscape mode, when menu pushed in Create mode
2017-08-01 11:29:15 -07:00
David Kelly
bd7c4b3b26
Merge remote-tracking branch 'upstream/master' into context-overlays
2017-07-31 13:14:53 -07:00
Brad Davis
7d18d2e017
Restore corrected touch event simulation
2017-07-29 08:51:51 -07:00
vladest
3c9ab36416
Remove already already implemented fix
2017-07-29 12:00:41 +02:00
vladest
0333849aa8
Merge branch 'master' into fix_menu_landscape
2017-07-29 11:44:58 +02:00
Brad Davis
5946a965da
Disable touch event emulation for tablet until we fix crash
2017-07-28 18:54:16 -07:00
Brad Davis
d42052a299
Fix overlay event handling thread issues
2017-07-28 14:56:21 -07:00
vladest
45934cb53e
Fix Landscape mode, when menu pushed in Create mode. Fix pages gets white in Create mode
2017-07-28 18:04:29 +02:00
Zach Fox
7702bfceaa
Big cleanup and preparation; Actually fix desktop tablet
2017-07-25 16:12:32 -07:00
Dante Ruiz
3c862c34b2
disable reload default scripts by default
2017-07-20 21:15:00 +01: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
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
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
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
6da46c2d4c
Resolve Mouse hover issue.
2017-05-22 10:53:58 +05:30
