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
a650c5bbc6
Move a define to resume watchdog a bit further
2018-01-31 23:31:31 -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
John Conklin II
7d05b302d3
Merge pull request #12313 from highfidelity/stable
...
Merge stable back into master
2018-01-31 18:05:24 -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
John Conklin II
d37e9af7d4
Merge pull request #12307 from jherico/hotfix/amd_crash
...
Fix for AMD crashes in QML rendering
2018-01-31 16:30:53 -08:00
Dante Ruiz
bd5fc65bfb
fix getDirtyFlags & getSpecialFlags function
2018-01-31 16:19:14 -08:00
Liv
8767bc8790
Merge pull request #12293 from misslivirose/fix-remote-exterminator-sample
...
removing old game sample from script-archive
2018-01-31 16:10:21 -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
vladest
bca903a6df
Fix build
2018-01-31 23:31:18 +01:00
samcake
0885b00ab8
Merge branch 'master' of https://github.com/highfidelity/hifi into pastel
2018-01-31 14:18:38 -08:00
Alexander Ivash
1ed7d164c4
FB11511 - position of log windows should be persistent between invocations of interface
2018-02-01 01:15:03 +03:00
vladest
2a5b3d97fb
AddressBar trigger implemented. Fixed warnings on non existing context properties. Fixed warnings about non notifyable property
2018-01-31 23:05:38 +01:00
Bradley Austin Davis
59a088f226
Merge pull request #12309 from highfidelity/revert-12126-addressbar_close_fix
...
Revert "AddressBar trigger implemented. Fixed warnings on non existing contex…"
2018-01-31 14:02:27 -08:00
Triplelexx
257932cedc
remove cache buster
2018-01-31 22:00:30 +00: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
Seth Alves
a49097789a
Revert "AddressBar trigger implemented. Fixed warnings on non existing contex…"
2018-01-31 13:32:19 -08: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
vladest
87ab8a5840
Image overlay uses bounds property
2018-01-31 21:46:05 +01:00
John Conklin II
3d5742865d
Merge pull request #12266 from hyperlogic/bug-fix/neck-cauterization
...
Bug fix for avatar neck cauterization
2018-01-31 12:37:09 -08:00
Seth Alves
96b6e85745
formatting
2018-01-31 12:24:23 -08:00
Seth Alves
acc5973813
Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1
2018-01-31 12:22:50 -08:00
Brad Davis
e5559fa865
Better fix for AMD crashing (hopefully
2018-01-31 12:10:06 -08:00
Zach Fox
90c2371f0c
It's working!
2018-01-31 12:09:23 -08:00
Seth Alves
0df4ae02fc
Merge pull request #12126 from vladest/addressbar_close_fix
...
AddressBar trigger implemented. Fixed warnings on non existing contex…
2018-01-31 11:26:05 -08:00
Seth Alves
50e6864988
Merge pull request #12138 from Triplelexx/21669_prompt_keyboard
...
WL#21669: Allow better keyboard navigation of prompt windows such as Window.prompt()
2018-01-31 11:19:49 -08:00
Seth Alves
a596e07464
fix left-over run button when scripts are reloaded
2018-01-31 11:05:35 -08:00
samcake
582ef2a8a2
MErging with master
2018-01-31 11:00:23 -08:00
Zach Fox
8a729e3cf0
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_SendMoneyNearbyParticle
2018-01-31 10:54:32 -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
Seth Alves
c4f57877dd
if hand is already in 'drop gesture' position when equipping something, don't unequip until the hand has been upright
2018-01-31 10:06:20 -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
Seth Alves
600cc1b48e
Merge pull request #12250 from druiz17/fix-multihighlight
...
Don't manually highlight tablet buttons from swipeview.
2018-01-31 09:33:33 -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
