Olivier Prat
bd666406f4
Removed glColor reset hack in MeshPartPayload and replaced it by a reset of the color attribute to white in the execution of the setInputFormat command of the various GLBackends
2017-12-19 14:17:17 +01:00
Anthony Thibault
7ea1f3b911
Merge pull request #12013 from sethalves/delete-expired-av-ents
...
when an avatar-entity's lifetime expires, remove it from avatarEntityData
2017-12-18 17:35:42 -08:00
Sam Gateau
8f6929fe53
Merge pull request #12011 from SamGondelman/skybox
...
Fix equirectangular skybox loading
2017-12-19 08:32:22 +07:00
Thijs Wenker
3a55fcfaf5
Merge pull request #12014 from thoys/feat/list-assignment-types
...
list assignment types in assignment-client help
2017-12-18 16:55:57 -08:00
Zach Fox
6fc58b713e
Merge pull request #12009 from zfox23/commerce_dataTracking2
...
Commerce: Add Passphrase Auth Status data tracking
2017-12-18 16:26:59 -08:00
Thijs Wenker
1bfb62bd7f
list assignment types in assignment-client help
2017-12-18 15:32:32 -08:00
Zach Fox
a2fe2797ff
Merge pull request #11982 from zfox23/commerce_staticCertVersioning
...
Commerce: staticCertificateVersion; Seal serverScripts JSON property; getStaticCertificateJSON()
2017-12-18 15:20:23 -08:00
Seth Alves
ddbb7a4416
when an avatar-entity's lifetime expires, remove it from avatarEntityData
2017-12-18 14:26:25 -08:00
SamGondelman
ee3c47d5ec
fix equirectangular skybox loading
2017-12-18 13:21:12 -08:00
Zach Fox
affd67d7d4
Merge pull request #12007 from zfox23/commerce_moreSecurityImages
...
Commerce: More security images!
2017-12-18 12:06:43 -08:00
Zach Fox
e075cd79fb
Add Passphrase Auth Status data tracking
2017-12-18 11:51:12 -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
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
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
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
Zach Fox
89795272c7
More security images!
2017-12-15 16:26:13 -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
luiscuenca
53e1c57e3b
Make lasers scale with avatar
2017-12-15 13:46:15 -07: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
Alexander Ivash
32acc8ad47
8992 Login window is small in tablet
2017-12-14 23:53:33 +00:00
Zach Fox
94bd8d8673
Merge pull request #11991 from zfox23/commerce_fixBrokenBuyButtons
...
Fix broken Buy buttons on main Marketplace page
2017-12-14 12:48:09 -08:00
Zach Fox
504949cd32
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_staticCertVersioning
2017-12-14 12:08:00 -08:00
Zach Fox
74a5f0881f
Fix broken Buy buttons on Marketplace
2017-12-14 11:56:36 -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
Stephen Birarda
fa75320acf
Merge pull request #11984 from birarda/bug/macdeployqt-for-oven
...
fix rpath for oven on OS X
2017-12-14 10:26:13 -08:00
Ken Cooke
b6a88bbdda
Invalid WAV files should always be logged and not played
2017-12-14 10:20:46 -08:00
Zach Fox
af346f2ced
Protocol change
2017-12-14 10:09:10 -08:00
SamGondelman
4fbf5db697
Merge remote-tracking branch 'upstream/master' into hysteresis
2017-12-14 09:55: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
Stephen Birarda
88831ff08a
don't trigger unix step on apple for oven
2017-12-13 18:39:19 -08:00
Stephen Birarda
0b598ea948
fix RPATH for oven so it loads things from macdeployqt
2017-12-13 18:39:19 -08:00
Zach Fox
4980c769c0
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_staticCertVersioning
2017-12-13 17:30:19 -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
Zach Fox
f0507e1608
Merge pull request #11972 from zfox23/commerce_fixWalletStatus1
...
Set Wallet Status to 'Ready' after correctly authenticating wallet
2017-12-13 13:19:54 -08:00
Nissim Hadar
b4df115507
Protect against use of null HazePointer.
2017-12-13 12:53:01 -08:00
Zach Fox
efd5c0ccb7
Add comment as per CR
2017-12-13 11:53:26 -08:00
