Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-19 18:20:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
85079 commits 25 branches 0 tags 1.1 GiB
Commit graph

4506 commits

Author SHA1 Message Date
Clément Brisset
62f21822ce
Merge pull request #14494 from Atlante45/fix/agent-shutdown-crash 
Fix Agent crash on shutdown
 2018-12-03 14:17:35 -08:00
SamGondelman
3ce6f7f3d6 real image entities 2018-12-03 11:50:59 -08:00
luiscuenca
ad42f6a590 Add method to check entities joint hierarchy 2018-12-01 12:32:29 -07:00
sabrina-shanman
142e787a9c Create MIMETypeLibrary for general MIME type detection 2018-11-30 10:28:43 -08:00
Jeff Clinton
0bca290de2
Merge pull request #14485 from sethalves/crash-on-exits 
suppress 'No instance available' messages during shutdown.  try a dif…
 2018-11-30 10:10:43 -08:00
Clement
181f2b4263 Fix Agent crash on shutdown 2018-11-28 18:40:52 -08:00
Shannon Romano
ff934a8f87
Merge pull request #14394 from sabrina-shanman/hfm_serializer 
(case 20005) Create HFMSerializer interface for model loaders
 2018-11-28 11:10:27 -08:00
Seth Alves
fac27553d7 suppress 'No instance available' messages during shutdown. try a different way of shutting down AudioClient. 2018-11-27 17:02:48 -08:00
Seth Alves
8f21ade0c7 make cmake -DDISABLE_QML=1 work again 2018-11-27 12:41:40 -08:00
sabrina-shanman
be511378cd Merge branch 'master' into hfm_serializer 2018-11-20 13:42:24 -08:00
Olivier Prat
45e0f65972 Merge branch 'ao' of http://github.com/Zvork/hifi into ao 2018-11-14 09:48:24 +01:00
sabrina-shanman
e08bc7296f Merge branch 'master' into hfm_serializer 2018-11-13 15:41:49 -08:00
sabrina-shanman
93c7578f54 Convert hfm::Serializer to use hifi-namespaced types 2018-11-12 16:12:21 -08:00
John Conklin II
0370c60398
Merge pull request #14358 from AndrewMeadows/fix-capsuleY 
Case 18436: consistent handling of CapsuleShape dimensions
 2018-11-12 15:25:42 -08:00
John Conklin II
dc4b967ff5
Merge pull request #14331 from SimonWalton-HiFi/large-avatars-bad-position 
Clamp avatar-joint translations that hit the compressed-format limit
 2018-11-11 16:27:56 -08:00
Dante Ruiz
358aa547b1 feedback changes 2018-11-08 09:58:53 -08:00
Dante Ruiz
f664421fe0 addressing code review feedback 2018-11-08 09:58:53 -08:00
Andrew Meadows
5bfb9c1f71 fix ShapeInfo::contains() logic for capsule shapes 2018-11-08 08:39:43 -08:00
Olivier Prat
9d5dcec0a0 Merge from master 2018-11-08 09:14:42 +01:00
Andrew Meadows
6ecf850159 clarify ShapeInfo::setCapsuleY() API and use it correctly 2018-11-06 12:37:55 -08:00
Simon Walton
26b9e2e162 Fix a URL while we're in the file 2018-11-02 14:47:40 -07:00
Simon Walton
e64557a46c Clamp the fixed-point network values to their limits 2018-11-02 11:52:40 -07:00
SamGondelman
e64a4d0536 try to fix unnecessary queryAACube updates 2018-10-30 12:47:44 -07:00
John Conklin II
2eb801bdc6
Merge pull request #14035 from SimonWalton-HiFi/avatar-mixer-improvements 
Further avatar-mixer improvements
 2018-10-25 12:25:32 -07:00
Jeff Clinton
67fe43ebb1
Merge pull request #14243 from hyperlogic/bug-fix/small-jumping-avatars 
Small avatars now have a minimum jump height of 0.25 meters
 2018-10-24 17:08:28 -07:00
Simon Walton
e22e0ecb04
Merge branch 'master' into avatar-mixer-improvements 2018-10-24 10:39:23 -09:00
Olivier Prat
69ace03919 Merged with master 2018-10-24 08:27:39 +02:00
Simon Walton
0a78eeaf1a Merge branch 'master' into avatar-mixer-improvements 2018-10-23 15:56:56 -07:00
Zach Fox
493262052c Remove extraneous code changes; remove QUrlAncestry code; remove extra logging 2018-10-22 13:59:52 -07:00
Zach Fox
7be5d5674d Merge branch 'master' of github.com:highfidelity/hifi into log-resource-requests-2 2018-10-22 13:59:35 -07:00
Olivier Prat
5f3a299fd9 Merge with master 2018-10-22 14:02:24 +02:00
Seth Alves
2ce8ed25f8
Merge pull request #14125 from Atlante45/fix/mac-warnings 
Fix new Mac warnings
 2018-10-20 13:40:53 -07:00
Anthony Thibault
6cc7c861d1
Merge pull request #14221 from hyperlogic/feature/disable-hands-if-too-far-or-at-rest 
Disable user hand controllers if they are too far away or not moving.
 2018-10-19 14:02:32 -07:00
Anthony Thibault
ef74014075 Small avatars now have a minimum jump height of 0.25 meters 
This should improve the quality of the jump animation and improve the mobility of small avatars.
 2018-10-19 13:55:56 -07:00
Simon Walton
0b2ee35907 Merge branch 'master' into avatar-mixer-improvements 2018-10-18 14:13:39 -07:00
Zach Fox
2f37a2b1a1 Merge branch 'master' of github.com:highfidelity/hifi into log-resource-requests-2 2018-10-18 11:12:26 -07:00
John Conklin II
1cc2569bd8
Merge pull request #13596 from SamGondelman/scriptvec3 
Replace vec2, vec3, and xColor properties with JS prototypes
 2018-10-18 09:47:56 -07:00
Kerry Ivan Kurian
3b15548ea3 Display resource-access events in marketplace item tester 
Includes refactoring marketplace item tester into a single-page app.
 2018-10-18 01:04:47 -07:00
John Conklin II
8e5bc1678f
Merge pull request #14219 from SamGondelman/materialCull 
QueryAACube fixes and materials expand to include their parent
 2018-10-17 15:15:23 -07:00
Sam Gondelman
e3543cf098
Merge branch 'master' into scriptvec3 2018-10-17 13:10:29 -07:00
John Conklin II
9f0b4fb437
Merge pull request #14122 from SamGondelman/skybox 
Rebake default skybox for all platforms
 2018-10-17 09:50:00 -07:00
Anthony Thibault
27c495406e Disable user hand controllers if they are too far away or not moving. 2018-10-16 17:24:47 -07:00
SamGondelman
49b496046b queryAACube fixes 2018-10-16 14:35:39 -07:00
SamGondelman
ded8d4b547 variant conversions 2018-10-16 11:55:28 -07:00
Sam Gondelman
121fc7205c Delete Default-Sky-9-cubemap.texmeta 2018-10-14 22:36:22 -07:00
SamGondelman
9788aa307e remove width/height/depth 2018-10-10 12:38:07 -07:00
Clement
8983fe2bcf Fix new Mac warnings 2018-10-09 12:11:55 -07:00
Olivier Prat
cfcf6f05a2 Merge with master 2018-10-09 14:18:02 +02:00
Simon Walton
6f659db3b5 Merge branch 'master' into avatar-mixer-improvements 2018-10-08 15:18:29 -07:00
Sam Gondelman
67662df760
Merge branch 'master' into scriptvec3 2018-10-08 12:59:34 -07:00
Sam Gondelman
4e96c3297b
Merge branch 'master' into scriptvec3 2018-10-03 17:14:15 -07:00
sabrina-shanman
2ef85dfdba Merge branch 'master' into stt_parenting2 2018-10-03 11:39:00 -07:00
Olivier Prat
4c84ae02fa Merge branch 'master' of http://github.com/highfidelity/hifi into ao 2018-10-02 18:13:57 +02:00
Sam Gondelman
5b6e7b2566
Merge branch 'master' into scriptvec3 2018-10-02 08:58:04 -07:00
David Rowe
f7fd76b316 Merge branch 'master' into M18586 
# Conflicts:
#	interface/src/scripting/HMDScriptingInterface.h
 2018-10-02 16:49:16 +13:00
sabrina-shanman
67dc526ee2 Merge branch 'master' of github.com:highfidelity/hifi into stt_parenting2 2018-10-01 17:17:32 -07:00
John Conklin II
3ab83731b9
Merge pull request #14087 from sethalves/quiet-asan 
fix several uninitialized reads
 2018-10-01 16:48:54 -07:00
sabrina-shanman
0cf7e954cc Simplify a RayPick and StylusTip constructor 2018-10-01 09:20:59 -07:00
Seth Alves
b69d0f3997 get interface building and working with clang-7 on ubuntu 18 2018-09-28 13:46:51 -07:00
David Rowe
1c4bde3e84 Fix build warnings 2018-09-28 18:38:38 +12:00
David Rowe
545c2591e3 Merge branch 'master' into M18586 2018-09-28 16:19:44 +12:00
sabrina-shanman
74937a1979 Serialize PickRay according to its variables 2018-09-27 14:41:38 -07:00
sabrina-shanman
3ac9478101 Assign _mathPick in the Pick constructor 2018-09-27 11:30:57 -07:00
John Conklin II
6c47ba0dc7
Merge pull request #13990 from SimonWalton-HiFi/chrono-timestamps 
Use C++ chrono system_clock for timestamps
 2018-09-26 11:22:49 -07:00
