vladest
d6ebd3d828
Remove static old touch point
2017-10-12 15:33:13 +02:00
vladest
337a74b281
Merge branch 'master' into fix_google_vr_height
2017-10-12 15:18:24 +02:00
Zach Fox
525e0d8f61
Make SettingsScriptingInterface accessible to tablet
2017-10-05 16:51:13 -07:00
vladest
cb21aaff72
Accept touch event according to last accepted values
2017-10-05 15:43:07 +02:00
vladest
91176f4659
Merge branch 'master' into fix_google_vr_height
2017-10-05 14:38:58 +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
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
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
vladest
58c0141f27
Remove unnecessary code
2017-09-12 19:00:00 +02:00
vladest
e60bd1d6b3
SOme stupid experiments
2017-09-11 19:14:43 +02:00
vladest
c6d3bce704
Switch off Flickable
2017-09-10 18:33:04 +02: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
