Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-15 16:09:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
71243 commits 75 branches 59 tags 1.2 GiB
Commit graph

71243 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Thijs Wenker
efa3fa7907 Don't always on top InteractiveWindows (Windows OS) 2018-08-27 20:42:06 +02:00
Sam Gateau
a6f7135ad8 Merge branch 'master' of github.com:highfidelity/hifi into black 2018-08-27 10:54:23 -07:00
sabrina-shanman
51683b0b53 Remove storage of parenting information from CollisionRegion 2018-08-27 10:16:09 -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
NissimHadar
62814deb32 Added read of map_d from MTL files 2018-08-27 08:34:01 -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
amantley
8406fb2359 Merge remote-tracking branch 'upstream/master' into steppingReboot 2018-08-24 16:48:26 -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
sabrina-shanman
cce62f4d92 Do not assume picks with doesIntersect()==false have no results to compare. Fixes CollisionPickResult 'loaded' value always evaluating to false when not colliding 2018-08-24 15:47:52 -07:00
sabrina-shanman
6e160ad22f Add TransformNode-based parenting and implement for CollisionPicks 2018-08-24 15:47:52 -07:00
sabrina-shanman
68b86963d4 Add CollisionRegion copy constructor 2018-08-24 15:47:52 -07:00
sabrina-shanman
b0f8d3e427 Add PickTransformNode 2018-08-24 15:47:52 -07:00
sabrina-shanman
3167d3c0c7 Create TransformNodes for SpatiallyNestables, the mouse, and MyAvatar head 2018-08-24 15:47:52 -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
Zach Fox
dc1a33ba6e Merge branch 'master' of github.com:highfidelity/hifi into wallet_autologout 2018-08-23 16:58:49 -07:00
Howard Stearns
fe3f48b194
Merge pull request #13859 from howard-stearns/wallet-locker2 
Wallet Locker
 2018-08-23 16:54:19 -07:00
Stephen Birarda
1263db5688 force NL reset if the domain changes session ID or local ID 2018-08-23 16:48:46 -07:00
Sam Gateau
cee9b90930 working on the LOD behavior 2018-08-23 16:48:42 -07:00
amantley
220dbf586f set the phase to 0.0 when it is negative 2018-08-23 16:46:58 -07:00
Andrew Meadows
10d0833c19 use DynamicsWorld::numCollisionObjects instead of our own count 2018-08-23 15:57:54 -07:00
Stephen Birarda
6ab3f83be0
Merge pull request #13868 from birarda/feat/avatar-traits 
fix traits re-send after node unignored, agent crash
 2018-08-23 15:53:16 -07:00
luiscuenca
3d959ca7ee Refactoring and cleaning 2018-08-23 15:52:42 -07:00