sabrina-shanman
4011660435 Merge branch 'master' into stt_parenting2 2018-09-26 10:17:45 -07:00
Seth Alves
ff2a47e7e6 fix several uninitialized reads 2018-09-26 09:33:12 -07:00
David Rowe
b98bd741b8 Indent and reword jumping and flying checkbox 2018-09-26 18:14:02 +12:00
David Rowe
af1b4fef5d Modify layout of rotation mode settings options 2018-09-25 18:03:57 +12:00
Simon Walton
d5977612a1
Merge branch 'master' into avatar-mixer-improvements 2018-09-24 13:29:45 -07:00
David Rowe
e29b403abc Merge branch 'master' into M18586 
# Conflicts:
#	interface/src/raypick/PointerScriptingInterface.cpp
#	interface/src/raypick/PointerScriptingInterface.h
#	interface/src/raypick/StylusPointer.h
#	libraries/pointers/src/Pointer.h
#	scripts/system/controllers/controllerModules/teleport.js
 2018-09-24 11:44:28 +12:00
Seth Alves
86e502637e Make Settings thread safe 2018-09-21 15:46:35 -07:00
Olivier Prat
9f0201878d Some work to try to find the odd resolution bug 2018-09-21 17:14:39 +02:00
Simon Walton
7bba4d4bad Change priorities in the correct place 2018-09-19 18:38:20 -07:00
Simon Walton
f1b7097edb Priority experiment 2018-09-19 15:32:56 -07:00
John Conklin II
65ef04ae75
Merge pull request #13937 from luiscuenca/stt_teleport_wip 
Safe Teleport Target
 2018-09-14 15:11:18 -07:00
Simon Walton
6a1c76d14d Only sort an estimated number of avatars 2018-09-14 12:19:55 -07:00
sabrina-shanman
237022d304 Refactor new pick parenting system for use with RayPick, ParabolaPick 2018-09-14 10:28:15 -07:00
SamGondelman
c522d1bc93 merge with master 2018-09-14 00:57:13 -07:00
Simon Walton
727aea2025 Remove comment 2018-09-13 18:21:16 -07:00
Simon Walton
74ea1548a9 Use chrono::system_clock for usecTimestampNow() on all platforms 2018-09-13 14:24:49 -07:00
Simon Walton
15f06264f9 Remove unneeded #include 2018-09-11 17:03:39 -07:00
Simon Walton
80b7e04bc6 Revert change to chrono<system_clock> for usecTimestampNow() 2018-09-11 10:51:36 -07:00
luiscuenca
9c6ee18db5 Merge branch 'stt_collision-group' of https://github.com/sabrina-shanman/hifi into stt_teleport_wip 2018-09-10 15:18:15 -07:00
sabrina-shanman
3b7dac9058 Account for collisionGroup in CollisionRegion implementation 2018-09-10 15:14:48 -07:00
luiscuenca
6f4e9ded09 Merge branch 'stt_collision-group' of https://github.com/sabrina-shanman/hifi into stt_teleport_wip 2018-09-10 14:42:02 -07:00
sabrina-shanman
9a86b7451b Add collision group parameter to collision pick and set my avatar as the default 2018-09-10 14:35:04 -07:00
Simon Walton
d12376187c
Merge branch 'master' into avatar-mixer-scaling 2018-09-10 10:15:49 -07:00
SamGondelman
b3bdddb3f4 set vec with one number 2018-09-07 15:15:02 -07:00
John Conklin II
405e2da91e
Merge pull request #13949 from sabrina-shanman/stt_parenting_scale 
Scale Collision Pick to match parent
 2018-09-07 11:54:02 -07:00
Simon Walton
741d4ba998
Merge branch 'master' into avatar-mixer-scaling 2018-09-07 09:30:39 -07:00
sabrina-shanman
8d4c47cf8e Make template specialization of BaseNestableTransformNode explicit 2018-09-07 08:49:44 -07:00
sabrina-shanman
52bc09cd2a Add override qualifier to BaseNestableTransformNode::getTransform 2018-09-06 17:44:06 -07:00
sabrina-shanman
f40f40e135 Use more reasonable value for BaseNestableTransformNode::_baseScale when given bad value 2018-09-06 17:35:12 -07:00
SamGondelman
ed7f993c0d avatar mixer and manager perf improvements and cleanup 2018-09-06 16:57:20 -07:00
sabrina-shanman
23a6abbaca Update jsdocs to reflect new collision pick scaling behavior 2018-09-06 16:47:09 -07:00
sabrina-shanman
836f810c41 Have OverlayTransformNode and similar define scale relative to nestable scale on creation time, and refactor code 2018-09-06 16:33:29 -07:00
amantley
90a51e6181 added walk velocity threshold, this determines if we are in the walk state. when we are then we don't do cg leaning calculation. this will smooth out the walking in a large tracked area 2018-09-06 13:12:48 -07:00
sabrina-shanman
714cfc5ef1 Add scaling information to CollisionRegion jsdoc and missing info to CollisionPickProperties jsdoc 2018-09-06 12:14:50 -07:00
Simon Walton
adf0a9a414 Convert priority age from microseconds to seconds 2018-09-05 17:41:00 -07:00
Simon Walton
d2650f7ede Modified priority function from Andrew 2018-09-05 17:22:07 -07:00
amantley
73e628bb8d merge with master fixes 2018-09-05 14:42:49 -07:00
Anthony Thibault
584d39744f
Merge pull request #13918 from hyperlogic/bug-fix/avatars-with-no-eyes-in-hmd-mode 
HMD mode bug fix for avatars with no eyes
 2018-09-05 10:57:21 -07:00
Andrew Meadows
4a1bd98584
Merge pull request #13914 from SamGondelman/avatarmanager 
Miscellaneous low-level performance improvements
 2018-09-05 10:12:05 -07:00
SamGondelman
589e88af4a Merge remote-tracking branch 'upstream/master' into scriptvec3 2018-09-04 17:54:45 -07:00
SamGondelman
9b75c7e07f trying to separate colors and vectors 2018-09-04 17:20:05 -07:00
SamGondelman
9e76c164ac fix aabox operator+= 2018-09-04 16:25:47 -07:00
Simon Walton
262dbaf5ed Merge commit 'ade58a52cc97fe06c2f4bb88c4b9d097636fd4b9' into avatar-mixer-scaling 2018-09-04 15:27:41 -07:00
Simon Walton
695fabf4f5 Merge commit 'd01b438cb320a7ccc0aa8a0085e86940bb73c09c' into avatar-mixer-scaling 2018-09-04 15:27:18 -07:00
Simon Walton
6ae2ca1576 Merge commit '5f08ed5027a8904242a47b17e994ab4f309e3930' into avatar-mixer-scaling 
Merge of Samuel's change to use simple sort instead of priority queue
 2018-09-04 15:26:26 -07:00
John Conklin II
476887a224
Merge pull request #13909 from NissimHadar/fixFileUtils 
Create correct folder.
 2018-09-04 14:20:20 -07:00
SamGondelman
ade58a52cc reserve priority sort util vectors 2018-09-04 11:21:43 -07:00
Anthony Thibault
3a034fdf66 HMD mode bug fix for avatars with no eyes 
Previously getCenterEyeCalibrationMat() would return the average eye position for an avatar, if the eyes are missing.
Now we fall back to using the HeadCalibrationMat() and adding an offset from the head to the center of the eyes.
This is more accurate for characters that don't quite have human proportions.
 2018-09-04 10:13:57 -07:00
Simon Walton
c2ea05b026 Merge remote-tracking branch 'upstream/master' into avatar-mixer-scaling 2018-09-04 09:31:05 -07:00
Sam Gondelman
7cdc7dcc66
Merge pull request #13873 from sabrina-shanman/stt_parenting 
Collision Pick Parenting
 2018-08-31 14:43:55 -07:00
SamGondelman
d01b438cb3 CR 2018-08-31 11:25:17 -07:00
sabrina-shanman
b5862aca2a Use bracket initialization for CollisionRegion.loaded 2018-08-31 10:53:20 -07:00
David Rowe
c41d74621e Merge branch 'master' into M17217-b 
# Conflicts:
#	interface/src/raypick/PathPointer.cpp
 2018-08-31 14:26:24 +12:00
Sam Gateau
a7fd35747d
Merge pull request #13896 from AndrewMeadows/workload-feedback 
Filter timings used in feedback logic for workload region sizes
 2018-08-30 19:11:49 -07:00
Simon Walton
33db1394e6 Use system_clock in usecTimestampNow for cross-platform goodness 2018-08-30 17:12:42 -07:00
SamGondelman
5f08ed5027 misc perf improvements 2018-08-30 16:55:15 -07:00
NissimHadar
4b7ca76ebd Create correct folder. 2018-08-30 14:15:57 -07:00
John Conklin II
8fa4a2855e
Merge pull request #13641 from amantley/rotateFilterChange 
Hand Azimuth Controls Shoulder Rotation
 2018-08-30 13:59:00 -07:00
