Clement
|
62a06fe383
|
Update build docs
|
2018-12-06 16:10:05 -08:00 |
|
Stephen Birarda
|
3374b610a9
|
Merge pull request #14452 from birarda/bug/lock-domain-ID-for-cloud
add warning for cloud domain ID changes to domain settings
|
2018-12-06 15:27:44 -08:00 |
|
Zach Fox
|
7dcf5da954
|
Merge pull request #14503 from zfox23/payOut1
Pay-Out API Frontend, Part One
|
2018-12-06 15:25:54 -08:00 |
|
David Back
|
cee34e7770
|
Merge branch 'master' of https://github.com/highfidelity/hifi into preventDragDrop
|
2018-12-06 15:18:35 -08:00 |
|
Wayne Chen
|
1a86b8d172
|
50% opacity/bold shortcut text
|
2018-12-06 14:58:39 -08:00 |
|
Wayne Chen
|
1ddba8e787
|
KB following updated login screen/keep login screen active
|
2018-12-06 14:58:06 -08:00 |
|
Thijs Wenker
|
4f2289b347
|
CR fixes
|
2018-12-06 23:42:37 +01:00 |
|
Thijs Wenker
|
2771e2862e
|
add missing material data json error clear on delete
|
2018-12-06 23:42:36 +01:00 |
|
Thijs Wenker
|
6d40bc9c2f
|
userData error message continues popup fix
|
2018-12-06 23:42:36 +01:00 |
|
John Conklin II
|
bbc8e4de70
|
Merge pull request #14534 from SamGondelman/vive
Case 20138: Fix vive crash
|
2018-12-06 14:28:24 -08:00 |
|
David Back
|
6a11766dbf
|
Merge branch 'master' of https://github.com/highfidelity/hifi into preventDragDrop
|
2018-12-06 14:02:42 -08:00 |
|
sabrina-shanman
|
6ea4769173
|
Re-name MIMETypeLibrary to MediaTypeLibrary and update related references
|
2018-12-06 13:39:18 -08:00 |
|
David Back
|
8620a5a4c3
|
CR changes
|
2018-12-06 13:07:59 -08:00 |
|
David Back
|
a247e14f3d
|
Merge branch 'entityListReorderColumns' of github.com:dback2/hifi into entityListReorderColumns
|
2018-12-06 13:06:49 -08:00 |
|
David Back
|
9fab86d972
|
Merge branch 'master' of https://github.com/highfidelity/hifi into entityListReorderColumns
|
2018-12-06 13:05:11 -08:00 |
|
David Back
|
e4efc90605
|
Merge branch 'master' of https://github.com/highfidelity/hifi into entityListReorderColumns
|
2018-12-06 13:04:53 -08:00 |
|
Sam Gondelman
|
2291c7e5fb
|
Merge branch 'master' into NOverlays3
|
2018-12-06 12:37:18 -08:00 |
|
Sam Gondelman
|
533e0e0326
|
Merge branch 'master' into NOverlays2
|
2018-12-06 12:29:38 -08:00 |
|
Sam Gondelman
|
da296cf45e
|
Merge pull request #14390 from SamGondelman/NOverlays
Case 19886: Convert "clientOnly" to new hostType property and add local entities
|
2018-12-06 12:27:56 -08:00 |
|
Luis Cuenca
|
37854ab05e
|
Add jsdoc information
|
2018-12-06 11:58:48 -08:00 |
|
Thijs Wenker
|
d25b5f054b
|
Merge branch 'master' into fix/create/missingStartMiddleFinishTooltips
|
2018-12-06 20:48:42 +01:00 |
|
Sam Gondelman
|
b690faeb12
|
Merge branch 'master' into NOverlays
|
2018-12-06 11:29:06 -08:00 |
|
Wayne Chen
|
4f0e23ed69
|
changing link steam flow/height of error message
|
2018-12-06 11:26:33 -08:00 |
|
Sam Gondelman
|
a7c083e97a
|
Merge branch 'master' into NOverlays2
|
2018-12-06 11:24:27 -08:00 |
|
Sam Gondelman
|
d30dd4c26c
|
Merge branch 'master' into NOverlays3
|
2018-12-06 11:23:50 -08:00 |
|
Jeff Clinton
|
43f84a9577
|
Merge pull request #14426 from ElderOrb/FB19400
FB19400 during shutdown -- TypeError: Cannot read property 'buttons' of null
|
2018-12-06 11:18:39 -08:00 |
|
Adam Smith
|
08d6e35d4d
|
Merge pull request #14372 from SamGondelman/decals
Case 19798: 3D projected Material Entities and materialRepeat option
|
2018-12-06 11:13:46 -08:00 |
|
Zach Fox
|
a2af50a9d0
|
Show pre-auth'd transactions in Recent Activity before redemption
|
2018-12-06 11:07:26 -08:00 |
|
Wayne Chen
|
9f894ae977
|
fixing case with KB pw prop./bolding error msg
|
2018-12-06 10:52:10 -08:00 |
|
David Back
|
1171821fc9
|
unity avatar exporter plugin
|
2018-12-06 10:22:18 -08:00 |
|
SamGondelman
|
645508de04
|
add jsdocs for BillboardMode
|
2018-12-06 09:59:24 -08:00 |
|
NissimHadar
|
4a50baddc2
|
Reverted debug code.
|
2018-12-06 09:55:48 -08:00 |
|
Wayne Chen
|
30f1016f1c
|
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
|
2018-12-06 09:55:00 -08:00 |
|
NissimHadar
|
0cca388971
|
Merge branch 'master' of https://github.com/highfidelity/hifi into 20116_nitpick_v1.2
|
2018-12-06 09:52:48 -08:00 |
|
NissimHadar
|
a665e728e6
|
Improved contents of the HTML results.
|
2018-12-06 09:52:21 -08:00 |
|
Ryan Huffman
|
13c3b410d8
|
Merge pull request #14495 from dback2/draggableNumberFixes76-master
Draggable numbers - RC76 fixes to master
|
2018-12-06 09:47:38 -08:00 |
|
Jeff Clinton
|
b9156d68e5
|
Merge pull request #14508 from amantley/restingHandsBug
removed the code that turns off inactive hands in MyAvatar.cpp
|
2018-12-06 09:42:34 -08:00 |
|
Jeff Clinton
|
e65e8d29a1
|
Merge pull request #14442 from hyperlogic/bug-fix/hand-grasp-during-desktop-handshake
Ensure that hand is in grasp pose during desktop handshake animation
|
2018-12-06 09:41:29 -08:00 |
|
Ryan Huffman
|
3160339551
|
Improve Create properties for particles + materials
Sizing of input fields is now flexible.
Material scale field labels are no longer obscured.
Material tooltips are corrected.
|
2018-12-06 09:41:10 -08:00 |
|
Jeff Clinton
|
e8c1c4a27b
|
Merge pull request #14536 from danteruiz/fix-audio-switching
Respect changed audio settings when switch displays (Master)
|
2018-12-06 09:13:47 -08:00 |
|
Jeff Clinton
|
7f242b8c0e
|
Merge pull request #14522 from thoys/fix/create/ignoreTextareaShortcuts-master
[RC77] MS20114 [CreateApp] ignore createApp shortcut keys while TEXTAREA elements are in focus
|
2018-12-06 09:11:49 -08:00 |
|
Wayne Chen
|
89a216a5ec
|
Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2
|
2018-12-06 09:05:07 -08:00 |
|
Wayne Chen
|
ce65e557bc
|
cleaning up commented code
|
2018-12-06 09:04:57 -08:00 |
|
NissimHadar
|
8938afd350
|
Updated for v1.2
|
2018-12-06 08:42:38 -08:00 |
|
Wayne Chen
|
f8a55a9196
|
25% opacity from PM req/fixing error message in profile body
|
2018-12-05 19:42:44 -08:00 |
|
Wayne Chen
|
a3a575acd1
|
updating background img binaries
|
2018-12-05 19:12:21 -08:00 |
|
Wayne Chen
|
f7265378bd
|
updating background img
|
2018-12-05 19:11:58 -08:00 |
|
David Rowe
|
aa952e9142
|
Fix mini tablet visibility angle calculations
|
2018-12-06 15:24:03 +13:00 |
|
Wayne Chen
|
037abd9b5e
|
don't allow PC keyboard in HMD login/fix sign up password
|
2018-12-05 18:14:59 -08:00 |
|
Simon Walton
|
e03104cad5
|
Merge remote-tracking branch 'upstream/master' into avatar-mixer-downloads-fst
Remove the code that was fixed in the conflicting PR - it's
now fixed in the new location.
|
2018-12-05 17:58:38 -08:00 |
|