Seth Alves
|
6641f9bafd
|
Merge pull request #9444 from druiz17/homeButtonFix
Home button is now an overlay
|
2017-01-20 10:32:31 -08:00 |
|
Seth Alves
|
2d220a557f
|
unmangle merge
|
2017-01-20 10:29:18 -08:00 |
|
Zach Fox
|
c83cd4a94a
|
Complex checkpoint
|
2017-01-20 10:24:51 -08:00 |
|
Seth Alves
|
c492319be2
|
merge from upstream
|
2017-01-20 10:14:11 -08:00 |
|
Seth Alves
|
caae804318
|
re-enable haptic pulse when stylus touches tablet overlay
|
2017-01-20 10:12:15 -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 |
|
Dante Ruiz
|
e1c2c73e5f
|
clean up
|
2017-01-20 01:04:14 +00:00 |
|
Dante Ruiz
|
a319db3cb4
|
removed duplicate code
|
2017-01-20 00:57:48 +00:00 |
|
Dante Ruiz
|
1e7e4576cc
|
comparing with ID instead of strings
|
2017-01-19 16:38:55 -08:00 |
|
Ryan Huffman
|
7cd19192d9
|
Remove dead code in entityProperties.js
|
2017-01-19 15:00:30 -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
|
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 |
|
Ryan Huffman
|
c015ac1bd5
|
Add display of server script status to edit.js
|
2017-01-19 13:27:44 -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
|
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
|
534fcd9399
|
Potential fix
|
2017-01-19 10:20:36 -08:00 |
|
Seth Alves
|
0e9ff7f7fc
|
make tablet be an avatar-entity
|
2017-01-19 10:12:06 -08:00 |
|
Seth Alves
|
eb25e1c12d
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
|
2017-01-19 09:41:49 -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 |
|
Dante Ruiz
|
30b57b62da
|
toggle help
|
2017-01-19 08:12:49 -08:00 |
|
Anthony J. Thibault
|
2fd691d844
|
Improved stylus and laser input deadspot
|
2017-01-18 18:23:00 -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
|
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 |
|
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
|
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
|
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 |
|
Zach Fox
|
7f57251a0e
|
Remove logs also removed in Master
|
2017-01-18 13:38:19 -08:00 |
|
David Kelly
|
3b70fa08a3
|
Merge pull request #9417 from davidkelly/dk/palLogSpam
Removing some PAL-related interface log spam
|
2017-01-18 13:20:57 -08:00 |
|
Zach Fox
|
e9d3c36873
|
Final commit?
|
2017-01-18 12:55:25 -08:00 |
|
Zach Fox
|
346cfbfe02
|
First checkpoint
|
2017-01-18 12:55:24 -08:00 |
|
Seth Alves
|
02b708feaf
|
Merge pull request #9419 from druiz17/buttonsMissing
Fixed pal on tablet
|
2017-01-18 11:04:10 -08:00 |
|
Seth Alves
|
a8038ce64e
|
cleanups
|
2017-01-18 10:50:02 -08:00 |
|
Seth Alves
|
1f92b57bf2
|
switch to model stylus
|
2017-01-18 10:46:18 -08:00 |
|
Dante Ruiz
|
8172329ec3
|
Fixed pal
|
2017-01-18 10:33:58 -08:00 |
|
Philip Rosedale
|
d60d183c8c
|
Merge pull request #9403 from humbletim/21118
Code Review for Job #21118 - Add on/off switch to ambisonic/ambient sound emitter
|
2017-01-18 10:29:01 -08:00 |
|
Seth Alves
|
b57803057d
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
|
2017-01-18 06:38:44 -08:00 |
|
Seth Alves
|
0abb41ca2d
|
Merge pull request #9413 from hyperlogic/tablet-ui
clara.io marketplace works on tablet
|
2017-01-18 06:37:55 -08:00 |
|
humbletim
|
6320d872b4
|
remove commented code
|
2017-01-18 02:57:13 -05:00 |
|
humbletim
|
f88b39918f
|
switch to messaging for toggle notifications; cleanup
|
2017-01-18 02:54:42 -05:00 |
|
humbletim
|
1048c2a3bf
|
apply default userData values; add error checking; throttle toggle clicks
|
2017-01-18 01:40:28 -05:00 |
|
Anthony J. Thibault
|
03f8a310fc
|
Fix for exception on script ending
|
2017-01-17 18:17:41 -08:00 |
|
Anthony J. Thibault
|
c6f3eb138a
|
Adjusted tablet spawn position and orientation to be more natural
|
2017-01-17 18:16:40 -08:00 |
|
David Kelly
|
f5300d3862
|
Removing some PAL-related interface log spam
Probably more, but these _seem_ to be the worst
|
2017-01-17 17:06:18 -08:00 |
|
Zach Fox
|
7a568ed8a7
|
Merge pull request #9401 from zfox23/PAL_DisplayName
PAL: Editable Display Names & Immediate Update
|
2017-01-17 16:00:41 -08:00 |
|
Anthony J. Thibault
|
56fc42a2bd
|
clara.io marketplace works on tablet
|
2017-01-17 15:38:44 -08:00 |
|
Ryan Huffman
|
71e039951c
|
Add reload server scripts button to edit.js
|
2017-01-17 14:47:57 -08:00 |
|
Ryan Huffman
|
142c7da523
|
Add serverScripts property support to edit.js
|
2017-01-17 14:47:06 -08:00 |
|
Seth Alves
|
89d7b8bfc6
|
call releaseEquip when an equipped entity is dropped with a secondary press
|
2017-01-17 13:27:01 -08:00 |
|
samcake
|
5ed3b48f9d
|
adding the checkbox to show the meta bounds from the debugDeferredLighting.js
|
2017-01-17 12:15:09 -08:00 |
|
Seth Alves
|
5c205f5800
|
avoid an unhook loop if two different hands have passed something back and forth more than once
|
2017-01-17 10:24:30 -08:00 |
|
David Kelly
|
2460e89a57
|
CR feedback
|
2017-01-17 09:53:04 -08:00 |
|
Seth Alves
|
1eb7b668bf
|
merge from upstream
|
2017-01-17 09:33:49 -08:00 |
|
Seth Alves
|
6bace4f451
|
merge from upstream
|
2017-01-17 09:29:30 -08:00 |
|
humbletim
|
7025ed5909
|
update test script to create a triggerable entity
|
2017-01-17 03:18:56 -05:00 |
|
humbletim
|
88b7f9ec9d
|
add ambient sound test
|
2017-01-17 01:44:03 -05:00 |
|
humbletim
|
27a2367634
|
update debugPrints
|
2017-01-17 01:27:48 -05:00 |
|
humbletim
|
c7a561aff9
|
trim extra debugging code
|
2017-01-17 01:23:03 -05:00 |
|
David Kelly
|
6c07a9aece
|
remove debuggng logspam
|
2017-01-16 19:06:36 -08:00 |
|
David Kelly
|
6c701bb0f0
|
remove ignored avatars from PAL when they disconnect
|
2017-01-16 18:22:53 -08:00 |
|
humbletim
|
827aa68d3f
|
cleanup pass
|
2017-01-16 19:50:25 -05:00 |
|
humbletim
|
c9fd650e70
|
update to support click/far-click toggling and userData.disabled setting
|
2017-01-16 19:37:31 -05:00 |
|
David Rowe
|
a1fe908380
|
Remove a lingering line of old code
|
2017-01-17 12:56:56 +13:00 |
|
howard-stearns
|
0a3236dcc9
|
handControllerGrab update loop change
|
2017-01-16 14:54:32 -08:00 |
|
David Kelly
|
95aad3140d
|
Merge pull request #9386 from davidkelly/dk/manageAudioIntervalInPal
Manage audio interval timer in PAL
|
2017-01-16 11:29:05 -08:00 |
|
Zach Fox
|
32e330320e
|
Cleanup after rebase
|
2017-01-16 11:26:57 -08:00 |
|
Zach Fox
|
6e4a4da92a
|
Checkpoint
|
2017-01-16 10:42:29 -08:00 |
|
Seth Alves
|
23ea65e2b5
|
more changes to handle camera-relative-controller joints.
|
2017-01-16 10:26:16 -08:00 |
|
Seth Alves
|
b617b3a114
|
put code to delete prim-stylus tip back in
|
2017-01-16 07:50:36 -08:00 |
|
Seth Alves
|
756d96c368
|
fix search ray getting left on. started adding stylus models
|
2017-01-16 07:46:12 -08:00 |
|
Seth Alves
|
c2d6bf10d2
|
hard-code dimensions on home-button so that it doesn't sometimes show-up with the wrong size
|
2017-01-16 06:47:50 -08:00 |
|
Seth Alves
|
4a451e95dc
|
don't call release when off state is entered. don't attempt to unhook stylus as a stray child
|
2017-01-15 11:29:29 -08:00 |
|
Seth Alves
|
b8234ad75c
|
try a different way of keeping track of original parentIDs of grabbed entities
|
2017-01-15 10:16:28 -08:00 |
|
David Kelly
|
baed3bc3b3
|
Manage audio interval timer in PAL
Now, it is only running when PAL is up. Was running (but doing nothing
before. Somewhat more efficient this way.
|
2017-01-14 12:57:00 -07:00 |
|
Seth Alves
|
e46b40e729
|
adjust overlay position so that it shows up on new tablet fbx
|
2017-01-13 16:14:12 -08:00 |
|
Seth Alves
|
e00814dd53
|
auto-end a near-grab if the parentID is changed to something else
|
2017-01-13 14:21:44 -08:00 |
|
Zach Fox
|
b9cddc31a9
|
Checkpoint before implementing Ken's suggestions
|
2017-01-13 13:00:03 -08:00 |
|
Zach Fox
|
8bb200902f
|
First pass
|
2017-01-13 12:57:35 -08:00 |
|
Seth Alves
|
9430d2a58d
|
get marketplace-in-tablet working again
|
2017-01-13 11:03:02 -08:00 |
|
Seth Alves
|
9de8144f0d
|
merge from upstream
|
2017-01-13 10:17:03 -08:00 |
|
Seth Alves
|
f9a36d68ad
|
Merge pull request #9363 from ctrlaltdavid/21127
Make Clara.io downloads convert textures to PNG
|
2017-01-13 10:14:43 -08:00 |
|
Seth Alves
|
208c4686c4
|
merge from upstream
|
2017-01-12 15:44:27 -08:00 |
|
David Rowe
|
d7ab7316a8
|
Tidying
|
2017-01-13 12:28:53 +13:00 |
|
David Rowe
|
ad5822d96d
|
Fix first progress message box not closing
|
2017-01-13 12:26:42 +13:00 |
|
David Rowe
|
632989e031
|
Fix progress messages not displaying in HMD
|
2017-01-13 12:09:22 +13:00 |
|
Seth Alves
|
b4870a14fa
|
Merge pull request #9372 from druiz17/removeHud
Completely removed HUD
|
2017-01-12 14:24:40 -08:00 |
|
David Rowe
|
6f2386eabd
|
Fix processing of Clara.io status messages
|
2017-01-13 11:20:00 +13:00 |
|
Seth Alves
|
9c148d2be0
|
Merge pull request #9370 from sethalves/tablet-ui-no-accidental-static-on-release
make sure dynamic things are moving at least a little upon release
|
2017-01-12 13:46:50 -08:00 |
|
Seth Alves
|
611a926894
|
if something dynamic is release and it's not moving, give it a little velocity so that it doesn't end up non-active in bullet
|
2017-01-12 13:45:03 -08:00 |
|
Seth Alves
|
1a0a013edd
|
Merge pull request #9369 from hyperlogic/tablet-ui2
Tablet springboard can now be scrolled
|
2017-01-12 13:38:46 -08:00 |
|
Anthony J. Thibault
|
b251dc9ed6
|
Tablet springboard can now be scrolled
|
2017-01-12 13:11:27 -08:00 |
|
Dante Ruiz
|
71083645e9
|
branch update
|
2017-01-12 20:51:25 +00:00 |
|
David Rowe
|
4dee0efdd3
|
Use more reliable Clara.io API parameters
|
2017-01-13 09:12:49 +13:00 |
|