Wayne Chen
|
32886d67d9
|
optimizing near-/far- grabbable entities a bit
|
2018-07-20 17:17:36 -07:00 |
|
Wayne Chen
|
be5fdef974
|
adding check in isReady for grabbing non-web entitys
|
2018-07-20 15:26:55 -07:00 |
|
Wayne Chen
|
4e3a6cb320
|
adding ignore for far-/near- grabbable entities when operating on web surface
|
2018-07-20 11:18:20 -07:00 |
|
Wayne Chen
|
5276d84aa5
|
pushing what i coded out loud - it broke the way grabbing works
|
2018-07-19 17:08:12 -07:00 |
|
Wayne Chen
|
1942eaf68f
|
Merge branch 'fixGrabWebSurface-case-16192' of https://github.com/wayne-chen/hifi into fixGrabWebSurface-case-16192
|
2018-07-19 13:47:48 -07:00 |
|
Wayne Chen
|
b60d650843
|
Merge branch 'master' of https://github.com/highfidelity/hifi into fixGrabWebSurface-case-16192
|
2018-07-19 13:47:38 -07:00 |
|
Qliemillar
|
e779e42d90
|
Merge pull request #13635 from NissimHadar/bug16645
Fix for bug16645 "disturbing flash when adding an overlay (even when everything is cached)"
|
2018-07-19 14:43:04 -06:00 |
|
Sam Gondelman
|
74a49dc14f
|
Merge pull request #13638 from jherico/fix/fb16762
Fix for audio continuing on destroyed Web 3D overlays
|
2018-07-19 13:33:18 -07:00 |
|
Brad Davis
|
63fa54ceda
|
Fix for audio continuing on destroyed Web 3D overlays
|
2018-07-19 11:50:18 -07:00 |
|
Qliemillar
|
2163bf1ef0
|
Merge pull request #13628 from r3tk0n/16726-Vive-Blackboxes
16726 - Remove Black Boxes ( HMD.requestShowHandControllers() )
|
2018-07-19 12:34:38 -06:00 |
|
Qliemillar
|
566c837bba
|
Merge pull request #13631 from ElderOrb/avatarapp-combobox-fix
fix 'the drop down does not shows the wearable'
|
2018-07-19 12:23:48 -06:00 |
|
Howard Stearns
|
2378cdfdc6
|
Merge pull request #13624 from howard-stearns/app-refactor4-merge
appUi module, and use in People app
|
2018-07-19 11:07:54 -07:00 |
|
Qliemillar
|
3466d944fb
|
Merge pull request #13630 from huffman/fix/create-undo-while-disabled-visual
Disable showing the entity edit tools when undoing while disabled
|
2018-07-19 09:03:40 -06:00 |
|
NissimHadar
|
4c0b7ca24c
|
Updated per Samuel's/Austin's comments.
|
2018-07-18 17:30:46 -07:00 |
|
Stephen Birarda
|
6257d5618a
|
Merge pull request #13640 from birarda/bug/404-bad-agent-requests-master
404 malformed agent script requests
|
2018-07-18 16:41:14 -07:00 |
|
Wayne Chen
|
37131d75e9
|
Merge pull request #13629 from wayne-chen/loginDialogBrowser-case-16537
MS16537: Updating "Forgot Username/Forgot Password" behavior
|
2018-07-18 16:32:55 -07:00 |
|
Howard Stearns
|
084a4338ff
|
Merge pull request #13633 from howard-stearns/pre-fectch-infinite-scroll-items
pre-fetch infinite scroll pages before reaching the end
|
2018-07-18 16:18:19 -07:00 |
|
Stephen Birarda
|
499aa4ad13
|
404 malformed agent script requests, check doc root
|
2018-07-18 15:22:45 -07:00 |
|
NissimHadar
|
a882931c6b
|
Only show overlay if textures have loaded
|
2018-07-18 15:02:02 -07:00 |
|
howard-stearns
|
a904182cc2
|
cr feedback
|
2018-07-18 14:03:26 -07:00 |
|
NissimHadar
|
99b95acada
|
Merge branch 'master' of github.com:highfidelity/hifi into bug16645
|
2018-07-18 13:56:12 -07:00 |
|
NissimHadar
|
446ef97fc5
|
Only show overlay if textures have loaded
|
2018-07-18 13:54:03 -07:00 |
|
Thijs Wenker
|
b29044fd7e
|
Merge pull request #13618 from dback2/clickHandleSwitchEntityFix
Fix quickly clicking an edit handle causing selected entity change
|
2018-07-18 22:49:11 +02:00 |
|
howard-stearns
|
74914ffb3e
|
Merge branch 'master' of github.com:highfidelity/hifi into app-refactor4-merge
|
2018-07-18 13:16:50 -07:00 |
|
howard-stearns
|
0a47672d64
|
machinery for fetching next page of inifinite scroll before it really
needed, and use in our infinite scrolls
|
2018-07-18 13:00:03 -07:00 |
|
Ryan Huffman
|
b015845371
|
Disable showing the entity edit tools when undoing while disabled
|
2018-07-18 11:54:40 -07:00 |
|
Alexander Ivash
|
fe96ad2389
|
fix 'the drop down does not shows the wearable'
|
2018-07-18 21:16:47 +03:00 |
|
Wayne Chen
|
0cbcae9181
|
reverting onLinkActivated brackets
|
2018-07-18 10:44:37 -07:00 |
|
Howard Stearns
|
db212a0c99
|
Merge pull request #13625 from zfox23/MS16802_openGlyph
Fix MS16802: In Purchases, there shouldn't be a glyph associated with the Open button
|
2018-07-18 10:12:47 -07:00 |
|
r3tk0n
|
a9eb8103f6
|
Clean up comments a bit.
|
2018-07-18 09:52:25 -07:00 |
|
r3tk0n
|
f7b49598b5
|
Disabled tip boxes for Vive controllers, as per experience team request.
|
2018-07-18 09:50:59 -07:00 |
|
Wayne Chen
|
c104e95ef4
|
Merge branch 'master' of https://github.com/highfidelity/hifi into loginDialogBrowser-case-16537
|
2018-07-18 09:06:22 -07:00 |
|
Zach Fox
|
919bfce7ab
|
Simplify
|
2018-07-18 09:00:01 -07:00 |
|
NissimHadar
|
6cecfd4d24
|
Merge branch 'master' of github.com:highfidelity/hifi into bug16645
|
2018-07-18 08:49:40 -07:00 |
|
Qliemillar
|
080d664341
|
Merge pull request #13619 from luiscuenca/handTouchDisabler
Allow creators to disable hand touch from javascript
|
2018-07-18 08:16:37 -06:00 |
|
Wayne Chen
|
ac642f126a
|
adding extra conditional to ensure all modules are checked
|
2018-07-17 20:52:50 -07:00 |
|
luiscuenca
|
e3594fe1b7
|
mutex added
|
2018-07-17 17:23:03 -07:00 |
|
Wayne Chen
|
3b7f88a4a8
|
Merge branch 'master' of https://github.com/highfidelity/hifi into loginDialogBrowser-case-16537
|
2018-07-17 17:08:43 -07:00 |
|
Wayne Chen
|
30ca5a8cbd
|
code cleanup to use web laser if laser is not pointing at grabbable entity
|
2018-07-17 16:44:49 -07:00 |
|
luiscuenca
|
ba884f8a94
|
Forgotten coment
|
2018-07-17 16:42:59 -07:00 |
|
luiscuenca
|
6225435385
|
some ortographic fixes
|
2018-07-17 16:38:34 -07:00 |
|
luiscuenca
|
fcb7614f7e
|
Format and fixes
|
2018-07-17 16:34:30 -07:00 |
|
Zach Fox
|
ef4265de4b
|
Fix MS16802: In Purchases, there shouldn't be a glyph associated with the Open button
|
2018-07-17 16:16:43 -07:00 |
|
Wayne Chen
|
eb7bde1bfc
|
switching near grab priority to be before web surface laser
|
2018-07-17 15:38:56 -07:00 |
|
Wayne Chen
|
f444d0ae28
|
Merge branch 'master' of https://github.com/highfidelity/hifi into fixGrabWebSurface-case-16192
|
2018-07-17 15:03:04 -07:00 |
|
Qliemillar
|
07a7bbbcf6
|
Merge pull request #13621 from thoys/fix/create/desktop-tablet#master
[FIX] Use create app in tablet mode when choosing to use tablet in desktop mode
|
2018-07-17 14:36:55 -06:00 |
|
howard-stearns
|
bfd9e208b5
|
Merge branch 'master' of github.com:highfidelity/hifi into app-refactor4-merge
|
2018-07-17 12:31:18 -07:00 |
|
Seth Alves
|
c67904b1a2
|
Merge pull request #13615 from luiscuenca/glTFPathFixes
glTF importer fixes (Corruption while reading .bin files and allows loading local files)
|
2018-07-17 12:19:58 -07:00 |
|
qliacoombs
|
db109589f6
|
Merge pull request #13535 from huffman/fix/asset-server-corrupt-mappings
Fix potential map.json corruption in Asset Server
|
2018-07-17 13:11:43 -06:00 |
|
Wayne Chen
|
2c16c6579f
|
Merge branch 'master' of https://github.com/highfidelity/hifi into fixGrabWebSurface-case-16192
|
2018-07-17 11:54:15 -07:00 |
|