Gabriel Calero
|
3d4893aba2
|
Merge remote-tracking branch 'upstream/master' into android_new_login
|
2018-11-13 10:43:36 -03:00 |
|
Howard Stearns
|
7da440a886
|
Merge pull request #14385 from howard-stearns/inventory-icons-again
new inventory icons, and align message waiting light in items tab
|
2018-11-12 17:05:06 -08:00 |
|
Howard Stearns
|
c520e9de35
|
Merge pull request #14384 from roxanneskelly/Case19808
Case19808 - Sys tray need to remove wallet and market --> inventory
|
2018-11-12 17:02:34 -08: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 |
|
Jeff Clinton
|
ab8ba2daad
|
Merge pull request #14230 from amantley/shoulderSpaceFix
Hand Azimuth improvement
|
2018-11-12 16:00:26 -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 |
|
Howard Stearns
|
3431bdbb0e
|
new inventory icons, and align message waiting light in items tab
|
2018-11-12 14:51:32 -08:00 |
|
Gabriel Calero
|
0aaf92ce79
|
Fix UI issue: login confirmation sometimes does not appear
|
2018-11-12 19:51:28 -03: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 |
|
Jamil Akram
|
6511b60aa4
|
Merge pull request #14264 from ctrlaltdavid/M19085
Fix AvatarManager.getPalData() returning data for just a single avatar
|
2018-11-12 12:27:58 -08:00 |
|
John Conklin II
|
cd3dc04dc5
|
Merge pull request #14159 from alexiamandeville/WoodyUpdate
Updating Woody avatar for new UV seams
|
2018-11-12 12:12:49 -08:00 |
|
Gabriel Calero
|
90295a06ba
|
Handle empty oauth redirect url
|
2018-11-12 16:26:01 -03: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 |
|
Ryan Huffman
|
5e6d0c0f94
|
Merge pull request #14376 from thoys/feat/create/localGlobalToggle
[CreateApp] Local/World toggle
|
2018-11-12 10:37:55 -08:00 |
|
Roxanne Skelly
|
e895021652
|
Merge branch 'master' of https://github.com/highfidelity/hifi into Case19808
|
2018-11-12 10:02:16 -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 |
|
Seth Alves
|
500b2b7adf
|
Merge pull request #14381 from zfox23/MS19803_retry
Actually fix MS19803: Replace missing imports
|
2018-11-09 16:38:26 -08:00 |
|
Jeff Clinton
|
12b833d121
|
Merge pull request #14167 from ElderOrb/FB18859
Make material entities to be presented in avatarapp
|
2018-11-09 15:32:27 -08:00 |
|
Zach Fox
|
8d325d8dd9
|
Actually fix MS19803: Replace missing imports
|
2018-11-09 15:02:57 -08:00 |
|
Howard Stearns
|
64bf7ba833
|
Merge pull request #14380 from zfox23/MS19803_securityQml
MS19803: Remove extra "as" in Security.qml
|
2018-11-09 14:29:54 -08:00 |
|
Roxanne Skelly
|
cd4e56e7d5
|
Case 19808 - Change MARKET and WALLET in tray notifier to be INVENTORY
along with other appropriate messaging changes.
|
2018-11-09 14:26:20 -08:00 |
|
Jeff Clinton
|
ee9154a801
|
Merge pull request #14341 from sethalves/fix-mouse-equip
only equip an entity to a hand-controller joint if the hand-controllers are in use, else use avatar hand
|
2018-11-09 12:54:36 -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 |
|
Zach Fox
|
1ce6079c5a
|
Remove extra as
|
2018-11-09 11:26:18 -08:00 |
|
Gabriel Calero
|
4f4239f3c9
|
Send state parameter to oauth server to redirect to steam login
|
2018-11-09 16:12:18 -03:00 |
|
Jeff Clinton
|
3d01949e43
|
Merge pull request #14305 from AndrewMeadows/zero-vel-neargrab-nondynamic
Case 19495: zero velocities of non-dynamic entities on nearGrab release
|
2018-11-09 10:10:49 -08:00 |
|
Howard Stearns
|
9ca8ed9e17
|
Merge pull request #14236 from roxanneskelly/SetupLogging
Add logging to the windows installer to track install options and install steps
|
2018-11-09 09:35:54 -08:00 |
|
Thijs Wenker
|
99fcef105f
|
spaceMode / desiredSpaceMode explanation
|
2018-11-09 17:59:00 +01:00 |
|
Jeff Clinton
|
43f304ea86
|
Merge pull request #14373 from danteruiz/image-entity-crash
fix image entity crash
|
2018-11-09 08:42:44 -08:00 |
|
Sam Gateau
|
e263776b19
|
Address the mac bug with ResourceBUffer implemented with TBO
|
2018-11-09 13:22:27 -03:00 |
|
Gabriel Calero
|
7687eb9948
|
Revert "Test redirect to steam"
This reverts commit 729a0b6a59.
|
2018-11-09 13:10:22 -03:00 |
|
Gabriel Calero
|
d9f68af634
|
Code review + minor ui fixes
|
2018-11-09 12:49:02 -03:00 |
|
Gabriel Calero
|
729a0b6a59
|
Test redirect to steam
|
2018-11-09 11:00:40 -03:00 |
|
Brad Hefta-Gaub
|
2ba5474195
|
Merge pull request #13059 from marko8904/updateLicense
Updated the license date
|
2018-11-08 18:18:58 -08:00 |
|
Thijs Wenker
|
e483b1342c
|
CR fixes
|
2018-11-09 01:56:17 +01:00 |
|
Brad Davis
|
3e0dc35e54
|
Removing outdated external build instructions
|
2018-11-08 16:46:36 -08:00 |
|
Thijs Wenker
|
9005efb639
|
style fixes
|
2018-11-09 01:30:05 +01:00 |
|
Thijs Wenker
|
08da8c4190
|
createApp - world/local switch
|
2018-11-09 01:28:37 +01:00 |
|
Brad Davis
|
5f6369daf6
|
Don't wipe explicit vcpkg directories
|
2018-11-08 15:44:28 -08: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 |
|
Gabriel Calero
|
c1174ad1ef
|
Set dimensions for android devices thinner than 385dp
|
2018-11-08 20:04:59 -03:00 |
|
Brad Davis
|
3d2e723438
|
Adding new package guidance
|
2018-11-08 14:55:29 -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
|
2691c39d66
|
PR feedback
|
2018-11-08 12:47:53 -08:00 |
|
Jeff Clinton
|
d349c1e672
|
Merge pull request #14336 from huffman/fix/horizontal-vertical-angle-particles
Fix horizontal and vertical props in entity properties being swapped
|
2018-11-08 12:42:48 -08:00 |
|