Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-12 16:03:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
67332 commits 25 branches 0 tags 1.1 GiB
Commit graph

67332 commits

This branch
This branch
All branches
Author SHA1 Message Date
Liv Erickson
afea186784 fix for both functions 2018-04-25 14:39:04 -07:00
Stephen Birarda
956cc411d5 Merge branch 'RC66.1' of github.com:highfidelity/hifi into sixty-six-one-mergeback 2018-04-25 14:33:23 -07:00
John Conklin II
cb7b03652b
Merge pull request #12796 from MiladNazeri/feature/add-findByName 
added Entities.findbyName
 2018-04-25 14:00:10 -07:00
Liv Erickson
1860e66bd2 Merge branch 'master' of github.com:highfidelity/hifi into fix/import-whitespace 2018-04-25 13:52:55 -07:00
John Conklin II
282d319972
Merge pull request #12977 from birarda/feat/new-serverlesss-tutorial 
update serverless content for RC67
 2018-04-25 13:23:22 -07:00
Brad Hefta-Gaub
a69ded05d8
Merge pull request #12997 from birarda/bug/avatar-mixer-agent-crash 
66.1 fix: use the correct joint count for other avatar last sent
 2018-04-25 13:17:05 -07:00
John Conklin II
43aed66494
Merge pull request #12993 from highfidelity/revert-12983-fix/web_crash_66 
Revert "HOTFIX version of PR 12969: Attempt to shutdown web surfaces more consistently"
 2018-04-25 13:02:32 -07:00
MiladNazeri
0f87e53902
Merge pull request #12963 from MiladNazeri/docs/DocsToJSDocsUpdate 
Docs/docs to js docs update
 2018-04-25 12:26:19 -07:00
Stephen Birarda
6c0177e2bd use the correct joint count for other avatar last sent 2018-04-25 11:50:53 -07:00
John Conklin II
f04200a620
Merge pull request #12976 from ctrlaltdavid/21856 
Docs to JSDoc
 2018-04-25 11:36:34 -07:00
John Conklin II
0cc43a95c8
Merge pull request #12951 from birarda/feat/installer-special-tutorial 
allow download of serverless content for specific campaign
 2018-04-25 11:35:30 -07:00
John Conklin II
eef3bc2df5
Merge pull request #12980 from dback2/desktopEquip 
Desktop equip - deleted/cleared entities fix
 2018-04-25 11:35:04 -07:00
John Conklin II
748c8cdc58
Merge pull request #12861 from Zvork/taapre 
Bloom and Temporal Anti-Aliasing improvements
 2018-04-25 11:16:56 -07:00
David Back
86b64fe3ab fix mouse equipping while someone else far grabbing 2018-04-25 10:22:39 -07:00
David Back
3c441f0312 safer clear grab actions 2018-04-25 10:22:30 -07:00
David Back
6a3303fe3e tabs 2018-04-25 10:22:12 -07:00
David Back
5bf48041df tabs 2018-04-25 10:22:02 -07:00
David Back
07fb604090 add entityIsEquipped utils for grab.js check 2018-04-25 10:21:48 -07:00
unknown
4a08a6c147 ensure target mouse entity has equip data 2018-04-25 10:21:39 -07:00
unknown
3a35fa1c08 missing reset flag on end equip, remove mouseEquip check on unequip via U 2018-04-25 10:21:30 -07:00
David Back
a869b58dfb fix bracket 2018-04-25 10:21:22 -07:00
David Back
0f2679b725 pre PR adjustments 2018-04-25 10:21:14 -07:00
David Back
4446ef853f remove animations 2018-04-25 10:21:02 -07:00
David Back
de4aff630a fix grab.js change 2018-04-25 10:20:53 -07:00
David Back
d03fcb5ed8 desktop equip 2018-04-25 10:20:41 -07:00
John Conklin II
91b93db0c5
Merge pull request #12981 from birarda/bug/revert-hmac 
revert HMAC packet verification for now
 2018-04-25 10:07:36 -07:00
Bradley Austin Davis
ea0ef20416
Revert "HOTFIX version of PR 12969: Attempt to shutdown web surfaces more consistently" 2018-04-25 09:43:20 -07:00
Olivier Prat
e37b18336a Improved anti-aliasing on text 2018-04-25 12:08:08 +02:00
Olivier Prat
f332849d9a Merge branch 'master' of http://github.com/highfidelity/hifi into taapre 2018-04-25 09:19:21 +02:00
Olivier Prat
eb01f25621 Merge branch 'taapre' of http://github.com/Zvork/hifi into taapre 2018-04-25 08:35:50 +02:00
Olivier Prat
c0b5bc8ffd
Merge pull request #1 from samcake/taa-zvork 
Fixing the crash on mac
 2018-04-25 08:35:32 +02:00
milad nazeri
4c736b2d62 Fixed defaults 2018-04-24 21:38:48 -07:00
David Rowe
cae9447ac5 Doc review 2018-04-25 15:09:47 +12:00
luiscuenca
165c3214a7 Avatar Scripts 2018-04-24 18:43:53 -07:00
Liv Erickson
10694e2256 Merge branch 'master' of github.com:highfidelity/hifi into fix/import-whitespace 2018-04-24 17:15:45 -07:00
John Conklin II
6062f21da1
Merge pull request #12961 from Atlante45/fix/es-deadlock 
Enforce correct lock order between EntityTree and EntitySimulation
 2018-04-24 15:40:32 -07:00
Anthony J. Thibault
2136134ed0 Debug Draw rendering now is visible on background skybox 2018-04-24 14:28:08 -07:00
David Back
71dc75b208 fix disconnect clear entities 2018-04-24 14:25:33 -07:00
samcake
f2c76abafa Apply the noAA /popJittering on the WebOverlay 2018-04-24 14:18:44 -07:00
John Conklin II
ce14dfb9a4
Merge pull request #12974 from AndrewMeadows/dont-feed-bullet-garbage 
don't try to build convex hulls with nan data
 2018-04-24 14:11:25 -07:00
David Back
3b251c0c49 Merge branch 'master' of https://github.com/highfidelity/hifi into desktopEquip 2018-04-24 14:09:29 -07:00
Brad Hefta-Gaub
497c3fac4d
Merge pull request #12971 from Atlante45/fix/crashes-hotfix 
Add memory corruption crash handler
 2018-04-24 14:01:09 -07:00
Dante Ruiz
29fce488e4 make some changes 2018-04-24 14:00:52 -07:00
Atlante45
d82333534c Ensure the tree lock is always taken before the simulation lock 2018-04-24 13:46:05 -07:00
Dante Ruiz
b2925c5843 fixing attachments not being visible when coming out of first person 2018-04-24 13:32:30 -07:00
John Conklin II
236e75b6c6
Merge pull request #12903 from druiz17/add-more-hmd-data 
Get the correct device name connect to OpenVr
 2018-04-24 13:29:41 -07:00
Brad Hefta-Gaub
e6f15c720f
Merge pull request #12973 from birarda/bug/no-node-stats 
66.1: fix connection to start stats sending for assignments
 2018-04-24 13:23:39 -07:00
milad nazeri
23d07fa292 fixed spacing issue 2018-04-24 13:14:55 -07:00
John Conklin II
47c983a004
Merge pull request #12978 from AndrewMeadows/fix-crash-createConvexHull-RC66.1 
RC66.1: don't try to build convex hulls with nan data
 2018-04-24 13:03:13 -07:00
Clement
0804abcca6 Heap corruption crashes CR 2018-04-24 12:47:13 -07:00