Ryan Downe Karpf
68177c7e71
Merge pull request #11981 from sethalves/pr-11960-for-rc-61
...
Pr 11960 for rc 61
2017-12-14 09:11:34 -08:00
Atlante45
ad547f483d
Keep track of message numbers
2017-12-13 19:25:24 -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
Stephen Birarda
1c83d7a1ef
Merge pull request #11983 from birarda/bug/macdeployqt-for-oven
...
fix rpath for oven so it can load things placed by macdeployqt
2017-12-13 18:36:16 -08:00
Stephen Birarda
1f57ac6081
don't trigger unix step on apple for oven
2017-12-13 18:08:39 -08:00
Elisa Lupin-Jimenez
264f362994
resolved merge conflict again
2017-12-13 17:54:30 -08:00
Elisa Lupin-Jimenez
e49181c3a2
added getAssetList() and getFBX()
2017-12-13 17:45:57 -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
Stephen Birarda
553e4e2449
fix RPATH for oven so it loads things from macdeployqt
2017-12-13 17:26:23 -08:00
Atlante45
44190f16c0
Reset ACK in ctor
2017-12-13 16:55:08 -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
Elisa Lupin-Jimenez
f7be67b5b2
removed key
2017-12-13 16:19:36 -08:00
Elisa Lupin-Jimenez
392f290dd6
can fetch poly asset list synchronously
2017-12-13 16:19:36 -08:00
Elisa Lupin-Jimenez
dc999401d5
Created poly scripting interface template
2017-12-13 16:19:36 -08:00
luiscuenca
483443d218
No mutex
2017-12-13 17:02:36 -07:00
Seth Alves
aa0d581236
Merge branch 'FB10334' of https://github.com/elderorb/hifi into pr-11960-for-rc-61
2017-12-13 15:29:27 -08: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
Atlante45
3a45907df0
Keep connection alive as long as the node is connected
2017-12-13 14:42:20 -08:00
Zach Fox
3764445272
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
2017-12-13 14:12:08 -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
David Rowe
627ce8ab87
Enable user connection with "x" key when capslock is on
2017-12-14 08:52:21 +13:00
Zach Fox
d388ca5ac9
Missed a spot. That was the problem the whole time.
2017-12-13 11:22:31 -08:00
luiscuenca
e709561a62
Fix getActiveDevice deadlocks on Linux
2017-12-13 12:14:49 -07:00
Anthony J. Thibault
c4a7f4843a
Much more stable hips IK target.
...
Target is now estimated in sensor space from the head, which is very deterministic and not prone to feedback from the IK system.
Previous the hip was estimated from accumulated IK error deltas, which was not stable, as the error would tend to accumulate if the IK targets could not be reached.
2017-12-13 11:12:32 -08: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
Sam Gateau
4e68663cfc
Merge pull request #11970 from SamGondelman/circleFix
...
Fix Circle3DOverlays uninitialized member variables, cloning, getProperty
2017-12-14 00:30:18 +07:00
Seth Alves
d3e24d3629
Merge pull request #11960 from ElderOrb/FB10334
...
10334 Unable to type in Go To app search bar after UI reappears from …
2017-12-13 09:06:53 -08:00
Brad Hefta-Gaub
9bbe696a87
Merge pull request #11971 from sethalves/possible-fix-for-tablet-freezing
...
possible fix for tablet freezing
2017-12-13 08:59:17 -08:00
Ryan Downe Karpf
d0f088164b
Merge pull request #11975 from luiscuenca/webPrivacyFixRC61
...
Fix web entities accessing the webcam RC-61
2017-12-13 08:44:50 -08:00
Olivier Prat
19e240460d
Slightly optimized matrix operations in LightStage as samcake's remark
2017-12-13 15:30:57 +01:00
Brad Davis
6cff86b0f3
Fix polyvox archive, correct build errors, add additional libraries
2017-12-12 18:29:36 -08:00
Zach Fox
7113a72f2e
Bugfixes
2017-12-12 18:04:20 -08:00
luiscuenca
a1f1e7b587
Fix web entities accessing the webcam RC61
2017-12-12 18:20:29 -07:00
MiladNazeri
8a28d04322
Merge pull request #11885 from ctrlaltdavid/21624
...
Overlays JSDoc
2017-12-12 17:04:46 -08:00
Seth Alves
4956978c76
Merge pull request #11973 from luiscuenca/webPrivacyFix
...
Fix web entities accessing the webcam
2017-12-12 17:01:38 -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
Ken Cooke
55ad42c40b
Merge pull request #11967 from ctrlaltdavid/21638
...
Reduce communications load of making user connection
2017-12-12 16:03:28 -08:00
Zach Fox
bced55801d
ABC ORDER!
2017-12-12 15:52:35 -08:00
Zach Fox
f5df83667f
Add getStaticCertificateJSON() to Entity Scripting Interface
2017-12-12 15:50:04 -08:00
luiscuenca
2d21f4d364
Fix web entities accessing the webcam
2017-12-12 16:00:17 -07:00
Sam Gondelman
e5a4f077c9
Merge pull request #11964 from SamGondelman/memFix
...
Remove unneeded getDedicatedMemory
2017-12-12 14:43:15 -08:00
David Rowe
92be33da31
Web3d overlay's "resolution" property has been removed
2017-12-13 11:40:44 +13:00
