Ryan Downe Karpf
f0499c8b64
Merge pull request #12006 from SamGondelman/burp61
...
Fix caching of ktx texture files (RC-61)
2017-12-18 11:13:18 -08:00
Andrew Meadows
cfd2097f36
Merge pull request #11965 from AndrewMeadows/expose-physics-perf-stats-to-js
...
Cleanup names of debug stats and trace contexts.
2017-12-18 10:02:42 -08:00
Elisa Lupin-Jimenez
0e57ed5c12
Merge branch 'master' of https://github.com/highfidelity/hifi into poly_api
2017-12-18 10:00:18 -08:00
Nissim Hadar
51e70365f0
Merge branch 'master' of https://github.com/highfidelity/hifi into hazeOnTransparent
2017-12-18 08:04:04 -08:00
vladest
0c99a56972
Merge branch 'master' into tablet_home_paginate
2017-12-18 14:57:48 +01:00
vladest
38453afb3b
Create pages and store in global array, makes sure it will not be cleared by garbage collector whe out of scope
2017-12-18 14:56:33 +01:00
Sam Gondelman
c39da5094b
weak_ptr _cacheFile
2017-12-17 22:31:09 -08:00
Sam Gondelman
a39eea5a34
cr and cleanup
2017-12-17 22:30:57 -08:00
SamGondelman
9bdcf34c91
clear all _cacheFiles on recycle
2017-12-17 22:30:47 -08:00
SamGondelman
90b97aba59
remove extra recycle
2017-12-17 22:30:31 -08:00
SamGondelman
355ceddcc6
keep _cacheFile alive
2017-12-17 22:30:05 -08:00
Sam Gondelman
6814dfcbfc
weak_ptr _cacheFile
2017-12-17 22:09:20 -08:00
Sam Gondelman
6990dda48d
cr and cleanup
2017-12-17 16:11:55 -08:00
Ken Cooke
4d42dba300
Merge pull request #12005 from ctrlaltdavid/21674
...
Fix handshake mode staying on when release "x" if Ctrl or Shift pressed
2017-12-17 08:50:46 -08:00
David Rowe
5e19410293
Fix handshake satyhing on when release "x" if Ctrl or similar pressed
2017-12-17 15:23:40 +13:00
vladest
62a762b879
Merge branch 'master' into tablet_home_paginate
2017-12-16 20:32:21 +01:00
vladest
cdb9d72387
Added smart pointer for qml buttons. removed extra modifiers. page changed using left and right buttons
2017-12-16 20:27:19 +01:00
Nissim Hadar
dcce5964dd
Merge branch 'master' of https://github.com/highfidelity/hifi into hazeOnTransparent
2017-12-16 00:23:08 -08:00
Nissim Hadar
d69297c02e
Replace evalGlobalLightingAlphaBlended with evalGlobalLightingAlphaBlendedWithHaze in all shaders.
2017-12-16 00:22:26 -08:00
Brad Hefta-Gaub
637e24504c
Merge pull request #11951 from dback2/polymaterialurl
...
Allow space characters in material library name
2017-12-15 19:42:25 -08:00
SamGondelman
3ae52c0e0e
clear all _cacheFiles on recycle
2017-12-15 17:52:48 -08:00
Sam Gondelman
dab4b12a72
Merge pull request #12001 from hyperlogic/bug-fix/anim-skeleton-crash
...
Fix for crash in AnimSkeleton::getNumJoints()
2017-12-15 17:40:42 -08:00
Anthony J. Thibault
e2df9e29e2
Fix for crash in AnimSkeleton::getNumJoints()
...
When initAnimGraph is called it asynchronously loads the Animation graph in the background.
If the model url is changed, or the Model is deleted in between the initial load and it's completion,
It's possible to access a bad Rig::_animSkeleton pointer.
The fix is to hold onto the _animSkeleton pointer via a weak ref.
2017-12-15 16:46:27 -08:00
SamGondelman
3477aa57a8
remove extra recycle
2017-12-15 16:36:07 -08:00
Zach Fox
89795272c7
More security images!
2017-12-15 16:26:13 -08:00
SamGondelman
52c4aef721
keep _cacheFile alive
2017-12-15 16:23:53 -08:00
Nissim Hadar
8038f2bd9f
Added required parameter to test call.
2017-12-15 16:14:01 -08:00
Seth Alves
b1503f7c46
Merge pull request #11976 from luiscuenca/fixLinuxAudioDLock
...
Fix getActiveDevice deadlocks on Linux
2017-12-15 15:41:41 -08:00
Anthony Thibault
f3fcac8e58
Merge pull request #11903 from Delanir/IPD8258
...
8258 IPD Tertiary Task List: Changing to Smaller Avatar Does not Resize Tablet
2017-12-15 15:37:27 -08:00
Brad Hefta-Gaub
c68bec175a
Merge pull request #11978 from hyperlogic/bug-fix/no-hip-glitches
...
More stable hips IK
2017-12-15 15:32:24 -08:00
Brad Hefta-Gaub
5087893097
Merge pull request #11804 from amantley/character_entity_fixes
...
Fixed Entity Animation Property not applying to FBXs
2017-12-15 15:31:11 -08:00
Brad Hefta-Gaub
4ceedf7731
Merge pull request #11986 from kencooke/audio-wavloader-fix
...
Unsupported WAV files should always be logged and not played
2017-12-15 15:24:24 -08:00
Brad Hefta-Gaub
45df668679
Merge pull request #11966 from SamGondelman/hysteresis
...
Update stylus touch hysteresis values
2017-12-15 15:22:41 -08:00
Brad Hefta-Gaub
95bfacb850
Merge pull request #11977 from ctrlaltdavid/21643
...
Enable user connection with "x" key when capslock is on
2017-12-15 15:22:00 -08:00
Brad Hefta-Gaub
6aebfd61c5
Merge pull request #11999 from luiscuenca/laserScaleFix
...
Make lasers scale with avatar
2017-12-15 15:21:01 -08:00
Nissim Hadar
0e7bc29649
Added include for MacOS
2017-12-15 14:10:58 -08:00
Nissim Hadar
8bf517b2f8
Merge branch 'master' into hazeOnTransparent
2017-12-15 13:45:31 -08:00
Nissim Hadar
bd5e2c9ab6
Cleanup per coding standard.
2017-12-15 13:14:27 -08:00
Nissim Hadar
ecd213d1cd
Merge branch 'master' into QtImageCompare
2017-12-15 12:55:17 -08:00
Nissim Hadar
320045cfbd
Modified by mistake.
2017-12-15 12:53:27 -08:00
Nissim Hadar
c7a45ec988
Completed storing test results.
2017-12-15 12:52:13 -08:00
luiscuenca
53e1c57e3b
Make lasers scale with avatar
2017-12-15 13:46:15 -07:00
Nissim Hadar
418d741b39
Auto-tester now saves results in a folder hierarchy.
2017-12-15 11:55:46 -08:00
Seth Alves
08af1b2894
Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3
2017-12-15 11:25:01 -08:00
Bradley Austin Davis
a3ef4ce976
Merge pull request #11946 from ElderOrb/FB8992_2
...
8992 Login window is small in tablet
2017-12-15 09:10:49 -08:00
Ryan Downe Karpf
11eaf435c9
Merge pull request #11996 from sethalves/pr-11946-for-rc-61
...
8992 Login window is small in tablet
2017-12-15 09:08:49 -08:00
Nissim Hadar
82b94eaacd
Reduced size of parameters in (shader) function call.
2017-12-14 18:50:41 -08:00
Alexander Ivash
a4696cc2b3
8992 Login window is small in tablet
2017-12-14 16:57:17 -08:00
Stephen Birarda
a5c951a666
remove tracking of last receiver response from SendQueue
2017-12-14 16:41:20 -08:00
Stephen Birarda
75e56b5daa
make the _lastMessageNumber in Connection default to 0
2017-12-14 16:41:20 -08:00
