Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
71094 commits 2 branches 0 tags 1.1 GiB
Commit graph

71094 commits

This branch
This branch
All branches
Author SHA1 Message Date
amantley
3c792a04c1 fixed roll rotation added to azimuth in MySkeletonModel.cpp 2018-08-28 11:25:42 -07:00
Sam Gateau
7b399d9a04 Merge branch 'master' of github.com:highfidelity/hifi into black 2018-08-28 09:20:13 -07:00
Sam Gateau
d9d23e7fcf
Merge pull request #13877 from luiscuenca/multiplyOtherAvatars 
Create N replicas of each other-avatar on the client side
 2018-08-28 09:02:13 -07:00
Sam Gateau
e2f3c99cf1 Merge branch 'master' of github.com:highfidelity/hifi into black 2018-08-28 08:58:55 -07:00
Sam Gateau
63eb57c741 Exploring PID again 2018-08-28 08:58:25 -07:00
David Back
511478a563 use not Mac instead of Windows 2018-08-27 18:11:19 -07:00
David Back
990638fd95 Merge branch 'master' of https://github.com/highfidelity/hifi into editControllerMapping 2018-08-27 18:04:23 -07:00
amantley
89b508251e added some comment to explain rig to avatar transform 2018-08-27 17:57:50 -07:00
luiscuenca
c19bd8968a Fix mixer crash 2018-08-27 16:48:47 -07:00
David Back
f81fe6b29f add more inputs to controller mapping 2018-08-27 16:35:36 -07:00
Seth Alves
52bbb4d2ab fix ray-pick results on entities with non-default registration point. clean up grab scripts to correctly use this fix. 2018-08-27 16:21:01 -07:00
Sam Gateau
657373d02f
Merge pull request #13588 from jherico/bug/fb15594 
Working on pauses in tomb domain
 2018-08-27 15:56:55 -07:00
SamGondelman
aae06e8f49 faster aabox ray intersection and pre-computed inverse direction 2018-08-27 15:40:33 -07:00
David Back
75d7bf0424 Merge branch 'master' of https://github.com/highfidelity/hifi into editControllerMapping 2018-08-27 14:53:28 -07:00
David Back
b6edb2c9d6 platform states, edit controller mapping, separate mac/win delete 2018-08-27 14:53:13 -07:00
amantley
055f03878e made changes to add roll to the spine2 rotation. also only the shoulders control the rotation recenter now 2018-08-27 14:44:27 -07:00
Brad Davis
945982b1bd Working on pauses in tomb domain 2018-08-27 13:28:49 -07:00
Stephen Birarda
7ddd70a84a
Merge pull request #13871 from birarda/bug/double-domain-connect 
force NodeList reset if DS changes session or local ID
 2018-08-27 11:59:24 -07:00
Sam Gateau
a6f7135ad8 Merge branch 'master' of github.com:highfidelity/hifi into black 2018-08-27 10:54:23 -07:00
John Conklin II
467fe56103
Merge pull request #13845 from SamGondelman/perf 
Move blendshape packing to worker thread
 2018-08-27 09:40:03 -07:00
luiscuenca
8ede6f1cd0 Fix removing my avatar and code standards 2018-08-27 06:55:52 -07:00
Sam Gateau
d97d655148 USing a simpler halfTan test for culling 2018-08-26 23:17:29 -07:00
Sam Gateau
294fe51fde Trying to simplify the LOD culling test 2018-08-24 16:48:23 -07:00
amantley
dd8a00983c Merge remote-tracking branch 'upstream/master' into rotateFilterChange 2018-08-24 16:29:20 -07:00
amantley
2bec867863 added the sanity check to see if the shoulders have flipped 2018-08-24 16:29:08 -07:00
SamGondelman
ff6020e0ef fix compile errors, maybe 2018-08-24 15:41:25 -07:00
Sam Gateau
8f8bcc1901 Merge branch 'master' of github.com:highfidelity/hifi into black 2018-08-24 15:23:37 -07:00
SamGondelman
98d145dc24 fix crash on shutdown in domain with material 2018-08-24 15:19:48 -07:00
John Conklin II
fcdbc6c6d2
Merge pull request #13778 from SamGondelman/bloom 
Enable bloom in zone properties
 2018-08-24 14:46:31 -07:00
Stephen Birarda
d8b5a1a4a6 always remove old socket-matching node before add 2018-08-24 14:21:54 -07:00
SamGondelman
70f4d0c634 Merge remote-tracking branch 'upstream/master' into perf 2018-08-24 14:04:37 -07:00
Stephen Birarda
cb4ce4fedb make sure settings are re-requested on new connection 2018-08-24 13:05:04 -07:00
John Conklin II
477fba4b15
Merge pull request #13847 from AndrewMeadows/workload-avatars-002 
workload tracks other avatars and adds/removes from physics simulation accordingly
 2018-08-24 12:43:51 -07:00
luiscuenca
ddbadf5a69 change to Test API 2018-08-24 11:59:46 -07:00
SamGondelman
3d048c77ba Merge remote-tracking branch 'upstream/master' into recurse 2018-08-24 11:39:05 -07:00
SamGondelman
1c0c17cecb faster triangle intersection 2018-08-24 11:20:10 -07:00
amantley
a60ab863a3 demo version of the head and hands determining the rotate function 2018-08-24 11:06:36 -07:00
luiscuenca
5654acf5bf Fix warnings 2018-08-24 09:24:58 -07:00
Angus Antley
25610c7587 got the hands turning the shoulders, needs error checking 2018-08-24 11:04:36 +01:00
Angus Antley
44a6c7df5f added hook to myskeleton model to update spine2, need to get the rotation from myavatar then we have spine rot 2018-08-24 07:17:17 +01:00
Sam Gateau
699240027e Merge branch 'master' of https://github.com/highfidelity/hifi into black 2018-08-23 19:29:14 -07:00
Howard Stearns
9a472fa388
Merge pull request #13870 from zfox23/wallet_autologout 
Implement Wallet Security feature - Auto Logout checkbox
 2018-08-23 18:04:38 -07:00
luiscuenca
1fd0d7da94 Create API call 2018-08-23 18:03:27 -07:00
amantley
0e0561bb24 latest rotate code 2018-08-23 17:59:18 -07:00
SamGondelman
b5b7167644 add to stats 2018-08-23 17:56:24 -07:00
John Conklin II
bc90d1a439
Merge pull request #13869 from zfox23/MS17738_fixBlastIcon 
Fix MS17738: Fix a case where the BLAST icon didn't show up in Snapshot Review
 2018-08-23 17:40:24 -07:00
amantley
671bf32d58 removed whitespace 2018-08-23 17:36:35 -07:00
Sam Gateau
57fd824005 working on the LOD behavior 2018-08-23 17:30:23 -07:00
amantley
884be2f99d removed comment and whitespace 2018-08-23 17:30:03 -07:00
amantley
0cc302f68c set phase to 0.0 2018-08-23 17:28:38 -07:00