Seth Alves
|
f384cde471
|
Merge pull request #11467 from sethalves/fix-near-trigger
Fix near trigger
|
2017-09-26 17:27:05 -07:00 |
|
Atlante45
|
acb0bf8d20
|
Asset Browser tweaks
|
2017-09-26 17:26:46 -07:00 |
|
samcake
|
f16c552978
|
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
|
2017-09-26 17:18:05 -07:00 |
|
Dante Ruiz
|
410baaf7bc
|
Merge pull request #11464 from druiz17/controller-dispatacher-bugs
fix auto dropping and re-grabbing loop
|
2017-09-26 16:46:34 -07:00 |
|
Seth Alves
|
8180acbffc
|
use same trigger test as in isReady
|
2017-09-26 16:29:22 -07:00 |
|
anshuman64
|
ca4d5ef807
|
Merge pull request #11454 from ElderOrb/case7877
7877 Unexpected Behavior when pressing Enter on Input Field
|
2017-09-26 16:26:42 -07:00 |
|
SamGondelman
|
49512c95d7
|
possibly fix threading crashes, mirror and fade
|
2017-09-26 16:21:36 -07:00 |
|
Andrew Meadows
|
dafadf82bb
|
Merge pull request #11458 from jherico/fix/tablet_latency
Fix long tablet lag on first load
|
2017-09-26 16:18:31 -07:00 |
|
samcake
|
328dd9c108
|
Merge branch 'game-render-interface' of https://github.com/highfidelity/hifi into blue
|
2017-09-26 16:12:27 -07:00 |
|
David Rowe
|
76889d1b67
|
Improve handle scaling of entity with near-zero dimension
|
2017-09-27 12:04:05 +13:00 |
|
Andrew Meadows
|
a0cfd87674
|
Merge pull request #11348 from jherico/android_new
Working on new android toolchain & sample
|
2017-09-26 16:00:09 -07:00 |
|
Bradley Austin Davis
|
9d18fd3a46
|
Merge branch 'master' into android_new
|
2017-09-26 15:59:01 -07:00 |
|
Seth Alves
|
a478506da3
|
Merge branch 'master' of github.com:highfidelity/hifi into fix-near-trigger
|
2017-09-26 15:52:22 -07:00 |
|
samcake
|
badb45c921
|
fixing the web surface now getting scaled when the table t is grabbed is fixed
|
2017-09-26 15:20:45 -07:00 |
|
Seth Alves
|
644532dd59
|
only send startNearTrigger once
|
2017-09-26 15:17:23 -07:00 |
|
Howard Stearns
|
eeab07cd27
|
Merge branch 'master' of https://github.com/highfidelity/hifi into certificate-properties
|
2017-09-26 15:16:28 -07:00 |
|
beholder
|
ef732fb547
|
enable 'close' button overlay on hover/leave with stylys/lasers
|
2017-09-27 01:07:32 +03:00 |
|
beholder
|
6409580b03
|
ignore intersection for 'close' button highlight overlay
|
2017-09-27 01:06:47 +03:00 |
|
druiz17
|
5a1242a1ac
|
fix spelling error
|
2017-09-26 15:06:31 -07:00 |
|
druiz17
|
76c1fe688c
|
fix auto dropping
|
2017-09-26 14:52:01 -07:00 |
|
Bradley Austin Davis
|
e42068f681
|
Merge branch 'master' into android_new
|
2017-09-26 14:31:29 -07:00 |
|
Anthony J. Thibault
|
a7cfb5d635
|
teleport.js: fix for TELEPORT_CANCEL_RANGE with large/small avatar scale
|
2017-09-26 14:21:25 -07:00 |
|
Andrew Meadows
|
909e5e86b1
|
Merge pull request #11442 from vladest/fix_dde_visibility
Fix dde visibility
|
2017-09-26 14:19:47 -07:00 |
|
Anthony J. Thibault
|
f081c36f25
|
ViveControllerManager: Code review feedback on PR #11422
|
2017-09-26 14:19:31 -07:00 |
|
Howard Stearns
|
4403c27b52
|
working checkpoint. still needs verification/hashing, etc.
|
2017-09-26 14:14:37 -07:00 |
|
David Rowe
|
0f5adb488c
|
Merge branch 'vr-edit-footer' into vr-edit-a
# Conflicts:
# scripts/vr-edit/modules/toolsMenu.js
|
2017-09-27 10:04:31 +13:00 |
|
Anthony J. Thibault
|
c26d04dca1
|
Teleport.js: Fix message bugs, and made eslint clean
* 'Hifi-Teleport-Ignore-Add' and 'Hifi-Teleport-Ignore-Remove' messages should now should work
* 'Hifi-Teleport-Disabler' message should now work
|
2017-09-26 13:58:00 -07:00 |
|
samcake
|
a8770e1077
|
Merge branch 'master' of https://github.com/highfidelity/hifi into game-render-interface
|
2017-09-26 13:14:24 -07:00 |
|
samcake
|
510b446409
|
mergine with master, resolving conflict
|
2017-09-26 13:13:46 -07:00 |
|
Seth Alves
|
a871a6db1d
|
Merge pull request #11430 from sethalves/fix-parent-grab
Fix parent grab
|
2017-09-26 13:00:16 -07:00 |
|
David Rowe
|
8bd0e464aa
|
Merge branch 'vr-edit-group-box' into vr-edit-a
|
2017-09-27 08:48:44 +13:00 |
|
beholder
|
24a12a2f8f
|
7722 Add onHover Outline to Tablet "X" Button
|
2017-09-26 22:31:56 +03:00 |
|
Seth Alves
|
7397a123c5
|
Merge pull request #11345 from SamGondelman/textAA
Text3D Overlays and Entities fixes and no-AA
|
2017-09-26 12:26:08 -07:00 |
|
Seth Alves
|
51d5f86989
|
Merge pull request #11460 from AndrewMeadows/fix-debug-build-20170926
remove asserts that break Debug build
|
2017-09-26 12:22:31 -07:00 |
|
Seth Alves
|
81f74f9297
|
Merge pull request #11444 from druiz17/module-handcontrollerPointer
Made handControllerPointer into modules in hope of preventing mouse cursor interference with tablet
|
2017-09-26 12:21:03 -07:00 |
|
Seth Alves
|
91f5f61ea3
|
Merge pull request #11456 from druiz17/bugs-handControllerGrab
Correctly grab tablet in 3rd person
|
2017-09-26 12:19:20 -07:00 |
|
utkarshgautamnyu
|
4fd0452694
|
Update JSBaker.cpp
|
2017-09-26 12:04:03 -07:00 |
|
Seth Alves
|
913d3c4d12
|
Merge pull request #11422 from hyperlogic/feature/ant-man2
Secondary IPD fixes
|
2017-09-26 11:53:45 -07:00 |
|
utkarshgautamnyu
|
258c32f9aa
|
Update AssetServer.cpp
|
2017-09-26 11:52:25 -07:00 |
|
Stephen Birarda
|
608d42cdf7
|
Merge pull request #11461 from birarda/bug/too-much-logging
remove noisy logging added by auto baking
|
2017-09-26 13:29:42 -05:00 |
|
Dante Ruiz
|
74f9e07f1a
|
Merge pull request #11361 from vladest/move_tablet2toolbar_to_developer_menu
Move Tablet becomes toolbar menu from General to Developer menu
|
2017-09-26 11:26:42 -07:00 |
|
utkarshgautamnyu
|
e81501a4d1
|
Update AssetServer.cpp
|
2017-09-26 11:08:48 -07:00 |
|
Seth Alves
|
216888aa03
|
Merge branch 'fix-parent-grab' of github.com:sethalves/hifi into fix-parent-grab
|
2017-09-26 11:08:40 -07:00 |
|
Seth Alves
|
737b583745
|
avoid unequipping things during a HMD snap-turn
|
2017-09-26 11:08:33 -07:00 |
|
Dante Ruiz
|
e397d49564
|
Merge pull request #11159 from vladest/modal_dialogs_async
Modal dialogs async
|
2017-09-26 11:07:42 -07:00 |
|
utkarshgautamnyu
|
0260749b6b
|
Update AssetServer.cpp
|
2017-09-26 11:02:22 -07:00 |
|
utkarshgautamnyu
|
0b387f5b38
|
Update JSBaker.cpp
|
2017-09-26 11:01:56 -07:00 |
|
utkarshgautamnyu
|
a9aab67a06
|
Update JSBaker.h
|
2017-09-26 11:01:26 -07:00 |
|
samcake
|
b5c942f7f6
|
Merge branch 'master' of https://github.com/highfidelity/hifi into game-render-interface
|
2017-09-26 10:47:59 -07:00 |
|
samcake
|
669af73a96
|
Bringing as much as possible out from render to game
|
2017-09-26 10:47:24 -07:00 |
|