David Rowe
d842e532ee
Remove Window.customPrompt() from JavaScript API
2018-02-04 14:02:30 +13:00
John Conklin II
c8bb26ae74
Merge pull request #12294 from samcake/pastel
...
Improve startup time by optimizing shader bookkeeping
2018-02-02 16:37:44 -08:00
Andrew Meadows
a5e968867e
Merge pull request #12302 from druiz17/fix-another-bootstrapping
...
Fix another bootstrapping and rename entityItem _dirtyFlags
2018-02-02 15:14:38 -08:00
John Conklin II
9f4820df3b
Merge pull request #12255 from Zvork/trnormalmap
...
Normal map support on translucent objects
2018-02-02 14:19:50 -08:00
Olivier Prat
03daba9bac
Removed duplicate shader include
2018-02-02 18:18:24 +01:00
Seth Alves
861497e907
Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1
2018-02-02 08:56:18 -08:00
Seth Alves
14d5029f4d
only update cauterization of child entities when something relevant changes
2018-02-02 08:56:11 -08:00
Olivier Prat
a44c5c9814
Merge branch 'master' of http://github.com/highfidelity/hifi into trnormalmap
2018-02-02 08:46:38 +01:00
John Conklin II
cbdbf51ccd
Merge pull request #12317 from hyperlogic/feature/remove-ik-hips-offset
...
Removal of hips offset shifting from AnimInverseKinematics node
2018-02-01 15:30:08 -08:00
Seth Alves
53f536c476
Merge pull request #12320 from ctrlaltdavid/21731
...
Bump avatar mixer packet version
2018-02-01 14:28:23 -08:00
Seth Alves
45ab2e9654
Merge pull request #12319 from hyperlogic/bug-fix/cauterization-on-rigid-bound-mesh
...
Fix for rigidly bound mesh not being properly cauterized.
2018-02-01 13:44:27 -08:00
samcake
9867b479fd
APplying review feedback
2018-02-01 13:12:28 -08:00
David Rowe
f46362906d
Bump avatar mixer packet version
2018-02-02 10:02:20 +13:00
Seth Alves
0a94af53fc
Merge pull request #12314 from ctrlaltdavid/21731
...
FBX fixes
2018-02-01 12:12:38 -08:00
Seth Alves
f7027b52e1
Merge pull request #12311 from ElderOrb/FB11511
...
FB11511 - position of log windows should be persistent between invocations of interface
2018-02-01 12:11:30 -08:00
Seth Alves
bdf6736a54
Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1
2018-02-01 12:04:56 -08:00
Anthony J. Thibault
a1b67afabf
Fix for rigidly bound mesh not being properly cauterized.
...
For example, sometimes in first person view, you can see the back of your avatar's eyes or the brim of your avatar's hat.
2018-02-01 11:57:50 -08:00
MiladNazeri
a9c6af6b13
Merge pull request #12318 from Triplelexx/entity_serverscript_log_typo
...
Fix typos for entity server script log
2018-02-01 10:55:29 -08:00
samcake
fd501cf3af
Addressing review comments
2018-02-01 10:37:54 -08:00
Dante Ruiz
ab20643ada
fix mistakes
2018-02-01 08:13:43 -08:00
Seth Alves
482be7ba4e
Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1
2018-02-01 06:36:04 -08:00
Sam Gateau
351f619555
Fixing a shader error on android
2018-01-31 23:35:16 -08:00
Sam Gateau
60238fa644
Fixing the android build
2018-01-31 23:15:19 -08:00
Triplelexx
a8d2be045c
fix typos
2018-02-01 07:09:24 +00:00
Sam Gateau
d4a3932549
Merge branch 'master' of https://github.com/highfidelity/hifi into pastel
2018-01-31 21:53:09 -08:00
Sam Gateau
edb416d24e
Fixing the program map sorting, good to go
2018-01-31 21:32:22 -08:00
Anthony J. Thibault
b23f98b311
Removal of hips offset shifting from AnimInverseKinematics node
...
With the addition of the hips IK target, the hips offset shifting code is no longer necessary.
This PR should not effect any behavior, but it removes this unused code from the animation system.
2018-01-31 17:56:33 -08:00
samcake
89f4fe1c04
Adding the map of existing shaders and programs and ways to identify them to avoid recompiling them
2018-01-31 17:28:45 -08:00
David Rowe
a7ec4501e6
FBX node IDs aren't alphanumerically ordered per logical structure
2018-02-01 13:43:14 +13:00
David Rowe
4cd130dd63
Don't reparent model node with clusters if it's a root node
2018-02-01 13:39:57 +13:00
Dante Ruiz
bd5fc65bfb
fix getDirtyFlags & getSpecialFlags function
2018-01-31 16:19:14 -08:00
John Conklin II
453d0038d6
Merge pull request #12297 from hyperlogic/bug-fix/hair-freakout
...
Fix avatars with extra joints during mirrored animations
2018-01-31 15:33:34 -08:00
John Conklin II
fd92ef226a
Merge pull request #12274 from samcake/flash
...
FIxing the dark ambient lighting on scattering surface
2018-01-31 15:32:29 -08:00
Dante Ruiz
f6029ed9dc
made requested changes
2018-01-31 15:21:22 -08:00
samcake
0885b00ab8
Merge branch 'master' of https://github.com/highfidelity/hifi into pastel
2018-01-31 14:18:38 -08:00
Brad Hefta-Gaub
f5614618b9
Merge pull request #12288 from ctrlaltdavid/21729
...
Add location.domainID as a synonym for location.domainId
2018-01-31 13:50:48 -08:00
Alexander Ivash
579d9a8640
fix slots invocation
2018-02-01 00:48:03 +03:00
Bradley Austin Davis
f40d83381d
Merge pull request #12300 from jherico/fix/amd_crash
...
Trying to fix AMD crash in QML rendering
2018-01-31 13:24:50 -08:00
Seth Alves
96b6e85745
formatting
2018-01-31 12:24:23 -08:00
samcake
582ef2a8a2
MErging with master
2018-01-31 11:00:23 -08:00
Seth Alves
64a46bf5df
merge from upstream
2018-01-31 10:43:41 -08:00
Dante Ruiz
01f8227fa2
remove stray prints
2018-01-31 10:41:08 -08:00
Bradley Austin Davis
b97c938544
Merge pull request #12216 from thoys/feat/js-script-console-auto-complete
...
JS scripting console auto-complete
2018-01-31 10:39:51 -08:00
Brad Davis
ef699c2a78
Better fix for AMD crashing (hopefully
2018-01-31 10:38:20 -08:00
Dante Ruiz
9ff6e079ee
fix functions
2018-01-31 10:09:23 -08:00
Sam Gateau
9a131cfab6
Merge pull request #12265 from SamGondelman/resourceCache
...
Remove unnecessary invokeMethod from ResourceCache::getResource
2018-01-31 09:35:05 -08:00
John Conklin II
ece72501b9
Merge pull request #12279 from druiz17/fix-parenting-crash
...
fix entity parenting crash
2018-01-31 09:32:52 -08:00
Dante Ruiz
c3b8565dea
min diff
2018-01-31 09:23:00 -08:00
Dante Ruiz
4429be23c0
add comment
2018-01-31 09:13:11 -08:00
Brad Davis
9893273d33
Trying to fix AMD crash in QML rendering
2018-01-31 08:36:52 -08:00
