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 |
|
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 |
|
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 |
|
David Back
|
1171821fc9
|
unity avatar exporter plugin
|
2018-12-06 10:22:18 -08:00 |
|
NissimHadar
|
4a50baddc2
|
Reverted debug code.
|
2018-12-06 09:55:48 -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 |
|
NissimHadar
|
8938afd350
|
Updated for v1.2
|
2018-12-06 08:42:38 -08:00 |
|
David Rowe
|
aa952e9142
|
Fix mini tablet visibility angle calculations
|
2018-12-06 15:24:03 +13: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 |
|
NissimHadar
|
079a623b30
|
Added text results to HTML.
|
2018-12-05 17:25:03 -08:00 |
|
Simon Walton
|
16144b6630
|
Move the previously deleted FST reader down to the ScriptableAvatar class
|
2018-12-05 17:14:40 -08:00 |
|
David Rowe
|
363e3ca32d
|
Merge branch 'master' into mini-tablet-tuning
|
2018-12-06 13:55:24 +13: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 |
|
Clement
|
7723261cb9
|
Remove deferred script loading logic
|
2018-12-05 14:08:30 -08:00 |
|
NissimHadar
|
e3402328c8
|
Use same name for all text results in zipped folder.
|
2018-12-05 12:10:28 -08:00 |
|
NissimHadar
|
f5a19efa8c
|
Saves text results in zip file.
|
2018-12-05 11:36:55 -08:00 |
|
SamGondelman
|
287878ff98
|
merge with master
|
2018-12-05 10:35:08 -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 |
|
NissimHadar
|
936119b246
|
Merge branch '20116_nitpick_v1.2' of https://github.com/NissimHadar/hifi into 20116_nitpick_v1.2
|
2018-12-05 07:41:36 -08:00 |
|
SamGondelman
|
58396b845f
|
move back to plugin thread
(cherry picked from commit 98d3f6a9d1191031cda1ff040e69093ef6824f1c)
|
2018-12-04 17:38:48 -08:00 |
|
NissimHadar
|
15f95aafa5
|
WIP.
|
2018-12-04 16:41:19 -08:00 |
|
SamGondelman
|
0c64d1227a
|
fix vive crash
|
2018-12-04 16:41:03 -08:00 |
|
amantley
|
edab74caa4
|
mapped the model joint names to hifi compliant joint names in FBX serializer
|
2018-12-04 16:20:46 -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 |
|
Simon Walton
|
f3236e0843
|
Remove FST joint members from AvatarData
|
2018-12-04 10:45:32 -08:00 |
|
sabrina-shanman
|
ed1684967f
|
Remove straggler HFMSimpleFormat.cpp
|
2018-12-04 10:08:14 -08:00 |
|
sabrina-shanman
|
1c9beed44f
|
Fix ModelFormatRegistry Dependency inheritance being private
|
2018-12-04 09:30:05 -08:00 |
|
sabrina-shanman
|
3c38b43a65
|
Fix compilation error due to static variable definition in MIMETypeLibrary header file
|
2018-12-04 09:30:04 -08:00 |
|
sabrina-shanman
|
a63888cac8
|
Remove unused default constructor for GLTFSerializer
|
2018-12-04 09:30:04 -08:00 |
|
sabrina-shanman
|
a04c822ef0
|
Oops, ModelFormatRegistry needs to be defined as a Dependency before it can be used by DependencyManager
|
2018-12-04 09:30:04 -08:00 |
|