Simon Walton
c2ac2b9ab0 Various tweaks; fix clang warning 2018-08-30 10:59:55 -07:00
Simon Walton
a186be014d Use std::chrono for usecTimestampNow() 2018-08-29 17:35:28 -07:00
sabrina-shanman
0926968e2b Do not have depth as a parameter in getTransform(..) when called in NestableTransformNode 2018-08-29 16:30:06 -07:00
sabrina-shanman
686f9fb18a Move load state flag from CollisionPickResult to CollisionRegion and make it a boolean 2018-08-29 16:29:59 -07:00
sabrina-shanman
78a438d89a Correct CollisionRegion jsdoc for 'joint' parameter 2018-08-29 14:55:14 -07:00
Andrew Meadows
f9d14e1351 filter time-cost drivers for region regulation 2018-08-29 11:17:59 -07:00
SamGondelman
0c8a4cc81e merge with master 2018-08-28 17:31:51 -07:00
Simon Walton
4b7f6a346f Use AvatarData::getClientGlobalPosition() for position in priority queue 
It looks like it's the same as world position with the avatar mixer.
Also use one time stamp for current time in priority queue; use
std::chrono for some other timestamps in hope that it's faster.
Fix priority-code logic bug.
 2018-08-28 16:21:47 -07:00
sabrina-shanman
6f6e70a470 Re-order variable initialization in CollisionRegion copy contructor 2018-08-28 08:45:47 -07:00
SamGondelman
aae06e8f49 faster aabox ray intersection and pre-computed inverse direction 2018-08-27 15:40:33 -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
sabrina-shanman
397b03d5d5 Add threshold parameter to collision pick with minimum of 0 2018-08-27 14:12:24 -07:00
Sam Gondelman
6730635931
Merge branch 'master' into scriptvec3 2018-08-27 10:43:52 -07:00
sabrina-shanman
51683b0b53 Remove storage of parenting information from CollisionRegion 2018-08-27 10:16:09 -07:00
amantley
8406fb2359 Merge remote-tracking branch 'upstream/master' into steppingReboot 2018-08-24 16:48:26 -07:00
amantley
dd8a00983c Merge remote-tracking branch 'upstream/master' into rotateFilterChange 2018-08-24 16:29:20 -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
3167d3c0c7 Create TransformNodes for SpatiallyNestables, the mouse, and MyAvatar head 2018-08-24 15:47:52 -07:00
SamGondelman
1c0c17cecb faster triangle intersection 2018-08-24 11:20:10 -07:00
Andrew Meadows
1c87d7b109 reorder initialization to remove compile warning 2018-08-23 12:59:28 -07:00
Andrew Meadows
55b1a6762c explicit delete default ctor, make _nestableType private 2018-08-23 12:59:28 -07:00
SamGondelman
283c0c0311 s i m p l i f y 2018-08-23 11:47:56 -07:00
SamGondelman
c474f38860 force coarse picking, sort avatars 2018-08-22 18:07:16 -07:00
SamGondelman
5c0b12abf6 ordered ray/parabola intersection code 2018-08-22 16:29:17 -07:00
amantley
2dd812935f Merge remote-tracking branch 'upstream/master' into rotateFilterChange 2018-08-22 12:57:16 -07:00
amantley
1e3ca6f902 added quicker follow code and added head to rotate calculation 2018-08-22 12:57:06 -07:00
amantley
1fabc77244 latest update to stop lurching, and allow leaning, and stop perma leans 2018-08-21 12:34:05 -07:00
amantley
1e2ca579c7 widened base of support and put head angular and hand angular back to normal 2018-08-20 18:06:34 -07:00
amantley
2dcdd60750 added new AvatarConstants and more frequent horizontal recentering to deal with lurching walk in large tracked volumes 2018-08-20 17:32:52 -07:00
Sam Gondelman
f0986a7f5a Merge branch 'master' into scriptvec3 2018-08-20 10:56:45 -07:00
amantley
471bb28545 Merge remote-tracking branch 'upstream/master' into steppingReboot 2018-08-20 09:50:45 -07:00
sabrina-shanman
2933038d04 Rename PhysicsEngine::getCollidingInRegion to contactTest and change it to accept collision flags instead of a MotionState enum 2018-08-17 14:22:42 -07:00
David Rowe
7e46a99400 Merge branch 'master' into M17217-b 2018-08-17 10:35:52 +12:00
John Conklin II
1edf1b4337
Merge pull request #13555 from SamGondelman/destroy 
Trying to fix dependency shutdown
 2018-08-16 13:14:58 -07:00
Seth Alves
3623590e90
Merge pull request #13784 from sethalves/far-point-joints 
Far point joints
 2018-08-14 15:40:07 -07:00
Seth Alves
527b27da96 pseudo-joints for far-grab positions 2018-08-14 08:55:20 -07:00
sabrina-shanman
e5cb078133 Merge branch 'master' of github.com:highfidelity/hifi into safe-teleport-target 2018-08-13 14:51:37 -07:00
amantley
c2612af7a8 changed the spine stretch limit, will check the scale implications next 2018-08-10 17:10:33 -07:00
John Conklin II
644ff1eafa
Merge pull request #13655 from amantley/animationBlendChanges 
New Default Strafe Animations Plus Animation Tuning Support
 2018-08-10 15:03:30 -07:00
John Conklin II
61f0e9323a
Merge pull request #13800 from samcake/zvork-shadow 
Fixing PR13731 shader error on Mac
 2018-08-10 14:10:47 -07:00
sabrina-shanman
e5e1a72598 Use 'orientation' for Collision Pick API, not 'rotation' 2018-08-10 10:52:21 -07:00
amantley
74186b0162 changed back speed to 2.2 m/s and the end frame for strafe left and right to 33, and the end frame for wlk_bkwd to 27 2018-08-10 09:56:24 -07:00
sabrina-shanman
f902552309 Finalize on using 'rotation' in Collision Pick API and add missing jsdoc for CollisionRegion 2018-08-10 08:55:29 -07:00
amantley
c8a31bc59f created a backward walk speed constant 1.6m/s and changed the characteristic speed for strafe right left to 1.3 2018-08-09 17:38:57 -07:00
John Conklin II
2d9cbe91bb
Merge pull request #13780 from hyperlogic/bug-fix/perftimer-memory-corruption 
Fix memory corruption in PerformanceTimer when Stats are active
 2018-08-09 17:16:03 -07:00
David Rowe
a08bcd325d Merge branch 'master' into M17217-b 
# Conflicts:
#	interface/src/scripting/HMDScriptingInterface.h
 2018-08-10 11:25:39 +12:00
sabrina-shanman
5b6916177c Add support for rotation as CollisionRegion parameter and make it the default 2018-08-08 10:47:13 -07:00
Stephen Birarda
e686df6fb9
Merge pull request #13720 from Atlante45/feat/test-tool 
Stack tester changes
 2018-08-08 13:40:05 -04:00
Anthony J. Thibault
c4c3581285 Fix memory corruption in PerformanceTimer when Stats are active 
PerformanceTimer was neither thread safe nor re-entrant.  Because it was being used increasingly on render and worker threads it has increased the likelihood of heap corruption.
I was able to identify this by enabling full page heap verification using the gflags app.

https://docs.microsoft.com/en-us/windows-hardware/drivers/debugger/enable-page-heap
 2018-08-08 09:53:26 -07:00
sabrina-shanman
4ffe164569 Address Mac/Linux build warnings 2018-08-08 08:56:35 -07:00
Olivier Prat
2584ce4c96 Merged with master 2018-08-08 08:42:44 +02:00
Clément Brisset
e9f23a43f6
Merge pull request #13726 from Atlante45/fix/angle-between 
Fix angleBetween potential NaN return value
 2018-08-07 18:31:57 -07:00
David Rowe
96767c1103 Merge branch 'master' into M17217-b 
# Conflicts:
#	plugins/openvr/src/OpenVrDisplayPlugin.cpp
 2018-08-08 10:43:58 +12:00
SamGondelman
9427de1a50 Merge branch 'scriptvec3' of github.com:SamGondelman/hifi into scriptvec3 2018-08-06 12:38:44 -07:00
SamGondelman
3c805df3cc try to get rid of qobject vecs 2018-08-06 12:38:01 -07:00
Sam Gondelman
2edefe3209
Merge branch 'master' into destroy 2018-08-06 09:51:14 -07:00
Olivier Prat
c56bb9a855 Small optimization by using squared distance and not distance in depth sort 2018-08-06 08:20:21 +02:00
sabrina-shanman
870940b3a0 Merge branch 'master' into safe-teleport-target 2018-08-03 18:14:43 -07:00
sabrina-shanman
cf34a2cffd Do not const cast CollisionRegion 2018-08-03 17:55:54 -07:00
Brad Davis
ae8f841912 Shader refactoring for explicit bindings 2018-08-03 14:58:11 -07:00
Sam Gondelman
7772e8adf2
Merge branch 'master' into scriptvec3 2018-08-03 14:57:49 -07:00
David Rowe
11b85e30db Merge branch 'master' into M17217-a 2018-08-04 09:44:39 +12:00
sabrina-shanman
b7d5804edb Format if..else statements 2018-08-03 12:55:11 -07:00
Sam Gateau
2013f1bd33
Merge pull request #13732 from AndrewMeadows/other-avatar-physics 
reduce physics simulation cost of other-avatars
 2018-08-03 09:33:59 -07:00
