John Conklin II
|
5f0db88a20
|
Merge pull request #14914 from raveenajain/gltf_tangents
Case 21165: tangent attribute
|
2019-02-15 11:24:21 -08:00 |
|
Sam Gateau
|
5e9eeccb95
|
Merge pull request #14930 from NissimHadar/fixCMake
Case 21241: Fix CMake problem for ubuntu build of nitpick
|
2019-02-15 11:23:58 -08:00 |
|
Sam Gondelman
|
9aa99f24f0
|
Merge pull request #14905 from SamGondelman/materialMapping
Case 20242: FST materialMapping supports our material JSON format
|
2019-02-15 11:21:51 -08:00 |
|
Brad Davis
|
a786a832d9
|
Fix android release build APK
|
2019-02-15 11:10:30 -08:00 |
|
SamGondelman
|
25b31cfc72
|
merge with master
|
2019-02-15 11:08:24 -08:00 |
|
Clément Brisset
|
3c60aaff96
|
Merge pull request #14922 from AndrewMeadows/avoid-entity-update-storm
Case 21232: avoid entity update storm from entity-server
|
2019-02-15 11:01:08 -08:00 |
|
Howard Stearns
|
490ef3542e
|
update for marketplace-in-qml, and make specific to username
|
2019-02-15 10:58:09 -08:00 |
|
Brad Davis
|
5483971855
|
Fix crash in vive and interleaved stereo plugins
|
2019-02-15 10:46:08 -08:00 |
|
David Back
|
af25a7bf6e
|
Merge pull request #14919 from dback2/selectAllClearAll
Case 19930: Entity List - add select/clear all to entity type dropdown
|
2019-02-15 10:12:30 -08:00 |
|
NissimHadar
|
b77f40d300
|
Revert due to stable build problem on Ubuntu.
|
2019-02-15 09:52:57 -08:00 |
|
Howard Stearns
|
8a6f2b221b
|
Merge branch 'master' of github.com:highfidelity/hifi into artist-stocking-inventory
|
2019-02-15 09:47:18 -08:00 |
|
Anthony Thibault
|
702f1c8e74
|
Merge pull request #14925 from hyperlogic/bug-fix/revert-anim-pose-optimization
Revert anim pose optimization
|
2019-02-15 09:42:27 -08:00 |
|
Howard Stearns
|
30c0dda9ed
|
Merge branch 'master' of github.com:highfidelity/hifi into artist-stocking-inventory
|
2019-02-15 09:27:48 -08:00 |
|
Simon Walton
|
748747da2d
|
Merge pull request #14864 from SimonWalton-HiFi/pal-sort-loudness-persist
Case 19724: If sorting PAL by loudness re-sort upon loudness updates
|
2019-02-15 09:24:34 -08:00 |
|
NissimHadar
|
8b2d9c36af
|
Adding client profile combo.
|
2019-02-15 08:39:29 -08:00 |
|
Ryan Huffman
|
ab5c4a927b
|
Fix asset browser being hidden in incorrect way on server switch
|
2019-02-14 22:18:42 -08:00 |
|
Sam Gateau
|
13b5390243
|
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
|
2019-02-14 21:01:44 -08:00 |
|
David Back
|
41abacbc6f
|
always overwrite, tweak warning
|
2019-02-14 17:51:32 -08:00 |
|
Shannon Romano
|
f267043953
|
Merge pull request #14838 from SamGondelman/billboardMode
Case 20962: Billboard mode improvements
|
2019-02-14 17:44:48 -08:00 |
|
David Back
|
e944e284a6
|
design feedback
|
2019-02-14 17:37:58 -08:00 |
|
Shannon Romano
|
3b5b077a3e
|
Merge pull request #14887 from AndrewMeadows/shape-garbage-collector
Case 21066: restore shape caching in ShapeManager
|
2019-02-14 17:33:33 -08:00 |
|
David Back
|
f6baa2432a
|
design feedback
|
2019-02-14 17:27:05 -08:00 |
|
Sam Gateau
|
34db48d3a3
|
Merging and resolving conflict
|
2019-02-14 17:03:44 -08:00 |
|
Anthony Thibault
|
a3407b96b0
|
Merge branch 'master' into bug-fix/revert-anim-pose-optimization
|
2019-02-14 16:56:17 -08:00 |
|
Sam Gateau
|
6168001ad4
|
Merge pull request #14909 from AndrewMeadows/update-collision-group-after-grab-80
Case 21159: fixes for more grab bugs
|
2019-02-14 16:52:03 -08:00 |
|
David Back
|
46ff3a8405
|
add select/clear all buttons to entity type dropdown
|
2019-02-14 16:16:33 -08:00 |
|
Anthony Thibault
|
39b4eaac34
|
Revert "AnimPose operator* optimizations"
This reverts commit 569bef50fd.
|
2019-02-14 16:13:00 -08:00 |
|
Anthony Thibault
|
f0e163b4df
|
Revert "AnimPose::inverse() optimization"
This reverts commit 5c7e81584c.
|
2019-02-14 16:10:26 -08:00 |
|
David Back
|
7cffcf2215
|
error handling, warnings for duplicate textures
|
2019-02-14 16:09:48 -08:00 |
|
Ryan Huffman
|
e800a6e030
|
Update hard-coded vec3 zero with Vec3.ZERO
|
2019-02-14 15:56:17 -08:00 |
|
Sam Gateau
|
fc1d3df613
|
Merge branch 'brown' of github.com:samcake/hifi into brown
|
2019-02-14 15:44:26 -08:00 |
|
Sam Gateau
|
522a9ed7c1
|
Keeping only the minimum for quest
|
2019-02-14 15:43:36 -08:00 |
|
Simon Walton
|
75901a1e37
|
Merge pull request #14853 from SimonWalton-HiFi/installer-removes
Case 20496: Windows (NSIS) installer shouldn't remove unselected component upon reinstall
|
2019-02-14 15:41:25 -08:00 |
|
Sam Gateau
|
98a5ec84a9
|
Adjusting the HUD operator render job to shave an extra framebuffer
|
2019-02-14 15:35:02 -08:00 |
|
Andrew Meadows
|
b94655260d
|
don't traverse for fullUpdate on changed view
|
2019-02-14 14:54:10 -08:00 |
|
Shannon Romano
|
453c081d9b
|
Merge pull request #14901 from huffman/fix/dropdown-close-on-click
Case 19999: Update edit.js to auto close dropdowns when clicking outside
|
2019-02-14 14:48:03 -08:00 |
|
NissimHadar
|
cf2e118c14
|
Added missing double-quote.
|
2019-02-14 14:33:49 -08:00 |
|
raveenajain
|
01def37efd
|
spacing
|
2019-02-14 14:22:43 -08:00 |
|
NissimHadar
|
a1e289cc1c
|
Compilation error on Qt 5.12
|
2019-02-14 14:17:29 -08:00 |
|
Bradley Austin Davis
|
d45d87031d
|
Merge pull request #14782 from SamGondelman/NOverlaysFinal
Case 20723, Case 20334: Internally, replace all overlays with local entities
|
2019-02-14 13:49:47 -08:00 |
|
NissimHadar
|
90aff53408
|
Merge branch 'master' of github.com:highfidelity/hifi into 21193-updateNitpickReadme
|
2019-02-14 13:47:16 -08:00 |
|
NissimHadar
|
ba68421d0c
|
Completed manual.
|
2019-02-14 13:46:51 -08:00 |
|
NissimHadar
|
705a0bcaa0
|
Updated manual to include Android.
|
2019-02-14 13:41:54 -08:00 |
|
SamGondelman
|
bed2732d34
|
start moving materials to rendering only
|
2019-02-14 12:59:16 -08:00 |
|
Sam Gateau
|
969c62d0df
|
Merge pull request #14907 from danteruiz/fix-qml-crash-on-mac
Case 21157: Fix Desktop.qml crash on local mac build
|
2019-02-14 12:15:50 -08:00 |
|
Sam Gateau
|
384d4fb959
|
Merge pull request #14809 from highfidelity/commandLineAndroid
case 19113: Recreated changes due to CLA issue in previous pr. Adding args to int…
|
2019-02-14 12:10:08 -08:00 |
|
raveenajain
|
e825be566d
|
Merge branch 'master' of https://github.com/highfidelity/hifi into gltf_tangents
|
2019-02-14 11:45:53 -08:00 |
|
David Back
|
4e4ec9940f
|
copy external texture dependencies
|
2019-02-14 11:38:39 -08:00 |
|
John Conklin II
|
5e177c31ee
|
Merge pull request #14912 from NissimHadar/21185-protectNitpickFromBadFilename
Case 21185: protect nitpick from bad filename
|
2019-02-14 11:25:36 -08:00 |
|
David Rowe
|
6a00834147
|
Merge branch 'master' into M21128
# Conflicts:
# interface/src/AboutUtil.h
|
2019-02-15 08:06:41 +13:00 |
|