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
Seth Alves
b1503f7c46
Merge pull request #11976 from luiscuenca/fixLinuxAudioDLock
...
Fix getActiveDevice deadlocks on Linux
2017-12-15 15:41:41 -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
NissimHadar
df34103895
Merge pull request #11980 from NissimHadar/crashFix10537
...
Protect against use of null HazePointer.
2017-12-14 11:45:49 -08:00
Ken Cooke
b6a88bbdda
Invalid WAV files should always be logged and not played
2017-12-14 10:20:46 -08:00
amantley
5bc113c818
deleted some debug print statements in ModelEntityItemcpp and deleted else statement that was superfluous
2017-12-13 19:07:23 -08:00
Zach Fox
ed5082e5d4
Merge pull request #11974 from birarda/feat/staging-env-or-cl
...
allow custom metaverse URL to be used with env var
2017-12-13 17:29:45 -08:00
amantley
2817eadb7a
iMerge remote-tracking branch 'origin/character_entity_fixes' into character_entity_fixes
...
updating branch with remote
2017-12-13 16:48:33 -08:00
amantley
7c29a1b09a
Merge remote-tracking branch 'origin/master' into character_entity_fixes
...
updating branch to master
2017-12-13 16:47:15 -08:00
luiscuenca
483443d218
No mutex
2017-12-13 17:02:36 -07:00
luiscuenca
e581c66b56
added mutex for audio handler
2017-12-13 16:11:46 -07:00
Nissim Hadar
79f0124244
Protect against use of null HazePointer.
2017-12-13 15:02:03 -08:00
Nissim Hadar
b4df115507
Protect against use of null HazePointer.
2017-12-13 12:53:01 -08:00
luiscuenca
e709561a62
Fix getActiveDevice deadlocks on Linux
2017-12-13 12:14:49 -07:00
Sam Gateau
a75010fb94
Merge pull request #11938 from Zvork/csm
...
Cascaded Shadow Maps and bug fix
2017-12-14 00:32:43 +07:00
Olivier Prat
19e240460d
Slightly optimized matrix operations in LightStage as samcake's remark
2017-12-13 15:30:57 +01:00
MiladNazeri
8a28d04322
Merge pull request #11885 from ctrlaltdavid/21624
...
Overlays JSDoc
2017-12-12 17:04:46 -08:00
Stephen Birarda
7a81c3e8e7
allow passing of custom URL on env
2017-12-12 16:32:43 -08:00
Stephen Birarda
139976d8bb
allow staging METAVERSE_SERVER_URL to be toggled by env
2017-12-12 16:22:08 -08:00
Sam Gondelman
e5a4f077c9
Merge pull request #11964 from SamGondelman/memFix
...
Remove unneeded getDedicatedMemory
2017-12-12 14:43:15 -08:00
David Rowe
578c42b4ea
Merge branch 'master' into 21624
2017-12-13 09:41:09 +13:00
MiladNazeri
cf3e9f78c9
Merge pull request #11884 from ctrlaltdavid/21603
...
Quat JSDoc
2017-12-12 12:20:23 -08:00
MiladNazeri
16e16501cd
Merge pull request #11791 from ctrlaltdavid/21602
...
JSDoc updates
2017-12-12 12:18:02 -08:00
amantley
079d9639e4
Got rid of the while loop in updateFrameCount in ModelEntityItem_cpp
2017-12-12 09:12:11 -08:00
amantley
29538851b6
Made the changes from the latest code review, except getting rid of the
...
while loop.
2017-12-12 09:06:43 -08:00
SamGondelman
ae625306ff
remove getDedicatedMemory
2017-12-11 14:54:29 -08:00
David Rowe
58fa8b9fbf
Miscellaneous fixes
2017-12-12 10:49:05 +13:00
amantley
65bb896450
Merge remote-tracking branch 'origin/master' into character_entity_fixes
2017-12-11 10:55:54 -08:00
Sam Gateau
0ff91e5926
Merge pull request #11952 from samcake/light
...
Exposing multi highlight and selection feature to js api
2017-12-12 01:09:15 +07:00
samcake
63fb9b5503
fix float literal syntax
2017-12-11 09:30:31 -08:00
Clément Brisset
833f98b98b
Merge pull request #11920 from Atlante45/feat/reduce-memory-usage
...
Reduce Image library memory usage
2017-12-11 09:29:22 -08:00
samcake
1008175a92
Removing commented code
2017-12-11 09:28:33 -08:00
samcake
b4f7433042
removing .f for a float in shader
2017-12-11 09:26:43 -08:00
amantley
7e49ce26d7
Merge remote-tracking branch 'origin/master' into character_entity_fixes
...
updating branch to the master
2017-12-11 08:02:33 -08:00
Olivier Prat
b9d49318e7
Fixed bug which culled medium sized objects in shadow maps due to perspective frustum assumed octree selection
2017-12-11 12:19:10 +01:00
Sam Gateau
cc4b266647
Add names to objects of the selection, remove comments in shader and fix one more warning on linux
2017-12-11 00:31:54 -08:00
Olivier Prat
a679dc6705
Merge branch 'master' of git://github.com/highfidelity/hifi into csm
2017-12-11 08:48:48 +01:00
Sam Gateau
eec4e966a7
Fix the linux build and correct the name of the property Intensity to Opacity
2017-12-10 10:13:49 -08:00
Sam Gateau
429d54d65d
Merge branch 'master' of https://github.com/highfidelity/hifi into light
2017-12-10 09:53:22 -08:00
divya
e187852df1
Merge pull request #11941 from huffman/feat/atp-baking-process
...
Move asset server baking to a separate process
2017-12-09 20:48:14 -08:00
Ryan Huffman
e3d00c4aa5
Remove unnecessary logging from PathUtils
2017-12-08 17:48:10 -08:00
Ryan Huffman
982607eedf
Remove unused variable from PathUtils
2017-12-08 15:40:33 -08:00
Sam Gondelman
352c11d7c4
Merge pull request #11358 from vladest/fix_google_vr_height
...
Momentum aka flickable for WebView
2017-12-08 10:46:52 -08:00
samcake
9a4f667059
Merge branch 'master' of https://github.com/highfidelity/hifi into light
2017-12-08 08:50:33 -08:00
Seth Alves
a7a6dee8e0
Merge pull request #11950 from hyperlogic/bug-fix/hand-scaling
...
Fix for hand controller avatar scaling.
2017-12-08 07:17:59 -08:00
Seth Alves
91b2d8df8a
Merge pull request #11874 from luiscuenca/audioscope
...
Improve Audio Scope
2017-12-08 07:15:28 -08:00
Sam Gateau
d07cde3ecb
Merge branch 'master' of https://github.com/highfidelity/hifi into light
2017-12-07 19:20:25 -08:00
David Kelly
42b509639b
Fix certificate hash
2017-12-07 17:22:00 -08:00