Brad Davis
3c7f1a0c4b Merge remote-tracking branch 'upstream/master' into destroy 2018-08-02 15:34:19 -07:00
Simon Walton
88fafc7a1f
Merge pull request #13704 from SimonWalton-HiFi/delay-physics 
Enable physics after ES indicates all nearby entities received
 2018-08-01 18:15:00 -07:00
SamGondelman
8a9c27ed92 Merge remote-tracking branch 'upstream/master' into destroy 2018-08-01 16:07:48 -07:00
Clement
2dd70f1fcd Warn against zero-length vectors 2018-08-01 11:39:14 -07:00
Andrew Meadows
0d92e2de0a remove bits from other-avatar collision mask 2018-08-01 11:21:54 -07:00
David Rowe
41c4ecd465 Add HMD play area to API; Oculus and Vive 2018-08-01 15:20:51 +12:00
SamGondelman
7c8d080050 Merge remote-tracking branch 'upstream/master' into scriptvec3 2018-07-31 14:04:23 -07:00
Clement
3a140145ae Fix angleBetween potential NaN return value 2018-07-31 13:30:13 -07:00
SamGondelman
2ca217eb4a merge with master 2018-07-30 17:43:15 -07:00
Clement
f8e98d2c6a Remove 2 year old migration code 2018-07-30 17:18:32 -07:00
Clement
333cbc99ad Remove static logging 2018-07-30 17:18:32 -07:00
SamGondelman
3b5a0d278d trying to fix conversion 2018-07-30 17:06:57 -07:00
sabrina-shanman
6be5ac8dee Add missing equality operator to CollisionRegion to fix false cache collisions leading to false negatives 2018-07-30 13:58:14 -07:00
Sam Gondelman
8201997a16
Merge pull request #13660 from SamGondelman/parabolic 
Parabolic Picking + Pointers
 2018-07-30 10:49:02 -07:00
SamGondelman
6a52b7b8f3 CR improvements 2018-07-26 12:15:12 -07:00
SamGondelman
9b41cb5554 improve model picking performance, scale parabola v/a with avatar, improve followNormal behavior, turn off followNormal on teleport, remove 1 m no teleport spot 2018-07-25 15:19:25 -07:00
Simon Walton
7cb917f735 Angles aren't boolean! 2018-07-25 14:45:26 -07:00
amantley
85b7a9b67c added the changes committed to the hot fix rc70.1 in AvatarConstants.h 2018-07-25 11:31:02 -07:00
Simon Walton
47e99cdeac Initial code for AC side of Enabling Physics plan 
When interface sets query flag send only entities
close to main frustrum origin, until no more available,
then send unreliabe sequence # reliably.
 2018-07-24 16:50:37 -07:00
SamGondelman
645f905239 cleanup, model performance improvements 2018-07-24 13:25:49 -07:00
sabrina-shanman
4ca9899000 Use SHAPE_TYPE_NONE instead of (ShapeType)0 in ShapeInfo.cpp 2018-07-24 11:37:52 -07:00
SamGondelman
318ef907b8 parabola/polyvox, fixing some bugs 2018-07-24 10:08:35 -07:00
sabrina-shanman
7f743de150 Fix CollisionRegion serialization/deserialization issues and CollisionPick implicit cast warning 2018-07-23 12:59:23 -07:00
SamGondelman
763e6465a2 followNormal, fixin stuff 2018-07-20 10:41:24 -07:00
SamGondelman
956c1511b6 Merge remote-tracking branch 'upstream/master' into parabolic 2018-07-19 15:23:25 -07:00
SamGondelman
564578aac6 parabola aabox fixes, refactoring some intersection math 2018-07-19 14:54:49 -07:00
sabrina-shanman
f33ee55f9e Create CollisionPick API 2018-07-19 10:33:21 -07:00
SamGondelman
845ddda695 parabola-overlay and -avatar intersection, handle case where acceleration == 0 2018-07-17 12:41:03 -07:00
SamGondelman
f9cdfbad7c cleanup 2018-07-12 17:59:57 -07:00
SamGondelman
16ad9cb5d3 xcolor/rgbcolor conversion 2018-07-11 18:06:06 -07:00
SamGondelman
9929529f30 vec3 conversion 2018-07-11 14:18:22 -07:00
Seth Alves
4cf706dd96
Merge pull request #13574 from AndrewMeadows/grab-kinematic-children 
more correct kinematic motion of grabbed things
 2018-07-11 10:34:44 -07:00
SamGondelman
5bbd5b9e52 vec2 conversion 2018-07-10 16:32:49 -07:00
Andrew Meadows
dd6be374fa cleanup and optimization rotational integration 2018-07-10 11:18:38 -07:00
SamGondelman
d2699e8e5b some more attempted cleanup 2018-07-10 10:50:01 -07:00
Anthony Thibault
1d33f51ca4
Merge pull request #13528 from amantley/integratedStepping 
Step Detection From Head and Hands Tracking
 2018-07-10 09:59:22 -07:00
