John Conklin II
|
55f59a720f
|
Merge pull request #14501 from thoys/fix/create/userDataErrorMessagePopupInfiniteLoopFix
MS19567 [CreateApp]: userData error message continues popup fix
|
2018-12-07 10:59:34 -08:00 |
|
John Conklin II
|
d7e3935d57
|
Merge pull request #14421 from dback2/entityListReorderColumns
Entity list - reorder columns
|
2018-12-07 10:59:02 -08:00 |
|
John Conklin II
|
3a22299503
|
Merge pull request #14441 from dback2/preventDragDrop
Prevent dragging and dropping files onto Create windows
|
2018-12-07 10:58:42 -08:00 |
|
Stephen Birarda
|
fb3cdabd87
|
Merge pull request #14527 from birarda/bug/entity-traits-handler-deadlock
fix for deadlock between setAvatarEntityData and sendChangedTraitsToMixer
|
2018-12-06 17:28:45 -08:00 |
|
Clément Brisset
|
ebe7ee834e
|
Merge pull request #14502 from Atlante45/fix/build-files
Update build docs and prebuild.py to warn about HIFI_VCPKG_BASE
|
2018-12-06 16:53:21 -08:00 |
|
John Conklin II
|
88efaaa4c7
|
Merge pull request #14544 from huffman/fix/particle-property-layout
Improve Create properties for particles + materials
|
2018-12-06 16:45:44 -08:00 |
|
David Back
|
1a3708c49d
|
better drag drop fix
|
2018-12-06 16:14:28 -08:00 |
|
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 |
|
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 |
|
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
|
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 |
|
Sam Gondelman
|
b690faeb12
|
Merge branch 'master' into NOverlays
|
2018-12-06 11:29:06 -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 |
|
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 |
|
Adam Smith
|
653974ca30
|
Merge pull request #14293 from SamGondelman/branching
Case 19473: Reduce branching in our shaders
|
2018-12-05 16:42:42 -08:00 |
|
Zach Fox
|
235b27a198
|
Merge branch 'master' of github.com:highfidelity/hifi into payOut1
|
2018-12-05 16:35:07 -08:00 |
|
Zach Fox
|
02307d2308
|
Secret to Coupon ID
|
2018-12-05 16:34:53 -08:00 |
|
Dante Ruiz
|
3123bb37e4
|
fix audio switching issue
|
2018-12-05 10:34:47 -08:00 |
|
Antonina Savinova
|
2dcfea5f7c
|
Merge pull request #14487 from SimonWalton-HiFi/avatar-mixer-memory-leak
Fix minor avatar-mixer memory leaks
|
2018-12-05 10:29:29 -08:00 |
|
SamGondelman
|
58396b845f
|
move back to plugin thread
(cherry picked from commit 98d3f6a9d1191031cda1ff040e69093ef6824f1c)
|
2018-12-04 17:38:48 -08:00 |
|
SamGondelman
|
0c64d1227a
|
fix vive crash
|
2018-12-04 16:41:03 -08:00 |
|
Brad Hefta-Gaub
|
77e1c98264
|
Merge pull request #14528 from sethalves/fix-delete-home
work around menu-item name hash collision for Home
|
2018-12-04 15:04:25 -08:00 |
|
John Conklin II
|
725cf6c526
|
Merge pull request #14518 from hyperlogic/bug-fix/puck-offsets
Head and Hand offsets for Vive Trackers now function as expected
|
2018-12-04 14:25:02 -08:00 |
|
Adam Smith
|
763e6d1a95
|
Merge pull request #14444 from SamGondelman/actionData
Case 19861: Fix: Shouldn't be able to write actionData from script
|
2018-12-04 11:25:00 -08:00 |
|
Adam Smith
|
864e9ca8ae
|
Merge pull request #14443 from SamGondelman/hud
Case 19660: Fix HUD crash
|
2018-12-04 11:10:43 -08:00 |
|
John Conklin II
|
e4b68f1d38
|
Merge pull request #14455 from samcake/one
case 20041: Package all the graphics related objects and functions in Application in the Graphics Engine
|
2018-12-04 10:46:45 -08:00 |
|
Sam Gateau
|
d2ff4d4674
|
Merge branch 'master' of https://github.com/highfidelity/hifi into one
|
2018-12-03 20:52:43 -08:00 |
|
Seth Alves
|
541d0ab4d6
|
work around menu-item name hash collision for Home
|
2018-12-03 17:33:04 -08:00 |
|
Zach Fox
|
ab184c5c2b
|
Authorized Script to Coupon
|
2018-12-03 15:16:06 -08:00 |
|
birarda
|
c959dd7024
|
release avatar entity and traits locks sooner to avoid deadlock
|
2018-12-03 14:57:38 -08:00 |
|
Clément Brisset
|
56ac34f9d1
|
Merge pull request #14506 from Atlante45/fix/misc-agent
Fix various AC bugs
|
2018-12-03 14:18:12 -08:00 |
|
Clément Brisset
|
62f21822ce
|
Merge pull request #14494 from Atlante45/fix/agent-shutdown-crash
Fix Agent crash on shutdown
|
2018-12-03 14:17:35 -08:00 |
|
Zach Fox
|
5b8c9d7cc1
|
Merge branch 'master' of github.com:highfidelity/hifi into payOut1
|
2018-12-03 12:11:55 -08:00 |
|