John Conklin II
|
7e7817212c
|
Merge pull request #14321 from jherico/fix/19256
Case 19256: Switch back to Qt for GL context creation by default
|
2018-11-13 13:14:22 -08:00 |
|
Brad Davis
|
099ffa23ec
|
PR feedback
|
2018-11-13 12:19:20 -08:00 |
|
Brad Hefta-Gaub
|
153b8920be
|
Merge pull request #14348 from sabrina-shanman/hfm_library
(case 19302) Create the HFM library and namespace
|
2018-11-13 12:03:53 -08:00 |
|
Brad Hefta-Gaub
|
6e2024350d
|
Merge pull request #14282 from gcalero/android_new_login
Change Android login flow (MS case 19470)
|
2018-11-13 12:02:10 -08:00 |
|
Brad Hefta-Gaub
|
4bafcd2cfa
|
Merge pull request #14271 from SamGondelman/oculus
Case 19475: Fix various Oculus Store test failures
|
2018-11-13 11:06:39 -08:00 |
|
John Conklin II
|
85e5c1d6ef
|
Merge pull request #14363 from SimonWalton-HiFi/scale-avatar-joint-translations
Send avatar-joint translations at world scale
|
2018-11-13 10:04:30 -08:00 |
|
Gabriel Calero
|
3d4893aba2
|
Merge remote-tracking branch 'upstream/master' into android_new_login
|
2018-11-13 10:43:36 -03:00 |
|
Sam Gondelman
|
f68706e72f
|
Merge pull request #14252 from gcalero/enable_aec_by_default
Enabled AEC by default (bug 19210)
|
2018-11-12 16:15:33 -08:00 |
|
John Conklin II
|
0370c60398
|
Merge pull request #14358 from AndrewMeadows/fix-capsuleY
Case 18436: consistent handling of CapsuleShape dimensions
|
2018-11-12 15:25:42 -08:00 |
|
sabrina-shanman
|
753557736e
|
Merge branch 'master' into hfm_library
|
2018-11-12 15:03:30 -08:00 |
|
John Conklin II
|
ec4f2f781d
|
Merge pull request #14352 from Atlante45/feat/solo-source
[master] Add audio soloing feature
|
2018-11-12 14:07:30 -08:00 |
|
John Conklin II
|
512b847684
|
Merge pull request #14339 from hyperlogic/bug-fix/anim-debug-draw-crash
AnimDebugDraw: Prevent multi-threaded access to shared map collection.
|
2018-11-12 10:47:01 -08:00 |
|
John Conklin II
|
9d404a6cf3
|
Merge pull request #14379 from Cristo86/gles_use_tbo_no_ssbo
case 19562: GLES - Use TBO instead of SSBO and make shaders use it when it is not gl45 (master)
|
2018-11-12 10:45:52 -08:00 |
|
John Conklin II
|
33da88f174
|
Merge pull request #14351 from luiscuenca/tweakTransitAnimations
Tweak transit animations
|
2018-11-12 10:39:56 -08:00 |
|
Brad Hefta-Gaub
|
22dd958582
|
Merge pull request #14297 from jherico/feature/vcpkg
Case 19807: Switch to vcpkg for many dependencies on all non-mobile platforms
|
2018-11-12 09:52:02 -08:00 |
|
John Conklin II
|
dc4b967ff5
|
Merge pull request #14331 from SimonWalton-HiFi/large-avatars-bad-position
Clamp avatar-joint translations that hit the compressed-format limit
|
2018-11-11 16:27:56 -08:00 |
|
Jeff Clinton
|
b9c11aad7b
|
Merge pull request #14259 from SamGondelman/webLock
Case 18986: Enable interaction with locked web entity
|
2018-11-09 12:21:13 -08:00 |
|
Sam Gateau
|
e263776b19
|
Address the mac bug with ResourceBUffer implemented with TBO
|
2018-11-09 13:22:27 -03:00 |
|
Dante Ruiz
|
f5b89ee7aa
|
reverting previous change
|
2018-11-08 15:43:45 -08:00 |
|
Dante Ruiz
|
5d000495df
|
making requested changes
|
2018-11-08 15:33:18 -08:00 |
|
Dante Ruiz
|
2a16ba57ac
|
fix image entity crash
|
2018-11-08 15:24:57 -08:00 |
|
John Conklin II
|
3fabe557c2
|
Merge pull request #13948 from danteruiz/3d-keyboard
3D Keyboard.
|
2018-11-08 13:35:13 -08:00 |
|
Brad Davis
|
8c4f0ec774
|
Vcpkg migration
|
2018-11-08 12:28:06 -08:00 |
|
Brad Davis
|
8c4237b520
|
Fix warnings
|
2018-11-08 12:27:56 -08:00 |
|
Brad Davis
|
caf952c252
|
Fix duplicated window member
|
2018-11-08 12:27:55 -08:00 |
|
Jeff Clinton
|
ea8dc8ae68
|
Merge pull request #14334 from danteruiz/interstitial-bug-fixes
Interstitial bug fixes
|
2018-11-08 11:43:38 -08:00 |
|
Clement
|
f337579616
|
CR
|
2018-11-08 11:31:22 -08:00 |
|
Ryan Huffman
|
1ff644b619
|
Merge pull request #14256 from ctrlaltdavid/M17008
Fix Interface crash importing JSON with duplicate entity IDs in file
|
2018-11-08 11:04:43 -08:00 |
|
Dante Ruiz
|
358aa547b1
|
feedback changes
|
2018-11-08 09:58:53 -08:00 |
|
Dante Ruiz
|
f664421fe0
|
addressing code review feedback
|
2018-11-08 09:58:53 -08:00 |
|
Dante Ruiz
|
501746b156
|
3D Keyboard
|
2018-11-08 09:58:53 -08:00 |
|
Zach Fox
|
b97fd6eb95
|
Merge pull request #14255 from zfox23/textToSpeech
Text to Speech App
|
2018-11-08 09:44:59 -08:00 |
|
Andrew Meadows
|
5bfb9c1f71
|
fix ShapeInfo::contains() logic for capsule shapes
|
2018-11-08 08:39:43 -08:00 |
|
Clement
|
ef54a63de6
|
Use uint8_t instead of bool on the wire
|
2018-11-07 17:54:49 -08:00 |
|
Clement
|
8f763dfd50
|
Fix bug and crash in solo logic
|
2018-11-07 17:46:18 -08:00 |
|
Sam Gateau
|
4489efa58b
|
Merge pull request #14346 from AndrewMeadows/fix-crash-19654
Case 19654: fix crash in btCollisionWorld::updateSingleAabb()
|
2018-11-07 16:09:36 -08:00 |
|
Zach Fox
|
48d3450c5a
|
Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech
|
2018-11-07 14:59:23 -08:00 |
|
sam gateau
|
9ada9a7ad3
|
Merge branch 'master' of github.com:highfidelity/hifi into black-bis
|
2018-11-07 12:07:15 -08:00 |
|
sabrina-shanman
|
4d9c20343a
|
Link shared library in hfm
|
2018-11-07 11:44:58 -08:00 |
|
Clement
|
65a83cb026
|
Resend solo nodes on mixer reconnect
|
2018-11-07 11:41:04 -08:00 |
|
Jeff Clinton
|
63bf077776
|
Merge pull request #14263 from ElderOrb/better_imports_for_controls_and_styles
Better imports for controls and styles
|
2018-11-07 11:19:55 -08:00 |
|
Sam Gateau
|
e28560a9c7
|
Merge pull request #14311 from SamGondelman/interstitial
Case 19682: Disable interstitial on android
|
2018-11-07 10:47:31 -08:00 |
|
Sam Gateau
|
d15c8a8854
|
Merge pull request #14313 from SamGondelman/macFix
Case 19686: Possibly fix mac debug deferred issue
|
2018-11-07 10:33:41 -08:00 |
|
Sam Gateau
|
8cda3f729b
|
Merge pull request #14316 from AndrewMeadows/workload-views-include-MyAvatar
Case 19394: always keep entities near MyAvatar in physics simulation
|
2018-11-07 10:26:47 -08:00 |
|
Sam Gateau
|
5d0be31fe7
|
Merge pull request #14354 from SamGondelman/deadlock
Case 19735: Fix ResourceCache mutex issues
|
2018-11-07 09:55:41 -08:00 |
|
sabrina-shanman
|
2c94d1f620
|
Fix hfm not linking in script-engine for Android build
|
2018-11-07 09:24:42 -08:00 |
|
Simon Walton
|
f88168bdfb
|
Send avatar-joint translations at world scale
|
2018-11-06 17:29:02 -08:00 |
|
sabrina-shanman
|
8b37133875
|
Remove unnecessary draco dependency from hfm library
|
2018-11-06 17:10:44 -08:00 |
|
SamGondelman
|
e20aeb28eb
|
force low detail on oculus first run
|
2018-11-06 15:58:35 -08:00 |
|
sabrina-shanman
|
e654ff9bbc
|
Remove forward declaration in HFM.h so ModelPackager and other things can use it instead
|
2018-11-06 14:53:23 -08:00 |
|