SamGondelman
ca5ce888f4 parabola triangle intersection 2018-07-09 18:11:57 -07:00
SamGondelman
fcc523fbef parabola sphere intersection 2018-07-09 15:15:36 -07:00
amantley
a2f8e024fb added avatar constants changed for posterior and head velocity 2018-07-09 13:59:56 -07:00
amantley
55ae08c071 Merge remote-tracking branch 'upstream/master' into integratedStepping 2018-07-09 13:55:59 -07:00
Alexander Ivash
fb1a2037e3 move specifying custom properties for preferences dialog from C++ to QML (per Dante's request) 2018-07-06 21:00:55 +03:00
Alexander Ivash
2c07aa787f allow passing properties to preferences; left align 'User real-world height' & right-align 'reset sensors' (Mukul's request) 2018-07-06 21:00:54 +03:00
SamGondelman
bbe9a0005d parabola vs. web and text 2018-07-05 17:02:55 -07:00
SamGondelman
7954865141 trying to fix dependency shutdown 2018-07-05 14:34:37 -07:00
SamGondelman
7130b5aa7f fixing findRayIntersection bugs 2018-07-05 10:27:12 -07:00
Anthony Thibault
f56c0a3a3f
Merge pull request #13502 from luiscuenca/eyelidFix 
Fix closed eyelids when head is tilted down
 2018-07-05 08:50:22 -07:00
SamGondelman
bfcf4f7865 add parabola test, performance optimization 2018-07-03 15:14:43 -07:00
SamGondelman
90091d11e4 parabola picks, started implementing math 2018-07-03 09:47:31 -07:00
amantley
7f5f762208 fixing merge conflict 2018-07-02 15:54:21 -07:00
amantley
096d0d2827 reorganized the step detection code, creating a shouldActivateHorizontalCG that calls all the step detection conditionals. The average rotation and the mode are now calculated in MyAvatar::update 2018-07-02 15:43:57 -07:00
luiscuenca
97a0edf026 spaces 2018-06-29 14:38:43 -07:00
luiscuenca
24d03ace4c Changes from CR and decreased looking at angle to mitigate freaky eyes 2018-06-29 14:34:17 -07:00
John Conklin II
b9439d1e6b
Merge pull request #13384 from ctrlaltdavid/21892 
Fix entity detaching from head joint not becoming visible
 2018-06-27 12:32:52 -07:00
John Conklin II
c1d949351e
Merge pull request #13399 from kitely/roll-log-on-startup 
Always roll hifi-log.txt when starting
 2018-06-27 12:32:20 -07:00
Sam Gondelman
fbe54437b8
Merge pull request #13409 from humbletim/add-raypick-shapeID 
Include shapeID in RayPick results
 2018-06-26 10:25:39 -07:00
David Rowe
40fb627504 Merge branch 'master' into 21892 2018-06-25 16:04:44 +12:00
Sam Gondelman
850e2d5cf5
Merge branch 'master' into particleFix 2018-06-21 17:32:24 -07:00
SamGondelman
8f411ad6c8 CR 2018-06-20 16:13:10 -07:00
SamGondelman
12a5d8b550 quiet ubuntu warnings, particle properties show radians 2018-06-19 12:51:35 -07:00
humbletim
dc5c5c20df raypick partIndex commit 
include shapeID for accessing proper material index

add raypick shapeID test script
 2018-06-18 18:22:30 -04:00
Andrew Meadows
085130e3c9 avatars collide again again 2018-06-18 13:17:32 -07:00
Oren Hurvitz
0cb77362e8 Always roll hifi-log.txt when starting. 
Otherwise the active log file ("hifi-log.txt") contains lines from both previous sessions and the current session, which is confusing.
 2018-06-17 13:44:14 +03:00
David Rowe
be4b929301 Fix cauterization when reparent entity to a different joint 2018-06-16 16:31:06 +12:00
Clément Brisset
11d84e780d
Merge pull request #13283 from huffman/feat/uncompressed-ktx-in-texmeta 
Add uncompressed KTX files to baked texture output
 2018-06-13 11:49:41 -07:00
John Conklin II
99b5835098
Merge pull request #13344 from birarda/feat/new-version-numbers 
handle semantic version numbers in interface/sandbox update
 2018-06-13 11:16:56 -07:00
Anthony J. Thibault
042f902d2e Merge branch 'master' into scriptedBlendshapesFaceFlags 2018-06-11 17:13:30 -07:00
Ryan Huffman
38df5d3db5 Merge branch 'master' of github.com:highfidelity/hifi into feat/uncompressed-ktx-in-texmeta 2018-06-11 16:17:56 -07:00
Anthony Thibault
044d142635
Merge pull request #13133 from amantley/nativeCGCode 
Center of Gravity Leaning
 2018-06-08 17:53:55 -07:00
Stephen Birarda
9506e7edbe check for update for dev-builds, handle semantic version 2018-06-08 17:20:57 -07:00
Anthony J. Thibault
c3da4e74de Code review feedback 2018-06-08 16:22:00 -07:00
Ryan Huffman
faafd26d2a Add uncompressed KTX files to baked texture output 2018-06-08 11:39:47 -07:00
amantley
913d78841d Merge remote-tracking branch 'upstream/master' into scriptedBlendshapes 
synching with upstream master
 2018-06-07 16:20:11 -07:00
amantley
67fc7b90b5 fixed get and set semi nibble to deal with 16 bits 2018-06-07 15:43:21 -07:00
amantley
dca93ca61f fixed setatone16 function to return the correct result for additional flags 2018-06-06 16:44:12 -07:00
Bradley Austin Davis
fa51c15849 Use binary resources on OSX 2018-06-06 15:10:52 -07:00
Anthony J. Thibault
c3d1daf855 Merge branch 'master' into nativeCGCode 2018-06-04 09:32:38 -07:00
amantley
2879eeb687 added flags for procedural face movement AvatarData.cpp toByteArray and parseDataFromBuffer 2018-06-01 17:18:48 -07:00
samcake
386c0f9ab2 Re review adjustments 2018-05-31 12:16:57 -07:00
John Conklin II
6095a3b319
Merge pull request #13082 from jherico/feature/shader_cache 
Shader load time performance optimiziations
 2018-05-30 13:55:34 -07:00
Anthony Thibault
eae5215d94
Merge pull request #13206 from ctrlaltdavid/21872-c 
JSDoc fixes
 2018-05-24 16:44:55 -07:00
Bradley Austin Davis
3beb77694f Cached shader binaries and uniform data for shaders 2018-05-24 12:42:33 -07:00
Andrew Meadows
31dd59d212 double bits in collision groups 2018-05-24 11:28:52 -07:00
David Rowe
6d4f704279 Regularize some JSDoc usage 2018-05-21 09:32:10 +12:00
Dante Ruiz
3b59af3ed7 Merge branch 'master' of github.com:highfidelity/hifi into menu-updates 2018-05-18 16:42:31 -07:00
vladest
72838f6d34 Implemented radio button preferences. Reimplemented snap smooth turn to radio buttons 2018-05-16 17:06:31 +02:00
David Rowe
fdeb0e3305 Avatar API JSDoc stubs 2018-05-16 09:20:54 +12:00
Anthony J. Thibault
ec638d9d91 Avatar can now look straight down without spinning 180. 
Also, come code clean up and removal of unnecessary Y_180 flips.
 2018-05-14 13:48:04 -07:00
amantley
8000bcd272 cleaned up cg code ie computeNewHipsRotation 2018-05-08 18:12:53 -07:00
amantley
3a10cacec0 1.added the swing twist code to update the follow rotation in MyAvatar.cpp 
2.added step.js and cg_lean.js to the developer folder
3.added menu item for toggling the hips following between head and hips
4.added new function to return true if the root of MyAvatar is translating
to be under the head.  Used to smooth the path of the hips
5.added computeCounterBalance to MyAvatar.h and cpp
6.added the menu item under developer/avatar to enable debug draw of the base of support in menu.h menu.cpp MyAvatar.h MyAvatar.cpp
7.added head yaw into the calculation of the hip rotation for the center
of gravity.  This is already was happening in the deriveBodyFromHMD code
that is default
8.Changed Constants in Avatar constants for the base of support
9.fixed the over rotation of the shoulders
10.fixed scaling problem in cg computation
11.added room for going up on the toes without stretching
 2018-05-07 17:41:35 -07:00
Clement
da9fb9c751 Fix non self-sufficient headers 2018-05-04 16:26:41 -07:00
Clément Brisset
39e2a78b1a
Merge pull request #13074 from Atlante45/fix/spec-cam-punchlist 
Multifrustum queries punchlist
 2018-05-04 15:50:44 -07:00
Stephen Birarda
a922471b9a
Merge pull request #13018 from huffman/fix/logging-size-limit 
Fix old log files not being cleaned up
 2018-05-04 10:46:13 -07:00
Ken Cooke
b657c28a9b
Merge pull request #13099 from kencooke/glm-asan-warnings 
Fix asan warnings
 2018-05-04 09:24:51 -07:00
Ken Cooke
73ce02ce75 Fix asan warnings in byte-unpacking functions 2018-05-04 07:56:44 -07:00
Clement
27c471ee97 Move all wire frustums to conical frustums 2018-05-03 18:19:29 -07:00
Clement
3283c5eaec Fix inverted comparaison 2018-05-03 18:19:29 -07:00
Clement
b4ea32bbb6 Correctly compute conical frustum for irregular ones 2018-05-03 18:19:29 -07:00
Clement
d774dc2060 WIP Only use conical frustums on the server 2018-05-03 18:19:29 -07:00
Stephen Birarda
21396287a4
Merge pull request #12990 from Atlante45/fix/spec-cam-av 
Add support for multifrustum avatar queries
 2018-05-03 18:18:51 -07:00
Stephen Birarda
31d5633b4a
Merge pull request #12930 from Atlante45/fix/spec-cam 
Add support for multifrustum entity queries
 2018-05-03 18:13:51 -07:00
Stephen Birarda
48aeebdd50
Merge pull request #13007 from Atlante45/fix/crashes-hotfix 
Keep CrashpadClient around for application lifetime
 2018-05-03 16:48:29 -07:00
MiladNazeri
8e214d8ee8
Merge pull request #13049 from ctrlaltdavid/21856-d 
List which contexts each namespace and class is available in
 2018-05-03 01:29:14 -07:00
Ryan Huffman
b29984ab2c Remove max log age for rolling interface log 2018-05-02 10:01:15 -07:00
Ken Cooke
a4105f1081
Merge pull request #13052 from kitely/fix-gcc-warnings 
Eliminated warnings in gcc
 2018-05-02 06:43:32 -07:00
Oren Hurvitz
26ffb3213c Changed "[[gnu::fallthrough]]" to "// FALLTHRU" 2018-05-02 07:06:47 +01:00
Clement
538f24162f Define ViewFrustums type alias 2018-05-01 18:03:21 -07:00
Clement
21213e81f4 Multiview support for priority queue 2018-05-01 18:03:21 -07:00
Clement
98cf48694e Expose secondary camera to game logic 2018-05-01 18:02:29 -07:00
Clement
49fad3d868 EntityServer traversal aware of all ViewFrustums 2018-05-01 18:02:29 -07:00
David Rowe
1aa28b7f54 Merge remote-tracking branch 'upstream/master' into 21856-d 
# Conflicts:
#	interface/src/LODManager.h
 2018-05-02 07:50:55 +12:00
John Conklin II
250aa3ab43
Merge pull request #13027 from jherico/fix/web_crash2 
Some fixes for QML surfaces
 2018-05-01 12:39:46 -07:00
Clement
f3fe1f3e58 Force crash helpers not inlined 2018-04-30 15:54:08 -07:00
Ryan Huffman
73cea112ee Update FilePersistThread to use std::chrono instead of usecTimestampNow 2018-04-30 14:13:59 -07:00
Oren Hurvitz
a226790295 Eliminated warnings in gcc 
Note that the call to encodeNode() in FBXWriter.cpp can never be reached, so it's safe to remove it.
 2018-04-30 15:05:27 +03:00
David Rowe
2cc3ed6287 List which contexts each namespace and object is available in 2018-04-28 20:00:28 +12:00
Ken Cooke
1e25d48941
Merge pull request #13044 from roxanneskelly/roxie-arm64-fixes 
Two fixes for arm64 on linux
 2018-04-27 17:15:03 -07:00
Roxanne Skelly
ac8b3e4f5e Two fixes for arm64 on linux 
1) size_t is not defined by default in gcc, so stddef.h needed to be added
to AudioDynamics.h to handle some size_t usage.
2) gcc defaults char to unsigned, where windows defaults to signed.  OctalCode.cpp
was assuming signed
 2018-04-27 23:21:54 +00:00
John Conklin II
dd32ca33a5
Merge pull request #12957 from sethalves/quiet-logging 
Quiet logging
 2018-04-27 14:59:38 -07:00
