Seth Alves
9cd2717163
Merge pull request #10083 from vladest/tablet-ui-scriptslog-back
...
Script log now back to HUD
2017-03-31 14:12:15 -07:00
Vladyslav Stelmakhovskyi
7558765042
Script log now back to HUD
2017-03-31 14:20:15 +02:00
Zach Fox
0bdd0f5c08
Merge pull request #10052 from vladest/tablet-ui-ambient-occlusion
...
Set z-order of comboboxes to make sure lowest will no overlap higher …
2017-03-30 15:19:43 -07:00
Vladyslav Stelmakhovskyi
9822193644
Set z-order of comboboxes to make sure lowest will no overlap higher ones
2017-03-29 14:41:18 +02:00
Seth Alves
45e83906e7
Merge pull request #10035 from sethalves/tablet-ui
...
Tablet ui - merge from upstream
2017-03-28 11:42:55 -07:00
Seth Alves
6df4dda746
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-28 11:42:14 -07:00
Seth Alves
8e38b41e44
Merge branch 'tablet-ui' of github.com:sethalves/hifi into tablet-ui
2017-03-28 11:41:58 -07:00
Seth Alves
851ea7dabc
fix initial finger/stylus setting
2017-03-28 11:41:51 -07:00
Clément Brisset
82114ae6ab
Merge pull request #9940 from Atlante45/fix/sit
...
Fix a few sitting bugs noticed at the meetup
2017-03-28 11:14:31 -07:00
Seth Alves
54a843ee90
Merge pull request #10033 from druiz17/tablet-help-script
...
Remove help button from the tablet when reloading scripts
2017-03-28 10:19:14 -07:00
Dante Ruiz
e276bb52d2
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-help-script
2017-03-28 18:14:28 +01:00
Dante Ruiz
b0e437cc5a
remove help button from tablet when reloading scripts
2017-03-28 18:14:05 +01:00
Seth Alves
39ec53d69a
Merge pull request #10032 from hyperlogic/bug-fix/null-tablet-proxy
...
Mark the system TabletProxy object as Cpp ownership.
2017-03-28 10:08:05 -07:00
Seth Alves
0cae616ab5
Merge pull request #10031 from hyperlogic/bug-fix/mouse-disconnect-issue
...
WebTablet.js: Don't remove or add mouse callbacks onHMDChanged
2017-03-28 10:07:52 -07:00
Seth Alves
9e675d4c93
Merge pull request #9990 from hyperlogic/bug-fix/sliders
...
Added inputMode property to Web3DOverlay
2017-03-28 10:07:37 -07:00
Anthony J. Thibault
ec6ef01600
Mark the system TabletProxy object as Cpp ownership.
...
This should prevent the problem where the QML engine erroneously thinks the QObject has been collected/destroyed.
2017-03-28 09:53:00 -07:00
Anthony J. Thibault
29a159b90d
WebTablet.js: Don't remove or add mouse callbacks onHMDChanged
...
This should prevent the exception on destroy, caused by disconnecting a signal that is not attached.
2017-03-28 09:27:13 -07:00
Andrew Meadows
60b8dbfce1
Merge pull request #10026 from AndrewMeadows/cleanup-fbx
...
reduce memory bandwitdh to GPU for skinned meshes
2017-03-28 08:55:06 -07:00
Seth Alves
dd6e4ed5d8
Merge pull request #10030 from sethalves/tablet-ui
...
Tablet ui - merge from upstream
2017-03-28 08:17:40 -07:00
Seth Alves
b50a02ea19
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-28 08:16:59 -07:00
Seth Alves
fa0e2a69a6
Merge pull request #10029 from ctrlaltdavid/21238-b
...
Snapshot dialog into tablet
2017-03-28 08:16:42 -07:00
Chris Collins
83aa7358e2
Merge pull request #9998 from birarda/bug/oculus-buttons-flipped
...
fix swapped buttons in oculus touch graphic
2017-03-28 06:50:20 -07:00
David Rowe
6a3dea030e
Settings link
2017-03-28 15:15:33 +13:00
David Rowe
55033df354
Merge branch 'tablet-ui' into 21238-b
2017-03-28 14:47:57 +13:00
David Rowe
a6ef592353
Non-scrolling window with images scaled to fit
2017-03-28 14:43:26 +13:00
Anthony Thibault
e18357196a
Merge pull request #10028 from sethalves/tablet-ui
...
fix home button
2017-03-27 18:30:30 -07:00
Seth Alves
cdac011472
fix home button
2017-03-27 18:21:00 -07:00
Andrew Meadows
5fc1e97166
fix windows build of render-utils-test
2017-03-27 16:49:43 -07:00
Seth Alves
c013813161
Merge pull request #10027 from druiz17/tablet-disable-vto
...
Remove visibleToOthers option for the tablet from general settings
2017-03-27 16:28:23 -07:00
Dante Ruiz
65be71fa69
min diff
2017-03-28 00:05:02 +01:00
Dante Ruiz
7434cc5644
force vto to false on start up
2017-03-28 00:02:02 +01:00
Andrew Meadows
92b41d7a38
fix link error for linux build
2017-03-27 15:50:40 -07:00
Dante Ruiz
02535722ba
removed visible to others opition from general settings
2017-03-27 23:31:41 +01:00
Andrew Meadows
ff2f4da4b2
final changes as per samcake
2017-03-27 15:19:28 -07:00
Seth Alves
343c9335b3
Merge pull request #10023 from hyperlogic/bug-fix/stylus-touching-deleted-entity
...
tablet bug fixes
2017-03-27 14:07:14 -08:00
Seth Alves
1916a46a31
Merge pull request #10024 from druiz17/tablet-goto-fix
...
fix spelling and page selection for help page on the tablet
2017-03-27 14:05:58 -08:00
Dante Ruiz
018138f422
fixed some issues with tablet help
2017-03-27 22:46:06 +01:00
Andrew Meadows
fcf18cba91
render pipeline support for normalized intergers
2017-03-27 14:40:31 -07:00
Andrew Meadows
60bc76e1c4
store cluster indices and weights in uint16_t
2017-03-27 14:40:31 -07:00
Andrew Meadows
f6d6c62fab
move variable closer to context where it is used
2017-03-27 14:40:31 -07:00
Andrew Meadows
18544581e6
remove warnings about implicit float cast
2017-03-27 14:40:31 -07:00
Andrew Meadows
60874e6041
remove unused cruft
2017-03-27 14:40:31 -07:00
Brad Hefta-Gaub
c986077a4f
Merge pull request #10007 from hyperlogic/feature/ik-debug-draw
...
Added Developer > Avatar > Show IK Targets
2017-03-27 14:29:02 -07:00
Brad Hefta-Gaub
3bdcfd8b78
Merge pull request #9796 from ZappoMan/removePropertiesFromRayPick
...
remove properties from RayToEntityIntersectionResult
2017-03-27 14:26:51 -07:00
Anthony J. Thibault
a0c42bacdb
Fix problem with ContextMenu triggering on button up and button down.
...
This is fixed by clearing the ButtonPressedMap in the KeyboardMouseDevice every update.
Previously, this button would never be cleared, causing other controller actions mapped to the same button to have the incorrect state.
In this case, ContextMenu action would become 2 when pressed and 1 when released, anytime after the right mouse button was pressed.
2017-03-27 14:26:17 -07:00
David Rowe
ead1f00bbf
Title
2017-03-28 09:10:20 +13:00
David Rowe
35305b4476
Make dialog single column with images above controls
2017-03-28 08:55:38 +13:00
Seth Alves
e0e36b7a0c
Merge pull request #10022 from sethalves/tablet-ui
...
Tablet ui -- merge from upstream
2017-03-27 11:06:57 -08:00
Seth Alves
f6ebc87f92
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-27 12:06:27 -07:00
Seth Alves
f8ba540d03
Merge pull request #9992 from samcake/brown
...
Fixing the broken rendering of subsurface scattering
2017-03-27 11:06:04 -08:00