Anthony Thibault
|
999bd0d339
|
Merge pull request #10075 from sethalves/tablet-ui
Tablet ui -- misc changes + landscape mode
|
2017-04-03 10:43:34 -07:00 |
|
Seth Alves
|
c45514a557
|
Merge pull request #10066 from vladest/tablet-ui-connection-dialog
Implemented no connection dialog for Tablet UI
|
2017-04-03 09:57:00 -07:00 |
|
Seth Alves
|
43e1cec8a3
|
merge from upstream
|
2017-04-03 06:28:59 -07:00 |
|
David Rowe
|
2b4afdb987
|
Fix tablet window getting stuck to pointer if release mouse off tablet
|
2017-04-02 12:58:11 +12:00 |
|
Chris Collins
|
3c62826ef9
|
Merge pull request #10091 from ctrlaltdavid/21248
Fix HTML controls not working properly in the tablet
|
2017-04-01 08:41:44 -07:00 |
|
Zach Fox
|
8a96969471
|
Merge pull request #9873 from highfidelity/PAL_v2
PAL v2.0
|
2017-03-31 17:00:41 -07:00 |
|
Andrew Meadows
|
0181783290
|
Merge pull request #10064 from samcake/ambient
Fix the sharp reflection happening after pr 10036 and bugs on backend 4.1
|
2017-03-31 16:04:00 -07:00 |
|
David Rowe
|
25ac82f162
|
Don't send "move" events for non-move events
|
2017-04-01 10:47:04 +13:00 |
|
David Rowe
|
b03fd44240
|
Fix controls in HTML pages not responding to mouse events on tablet
|
2017-04-01 10:40:06 +13:00 |
|
Clément Brisset
|
9d0676dd87
|
Merge pull request #10088 from huffman/stable-merge
Stable merge
|
2017-03-31 14:27:42 -07:00 |
|
Sam Cake
|
dd73cb7b8e
|
Use a magic number gpu::Texture::SINGLE_MIP instead of 1
|
2017-03-30 23:46:37 -07:00 |
|
Ryan Huffman
|
150dcd7dec
|
Merge remote-tracking branch 'upstream/master' into stable-merge
|
2017-03-30 14:22:27 -07:00 |
|
Seth Alves
|
c62b07d26f
|
add setLandscape call to tablet
|
2017-03-30 11:36:21 -07:00 |
|
David Rowe
|
06910d1881
|
Add comment re scrollbar stability in tablet
|
2017-03-30 14:20:02 +13:00 |
|
David Rowe
|
f954767b84
|
Get entities list and entity properties scrollbars working on tablet
|
2017-03-30 14:04:03 +13:00 |
|
samcake
|
b6504bba56
|
Moving the num mips per texture to the creator so it s immutable and simpler
|
2017-03-29 17:58:56 -07:00 |
|
Seth Alves
|
371df35013
|
remove code related to tablet being a model rather than an overlay. start on landscape mode
|
2017-03-29 14:16:14 -07:00 |
|
Delamare2112
|
3ebe1a0015
|
Add AvatarInputs::loudnessToAudioLevel
|
2017-03-29 14:01:27 -07:00 |
|
samcake
|
9bc7e41642
|
Remove extra calls for binding default textures, not needed
|
2017-03-29 10:57:08 -07:00 |
|
Vladyslav Stelmakhovskyi
|
209de29b2a
|
Intial commit. Basically works. Need some testing
|
2017-03-29 17:36:05 +02:00 |
|
Zach Fox
|
b776f25b3b
|
Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2
|
2017-03-28 18:09:17 -07:00 |
|
Zach Fox
|
81264c998b
|
Revert "Merge from upstream/master"
This reverts commit b5ba4a109d.
|
2017-03-28 17:39:45 -07:00 |
|
Zach Fox
|
b5ba4a109d
|
Merge from upstream/master
|
2017-03-28 17:37:34 -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
|
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
|
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 |
|
Dante Ruiz
|
7434cc5644
|
force vto to false on start up
|
2017-03-28 00:02:02 +01:00 |
|
Dante Ruiz
|
02535722ba
|
removed visible to others opition from general settings
|
2017-03-27 23:31:41 +01:00 |
|
Andrew Meadows
|
18544581e6
|
remove warnings about implicit float cast
|
2017-03-27 14:40:31 -07:00 |
|
Dante Ruiz
|
cba7adf32a
|
removed qDebug
|
2017-03-27 19:08:41 +01:00 |
|
Dante Ruiz
|
f4255735a9
|
make login screen show up on the tablet on startup
|
2017-03-27 18:03:38 +01:00 |
|
Zach Fox
|
e1a880a5d4
|
Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2
|
2017-03-27 09:10:12 -07:00 |
|
Seth Alves
|
bb28976d0e
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
|
2017-03-26 09:32:35 -07:00 |
|
Vladyslav Stelmakhovskyi
|
edb66ae704
|
Merge branch 'tablet-ui' into tablet-ui-audio-screen
|
2017-03-25 13:20:43 +01:00 |
|
Vladyslav Stelmakhovskyi
|
fc23c348cb
|
Implemented Audio settings screen for Tablet UI
|
2017-03-25 13:17:38 +01:00 |
|
Zach Fox
|
e88895935b
|
Revert "Actually merge from master"
This reverts commit 056d6fbe4f.
|
2017-03-24 17:56:48 -07:00 |
|
Anthony J. Thibault
|
f7de74109b
|
Added jsdoc documentation for some of MyAvatar properties and methods
|
2017-03-24 15:10:26 -07:00 |
|
Zach Fox
|
056d6fbe4f
|
Actually merge from master
|
2017-03-24 10:10:17 -07:00 |
|
Zach Fox
|
915ace0087
|
Revert "Merge from Master"
This reverts commit e48123b5bb.
|
2017-03-24 10:04:51 -07:00 |
|
Anthony J. Thibault
|
bab9890fea
|
Added inputMode property to Web3DOverlay.
This allows user to switch between Touch messages and Mouse messages.
Added a sliderTestMain.js script which demonstrates this behavior.
|
2017-03-23 13:54:18 -07:00 |
|
Anthony J. Thibault
|
8915ecd23d
|
compile time option to switch from touch to mouse events for web tablet
|
2017-03-23 13:54:17 -07:00 |
|
Zach Fox
|
e48123b5bb
|
Merge from Master
|
2017-03-23 09:54:14 -07:00 |
|
Seth Alves
|
ff3fc244d1
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
|
2017-03-23 09:50:53 -07:00 |
|
Brad Davis
|
85c80f3be8
|
Merge remote-tracking branch 'upstream/master' into smarter_textures
Conflicts:
libraries/gpu/src/gpu/Texture.cpp
|
2017-03-22 14:25:23 -07:00 |
|
Seth Alves
|
1da6349505
|
merge from upstream
|
2017-03-21 10:26:02 -07:00 |
|
Ryan Huffman
|
13222468e3
|
Merge pull request #9712 from huffman/feat/edit-particle-icon
Add particle system overlay in edit.js
|
2017-03-21 10:02:52 -07:00 |
|
Seth Alves
|
cc4ddd1387
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
|
2017-03-21 08:43:35 -08:00 |
|
Chris Collins
|
ea13151d55
|
Merge pull request #9945 from mnafees/21233
21233: Remove Scripts Editor option from Edit menu and all related files
|
2017-03-21 08:01:36 -07:00 |
|
Zach Pomerantz
|
20ea13e00a
|
Merge pull request #9897 from zzmp/record/noise-gate
Add AudioNoiseGate to recordings played through Interface
|
2017-03-21 00:21:20 -04:00 |
|