Brad Davis
2662dc9b4e Suppress tracing log spam when tracing is not active 2018-04-27 08:03:48 -07:00
Ryan Huffman
496b638a88 Fix log file directory not being capped at 50MB 2018-04-26 15:48:55 -07:00
John Conklin II
5a3f44fa15
Merge pull request #12965 from NissimHadar/bug12979 
Fix for bug #12979: Setting colors [0, 0, 254] from js api ends up as black color
 2018-04-23 13:49:41 -07:00
John Conklin II
b3dbf7a025
Merge pull request #12943 from vladest/fix_spinbox 
Fix SpinBox.
 2018-04-23 13:02:01 -07:00
NissimHadar
ea6585a0b9 Corrected tosRGBFloat() computation. 2018-04-23 11:53:35 -07:00
MiladNazeri
3710ce593d
Merge pull request #12922 from ctrlaltdavid/21815 
Controller API JSDoc
 2018-04-21 10:44:05 -07:00
vladest
2e44220b80 Merge branch 'master' into fix_spinbox 2018-04-21 19:38:28 +02:00
MiladNazeri
080e26f408
Merge pull request #12952 from ctrlaltdavid/21851 
Vec3 API JSDoc
 2018-04-20 18:10:18 -07:00
Seth Alves
84e71a9bca missed a file 2018-04-20 16:08:57 -07:00
Seth Alves
bec39369f7 remove some uncatagorized logging, suppress some categories by default 2018-04-20 16:08:57 -07:00
David Rowe
7087abd201 Merge branch 'master' into 21815 2018-04-21 10:49:56 +12:00
Simon Walton
9f9a68188d Merge remote-tracking branch 'upstream/master' into short-id 2018-04-20 11:10:21 -07:00
David Rowe
0a7cccc3f7 Move Vec2 and Vec4 JSDoc 2018-04-20 12:47:53 +12:00
vladest
663af09605 Fix SpinBox. attempt 1 2018-04-19 20:43:48 +02:00
John Conklin II
cad4d45941
Merge pull request #12871 from Atlante45/fix/dead-octree-code 
Remove dead Octree code
 2018-04-19 09:58:20 -07:00
Stephen Birarda
c4ad93bafb
Merge pull request #12782 from SimonWalton-HiFi/qregexp 
Replace LogHandler repeated regex scheme with assigned ID tracking scheme
 2018-04-18 17:28:48 -07:00
Clement
2e8a6e1961 Remove more dead octree code 2018-04-17 18:21:51 -07:00
David Rowe
c1ede6ef58 Merge branch 'master' into 21815 
# Conflicts:
#	tools/jsdoc/plugins/hifi.js
 2018-04-17 11:54:56 +12:00
David Rowe
9f83c606e9 Controller API JSDoc 2018-04-17 11:46:40 +12:00
Simon Walton
9b6306601a Merge Clement's PR12700 diffs for early trace start 2018-04-10 13:13:46 -07:00
Simon Walton
f10bbce557 Squelch initialization warning 2018-04-04 18:32:40 -07:00
Simon Walton
d05f0600d4 Handle one-time messages outside LogHandler class 
Also change to std::call_once for the file-scope message IDs.
 2018-04-04 15:44:47 -07:00
Simon Walton
ce5f6da6ca Restore setup of flush timer that was inadvertently lost 2018-04-04 14:43:26 -07:00
Simon Walton
ed3347a89b Repeated logging - reviewer fixes 2018-04-04 14:11:10 -07:00
Simon Walton
692ccfc09b Create HIFI_FCDEBUG(_ID) variants that require a category 
Original macros use default settings.
 2018-04-04 09:49:15 -07:00
Simon Walton
7d16ca9c1c Remove uses of addRepeatedMessageRegex() and its implementation 
Change to new log-message ID scheme.
 2018-04-03 17:54:01 -07:00
Simon Walton
d4ab06b1d4 Move HIFI_FDEBUG macro to LogHandler.h 
Not all uses of repeated log messages include NetworkLogging.h,
but if they use addRepeatedMessageRegex() they must include
LogHandler.h. Also add second macro for client-supplied
message ID.
 2018-04-03 15:53:12 -07:00
Clément Brisset
3d4490f3fd
Merge pull request #12737 from highfidelity/RC66 
RC66 mergeback
 2018-04-03 15:39:16 -07:00
Simon Walton
5b0bcd76e3 Repeated logging - Fixes and clean-up 2018-04-03 12:23:21 -07:00
Simon Walton
a7fc6a2991 Repeated logs - use #define to replace qCDebug 2018-04-03 10:44:53 -07:00
Simon Walton
6d078f41e7 Use unique IDs for log strings that should have repeats supressed 2018-04-02 17:32:18 -07:00
SamGondelman
afe39aba46 fix octal code char issue 2018-03-29 10:05:08 -07:00
Simon Walton
bed4033554 Local node IDs now working correctly 
Move typedef to single location; fixes for replicated packets
(probably still not correct); reserve zero as local ID;
pass domain server's local ID in domain server list;
other tweaks.
 2018-03-27 18:18:14 -07:00
Dante Ruiz
4d52caccde making some more requested changes 2018-03-22 17:39:22 -07:00
Seth Alves
bea7ee42e2 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-21 14:30:07 -07:00
John Conklin II
2d63afbe28
Merge pull request #12588 from SamGondelman/shapeTex 
Materials on primitives
 2018-03-21 12:08:24 -07:00
Seth Alves
bc527d5ae8 try again on expandToLocalDataAbsolutePath 2018-03-19 14:59:10 -07:00
Seth Alves
a623ba7499 expandToLocalDataAbsolutePath now expands to a file:// url rather than a qrc:// url 2018-03-19 13:48:31 -07:00
Seth Alves
af42b5e93f trying to fix expandToLocalDataAbsolutePath 2018-03-19 09:42:03 -07:00
Seth Alves
e3022da787 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-16 09:34:38 -07:00
Seth Alves
2fd6bc4130 rename Mesh api getPos3 to getPos, deprecate but still support getPos3 2018-03-14 10:24:44 -07:00
Seth Alves
b39c7eadd2 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-13 09:24:18 -07:00
Sam Gondelman
c59d29f4ee
Merge pull request #12623 from SamGondelman/android 
Android: Fix corruption on startup
 2018-03-12 15:03:07 -07:00
MiladNazeri
e054f16c46
Merge pull request #12526 from ctrlaltdavid/21709 
Entities API JSDoc
 2018-03-12 14:40:09 -07:00
SamGondelman
9953e7051f Merge remote-tracking branch 'upstream/master' into android 2018-03-12 14:15:31 -07:00
SamGondelman
4bef033d6f cleanup, don't compress rcc file to fix corruption 2018-03-12 13:05:03 -07:00
Seth Alves
22f1ec5c82 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-10 14:49:25 -08:00
Simon Walton
cc166dbece LogHandler regexps - use vector of values 2018-03-09 15:44:56 -08:00
Seth Alves
c781f88239 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-09 15:43:14 -08:00
Simon Walton
d4cf22fbaf LogHandler class stores regexps - code tweaks 
Code standard changes from review.
 2018-03-09 15:29:10 -08:00
Simon Walton
4b27cd73ff LogHandler class stores regexps rather than always recreating 
General efficiency tweaks; move to C++11.
 2018-03-09 15:29:09 -08:00
Andrew Meadows
7a39bd5c81 remove tab whitespace 2018-03-09 08:35:18 -08:00
Andrew Meadows
7a19f48b9c move rayHitsSphere logic to AABox method 2018-03-09 08:35:18 -08:00
Andrew Meadows
79b9fec900 add rayHitsSphere() util method 2018-03-09 08:35:18 -08:00
SamGondelman
96e48a0162 warnings 2018-03-07 13:50:51 -08:00
Dante Ruiz
8382d842e1 changing to resources path 2018-03-07 12:51:26 -08:00
SamGondelman
19e4fb2355 materials on primitives 2018-03-07 12:22:17 -08:00
David Rowe
a62b6b7150 Merge branch 'master' into 21709 2018-03-07 17:34:53 +13:00
David Rowe
eeb7f5ca8d Doc review 2018-03-07 17:29:39 +13:00
Seth Alves
45157a16f2 merge from upstream 2018-03-02 09:57:27 -08:00
David Rowe
f9086e31de Deprecate Entities.getMeshes() in favor of using the new Graphics API 2018-03-01 10:08:50 +13:00
David Rowe
a782b6779a Merge branch 'master' into 21709 
# Conflicts:
#	interface/src/ui/overlays/Overlays.h
#	interface/src/ui/overlays/Shape3DOverlay.cpp
#	libraries/entities/src/EntityItemProperties.cpp
#	libraries/entities/src/EntityScriptingInterface.h
 2018-02-28 12:42:05 +13:00
