Seth Alves
|
2d220a557f
|
unmangle merge
|
2017-01-20 10:29:18 -08:00 |
|
Seth Alves
|
e96b646f66
|
Merge pull request #9452 from sethalves/tablet-ui
Tablet ui
|
2017-01-20 10:14:44 -08:00 |
|
Seth Alves
|
c492319be2
|
merge from upstream
|
2017-01-20 10:14:11 -08:00 |
|
Seth Alves
|
5a316d639a
|
Merge pull request #9451 from sethalves/tablet-ui
re-enable haptic pulse when stylus touches tablet overlay
|
2017-01-20 10:12:45 -08:00 |
|
Seth Alves
|
caae804318
|
re-enable haptic pulse when stylus touches tablet overlay
|
2017-01-20 10:12:15 -08:00 |
|
Seth Alves
|
eb169abdd7
|
Merge pull request #9449 from hyperlogic/tablet-ui
Can now use mouse to move tablet in 2D desktop mode.
|
2017-01-20 09:18:02 -08:00 |
|
Ryan Downe Karpf
|
03851d4188
|
Merge pull request #9441 from davidkelly/dk/makeUsSomeAnalytics
Some initial analytics for PAL usage
|
2017-01-20 08:30:46 -08:00 |
|
Anthony J. Thibault
|
4e4545ac00
|
Updated orientation of tablet when no hand controllers are present.
|
2017-01-19 20:27:06 -08:00 |
|
Anthony J. Thibault
|
8304aa7b19
|
Added ability to mouse move the tablet in 2d desktop mode.
|
2017-01-19 18:04:08 -08:00 |
|
David Kelly
|
5adc2cc593
|
Couple improvements
Only send one message when gain is changed. Eliminated the bool and
now just sending un-personalMute, etc...
|
2017-01-19 17:22:39 -08:00 |
|
Anthony J. Thibault
|
2c3c96b600
|
Fix for broken entity scrolling introduced by 23ea65e2
this.grabbedEntity was being cleared before entityTouchingExit transition could send the release event.
|
2017-01-19 14:23:43 -08:00 |
|
Seth Alves
|
fc8b09d2b3
|
Merge pull request #9442 from sethalves/tablet-ui
don't save tablet to Settings when logging out or switching domains
|
2017-01-19 14:11:14 -08:00 |
|
Seth Alves
|
47b59ffae3
|
don't save tablet to Settings when logging out or switching domains
|
2017-01-19 14:10:48 -08:00 |
|
Zach Fox
|
64ef3d5665
|
Merge pull request #9426 from zfox23/PAL_AdminLabel
PAL: Admin Labels, Updated Letterboxes
|
2017-01-19 13:48:05 -08:00 |
|
Seth Alves
|
18e9b476c5
|
Merge pull request #9439 from hyperlogic/tablet-ui
Improved stylus and laser input deadspot
|
2017-01-19 12:43:02 -08:00 |
|
David Kelly
|
d9fbf832e2
|
Some initial analytics for PAL usage
|
2017-01-19 11:35:17 -08:00 |
|
Seth Alves
|
a861f5091e
|
Merge pull request #9440 from sethalves/tablet-ui
clean up grab.js. provide a way to delete old tablets that got saved…
|
2017-01-19 11:35:07 -08:00 |
|
Seth Alves
|
41ddfbfd27
|
clean up grab.js. provide a way to delete old tablets that got saved into Settings on exit
|
2017-01-19 11:34:38 -08:00 |
|
Zach Fox
|
44eaa64a1d
|
It was writeString() all along!
|
2017-01-19 11:25:17 -08:00 |
|
Zach Fox
|
534fcd9399
|
Potential fix
|
2017-01-19 10:20:36 -08:00 |
|
Seth Alves
|
99de46cb27
|
Merge pull request #9438 from sethalves/tablet-ui
make tablet be an avatar-entity
|
2017-01-19 10:12:34 -08:00 |
|
Seth Alves
|
0e9ff7f7fc
|
make tablet be an avatar-entity
|
2017-01-19 10:12:06 -08:00 |
|
Seth Alves
|
c3505b854e
|
Merge pull request #9437 from sethalves/tablet-ui
Tablet ui
|
2017-01-19 09:42:33 -08:00 |
|
Seth Alves
|
eb25e1c12d
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
|
2017-01-19 09:41:49 -08:00 |
|
Seth Alves
|
1a6ae01d9c
|
Merge pull request #9435 from druiz17/tabletNav
Tablet issues Fixed
|
2017-01-19 09:22:18 -08:00 |
|
Chris Collins
|
601223aa98
|
Merge pull request #9402 from ctrlaltdavid/clara-tidying
Remove a line of old code in Clara.io download
|
2017-01-19 09:15:58 -08:00 |
|
Brad Davis
|
70de00c6bf
|
Merge pull request #9421 from jherico/more_trace_details
Additional trace details for GPU timing, frame data updates
|
2017-01-19 09:12:34 -08:00 |
|
Dante Ruiz
|
342a6c67fb
|
menu checkable button fix
|
2017-01-19 08:12:49 -08:00 |
|
Dante Ruiz
|
30b57b62da
|
toggle help
|
2017-01-19 08:12:49 -08:00 |
|
samcake
|
149e727cf3
|
Merge pull request #9429 from gcalero/android_forward_shaders
Create render forward version of pixel shaders
|
2017-01-19 00:48:25 -08:00 |
|
Anthony J. Thibault
|
2fd691d844
|
Improved stylus and laser input deadspot
|
2017-01-18 18:23:00 -08:00 |
|
Clément Brisset
|
b2e7efa4a8
|
Merge pull request #9410 from samcake/meta
Introducing type Meta to the render items of the scene
|
2017-01-18 17:50:53 -08:00 |
|
samcake
|
05304c72e0
|
Merge branch 'master' of https://github.com/highfidelity/hifi into meta
|
2017-01-18 17:00:20 -08:00 |
|
Seth Alves
|
7389475281
|
Merge pull request #9434 from sethalves/tablet-ui
Tablet ui
|
2017-01-18 17:00:09 -08:00 |
|
samcake
|
027bd30cbc
|
Removing macOS warning
|
2017-01-18 16:59:50 -08:00 |
|
Seth Alves
|
7c938728e5
|
don't do constant haptics if stylus touches tablet frame. home button triggers only once per click
|
2017-01-18 16:56:39 -08:00 |
|
Brad Davis
|
1ef4ac9a6c
|
Additional trace details for GPU timing, frame data updates
|
2017-01-18 16:19:32 -08:00 |
|
Seth Alves
|
c4d85c91d0
|
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui
|
2017-01-18 15:51:54 -08:00 |
|
Seth Alves
|
49d8a644c3
|
Merge pull request #9432 from hyperlogic/tablet-ui
Tablet improvements / bug fixes
|
2017-01-18 15:49:14 -08:00 |
|
Seth Alves
|
3517daaad2
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
|
2017-01-18 15:49:12 -08:00 |
|
Anthony J. Thibault
|
56c897cc2f
|
Process the tablet stylus even when reticle is over 2d HUD overlay.
|
2017-01-18 15:36:09 -08:00 |
|
Anthony J. Thibault
|
bcd94203e6
|
Raised min fps of tablet overlay for smoother scrolling
|
2017-01-18 15:32:39 -08:00 |
|
Anthony J. Thibault
|
fc5c2c8def
|
Fix for glitchy scrolling
|
2017-01-18 15:32:38 -08:00 |
|
Anthony J. Thibault
|
448e3fda0c
|
fix for JSON parse exception
|
2017-01-18 15:32:37 -08:00 |
|
Anthony J. Thibault
|
28dac9d802
|
Lasers now interact with the tablet in edit mode.
|
2017-01-18 15:32:36 -08:00 |
|
samcake
|
e3da6aa9f1
|
Removing the comment
|
2017-01-18 15:03:31 -08:00 |
|
Seth Alves
|
aeb02001ed
|
Merge pull request #9431 from sethalves/tablet-ui
avoid unthreadsafe use of getJointIndex
|
2017-01-18 14:59:02 -08:00 |
|
Zach Fox
|
0ec01c0dc5
|
CR feedback
|
2017-01-18 14:55:53 -08:00 |
|
Seth Alves
|
c6d0c0909e
|
avoid unthreadsafe use of getJointIndex
|
2017-01-18 14:54:38 -08:00 |
|
Zach Fox
|
8a35afd3ac
|
Merge branch 'master' into PAL_AdminLabel
|
2017-01-18 14:46:08 -08:00 |
|