Seth Alves
a44ddbbc26 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-02-27 14:09:05 -08:00
Brad Davis
136ced98c3 Merge remote-tracking branch 'upstream/master' into android_dev 2018-02-27 13:44:00 -08:00
Stephen Birarda
9cc348ef27 Merge branch 'master' of github.com:highfidelity/hifi into feat/content-settings 2018-02-27 09:59:37 -08:00
Seth Alves
636c271dc3 merge from upstream 2018-02-27 09:21:08 -08:00
John Conklin II
48f0cded05
Merge pull request #12440 from humbletim/Leopoly_Phase1_010_graphics-scripting 
Leopoly_Phase1_010 Graphics Scripting
 2018-02-27 07:53:25 -08:00
John Conklin II
25144f0fec
Merge pull request #12456 from Atlante45/fix/min-spec-crash 
Fix crash when passing --checkMinSpec flag
 2018-02-26 17:35:46 -08:00
Stephen Birarda
7e3d4d7503
Merge pull request #12506 from birarda/feat/content-settings 
merge upstream/master into upstream/feat/content-settings
 2018-02-26 18:08:58 -07:00
Stephen Birarda
aa7bd2066a Merge branch 'master' of github.com:highfidelity/hifi into feat/content-settings 2018-02-26 17:02:00 -08:00
Atlante45
2a204533f4 Add comments to startup processes 2018-02-26 16:25:41 -08:00
Seth Alves
666fa77be2 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-02-26 13:53:20 -08:00
Ryan Huffman
dbfbee5406 CR 2018-02-26 13:53:20 -08:00
Brad Davis
b9387f2a21 Merge remote-tracking branch 'upstream/master' into android_dev 2018-02-26 13:18:14 -08:00
Anthony J. Thibault
c8af9c6f04 Missing EPSILON 2018-02-26 10:05:15 -08:00
Anthony J. Thibault
0404b722e4 Code review feedback 2018-02-26 10:00:32 -08:00
David Rowe
c2d8c96463 Entities collisions JSDoc 2018-02-26 14:10:33 +13:00
Seth Alves
5632f9d8fd clean up debug prints. put filename in window title-bar when connected to a serverless domain 2018-02-23 16:46:42 -08:00
Seth Alves
3be1988260 fix expandToLocalDataAbsolutePath 2018-02-23 14:27:28 -08:00
Seth Alves
1e49dc5ca2 try using app-local-data path for /~/ 2018-02-23 13:58:23 -08:00
Brad Davis
0550138609 Merge remote-tracking branch 'upstream/master' into android_dev 2018-02-23 12:48:10 -08:00
Dante Ruiz
364081df63
Merge branch 'serverless-domains' into serverless-domains 2018-02-23 11:54:53 -08:00
Dante Ruiz
73ea0dbc05 use resources path instead 2018-02-23 11:51:31 -08:00
Seth Alves
9b8c925b72 still trying to get /~/ in json files to work right 2018-02-23 11:09:09 -08:00
Seth Alves
277e1ebec4 fix /~/ expansion on osx 2018-02-23 10:50:57 -08:00
David Rowe
26404a6ce8 Entities functions JSDoc bulk 2018-02-23 19:27:13 +13:00
Atlante45
c106fee659 Merge branch 'master' of https://github.com/highfidelity/hifi into feat/backups-integration 2018-02-22 19:45:43 -08:00
Anthony J. Thibault
0469eafbe4 Switch between dualQuats and matrix skinning based on model entity scale factor. 2018-02-22 18:35:16 -08:00
Brad Davis
aeb29db37d Merge remote-tracking branch 'upstream/stable' into android_stable 2018-02-22 17:35:00 -08:00
Atlante45
277e556b48 Create a standard function to init Hifi Apps 2018-02-22 17:06:09 -08:00
Atlante45
80c0f2a21e Fix crash when passing --checkMinSpec flag 
That flag caused a DLL to be loaded before Application was
	instanced.
	This triggers a Qt bug inside Q_COREAPP_STARTUP_FUNC that causes
	the previous registration pointing the startup function in
	the main executable to be overridden with the address of the
	function in the DLL (Since they both link the same static
	library)
	This leads to the correct function running in the wrong address
	space (the DLLs), hence not initializing some global variables
	correctly.
 2018-02-22 16:29:38 -08:00
David Rowe
25b1e9f50b Fix PickRay JSDoc 2018-02-23 12:05:33 +13:00
humbletim
72fca7e57e Merge remote-tracking branch 'samuel/scriptableMaterials' into Leopoly_Phase1_010_graphics-scripting-merge 2018-02-22 05:18:05 -05:00
humbletim
be8d79f53f CR fedback and cleanup 2018-02-22 05:15:01 -05:00
Seth Alves
f44749387a cleanups 2018-02-21 15:24:54 -08:00
SamGondelman
4c6169ec78 merge and a little cleanup 2018-02-20 15:45:34 -08:00
Dante Ruiz
43ce9508ee better way to handle urls 2018-02-20 14:27:21 -08:00
Dante Ruiz
024d5d30c6 adding print statment 2018-02-20 11:34:24 -08:00
Dante Ruiz
8fc50222f5 allow json for uses /~/ for file paths 2018-02-20 11:20:42 -08:00
humbletim
5791ca4c51 interim checkin 2018-02-20 12:22:04 -05:00
Seth Alves
25c34403db Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-02-19 11:24:42 -08:00
David Rowe
67cfe783be Entity properties JSDoc 2018-02-19 12:17:31 +13:00
Dante Ruiz
e0bbc57f6c support relative file path from appliaction directory 2018-02-16 14:48:38 -08:00
Stephen Birarda
f5cad5683d make sure backup handlers end up on the correct thread 2018-02-15 15:39:25 -08:00
Ryan Huffman
cb9327e030 Add entity file sync and domain content backups 2018-02-15 10:09:20 -08:00
Sam Gondelman
15cdfef16a
Merge branch 'master' into decals 2018-02-14 17:33:01 -08:00
SamGondelman
324eefc914 remove fresnel, add unlit, fix overlays, cleanup 2018-02-14 17:02:07 -08:00
John Conklin II
63f752e76f
Merge pull request #12366 from sethalves/fix-children-of-animated-entity-joints 
fix -- get children of animated entity joints to follow along, again
 2018-02-14 11:12:45 -08:00
SamGondelman
4500ed17e7 merge from master 2018-02-13 13:58:39 -08:00
Andrew Meadows
20c2a4470e merge 'findByID' into 'workload-001' 2018-02-13 11:47:02 -08:00
Andrew Meadows
38bc312004 faster and const EntityTree::findByID() 2018-02-13 11:25:34 -08:00
Andrew Meadows
a1c540fc85 instantiate trace_workload logging category 2018-02-13 08:57:20 -08:00
Andrew Meadows
d59c3898dc add 'workload' logging profile 2018-02-13 08:57:20 -08:00
Sam Gateau
714e3f445d
Merge pull request #11537 from jherico/threaded_qml 
Migrating QML rendering off the main thread
 2018-02-12 15:32:33 -08:00
John Conklin II
51bf3c1466
Merge pull request #12323 from Zvork/shadow 
Shadow performance / acnee improvements
 2018-02-12 14:41:13 -08:00
John Conklin II
d084e58f48
Merge pull request #12328 from Atlante45/fix/misc-bugs 
Misc bug fixes
 2018-02-12 14:31:38 -08:00
SamGondelman
9e8aa1898c warnings, load material from URL, shapeID -> parentMaterialID 2018-02-12 12:50:09 -08:00
Sam Gateau
f3918ad216
Merge pull request #12367 from AndrewMeadows/fix-shared-unit-tests 
Fix shared unit tests
 2018-02-09 17:18:35 -08:00
SamGondelman
5337377ef5 Merge remote-tracking branch 'upstream/master' into decals 2018-02-09 14:40:20 -08:00
Bradley Austin Davis
dbc4b1533d Fixing build warnings in minipromises 2018-02-09 10:12:32 -08:00
RebeccaStankus
14839bc5f4 Some improvements to the log window 
-Renamed button "Clear Filters" to "All Messages"
-Changed search result matching text to a more visible color
-Made Date/Time text more visible
-Added count of current messages in window
-Set window to show all messages with no filtering upon first opening
 2018-02-08 11:26:02 -08:00
Andrew Meadows
572edab79f remove dupe const 2018-02-07 16:48:31 -08:00
Seth Alves
b6ac348428 get children of animated entity joints to follow along, again 2018-02-07 16:30:07 -08:00
Andrew Meadows
96c97547f9
Merge pull request #12205 from jherico/no_widgets 
Remove some unneeded Qt dependencies
 2018-02-05 15:32:54 -08:00
Olivier Prat
2940a67b3e Merged with master 2018-02-03 16:55:25 +01:00
SamGondelman
4d4294dd6a Merge remote-tracking branch 'upstream/master' into decals 2018-02-02 16:50:01 -08:00
SamGondelman
d7f4b033e8 wip finish adding material entity 2018-02-02 16:49:33 -08:00
Atlante45
8ebb3e52d8 Misc bug fixes 2018-02-02 13:10:49 -08:00
Olivier Prat
234cb1e3e6 Added anti frustum test to remove lower cascade objects from higher shadow cascades 2018-02-02 12:15:43 +01:00
Olivier Prat
3804917cf4 Orthographic octree selection seems to be working 2018-02-02 09:40:57 +01:00
humbletim
06afaa7470 BufferView <-> QVariant/QScriptValue conversion 
update MeshProxy/SimpleMeshProxy and ScriptableModel

ModelScriptingInterface / scriptable::ModelProvider

integration

update to RC-63

initial graphics-scripting refactoring

graphics-scripting baseline commit

wip commit

Geometry -> MeshPart

remove SimpleMeshProxy

collapse graphics-utils -> graphics-scripting

scriptable::Model => scriptable::ScriptableModel
 2018-02-01 16:30:29 -05:00
Atlante45
bc819c698e Merge branch 'stable' of https://github.com/highfidelity/hifi into merge-back 2018-01-30 16:09:30 -08:00
Atlante45
db08f1dda6 Move backtrace to interface 2018-01-30 11:39:48 -08:00
Atlante45
cb6bebd824 Fix Mac dev builds 2018-01-29 19:47:36 -08:00
MiladNazeri
3585bead96
Merge pull request #12037 from humbletim/Leopoly_Phase1_004_RayPick-Changes 
Leopoly_Phase1_004_RayPick-Changes
 2018-01-29 14:02:38 -08:00
Atlante45
061f9ea359 Don't run settings preroutine when not initialized 2018-01-29 12:09:16 -08:00
MiladNazeri
9baf02b7a1
Merge pull request #12036 from humbletim/Leopoly_Phase1_003_Asset-Request 
Leopoly_Phase1_003_Asset-Request
 2018-01-29 11:40:41 -08:00
Brad Davis
0781d8eaf0 Remove some unneeded Qt dependencies 2018-01-28 22:18:24 -08:00
Seth Alves
d73538f233 oops 2018-01-26 12:08:19 -08:00
Seth Alves
b7303414f2 unmangle merges 2018-01-26 11:57:30 -08:00
Seth Alves
dbe9fd290e comment out code that would set annotations after StartHandler is called 2018-01-26 09:23:29 -08:00
Atlante45
df62ba88cb Fix rebase error 2018-01-26 09:22:37 -08:00
Seth Alves
c02ab28c60 fix clang build 2018-01-26 09:22:28 -08:00
Atlante45
39f26e35f0 backtrace for rc-63 2018-01-26 09:22:14 -08:00
Seth Alves
6c04431636 call startCrashhandler from interface 2018-01-26 09:20:29 -08:00
Atlante45
ced5aad1d1 backtrace for rc-63 2018-01-26 09:20:07 -08:00
Brad Davis
361b767586 Merge branch 'fix/render_config' into android 2018-01-25 14:50:41 -08:00
Brad Davis
3915a2d4ba Fix resource loading from source tree 2018-01-25 11:07:39 -08:00
Anthony J. Thibault
58d3d8ef3d Bug fix for incorrect positioned eyes on other peoples avatars 
There was a bug in writeBitVector(), where the last byte was not consistantly written into the destination buffer.
A unit test was added to verify that writeBitVector() and readBitVector() are correct.

(cherry picked from commit a252e90f96)
 2018-01-24 21:14:29 -08:00
Anthony J. Thibault
a252e90f96 Bug fix for incorrect positioned eyes on other peoples avatars 
There was a bug in writeBitVector(), where the last byte was not consistantly written into the destination buffer.
A unit test was added to verify that writeBitVector() and readBitVector() are correct.
 2018-01-24 18:58:08 -08:00
Brad Davis
5049bac6ff Add helper function for QFileSelector 2018-01-23 12:25:22 -08:00
humbletim
65455e7b50 Merge remote-tracking branch 'upstream/master' into Leopoly_Phase1_004_RayPick-Changes 2018-01-23 14:57:33 -05:00
humbletim
3a735c1fc7 CR feedback and code cleanup 2018-01-23 03:12:26 -05:00
Brad Davis
8ae0b09ea2 Merge remote-tracking branch 'upstream/master' into android 2018-01-22 15:07:30 -08:00
John Conklin II
4697c5f92c
Merge pull request #12225 from hyperlogic/bug-fix/sassy-avatar 
Fix for avatars with crooked spine/head when exiting HMD mode
 2018-01-22 11:50:44 -08:00
Brad Davis
d2fe9e2710 PR feedback 2018-01-19 20:24:34 -08:00
Anthony J. Thibault
cd4d9255bd Added defaultPoseFlags to avatar protocol 
Change rotationSet to rotationIsDefaultPose for JointData
Also for translation.  Fixed all code to flip boolean value.
Created EntityJointData so that the ModelEntity stuff doesn't need to change.
 2018-01-19 15:34:27 -08:00
Brad Davis
d53b8b38ac Merge remote-tracking branch 'upstream/master' into android 2018-01-19 14:35:20 -08:00
humbletim
31cdd5cca2 QueuedConnection per CR feedback 2018-01-18 22:20:28 -05:00
Andrew Meadows
3d3bfcf7a3 check dirty flags when harvesting physics results 2018-01-18 17:43:22 -08:00
Bradley Austin Davis
6200d31c93 Fixing OSX resources URL 2018-01-17 14:46:27 -08:00
humbletim
49bb9420cc
Merge branch 'master' into Leopoly_Phase1_003_Asset-Request 2018-01-17 17:11:33 -05:00
SamGondelman
134a026d8a merge from master 2018-01-17 13:36:07 -08:00
humbletim
744da48551 add apache 2.0 headers 2018-01-17 14:00:50 -05:00
Bradley Austin Davis
503fed19a7 Trying to fix mac resource loading 2018-01-17 10:36:34 -08:00
Brad Davis
6a06bf405a Merge remote-tracking branch 'upstream/master' into android 2018-01-16 18:24:44 -08:00
Bradley Austin Davis
b4223215ef Use old style resources on OSX for now 2018-01-16 14:44:05 -08:00
humbletim
b91d536dd0 rename model:: -> graphics:: 2018-01-16 12:46:16 -05:00
SamGondelman
241849139f wip 2018-01-15 10:21:16 -08:00
Brad Davis
58530c595a Pre-merge cleanup 2018-01-14 19:48:12 -08:00
Brad Davis
bee869d88e Merge remote-tracking branch 'upstream/master' into android 2018-01-14 13:53:47 -08:00
Anthony J. Thibault
7753b8a0b5 Merge branch 'master' into feature/dual-quat 2018-01-11 17:31:29 -08:00
Brad Davis
001edcd71b Allow creation of empty files with storage API 2018-01-11 08:06:52 -08:00
Brad Davis
97593bc4d8 Fixing compiled resource access 2018-01-10 17:18:12 -08:00
Brad Davis
2c35242af1 Merge remote-tracking branch 'upstream/master' into android_nov 2018-01-10 13:40:12 -08:00
Brad Davis
7a7aee770c Switching to binary resources 2018-01-10 13:39:56 -08:00
Brad Davis
bd5af2b493 Working on android avatar rendering 2018-01-09 11:40:32 -08:00
Anthony J. Thibault
fbea22e0f0 Renamed imag component to dual, using the correct nomenclature 
Also removed incomplete test from unit tests.
 2018-01-08 18:21:23 -08:00
Brad Davis
a2c2e7d9ff Fixes to load cubemap 2018-01-08 14:43:54 -08:00
Anthony J. Thibault
d08f94a74d Code review feedback 
* Removed AnimPose::fuzzyEqual
* Fixed DualQuaternion ctor
 2018-01-08 13:36:23 -08:00
Anthony J. Thibault
59b843781e Merge branch 'master' into feature/dual-quat 2018-01-08 13:18:42 -08:00
Gabriel Calero
7fbd23f36b Merge branch 'android_render_pr' of https://github.com/gcalero/hifi into android_render_pr 2018-01-08 17:38:28 -03:00
Gabriel Calero
6050737e7c Resolving comments in PR 2018-01-08 17:36:08 -03:00
Bradley Austin Davis
68cd768a65
Merge branch 'android' into android_render_pr 2018-01-08 12:49:52 -05:00
Nissim Hadar
8e793e790a Deleted unused include file. 2018-01-07 14:11:26 -08:00
humbletim
fc41bcca5a removing unnecessary qWarning() debug output 2018-01-05 18:41:51 -05:00
Brad Hefta-Gaub
6a3609093d
Merge pull request #12051 from dback2/polyobjimportfixes 
Poly obj import fixes
 2018-01-05 13:33:29 -08:00
David Back
7558b00467 better fix for model scale floor, remove abs 2018-01-04 17:49:39 -08:00
David Back
6b9658f8cf merge 2018-01-04 16:41:58 -08:00
Anthony J. Thibault
bcd813ac62 Optimizations and cleanup 2018-01-04 16:15:44 -08:00
Anthony J. Thibault
e86fd4f992 Removed SKIN_COMP define, re-enabled cauterization 2018-01-04 16:15:42 -08:00
Anthony J. Thibault
5bb0b06061 WIP: Dual Quaternion compensation for spinning the right way. 2018-01-04 16:15:39 -08:00
Anthony J. Thibault
8bdddf7211 Full Dual Quaternion support 2018-01-04 16:15:38 -08:00
Anthony J. Thibault
565875e823 WIP first attempt at dual quat skinning 2018-01-04 16:09:02 -08:00
Gabriel Calero
32494a8e24 Set QMLEngine base path for android 2018-01-03 22:13:31 -03:00