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

3790 commits

Author SHA1 Message Date
Andrew Meadows
6b386000db initialize 'success' and use for return value 2017-07-27 17:11:13 -07:00
Anthony J. Thibault
78c6564174 Merge branch 'master' into feature/secondary-pose-support 2017-07-27 09:09:32 -07:00
Sam Gondelman
fcaa39b245 Merge branch 'master' into sharks 2017-07-26 18:18:09 -07:00
Brad Davis
8d37e54a4e Merge pull request #11051 from highfidelity/qt59 
Changes for Qt 5.9 warnings and build issues
 2017-07-25 15:05:28 -07:00
LaShonda Hopper
ef1e426273 [WL21389] Some code and todo cleanup in prep for PR1. 
Changes to be committed:
	modified:   libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
	modified:   libraries/entities/src/ShapeEntityItem.cpp
	modified:   libraries/physics/src/ShapeFactory.cpp
	modified:   libraries/shared/src/ShapeInfo.cpp
 2017-07-25 15:27:02 -04:00
Leander Hasty
d155c02640 [WL21389] wip and modifications based on comments 
https://github.com/highfidelity/hifi/pull/11024#pullrequestreview-51611518

Cleans up tabs, moves new functionality out of ShapeFactory directly to
RenderableShapeEntityItem's computeShapeInfo override, begins to break down
where we will need pointlists.

Still need to determine how rotation is handled for pointlists, and check
for axis alignment on cylinders before deciding on a shape.

Changes to be committed:
	modified:   libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
	modified:   libraries/entities-renderer/src/RenderableShapeEntityItem.h
	modified:   libraries/entities/CMakeLists.txt
	modified:   libraries/entities/src/ShapeEntityItem.cpp
	modified:   libraries/entities/src/ShapeEntityItem.h
	modified:   libraries/physics/src/ShapeFactory.cpp
	modified:   libraries/physics/src/ShapeFactory.h
	modified:   libraries/shared/src/ShapeInfo.cpp
	modified:   scripts/developer/tests/basicEntityTest/entitySpawner.js
 2017-07-25 15:20:35 -04:00
LaShonda Hopper
75403124b6 [WL21389] Addresses physics library dependency and has some other fixes (details below). 
* Addresses physics library dependency by moving computeShapeInfo override from
ShapeEntityItem (which is within Entities Library) to RenderableShapeEntityItem
(which is in Entities-Renderer Library).
** Entities-Renderer library already links against the physic library.
** Per discussion with Andrew Meadows: In order to ShapeEntityItem to be
utilized the library dependency between the Entity and Physics library
would need to be resolved to avoid the cyclical reliance which isn't in
the scope of this ticket.
* Updates shapeSpawner test script from the default clone of basicEntityTest\entitySpawner.js
** Objects now have a finite lifetime
** Script now cleans up the objects created when the script ends
** Also moved some adjustable properties out into var aliases at the top of the
file for easier/less error prone tweaking. Should probably add one for the shapeType.
* Fixes some issues with validateShapeType helper function
* Removed naive attempt at including physics library within entities library.
* Transferred some todos from notes
* Fixed some formatting

NOTE(s):
  This compiles and runs.  Cylinder is spawned and treated as CYLINDER_Y.

TODO(s):
* Add tweakable var for shapeType within shapeSpawner.js
* Vet and verify other shapes.
* Add in edge case handling.
* Add in support for other shapes to ShapeInfo infrastructure.

Changes to be committed:
	modified:   libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
	modified:   libraries/entities-renderer/src/RenderableShapeEntityItem.h
	modified:   libraries/entities/CMakeLists.txt
	modified:   libraries/entities/src/ShapeEntityItem.cpp
	modified:   libraries/entities/src/ShapeEntityItem.h
	modified:   libraries/physics/src/ShapeFactory.cpp
	modified:   libraries/shared/src/ShapeInfo.cpp
	modified:   scripts/developer/tests/basicEntityTest/shapeSpawner.js
 2017-07-25 14:43:39 -04:00
LaShonda Hopper
5bc38bd7f0 [WL21389] Collision Shapes need to be updated (details below). 
Revised approach involves creating a helper function within ShapeFactory to aid
in devising the ShapeType to be used by an ShapeEntityItem for collision.  The
ShapeFactory is currently doing this for creating the actual Bullet Library
collision shapes.

ShapeEntityItem overrides its virtually inherited computeShapeInfo which
in turn calls the new ShapeFactory helper function.

ShapeEntityItem has a new memvar _collisionShapeType to cache its actual
ShapeType used by the physics system.  This memvar is returned via the getShapeType
accessor which is expected to return an object's ShapeType.

Note(s):
    This is similar to the original approach save translation between entity::Shape and ShapeType
    isn't tied to the EntityItemProperties shapeTypeNames or shapeType. This approach more
    directly solves the issue of getting the actual ShapeType used by the time it's needed
    to determine the bullet collision object type created when initializing the physic information.

    Translation of the ShapeEntityItem's entity::Shape to its ShapeType is handled by
    ShapeFactory which handles creating the bullet collision objects when setting up
    physics on the ShapeEntityItems.

Known Issue(s):
    This doesn't compile.  It appears that the Entity Library needs to know about
    the Physics Library.  The naive attempt at providing that link failed to resolve
    all compilation issues.

    Current Error:
    C1083: Cannot open include file: btBulletDynamicsCommon.h:
    No such file or directory (C:\projects\cusack\libraries\entities\src\ShapeEntityItem.cpp)
       C:\projects\cusack\libraries\physics\src\ShapeFactory.h	15	1	entities

	modified:   libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
	modified:   libraries/entities/CMakeLists.txt
	modified:   libraries/entities/src/ShapeEntityItem.cpp
	modified:   libraries/entities/src/ShapeEntityItem.h
	modified:   libraries/physics/src/ShapeFactory.cpp
	modified:   libraries/physics/src/ShapeFactory.h
	modified:   libraries/physics/src/ShapeInfo.cpp
	modified:   scripts/developer/tests/basicEntityTest/entitySpawner.js
	new file:   scripts/developer/tests/basicEntityTest/shapeSpawner.js
 2017-07-25 14:43:07 -04:00
Ryan Huffman
9421e6ebb6 Merge pull request #11029 from cain-kilgore/dominant-hands 
WL 21453 - Add a "Dominant Hand" setting
 2017-07-25 08:01:31 -07:00
Anthony J. Thibault
33a1d6e225 Merge branch 'master' into feature/secondary-pose-support 2017-07-24 17:27:33 -07:00
Anthony J. Thibault
9f6641ed10 Shoulder puck calibration work in progress 
* AnimInverseKinematics: debug draw for secondary targets
* AnimInverseKienmatics: better clean up of ik target debug draw
* GeometryUtil: added findPlaneFromPoints()
* ViveControllerManager: external dependency on eigen
* ViveControllerManager: record history of left/right hand controllers
* ViveControllerManager: use history to determine user shoulder location for better calibration
* ViveControllerManager: pass defaultToReferenceMat by const ref to calibrate functions.
* CMake: added external depenency to eigen linear algebra library.
 2017-07-24 17:22:48 -07:00
Andrew Meadows
8c55476c65 fix motor direction when walking upside down 
also maintain worldUp and remove unnecessary cruft
 2017-07-24 16:00:13 -07:00
Cain Kilgore
42742ba1f9 Changed the Return to a String "left/right" instead. 2017-07-24 18:31:16 +01:00
Cain Kilgore
630922dd95 Dominant Hands Branch Initial Commit 
Adds a new option in the Avatar Basics section of the Avatar Settings.

API Accessible Functions:
MyAvatar.getUseAlternativeHand()
MyAvatar.setUseAlternativeHand()

Defaults to false (Right Hand). Will return True if set to Left Hand.
 2017-07-24 06:18:24 +01:00
Andrew Meadows
29daac83a4 optimize cube update only for connected things 2017-07-21 10:59:25 -07:00
Andrew Meadows
1e6fc85e3e fix math for expanded bounding box 2017-07-21 10:17:10 -07:00
Andrew Meadows
e1eb223616 cleanup bad indentation, cruft, and constants 2017-07-20 16:12:33 -07:00
Andrew Meadows
a8dac0cb79 don't send constant updates for grabbed objects 2017-07-20 15:45:50 -07:00
Brad Davis
3a31805dff Fix warnings in Qt 59 / VS 2017 build 2017-07-20 11:57:12 -07:00
Andrew Meadows
0fc0cf736f fix spelling 2017-07-20 09:34:28 -07:00
Andrew Meadows
4f1489f8b4 less magic 2017-07-20 08:18:19 -07:00
Stephen Birarda
3936ee93f0 use default scripts path in EditTabView to fix load on OS X 2017-07-19 16:34:04 -07:00
Clément Brisset
d76039387a Merge pull request #10992 from Atlante45/fix/heap-use-after-free 
Fix potential data corruption in the FileCache
 2017-07-19 10:44:02 -07:00
Atlante45
497fd7f714 Pin File pointer during eject 2017-07-18 13:45:46 -07:00
Atlante45
2d246d2563 Implement shutdown with parent for Mac and Linux 2017-07-14 11:39:32 -07:00
SamGondelman
3a35cd128f fix dirOffset, expose intersection type to JS 2017-07-13 16:09:21 -07:00
Cain Kilgore
f91a8c0f53 Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-scaler 2017-07-13 21:25:39 +01:00
Cain Kilgore
521babb6bd Avatar Scaler - should be PR Ready. 2017-07-13 19:18:51 +01:00
SamGondelman
916a99c670 added JS/C++ RayPickResult, working on RayPickManager::update 2017-07-12 17:12:25 -07:00
SamGondelman
ea65a04f28 expose RayPickMask to JS, move everything to interface/src/raypick to prevent dependency issues, start working on RayPickManager::update (needs testing) 2017-07-12 14:20:39 -07:00
SamGondelman
3ac369d782 framework for LaserPointers and abstracted RayPicking on C++ side, including JS API 2017-07-12 14:20:39 -07:00
Cain Kilgore
43782a29c7 Avatar Scaler - WIP 2017-07-12 22:04:58 +01:00
Andrew Meadows
2349057306 Merge pull request #10879 from AndrewMeadows/avoid-null-shape 
fix crash in ObjectMotionState::handleEasyChanges()
 2017-07-07 10:22:05 -07:00
Clément Brisset
34e3f56002 Merge pull request #10843 from birarda/bug/user-activities-interface-only 
disable user activity logger in DS/AC/ac-client
 2017-07-06 14:01:49 -07:00
Stephen Birarda
bdcdff3dbc force _isSet to be set before isSet() called 2017-07-06 12:01:08 -07:00
Andrew Meadows
2299bb7718 supply minimum shape rather than null 2017-07-06 10:37:44 -07:00
David Kelly
1ccf0da7d8 Merge pull request #10897 from davidkelly/dk/cacheSwitchFix 
redo cache switch
 2017-07-06 09:53:01 -07:00
David Kelly
4a22fbca1b redo cache switch 2017-07-05 17:01:31 -07:00
Brad Davis
2409c83d5d Fix ACClient on Linux 2017-07-05 16:53:42 -07:00
Seth Alves
70a7b302fc Merge pull request #10860 from jherico/deadlock_guards 
Don't use blocking connections on the main thread
 2017-07-03 09:05:56 -07:00
Brad Davis
6fc82bb351 Switch to preprocessor macro for blocking invokes to capture function information 2017-06-30 11:36:24 -07:00
Brad Davis
b52dd7b822 Don't use blocking connections on the main thread 2017-06-29 20:45:17 -07:00
Atlante45
5c731636b1 Sandbox restarts crashed processes 2017-06-29 12:13:52 -07:00
Andrew Meadows
e9edf01a34 Merge pull request #10831 from kencooke/audio-hrtf-optimize 
More HRTF optimizations
 2017-06-28 14:17:00 -07:00
Seth Alves
2f3109e4be move the location of Q_DECLARE_METATYPE(std::function<void()>) so that the server-script AC can see it 2017-06-28 11:00:05 -07:00
Ken Cooke
0acbdc7755 CR fix: use predefined PI 2017-06-28 10:18:54 -07:00
Brad Davis
8130a91b8c Cleanup entity dependencies 2017-06-27 19:15:49 -07:00
Howard Stearns
20f713a241 Merge pull request #10803 from davidkelly/dk/cacheSwitch 
new --cache switch for interface
 2017-06-27 12:23:23 -07:00
Ken Cooke
dcdf07191b Fast acosf() using polynomial approximation 2017-06-27 11:29:44 -07:00
David Kelly
01155ba4e3 this handles redirecting ktx_cache, data8, prepared 2017-06-27 08:47:54 -07:00
samcake
c0e8b6c8bc clean up 2017-06-23 14:18:56 -07:00
David Kelly
bda50af780 this uses qt's test location for AppData/Local, but leaves Roaming alone 2017-06-23 11:06:48 -07:00
David Kelly
04160f2ca1 switch to change ktx_cache directory (only) 2017-06-23 09:19:41 -07:00
David Kelly
7ef50042ba remove turd 2017-06-23 08:00:18 -07:00
David Kelly
06d1ac8bf7 Merge remote-tracking branch 'upstream/master' into dk/scriptsSwitch 2017-06-22 14:14:54 -07:00
David Kelly
ff5b37c785 new --scripts switch overrides default scripts location 2017-06-22 14:09:05 -07:00
Brad Hefta-Gaub
197006e3d3 Merge pull request #10780 from kencooke/audio-hrtf-avx512 
HRTF optimizations
 2017-06-22 13:34:05 -07:00
Ken Cooke
b27b09ebc6 Detect support for AVX512 instructions 2017-06-20 16:09:52 -07:00
Ken Cooke
bbfdb0f7eb Refactor CPU detection to use common subfunctions 2017-06-20 16:06:05 -07:00
Brad Davis
e3fb42eefd Fix crash when cache File lifetime exceeds cache lifetime 2017-06-20 14:38:51 -07:00
Brad Davis
ed6620fc51 Merge pull request #10718 from jherico/frame_thread 
Cleanup and refactoring
 2017-06-19 13:31:44 -07:00
Brad Davis
1d4b443113 Prevent cache ejection of textures in use 2017-06-19 09:51:11 -07:00
Brad Davis
fece438602 Cleanup and refactoring 2017-06-15 18:58:56 -07:00
Atlante45
61eb93af35 Fix SharedNodePointer leak 2017-06-14 11:42:25 -07:00
Anthony Thibault
e3c342aa77 Merge pull request #10595 from hyperlogic/feature/spine-spline 
Spline IK target support
 2017-06-08 18:09:55 -07:00
Seth Alves
485df396ef Merge pull request #10628 from jherico/qt59 
Fixes for Qt 5.9 compatibility
 2017-06-08 16:51:08 -07:00
howard-stearns
fa74daf875 Merge branch 'master' of https://github.com/highfidelity/hifi into do-not-get-stuck-in-floor 2017-06-07 16:43:25 -07:00
Anthony J. Thibault
606c6415ae Merge branch 'master' into feature/spine-spline 2017-06-07 10:53:46 -07:00
Bradley Austin Davis
b4bbf98fe3 Suppress TBB warnings 2017-06-06 15:02:16 -07:00
Bradley Austin Davis
fc6a278217 Fixing dangling thread issues, consolidating thread management 2017-06-06 15:02:16 -07:00
Clément Brisset
67970182aa Merge pull request #10579 from AndrewMeadows/fix-generateBasisVectors 
Fix generateBasisVectors() helper
 2017-06-05 14:47:18 -07:00
Brad Hefta-Gaub
51e00b9de9 Merge pull request #10614 from samcake/brown 
Introduce a stencil mask pass in the rendering to optimize HMD
 2017-06-05 14:14:11 -07:00
Andrew Meadows
6970576bb8 use helper constants in helper code 2017-06-05 08:54:05 -07:00
Andrew Meadows
205e5d7309 add unit tests and fix final bugs 2017-06-05 08:54:05 -07:00
Andrew Meadows
81764f0f71 fix GLMHelpers::generateBasisVectors() 2017-06-05 08:54:05 -07:00
Howard Stearns
a0ea306aed cleanup, and include missing allowBackface parameter 2017-06-04 07:55:23 -07:00
Howard Stearns
3d62900daf When we do precision detailed picking on a model, check the back faces, too. In other words, precision picking from inside a model works. 2017-06-03 16:49:16 -07:00
Anthony J. Thibault
1a8f6b8de0 Readability improvement 2017-06-02 18:16:14 -07:00
Clément Brisset
c636922a5d Merge pull request #10590 from huffman/fix/running-marker 
Update server-console to watch interface via pid rather than marker
 2017-06-02 15:57:44 -07:00
Anthony J. Thibault
2422c7e1bb code review feedback 2017-06-02 15:47:51 -07:00
Clément Brisset
5f91d2dcb7 Merge pull request #10569 from ctrlaltdavid/21312 
Improve positioning of assets when added / imported
 2017-06-02 15:45:18 -07:00
Sam Cake
f9aa400b95 Refining the stencil configuration and triggering only in hmd mode 2017-06-02 00:22:38 -07:00
Ryan Huffman
86da91ac8d Remove the runningMarker timer 2017-06-01 18:19:13 -07:00
Anthony J. Thibault
3710637254 warning fix 2017-06-01 15:17:02 -07:00
Anthony J. Thibault
b9bf6f4c05 whitespace 2017-06-01 13:30:35 -07:00
Anthony J. Thibault
226855b2b9 Bug fixes and cleanup 
* Bug fix for problem when chest target is enabled but hips target is not.
* centralized the two computeSplineFromTipAndBase functions into one.
* Removed dead code
 2017-06-01 13:20:50 -07:00
Brad Davis
a77491ccb1 FileCache refactoring and tests 2017-05-31 13:45:59 -07:00
Anthony J. Thibault
39c23bfe2f revision of spine spline rotation calculation 2017-05-30 14:25:30 -07:00
Anthony J. Thibault
fc12d7547a Addition of CubicHermiteSpline helper classes. 2017-05-30 14:25:29 -07:00
David Rowe
8de93d9651 Fix typo noticed in passing 2017-05-30 15:53:58 +12:00
Seth Alves
a45b5599c9 Merge branch 'master' of github.com:highfidelity/hifi into fix-imported-children-querybox 2017-05-19 17:37:03 -07:00
Clément Brisset
6e89f7d2f9 Merge pull request #10512 from Atlante45/fix/running-marker 
Fix "Reset Settings" window poping up every time
 2017-05-19 17:36:00 -07:00
Seth Alves
40c8261111 Merge branch 'master' of github.com:highfidelity/hifi into fix-imported-children-querybox 2017-05-19 17:14:58 -07:00
Seth Alves
5c93dbd20d be more careful about fixing up entities which arrived before their parents 2017-05-19 13:48:29 -07:00
Ryan Huffman
64bf5784e6 Fix FileStorage to not close files after they are opened 
This is particularly an issue with KTX file reading/writing where we do
both concurrently.
 2017-05-19 11:16:20 -07:00
Atlante45
c2e2682eff Fix "Reset Settings" window poping up every time 2017-05-19 10:50:23 -07:00
Seth Alves
ec02887ae6 attempt to get imported entities into the correct octree-element 2017-05-18 13:20:44 -07:00
Brad Hefta-Gaub
fbc32e5ba1 Merge pull request #10485 from samcake/orange 
Add protections when accessing the mip bytes of a texture when provided from a KtxStorage
 2017-05-18 08:47:58 -07:00
Brad Hefta-Gaub
014fd710de Merge pull request #10490 from Atlante45/feat/settings-map 
Enable Map/List storage in the settings
 2017-05-17 21:24:04 -07:00
Zach Pomerantz
e8ab780899 include details in critical variantMap parsing error 2017-05-17 21:32:13 -04:00
Stephen Birarda
2ac5fbf91d set wireless scan interval to -1 2017-05-17 15:33:52 -07:00
samcake
ab3ea65d54 Simply add protections when accessing the mip bytes of a texture when provided from a KtxStorage 2017-05-17 12:36:12 -07:00
Atlante45
0d77977936 Enable Map/List storage in the settings 2017-05-17 12:11:15 -07:00
Brad Hefta-Gaub
764bfe94f5 Merge pull request #10336 from trentpolack/feature/snap-turn-smoothing-21270 
Feature/snap turn smoothing 21270
 2017-05-16 21:05:38 -07:00
Brad Hefta-Gaub
254c6e9292 Merge pull request #10441 from Atlante45/feat/launch-sandbox 
Launch the Sandbox as early as possible
 2017-05-16 20:52:23 -07:00
Brad Hefta-Gaub
36c7821e1e Merge pull request #10455 from ZappoMan/TriangleSetOptimizations 
TriangleSet optimizations - ~80% improvement in Ray picking against models
 2017-05-16 20:47:50 -07:00
Atlante45
201f81f20a Don't wait on the sandbox 2017-05-16 14:41:57 -07:00
ZappoMan
149750fe21 make the octree sparse 2017-05-14 08:36:54 -07:00
ZappoMan
5065c7c5c4 more warning fixes 2017-05-13 10:17:59 -07:00
ZappoMan
da404ce2ce fix warning 2017-05-13 09:29:32 -07:00
Vladyslav Stelmakhovskyi
49a45f0300 Merge branch 'master' into market-crash-fix 2017-05-13 14:23:26 +02:00
Vladyslav Stelmakhovskyi
20c27fc133 Fix crash on save Map data settings from scripts 2017-05-13 14:20:28 +02:00
ZappoMan
dcb70aa504 more cleanup 2017-05-12 19:03:08 -07:00
ZappoMan
4af3c760e6 more cleanup 2017-05-12 18:57:33 -07:00
ZappoMan
f1bd06cfa0 cleanup some unneeded class 2017-05-12 18:33:28 -07:00
ZappoMan
89b6a79f68 make sure to exit early if box intersection is already larger than best triangle intersection 2017-05-12 17:56:45 -07:00
ZappoMan
eb3b27849c only keep one copy of Triangles 2017-05-12 17:07:47 -07:00
ZappoMan
ea8330e4e3 Merge branch 'master' of https://github.com/highfidelity/hifi into TriangleSetOptimizations 2017-05-12 13:00:14 -07:00
Brad Hefta-Gaub
a88f72024d Merge pull request #10243 from birarda/bake-textures 
Add an internal tool for domain/model/skybox KTX texture baking
 2017-05-12 12:26:33 -07:00
Clément Brisset
1658ced671 Merge pull request #10437 from Atlante45/feat/faster-startup 
Use baked default skybox
 2017-05-12 11:35:51 -07:00
Seth Alves
4aa683363c back out previous changes, do compressionOptions.setPitchAlignment(4) instead 2017-05-11 16:22:12 -07:00
Atlante45
6378b96b4c CR 2017-05-11 14:41:02 -07:00
Seth Alves
ac2bc39a27 try, try again 2017-05-11 14:10:03 -07:00
Seth Alves
a26f9c7887 make _size const 2017-05-11 13:36:05 -07:00
Atlante45
e0863aa50f Only open files for write if necessary 2017-05-11 11:54:52 -07:00
Seth Alves
dfb9fecf17 pad MemoryStorage size to multiple of 4 rather than using a vector of uint32_t -- this gets the same alignment without needs casts 2017-05-11 07:11:40 -07:00
Seth Alves
c9868640c1 force data in MemoryStorage to be word aligned to avoid crash in glTextureSubImage2D 2017-05-10 18:14:50 -07:00
ZappoMan
a15c5999b5 first cut at octree storage of Triangle Set 2017-05-10 16:58:51 -07:00
trent
a3545661dc Merged hifi/master into this PR and resolved merge conflicts. 2017-05-09 15:09:53 -04:00
Andrew Meadows
2835a73c6b Merge pull request #10071 from AndrewMeadows/walk-up-steps 
avatar can walk up steps
 2017-05-08 18:17:16 -07:00
Andrew Meadows
a31a861e19 fix typo: physcis --> physics 2017-05-05 09:33:50 -07:00
Seth Alves
92966377fb Merge branch 'fix-dont-send-non-entity-edits-over-wire' of github.com:sethalves/hifi into fix-dont-send-non-entity-edits-over-wire 2017-05-04 19:05:57 -07:00
Seth Alves
51cb579773 function to turn nestable-type into a string 2017-05-04 19:05:01 -07:00
Seth Alves
960bab6e4e Merge branch 'master' of github.com:highfidelity/hifi into fix-dont-send-non-entity-edits-over-wire 2017-05-04 16:42:57 -07:00
Brad Davis
2d0bbf70ae Migrate core avatar rendering functionality to library 2017-05-04 14:08:59 -07:00
Seth Alves
69944cc76d add a way to get a SpatiallyNestable's name without knowing what its type is 2017-05-03 21:32:49 -07:00
trent
557a8fffd7 Addressing some PR feedback; moved easeInEaseOut to Interpolate class. My function is faster than andrew's. :D 2017-05-02 19:56:47 -04:00
Brad Davis
425405f72d Merge pull request #10245 from AndrewMeadows/avatar-renderer-002 
more cleanup in preparation for moving Avatar class to lib
 2017-05-02 10:37:22 -07:00
Anthony J. Thibault
2120e63e3a Merge branch 'master' into feature/head-standard-action 2017-04-27 17:51:13 -07:00
Andrew Meadows
75b563d598 restore rendering of avatar receive stats 2017-04-27 13:16:50 -07:00
Andrew Meadows
442080dec7 remove unused RenderArgs::_cameraMode hack 2017-04-27 13:16:50 -07:00
Stephen Birarda
49e7ae6dbc call image library for texture baking 2017-04-26 18:37:35 -07:00
Stephen Birarda
425385d982 leverage settings to remember paths used before 2017-04-26 18:37:35 -07:00
Ryan Huffman
60ba874e2e Fix implementation of mutableData in non-File Storage classes 2017-04-26 18:02:23 -07:00
Ryan Huffman
8d03d50d35 Cleanup progressive ktx debugging 2017-04-26 10:48:57 -07:00
Ryan Huffman
20f4d14e07 Add compressed KTX size evaluation 2017-04-26 10:48:23 -07:00
Ryan Huffman
b20fcbfcdb Add a way to write data to a storage object 2017-04-26 10:45:50 -07:00
Ryan Huffman
00cbfa0f70 Add start of progressive ktx-loading 2017-04-26 10:45:50 -07:00
Anthony J. Thibault
dc19f37726 input/controller routing thru skeleton model and rig. 2017-04-25 15:04:47 -07:00
Andrew Meadows
5a458c9923 remove last qApp usage from Avatar class 2017-04-18 11:52:21 -07:00
Andrew Meadows
685a01482c remove Camera argument from Avatar::render() 2017-04-18 11:52:21 -07:00
Thijs Wenker
6f58e91d76 Merge pull request #10121 from birarda/bug/recording-cache 
cleanup Agent RSI handling, make loadRecording async
 2017-04-14 21:35:51 +02:00
Andrew Meadows
e64e2614e3 Merge pull request #10147 from alhighfidelity/Kinect-Hand-Filter 
Kinect hand filter
 2017-04-12 14:27:05 -07:00
Al Bernstein
c628b23895 removed whitespace 2017-04-06 17:21:58 -07:00
Al Bernstein
e737456dcd used thread safe moving average for the quaternions 2017-04-06 16:56:03 -07:00
Al Bernstein
de1fdfacca made requested changes in PR10147 2017-04-06 16:18:40 -07:00
samcake
5629cf425e Cleaning up the files updated 2017-04-05 13:49:07 -07:00
samcake
6122155880 Renaming the PendingCHanges class to Transaction 2017-04-05 13:10:31 -07:00
Stephen Birarda
c7a28a527a cleanup Agent recording handling, make loadRecording async 2017-04-04 10:56:25 -07:00
David Rowe
405e8cfc9e Fix typo noticed in passing 2017-04-02 12:58:24 +12:00
Seth Alves
4516ddf855 Merge pull request #9847 from highfidelity/tablet-ui 
Tablet ui
 2017-03-28 14:48:02 -07:00
Seth Alves
1cf6945bf2 pass radials argument to AABox::touchesAAEllipsoid as const reference 2017-03-28 11:12:00 -07:00
Seth Alves
9789476a73 handle case where AAEllipsoid is entirely inside the AABox 2017-03-28 10:57:03 -07:00
Seth Alves
9e675d4c93 Merge pull request #9990 from hyperlogic/bug-fix/sliders 
Added inputMode property to Web3DOverlay
 2017-03-28 10:07:37 -07:00
Seth Alves
59da607d07 Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-2 2017-03-24 15:08:23 -07:00
Seth Alves
8f7f5efade new javascript call: Model.newMesh() 2017-03-24 12:51:00 -07:00
Seth Alves
902e3d41d6 merge from upstream 2017-03-24 08:20:35 -07:00
Brad Hefta-Gaub
9a38b36f59 Merge pull request #9970 from Triplelexx/21223 
21223 - Quat functions have naming inconsistencies
 2017-03-24 08:12:11 -07:00
Anthony J. Thibault
bab9890fea Added inputMode property to Web3DOverlay. 
This allows user to switch between Touch messages and Mouse messages.
Added a sliderTestMain.js script which demonstrates this behavior.
 2017-03-23 13:54:18 -07:00
Seth Alves
f5680def55 Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-2 2017-03-23 09:55:41 -07:00
Seth Alves
ff3fc244d1 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-23 09:50:53 -07:00
Seth Alves
df875ab504 make RenderablePolyVoxEntityItem::setSphere affect any voxel the sphere touches rather than just the ones whose center the sphere touches 2017-03-22 16:21:45 -07:00
Triplelexx
b7980569cc change all references of IDENTITY_FRONT to IDENTITY_FORWARD 2017-03-21 22:13:33 +00:00
Brad Davis
e482eac437 Merge remote-tracking branch 'upstream/master' into smarter_textures 2017-03-20 16:22:13 -07:00
Brad Davis
14c8c3f4db Return existing textures when matching hash for a previously found live texture 2017-03-20 09:39:29 -07:00
Chris Collins
308c134119 Merge pull request #9686 from humbletim/21114-part3 
CR 21114 -- Implement modules/require support into hifi
 2017-03-20 06:22:35 -07:00
Seth Alves
424af2255b Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-19 21:17:30 -08:00
humbletim
758c07c7d4 Merge branch 'master' into 21114-part3 2017-03-16 14:29:17 -04:00
humbletim
366c90ef6a add Q_ASSERT to IS_THREADSAFE_INVOCATION 2017-03-16 01:28:50 -04:00
samcake
0399249a03 Expeand the wireframe to the primitive entities and the polyvox 2017-03-15 16:58:31 -07:00
Seth Alves
b5919d89a5 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-15 08:26:10 -08:00
Brad Davis
eab91d061d Merge pull request #9868 from zzmp/ktx/local-not-roaming 
Use Local for WIN32 FileCache
 2017-03-13 15:52:11 -07:00
Brad Davis
3bef5ad528 Merge remote-tracking branch 'upstream/master' into smarter_textures 2017-03-13 14:30:25 -07:00
Zach Pomerantz
808973d7d2 use QStandardPaths instead of hardcoded paths 2017-03-13 17:26:42 -04:00
Zach Pomerantz
172a638ef0 move resource paths to PathUtils 2017-03-13 17:26:34 -04:00
Andrew Meadows
546f32431d Merge pull request #9862 from ZappoMan/fadeInWhenOpeningNoiseGate 
Various noise gate, scope, and audio stats improvements
 2017-03-13 11:52:16 -07:00
Brad Hefta-Gaub
a38965d628 add more audio stats 2017-03-11 09:50:30 -08:00
Brad Davis
399270d243 Still trying to fix OSX build 2017-03-08 09:03:59 -08:00
Bradley Austin Davis
62fcd238ae Fix shared pointer usage in storage abstraction 2017-03-08 09:03:58 -08:00
Brad Davis
e94f803b84 Merge remote-tracking branch 'upstream/master' into HEAD 2017-03-08 09:03:21 -08:00
Seth Alves
509ce3f2d2 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-03-07 18:41:36 -08:00
Brad Hefta-Gaub
8ae6f2727d add support for double click messages to overlays and entities 2017-03-07 17:52:55 -08:00
Seth Alves
71c2b4215d Merge pull request #9811 from ZappoMan/triangleSet 
Cleanup how Models do ray-picking and determination of point inside of convex hull
 2017-03-07 14:12:56 -08:00
humbletim
40ba8185a0 * Update per 21114-part2 changes. 
* Add explicit thread safety guards.
* Add Entities.queryPropertyMetdata for unit testing Entity script module support.
* Cleanup / commenting pass.
 2017-03-07 16:36:07 -05:00
humbletim
9b09651337 Move BaseScriptEngine from script-engine to shared. 2017-03-07 16:34:24 -05:00
Ryan Huffman
a744e0d11c Merge pull request #9685 from humbletim/21114-part2 
CR-2 21114 -- BaseScriptEngine.cpp, order-of-operations fixes, reworked JS Exceptions
 2017-03-07 13:25:25 -08:00
Brad Hefta-Gaub
f7e824e47c Merge branch 'master' of https://github.com/highfidelity/hifi into triangleSet 2017-03-07 12:18:36 -08:00
Seth Alves
b938579598 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-03-07 11:42:44 -08:00
Brad Hefta-Gaub
87934ee82d fix bugs in some meshes 2017-03-06 21:50:32 -08:00
Brad Davis
8782fe1d93 Merge branch 'master' into smarter_textures 
Conflicts:
	libraries/model-networking/src/model-networking/TextureCache.cpp
 2017-03-06 15:29:41 -08:00
Andrew Meadows
10b3e7fc67 sphere shapeType for models means 'sphere' 2017-03-06 15:14:51 -08:00
Brad Hefta-Gaub
f27475613f Merge branch 'master' of https://github.com/highfidelity/hifi into triangleSet 2017-03-06 12:53:59 -08:00
ZappoMan
faba160331 more CR feedback 2017-03-06 11:10:04 -08:00
ZappoMan
af97e9bdd9 CR feedback 2017-03-06 10:49:38 -08:00
Seth Alves
93246b24b0 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-03-06 08:54:49 -08:00
ZappoMan
87bcced409 cleanup use of triangleSet for picking 2017-03-05 19:23:55 -08:00
Ken Cooke
0bababf1f5 Safe replacement of glm_mat4_mul() for unaligned arguments instead of __m128 2017-03-04 14:53:07 -08:00
ZappoMan
9908723bb9 fist cut at basic TriangleSet class 2017-03-03 22:27:38 -08:00
Anthony J. Thibault
bc256f3e8f Fix for multi-threaded access to maps in DebugDraw. 2017-03-02 14:42:06 -08:00
Seth Alves
cf37845f9e Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-03-02 10:06:38 -08:00
Bradley Austin Davis
fa5b315e09 Merge remote-tracking branch 'upstream/master' into smarter_textures 2017-03-01 15:16:18 -08:00
Anthony J. Thibault
01abb4bdb6 Exposed DebugDraw interface to Java Script 2017-03-01 13:14:29 -08:00
Seth Alves
88c850afa2 voxel-paint paints with capsules rather than spheres 2017-02-26 12:56:17 -08:00
samcake
e8835b34f4 fix issues while testing the ktxStorage 2017-02-22 19:05:20 -08:00
samcake
262d7c3b79 Merging with upstream smarter_textures and Austin's pr 2017-02-22 17:54:38 -08:00
Brad Davis
c6b72dfe3c Make memory storage mutable 2017-02-22 13:29:08 -08:00
Seth Alves
a6b4f07674 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-02-22 12:07:31 -08:00
samcake
6938948501 Merge branch 'master' of https://github.com/highfidelity/hifi into texmex 2017-02-22 12:00:11 -08:00
Seth Alves
84b93826d0 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-02-22 09:30:16 -08:00
Brad Hefta-Gaub
a526db1779 Merge branch 'master' of https://github.com/highfidelity/hifi into avatarMixerLoopImprovements 2017-02-21 14:18:36 -08:00
Brad Davis
27e8750b9b Adding new storage backing for gpu::Texture, moving mip format into Storage abstraction 2017-02-19 18:11:56 -08:00
Brad Davis
285222d490 Add view storage 2017-02-17 12:49:55 -08:00
Brad Davis
d1b91cb436 Adding abstracted storage for in-memory or file backed data 2017-02-17 10:13:08 -08:00
Stephen Birarda
78301fd947 call getParentPointer when parent ID changes to update children 2017-02-16 16:46:09 -08:00
Seth Alves
21b0e45b0f don't show keyboard in edit.js unless HMD is being worn 2017-02-16 09:56:50 -08:00
humbletim
b15956278c separate out supporting changes into 21114-part2 branch 2017-02-16 07:40:19 -05:00
Brad Hefta-Gaub
faa8e629a0 checkpoint 2017-02-15 20:28:32 -08:00
Seth Alves
1038e97c7f fix windows build 2017-02-15 11:14:23 -08:00
Seth Alves
792c7ff51f PointerEvent will now relay keyboard modifiers 2017-02-15 10:41:56 -08:00
Seth Alves
bc5f563f57 make _parentID and _parentJointIndex private to avoid accidental direct access 2017-02-12 11:37:29 -08:00
Atlante45
2962dd6dc2 Factor LogDialog 2017-02-09 13:04:43 -08:00
Brad Hefta-Gaub
74f10a1e7f Merge pull request #9603 from huffman/feat/trace-thread-script 
Add thread names and scripts to chrome traces
 2017-02-09 13:00:05 -08:00
Andrew Meadows
a871613f84 make Settings::remove() work for groups 2017-02-08 11:49:40 -08:00
Anthony Thibault
caefb6c711 Merge pull request #9620 from hyperlogic/bug-fix/find-entity-bug 
Fix for findEntities not returning some entities that are within range.
 2017-02-06 20:22:34 -08:00
Anthony J. Thibault
a14dcbd513 Fix for findEntities not returning some entities that are within range. 
This bug has been around a long time... introduced by commit 39ed7f7b in 2014.
This became apparent to me when testing the tablet-ui, there was a case where the
hand styluses were not appearing when close to a web entity.  Because findEntities
is such a fundamental feature used by handControllerGrab, this fix should make all
grabbing feel more consistent and predictable.

I added a unit test that reproduces the issue.
 2017-02-06 15:13:25 -08:00
Seth Alves
ad83f20199 make findAncestorOfType understand AVATAR_SELF_ID 2017-02-03 16:43:36 -08:00
Seth Alves
c7200d2d3a make hasAncestorOfType understand AVATAR_SELF_ID 2017-02-03 16:14:15 -08:00
Ryan Huffman
55df6f8f76 Add tracing to ScriptEngine and EntitiesScriptingInterface 2017-02-03 09:45:33 -08:00
Ryan Huffman
a5e61184bf Add support for adding thread names to a trace 2017-02-03 09:18:51 -08:00
Brad Hefta-Gaub
3bbb57599b Merge pull request #9565 from kencooke/cpudetect-gcc-bugfix 
Fix bug that causes GCC not to detect AVX2
 2017-01-31 11:11:35 -08:00
Brad Hefta-Gaub
cff49ea5f3 Merge pull request #9556 from samcake/blue 
Adding support for disabling texturing from the material
 2017-01-31 10:39:44 -08:00
Seth Alves
7c2957cfa7 merge from upstream 2017-01-31 08:57:36 -08:00
Ken Cooke
2ce357db3a Fix bug that causes GCC not to detect AVX2 2017-01-30 17:11:48 -08:00
samcake
3c56bd2960 Adding support for disabling texturing from the material 2017-01-30 15:03:04 -08:00
Andrew Meadows
8cf7aee009 fix bug: second collision event with bad data 2017-01-30 13:21:23 -08:00
Seth Alves
fa61bbe2a6 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-26 18:21:39 -08:00
ZappoMan
4c80422a73 Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo 2017-01-26 14:34:58 -08:00
Seth Alves
db38503d57 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-26 13:48:59 -08:00
samcake
19858bda78 Merge pull request #9493 from AndrewMeadows/otherAvatars 
optimize, prioritize, and timebox processing of avatar updates
 2017-01-26 13:30:51 -08:00
Seth Alves
0b51b1d566 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-26 11:00:02 -08:00
Brad Hefta-Gaub
0c9e42e2d9 Merge pull request #9486 from huffman/fix/overlay-parent-reg-point 
Fix Overlay-as-child of model entity with reg point
 2017-01-26 10:59:01 -08:00
Andrew Meadows
d8a10320d1 fix warning about implicit cast 2017-01-26 08:35:25 -08:00
ZappoMan
3c3dcbbbaa Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo 2017-01-26 08:20:03 -08:00
Seth Alves
c317ba8054 merge from upstream 2017-01-25 15:57:53 -08:00
Atlante45
f540c94113 Merge branch 'master' of https://github.com/highfidelity/hifi into ess-pr 2017-01-25 13:06:49 -08:00
ZappoMan
cb812ca506 CR feedback 2017-01-24 12:06:31 -08:00
Ryan Huffman
f0f5f8871c Fix Overlay-as-child of model entity with reg point 
This fixes as issue where when you set the parent of an overlay to be a
model entity with a non-(0.5, 0.5, 0.5) registration point, the overlay would
still be positioned relative to the center of the model. The issue is
that the default parent joint index was 0, which is the center of the
model.

Entities had a default parent joint index of -1 (technically 65535
because it is a uint16). Avatars previously defaulted to 0, and that is
maintained here.
 2017-01-23 16:08:01 -08:00
ZappoMan
6801099cd9 more cleanup 2017-01-23 16:03:07 -08:00
ZappoMan
29fff2e556 Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo 2017-01-23 13:09:59 -08:00
Seth Alves
be8bc9652b Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-23 09:44:04 -08:00
Stephen Birarda
5c5c69fff3 setup the repeated message flusher on LogHandler thread 2017-01-20 11:20:48 -08:00
Andrew Meadows
10cdea9cd8 cleanup model fade logic 2017-01-19 14:17:50 -08:00
Seth Alves
b57803057d Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-18 06:38:44 -08:00
Brad Davis
a593a2116a Removing magic numbers 2017-01-17 18:15:40 -08:00
Brad Davis
cbc89e77ab Consume fewer resources in AssetServer when interface is running locally 2017-01-17 18:15:39 -08:00
Seth Alves
6bace4f451 merge from upstream 2017-01-17 09:29:30 -08:00
Stephen Birarda
1993e358d6 Merge pull request #9318 from birarda/ovr-platform-entitlement 
handle OVR Platform entitlement checks
 2017-01-16 11:16:31 -08:00
ZappoMan
fe06dfdca7 tweak audioLoudness packing 2017-01-11 18:58:43 -08:00
ZappoMan
0661531e3a try another version of an 8bit audio loudness 2017-01-11 17:51:12 -08:00
ZappoMan
5b76eaaf52 Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo 2017-01-11 10:22:14 -08:00
Seth Alves
bacc796730 Merge branch 'master' of github.com:highfidelity/hifi into update-tablet-ui-again 2017-01-11 09:54:26 -08:00
Brad Davis
1dd2747ef9 Push some tracing into 'detail' categories for easy filtering. Add new tracing categories, add counter change tracking. 2017-01-10 10:44:04 -08:00
Seth Alves
eb4a2b0af5 Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-grab-no-patch 2017-01-10 09:13:34 -08:00
Seth Alves
4a29cce584 adjust when USER_COLLISION_GROUP_MY_AVATAR is auto-disabled 2017-01-10 06:17:40 -08:00
samcake
8c7ec8b0c5 Add profiling in COntext batch execution and shortcuts for trace names 2017-01-09 18:05:02 -08:00
Seth Alves
45a26d599f if something is a child of the local avatar, never let it collide with MY_AVATAR 2017-01-09 16:40:28 -08:00
ZappoMan
636ade9eb7 Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo 2017-01-09 11:29:54 -08:00
Ryan Huffman
39070fe0d1 Merge pull request #9065 from huffman/fix/script-engine-abuse 
Fix deleteLater() vulnerability in scripts
 2017-01-09 11:02:28 -08:00
Chris Collins
30d5f70e11 Merge pull request #9278 from jherico/cpu_opt_scene 
More low level optimizations
 2017-01-09 10:10:40 -08:00
Stephen Birarda
46086cdcce set the OCULUS_STORE property with oculus store arg 2017-01-05 14:02:35 -08:00
Brad Hefta-Gaub
5242375215 Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo 2017-01-05 08:57:10 -08:00
Brad Hefta-Gaub
825fc1cfa1 Merge pull request #9309 from kencooke/audio-hdr-volume 
High Dynamic Range Audio injectors
 2017-01-05 08:10:54 -08:00
Brad Hefta-Gaub
acca9dbe87 Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo 
Conflicts:
	libraries/networking/src/udt/PacketHeaders.cpp
	libraries/networking/src/udt/PacketHeaders.h
 2017-01-04 18:07:22 -08:00
Ken Cooke
afacb59999 Use logarithmic quantization of injector "volume" over the wire. 
Allow gains > 1.0 (up to +30dB)
Better quantization at low levels (uniform steps in dB)
 2017-01-04 15:38:26 -08:00
Atlante45
56a25dfdee Check setting value changed 2017-01-04 11:56:24 -08:00
Ryan Huffman
601aa51392 Merge branch 'master' into fix/script-engine-abuse 2017-01-04 08:09:06 -08:00
Brad Hefta-Gaub
60d48bcd49 Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo 2017-01-03 14:42:59 -08:00
Brad Hefta-Gaub
84eca0159e Merge branch 'master' of https://github.com/highfidelity/hifi into improveInterval 
Conflicts:
	tests/networking/src/ResourceTests.cpp
 2016-12-29 16:42:52 -08:00
Brad Hefta-Gaub
a72f60152b audit use of QTimer intervals to make sure we're using Qt::PreciseTimer when appropriate 2016-12-29 08:53:37 -08:00
Andrew Meadows
be0ca41eb3 make implicit cast explicit 2016-12-28 18:27:34 -08:00
Brad Davis
694c8b5690 Further reduce cost of Duration class when tracing is inactive 2016-12-28 12:37:47 -08:00
Brad Davis
d2179b1acf Reduce tracing impact if tracing isn't active 2016-12-28 12:11:26 -08:00
Brad Hefta-Gaub
73bfc069da more work on only sending changes 2016-12-27 17:19:55 -08:00
Brad Davis
901c020aae Optimizations, SIMD and const correctness 2016-12-27 15:39:38 -08:00
Seth Alves
1cb330057e fix a crash and a memory leak in vhacd-util 2016-12-23 13:05:57 -08:00
Brad Hefta-Gaub
d09afa9454 Merge branch 'master' of https://github.com/highfidelity/hifi into addViewFrustumToAvatarMixer 
Conflicts:
	assignment-client/src/avatars/AvatarMixer.h
	assignment-client/src/avatars/AvatarMixerClientData.h
	libraries/avatars/src/AvatarData.cpp
	libraries/networking/src/udt/PacketHeaders.h
 2016-12-20 16:25:12 -08:00
Brad Hefta-Gaub
c2320d317c Merge branch 'master' of https://github.com/highfidelity/hifi into removeLogSpam 2016-12-20 14:34:57 -08:00
Brad Hefta-Gaub
dbbed462b4 cleanup naked qDebug() calls 2016-12-19 22:24:25 -08:00
Brad Davis
9b0d0b3e7a Updates to tracing, removing log spam 2016-12-19 15:12:48 -08:00
Brad Davis
2d73588361 Fix stat tracker missing in agents 2016-12-16 17:34:00 -08:00
Brad Davis
30a9961362 tracing polish 2016-12-16 14:02:27 -08:00
Brad Davis
a12b8b4b62 Cleanup dead code 2016-12-16 09:21:41 -08:00
Ryan Huffman
7bb2755913 Add chrome tracing support 2016-12-16 01:14:01 -08:00
Brad Hefta-Gaub
8497ad1e29 Merge branch 'master' of https://github.com/highfidelity/hifi into addViewFrustumToAvatarMixer 2016-12-15 16:42:41 -08:00
Seth Alves
26639aac15 Merge pull request #8789 from Atlante45/fix/settings 
Use JSON for application Settings
 2016-12-15 07:00:46 -08:00
Brad Hefta-Gaub
7189f766a2 more hacking 2016-12-13 20:56:41 -08:00
Brad Hefta-Gaub
a7750501c6 first cut at adding view frustum support to avatar mixer 2016-12-13 18:58:11 -08:00
samcake
9155f11b3d Merge pull request #9190 from jherico/test_mode 
Add test mode to interface
 2016-12-12 15:37:05 -08:00
Brad Davis
2a43f5fbef Add test mode to interface 2016-12-12 14:51:11 -08:00
Zach Fox
7030c7b0a6 Space bubble improvements (#9142) 
* The space bubble around a player's avatar is now visualized. When another avatar enters a player's bubble, The bubble visualization will appear, a soft tone will play, and the "Bubble" HUD button will flash.
* The space bubble radius setting has been removed. Space bubble size now scales based on avatar scale.
* Space bubble collision detection is now more accurate and reliable.
* CTRL + N toggles the bubble.
* The "Bubble" HUD button has been moved to the proper location.
 2016-12-12 14:22:54 -08:00
Bradley Austin Davis
3fcd45a236 Optimized method for transforming axis aligned bounding boxes 2016-12-08 10:59:14 -08:00
Brad Hefta-Gaub
b97012fc97 Merge pull request #9137 from jherico/msvc2015 
Fixes for building on MSVC 2015 / Qt 5.8
 2016-12-06 10:25:16 -08:00
Anthony J. Thibault
89ae3b3d6e Revert "Merge pull request #8691 from highfidelity/out-of-body-experience" 
This reverts commit efe9571ab8, reversing
changes made to 333e9ec7f4.
 2016-12-05 15:18:03 -08:00
Brad Davis
5cbf7588ac Fixes for building on MSVC 2015 / Qt 5.8 2016-12-02 14:58:09 -08:00
Seth Alves
efe9571ab8 Merge pull request #8691 from highfidelity/out-of-body-experience 
Room Scale HMD comfort features.
 2016-12-01 11:09:39 -08:00
Andrew Meadows
2bbe2be516 fix spelling: physcis --> physics 2016-12-01 10:50:10 -08:00
Atlante45
e6b9d3604d Merge branch 'master' of https://github.com/highfidelity/hifi into fix/settings 2016-12-01 09:45:50 -08:00
Atlante45
1d8c97b337 Merge branch 'master' of https://github.com/highfidelity/hifi into fix/settings 2016-11-30 10:22:16 -08:00
Brad Davis
a98e49c892 Fix build errors 2016-11-29 14:02:15 -08:00
Brad Davis
3b07e31eab Working on OpenGL debuggability 2016-11-29 13:15:56 -08:00
Atlante45
3035d43772 Merge branch 'master' of https://github.com/highfidelity/hifi into fix/settings 2016-11-21 13:05:08 -08:00
samcake
9031e65aa5 Merge and fix the bug!!! 2016-11-16 19:12:56 -08:00
Chris Collins
44b2b090df Merge pull request #9010 from samcake/orange 
Improve Input Stage Format switching in GL45Backend
 2016-11-16 14:00:17 -08:00
Ryan Huffman
75eafbb349 Add docs to Paths 2016-11-16 12:11:32 -08:00
Andrew Meadows
6bb3dd6830 Merge hifi/master into hifi/out-of-body-experience 2016-11-14 15:08:04 -08:00
samcake
b888af15e4 Fix merge 2016-11-14 11:15:27 -08:00
samcake
a05e42138c Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-11-14 09:58:12 -08:00
Ryan Huffman
51586ae0a3 Fix log typo in SpatiallyNestable 2016-11-14 09:06:11 -08:00
Seth Alves
9868ddd602 global/static QStrings in plugins appear to cause crashes during shutdown 2016-11-13 10:22:14 -08:00
Clément Brisset
e38da75115 Merge pull request #9053 from huffman/feat/whitelist-ac-ip 
Add AC ip address whitelist to domain server
 2016-11-11 15:03:21 -08:00
Ryan Huffman
e1466c0d47 Fix NULL -> nullptr 2016-11-11 10:21:58 -08:00
samcake
00addcad9e Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-11-10 17:57:34 -08:00
Chris Collins
5b91c8f32b Merge pull request #8984 from sethalves/fix-setLocalJointRotation-name 
fix names of model-entity joint setters
 2016-11-10 13:39:14 -08:00
samcake
cab699464e Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-11-07 17:31:06 -08:00
Seth Alves
c8a654a915 Merge pull request #9006 from Atlante45/logging 
Logging improvements
 2016-11-07 13:35:13 -08:00
Andrew Meadows
ccdf383151 Merge hifi/master into hifi/out-of-body-experience 2016-11-07 08:24:26 -08:00
samcake
f274ef1a59 Merging back with upstream and trying to fix counter for them to be more stable 2016-11-04 16:56:03 -07:00
samcake
e12040a98a Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-11-04 14:54:18 -07:00
Brad Hefta-Gaub
2684aed523 Merge pull request #8995 from AndrewMeadows/avoid-zero-quaternion 
normalize quaternions submitted to C++ from JS
 2016-11-04 14:34:42 -07:00
Atlante45
ae29fe8ab2 Logging improvements 2016-11-04 14:26:19 -07:00
Seth Alves
727fe4bc21 Merge branch 'master' of github.com:highfidelity/hifi into fix-setLocalJointRotation-name 2016-11-04 10:04:56 -07:00
Andrew Meadows
4b623f72c3 compute correct volume for ellipsoid 2016-11-03 18:05:50 -07:00
Andrew Meadows
0d2cec290d use convexHull for ellipsoidal "spheres" 2016-11-03 17:56:38 -07:00
Andrew Meadows
3ed3a74b7d oops, don't forget to remove the sqrt 2016-11-03 17:08:42 -07:00
Andrew Meadows
c9c0b9ebc4 tighten rejection of zero-length quaternions 2016-11-03 17:01:09 -07:00
Andrew Meadows
757ec5fff4 normalize quaternions submitted from scriptland 2016-11-03 16:02:39 -07:00
Seth Alves
339d6a55cf getLocalJointRotation getLocalJointTranslation, started on getLocalJointTranslation getLocalJointRotation 2016-11-03 10:06:07 -07:00
samcake
6926cd274c Merge with upstream 2016-11-02 18:15:08 -07:00
samcake
3c777bb079 Clenaing up the detection phase to get all the iformation from DXGI 2016-11-02 12:29:51 -07:00
Seth Alves
844cc03dcb fix names of model-entity joint setters 2016-11-02 10:24:01 -07:00
samcake
49f1590e01 Start detecting all the gpus 2016-11-01 16:51:57 -07:00
samcake
861944ba71 Try uing DXGI on windows instead of com 2016-11-01 11:12:47 -07:00
samcake
a23bbd1e4e Trying to extend the memory counter 2016-10-31 16:40:15 -07:00
Seth Alves
f47aeae2a7 stop passing bare pointers to EntityTreeRenderer all around 2016-10-27 10:10:22 -07:00
Andrew Meadows
38e4ac0ae9 Merge master into out-of-body-experience 2016-10-26 16:59:31 -07:00
Seth Alves
3903a51062 fix a couple of crash-on-exits 2016-10-25 13:58:48 -07:00
Brad Hefta-Gaub
da0d1f1f13 Merge pull request #8896 from ZappoMan/i5SandboxHeartbeat 
actually make the RunningMarker run on a different thread
 2016-10-25 08:47:06 -07:00
Brad Hefta-Gaub
4cb693315f CR feedback 2016-10-25 08:31:23 -07:00
Chris Collins
9846614468 Merge pull request #8879 from AndrewMeadows/show-physics-stats 
add Bullet profile info to PerformanceTimer stats
 2016-10-25 06:29:27 -07:00
Brad Hefta-Gaub
ae6022c498 actually make the RunningMarker run on a different thread 2016-10-24 18:55:25 -07:00
Andrew Meadows
51a9a99381 Merge hifi/master into hifi/out-of-body-experience 2016-10-24 08:13:42 -07:00
Andrew Meadows
e44672180a add Bullet profile info to PerformanceTimer stats 2016-10-21 13:22:22 -07:00
Seth Alves
8ac799ddaf Merge branch 'master' of github.com:highfidelity/hifi into fix-audio-mixer-data-race-1 2016-10-20 10:02:58 -07:00
Chris Collins
98e7d6d0eb Merge pull request #8843 from sethalves/fix-audio-mixer-data-race-0 
Fix some audio mixer data races
 2016-10-20 10:01:26 -07:00
Brad Hefta-Gaub
9008de72e0 Merge pull request #8864 from hyperlogic/feature/grab-sphere-adjustments 
Adjustment to position and visibility of grab sphere.
 2016-10-19 21:51:02 -07:00
Anthony J. Thibault
bcd31e3d99 Adjust size and offset of grab balls to better align with hand controllers. 
(cherry picked from commit d97a8c2e7eace2494d3142e8187022a33aedc060)
 2016-10-19 15:59:26 -07:00
Seth Alves
2e73330e8e quiet warnings in Linux build 2016-10-18 17:47:47 -07:00
Seth Alves
a801f27c7c Merge branch 'fix-audio-mixer-data-race-0' of github.com:sethalves/hifi into fix-audio-mixer-data-race-1 2016-10-18 17:34:22 -07:00
Seth Alves
72998b190c Merge branch 'master' of github.com:highfidelity/hifi into fix-audio-mixer-data-race-0 2016-10-18 17:33:57 -07:00
Seth Alves
af5be8d1d9 reduce data-races in logging 2016-10-18 15:59:00 -07:00
Atlante45
f143e9bf3f Register SequenceNumber and time_point 2016-10-18 15:54:25 -07:00
Seth Alves
0c6dedff45 avoid various data-races related to stats collection and delivery 2016-10-18 13:05:53 -07:00
Brad Hefta-Gaub
d5c87a0db6 CR feedback 2016-10-17 12:02:23 -07:00
Brad Hefta-Gaub
d46170bec0 auto shutdown of sandbox when interface quits 2016-10-17 07:55:24 -07:00
Atlante45
36bd9ef4e6 Update new ACClientApp code 2016-10-12 14:02:05 -07:00
Andrew Meadows
d54c07ed14 Merge 'master' into 'out-of-body-experience' 2016-10-12 13:35:27 -07:00
Atlante45
5bae69bb51 Fix DS 2016-10-12 10:20:19 -07:00
Atlante45
d5429e76da Warnings fixes and cleanup 2016-10-12 10:20:19 -07:00
Atlante45
cc574c3e05 Fix string mishandling 2016-10-12 10:20:19 -07:00
Atlante45
e5d54fc6bc Move helpers to their own file 2016-10-12 10:20:19 -07:00
Atlante45
eaca3b672f Switch to JSON for application settings 2016-10-12 10:20:19 -07:00
samcake
5def24a5ac Merging... 2016-10-07 17:09:00 -07:00
Andrew Meadows
55c90e7bca Merge branch 'master' into out-of-body-experience 2016-10-07 15:18:08 -07:00
Ryan Huffman
e24a01d1fe Add path parameter to goToSandbox 2016-10-07 10:30:18 -07:00
samcake
3d99179e3f Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-10-06 18:15:53 -07:00
samcake
6f7f949343 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-10-06 09:35:48 -07:00
Seth Alves
7b5106afd8 Merge branch 'possible-fix-for-domain-server-crash' of github.com:sethalves/hifi into ac-client 2016-10-05 19:36:59 -07:00
Anthony J. Thibault
cc7a6ada38 Merge branch 'master' into out-of-body-experience 2016-10-05 17:16:39 -07:00
Clément Brisset
476ccadb38 Merge pull request #8732 from huffman/feat/category-in-logs 
Add category to log lines
 2016-10-05 13:29:41 -07:00
Clément Brisset
d18394f249 Merge pull request #8596 from huffman/feat/my-avatar-self-id 
Add ability to parent overlays to MyAvatar for use across servers
 2016-10-05 12:03:01 -07:00
Ryan Huffman
2bb2aca2be Remove commented line in LogHandler 2016-10-04 16:54:37 -07:00
Ryan Huffman
a52e2d8bc5 Add category to log lines 2016-10-04 16:49:24 -07:00
Seth Alves
7261fcae4a possible fix for domain-server crash-on-exit 2016-10-04 14:35:23 -07:00
Anthony J. Thibault
aab974e6ae Merge branch 'master' into out-of-body-experience 2016-10-04 11:17:52 -07:00
samcake
64c2488155 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-10-04 11:03:31 -07:00
Ryan Huffman
0b2def6013 Fix style error 2016-10-03 15:23:39 -07:00
Ryan Huffman
e213a47814 Fix incorrect return values in getProcessorInfo 2016-10-03 15:19:03 -07:00
Ryan Huffman
dafb5c5bab Add processor information to launch user activity event 2016-10-03 15:11:56 -07:00
Anthony J. Thibault
eccd01e88f Merge remote-tracking branch 'upstream/master' into out-of-body-experience 2016-09-29 16:36:25 -07:00
samcake
9b94a025fc Refining the voxelization of the sphere in the view frustum grid 2016-09-26 18:41:53 -07:00
Anthony Thibault
10c5da5728 Smooth transition of hands from in-body to out-of-body modes. 2016-09-24 14:28:56 -07:00
Anthony J. Thibault
f4c4b3474b capsule projection and distance tests now work for non-vertical capsules 2016-09-23 16:55:38 -07:00
Zach Pomerantz
a9318d052b Merge branch 'master' of github.com:highfidelity/hifi into clean/audio-config 2016-09-23 13:11:52 -07:00
Brad Davis
2a058fa419 Add file logging to perf tool 2016-09-23 12:04:59 -07:00
Brad Davis
f33d3a3b36 Migrate logging functionality to shared library 2016-09-23 12:04:58 -07:00
Anthony J. Thibault
98ffea2fb9 Merge branch 'master' into out-of-body-experience 2016-09-22 18:08:23 -07:00
Zach Pomerantz
e2ff738fc3 strip unused audio settings 
- remove parameters on the jitter buffer algorithm, these are now static
- remove parameters on the output starve detection algorithm, now static
- move interface audio settings to the Developer menu
 2016-09-21 17:35:27 -07:00
Seth Alves
4470338663 catagorize some qDebugs 2016-09-14 21:39:45 -07:00
samcake
11c6bb7d80 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-09-13 17:44:42 -07:00
Ryan Huffman
5e8c8f84b5 Handle edge cases of AVATAR_SELF_ID being used with entities 2016-09-13 16:34:05 -07:00
Ryan Huffman
23450e929b Add special avatar id for attaching overlays 2016-09-13 16:33:58 -07:00
David Rowe
fe8b3b4d0d Merge branch 'master' into 21040 2016-09-13 09:12:47 +12:00
Anthony J. Thibault
baee5180c1 Moved outOfBody detection into MyAvatar::FollowHelper 
in preparation for different follow behavior for in-body and out-of-body.
 2016-09-12 11:52:27 -07:00
samcake
3bcea4310d Fixing the vizualisation shader for world to cluster space 2016-09-10 10:41:18 -07:00
samcake
108910052a Adding the reverse transformation 2016-09-09 19:00:54 -07:00
Brad Davis
ecfe56085d GLM update and GLI integration 2016-09-09 10:18:15 -07:00
David Rowe
38c2efa22f Implement Entities.findInFrustum() method 2016-09-09 18:57:48 +12:00
Brad Hefta-Gaub
3d54600843 Merge pull request #8513 from Atlante45/feat/network-port 
Add settings to change local port
 2016-09-08 18:10:32 -07:00
samcake
61de063b29 Developping the Light Clusters, adding visualization 2016-09-08 18:02:35 -07:00
Atlante45
006780fe8e Indentation 2016-09-08 14:29:43 -07:00
sam
248f172832 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-09-06 23:37:16 -07:00
SamGondelman
b048637c26 fix signal issue and qabstract::socket issue 2016-09-06 17:36:52 -07:00
Atlante45
fcf44911a3 Fix Windows warning 2016-09-06 10:18:42 -07:00
Atlante45
a8de6f0a57 Add settings to change local port 2016-09-06 10:18:42 -07:00
samcake
0c0109e427 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-09-01 15:20:34 -07:00
samcake
354cbbc927 Investigate why the disable depth Bclamp doesn't work 2016-08-31 19:14:35 -07:00
Stephen Birarda
85ba0f36cf fix controllers/shared compile for android interface port 2016-08-31 16:34:31 -07:00
samcake
b563e280e4 Commuting the LIghtEntityItem changes correctly to the LightRenderItem 2016-08-31 13:55:41 -07:00
Anthony J. Thibault
e34aecde49 Bug fix for click events received by entity scripts 
PointerEvent.isLeftButton should be true even on left button release events.
in a previous PR this behavior was changed. isLeftButton was used as a flag indicating the button state, which would be false on left button release events.
Because we have scripts that rely on the old behavior, I've changed it back to the original and introduced isPrimaryHeld properties instead.
 2016-08-29 16:21:39 -07:00
Andrew Meadows
af1be8ccd4 remove whitespace 2016-08-24 22:25:45 -07:00
Anthony J. Thibault
d015c5cfb5 Merge branch 'master' into feature/hand-controller-web-entity-integration 2016-08-22 14:13:17 -07:00
Seth Alves
87dbfa7e47 add -Wsuggest-override to compile flags and deal with fallout 2016-08-18 09:51:41 -07:00
Anthony J. Thibault
7b248b440a Merge branch 'master' into feature/hand-controller-web-entity-integration 2016-08-17 13:55:12 -07:00
Anthony J. Thibault
7de8cc6422 Merge branch 'master' into feature/hand-controller-web-entity-integration 2016-08-16 16:49:57 -07:00
Seth Alves
7bc1235c54 local velocity and angular velocity in scripts is now handled the way local position and rotation are 2016-08-16 16:47:13 -07:00
Anthony J. Thibault
c407818d63 send pointer events from handControllerGrab.js to webEntities 2016-08-16 15:26:14 -07:00
Brad Davis
d548da02d9 Expose whether nsight is running to the app, disable some stuff under nsight 2016-08-12 22:28:50 -07:00
Brad Davis
42dcae72cb Use ranges instead of stacks for nSight 2016-08-12 22:28:46 -07:00
Brad Davis
c2509e9492 Working on draw crash bug, adding render thread trash handling 2016-08-12 22:28:27 -07:00
Brad Davis
2340afc48e Updating object transform code 2016-08-12 22:28:25 -07:00
Brad Davis
adcfd55cc0 Batch replay reprojection 2016-08-12 22:28:23 -07:00
Brad Davis
7e93747acf Working on reprojection 2016-08-12 22:28:22 -07:00
Bradley Austin Davis
274321de8a First pass at threaded rendering 2016-08-12 22:18:36 -07:00
Anthony J. Thibault
1be434342b Work In Progress snapshot 
* Added new PointerEvent type.
* Mouse events are still sent from Application to EntityTreeRenderer, however, EntityTreeRenderer converts them to PointerEvents
* All outgoing signals from EntityTreeRenderer use PointerEvents instead of MouseEvents
* Associated JavaScript entity methods will receive PointerEvents instead of MouseEvents
* Events from handControllerGrab.js to entities are currently broken.
 2016-08-12 17:11:59 -07:00
Seth Alves
15e2140cb2 Merge branch 'master' of github.com:highfidelity/hifi into overlay-children 2016-08-11 15:06:58 -07:00
SamGondelman
9b27f8bc0f Merge remote-tracking branch 'upstream/master' into loadingFade 2016-08-09 14:55:14 -07:00
Andrew Meadows
85d87fe13f Merge pull request #8218 from huffman/feat/load-improvements 
Speed up gamma correction in cube map processing
 2016-08-09 11:10:36 -07:00
Seth Alves
607c168493 Merge branch 'master' of github.com:highfidelity/hifi into overlay-children 2016-08-09 09:01:55 -07:00
Ryan Huffman
43c1472b36 Move srgbToLinear lookup table to external cpp 2016-08-08 15:47:53 -07:00
Ryan Huffman
2ee511bae0 Fix syntax error 2016-08-08 12:30:11 -07:00
Ryan Huffman
28b3ff9bca Update generation of srgb to linear lookup to include python script 2016-08-08 12:04:06 -07:00
SamGondelman
771e105fa2 Merge remote-tracking branch 'upstream/master' into loadingFade 2016-08-05 16:52:01 -07:00
Seth Alves
a2441ca84c back out some uneeded chagnes 2016-08-04 14:09:12 -07:00
Seth Alves
981a8d76fa code review 2016-08-04 13:47:43 -07:00
Seth Alves
45c21ca523 make UNSET_VALUE still work while still returning and empty string value for undefined keys 2016-08-04 13:37:08 -07:00
SamGondelman
b6e73e06a2 merge from master 2016-08-04 13:34:38 -07:00
Seth Alves
4c258b9568 fix bug which caused getValue for a non-existent key to return the integer 2 2016-08-04 10:16:08 -07:00
Seth Alves
1b571f3be3 Merge branch 'master' of github.com:highfidelity/hifi into overlay-children 2016-08-04 09:58:41 -07:00
SamGondelman
d63a0ef08f working on making other entities transparent 2016-08-02 18:09:42 -07:00
Stephen Birarda
39e6ac0974 cleanup API for HifiConfigVariantMap after migration 2016-08-02 14:35:11 -07:00
Stephen Birarda
62af203d08 migrate the deprecated merged master/user config 2016-08-02 14:35:11 -07:00
Seth Alves
2c449320d0 when and ID of a SpatiallyNestable subclass is changed, update the parentID of any children 2016-08-02 08:20:48 -07:00
Seth Alves
28e0ca2e49 when a parent of a 3d overlay is deleted, delete the overlay 2016-08-01 10:55:34 -07:00
Seth Alves
2d88e74841 added operator!= for Transform class 2016-08-01 07:50:12 -07:00
Seth Alves
8102ea4b8e don't call locationChanged or dimensionsChanged when they didn't 2016-08-01 07:48:44 -07:00
Seth Alves
e4e86c245e 3d overlays can be children of entities or avatars 2016-07-31 14:11:56 -07:00
samcake
2618741505 Merging with upstream master and updating my old PR 2016-07-21 17:59:00 -07:00
Andrew Meadows
207ddcea38 wrap hull about each mesh part 2016-07-09 22:25:28 -07:00
Ryan Huffman
611779b58b Improve gamma correction implementation in cube map processing 2016-07-08 16:25:50 -07:00
Andrew Meadows
5659d57ac3 fix shape generation for SIMPLE_COMPOUND 2016-07-06 13:00:57 -07:00
Andrew Meadows
431043e195 declare new shape types 2016-07-06 10:50:51 -07:00
Brad Davis
5a9be817df PR comments 2016-06-29 10:28:55 -07:00
Brad Davis
21d2c977a3 Remove roll from cursor in HMD 2016-06-28 18:30:07 -07:00
Zach Pomerantz
c62967a57b add secs per hour 2016-06-28 12:38:00 -07:00
Brad Hefta-Gaub
da74114b32 Merge pull request #8070 from AndrewMeadows/triangle-soup-4 
support btBvhTriangleMeshShape for static mesh entities
 2016-06-23 12:17:32 -07:00
howard-stearns
67f76db7e4 Merge branch 'master' of https://github.com/highfidelity/hifi into vive-ui 2016-06-22 15:58:53 -07:00
Ryan Huffman
70be7b3273 Merge branch 'master' of https://github.com/highfidelity/hifi into feat/user-actions 2016-06-21 16:39:25 -07:00
Andrew Meadows
937bd0c1be SHAPE_TYPE_MESH --> SHAPE_TYPE_STATIC_MESH 2016-06-21 13:54:21 -07:00
Ryan Huffman
0ea9c5c26d Fix getMemoryInfo not returning false on non-Windows 2016-06-21 13:32:17 -07:00
Andrew Meadows
2f6e5ab2ee remove fall-through in switch/case logic 2016-06-20 17:29:20 -07:00
Andrew Meadows
a519b77ae7 add SHAPE_TYPE_MESH and build mesh shapes 2016-06-20 17:29:20 -07:00
Andrew Meadows
d64729372a ShapeInfo name changes 2016-06-20 17:29:20 -07:00
Andrew Meadows
57760bca7d sort ShapeInfo data members 2016-06-20 17:29:20 -07:00
Ryan Huffman
0393777b03 Add getMemoryInfo helper function 2016-06-20 16:01:44 -07:00
Ryan Huffman
1fa274a527 Fix GPUIdent name trailing whitespace 2016-06-20 16:01:03 -07:00
Bradley Austin Davis
0b0977f362 Support keyboard suppresion, control suppresion while in keyboard mode 2016-06-15 10:48:48 -07:00
Bradley Austin Davis
b1c472e82b Fixing settings, even in release builds 2016-06-14 12:16:40 -07:00
Bradley Austin Davis
d52a1fe6f9 Fix persistence for global scope settings handles, clean up invalid variants in settings 2016-06-14 09:49:38 -07:00
Bradley Austin Davis
34c8d257d2 Fixing issues with unclosed groups in settings persistence 2016-06-14 09:49:38 -07:00
Seth Alves
f8f62a4ff1 remove unused function 2016-06-13 15:10:52 -07:00
Seth Alves
eba518cb65 try to make code that converts bullet-calculated values to parent-frame values more effecient 2016-06-13 14:26:41 -07:00
Seth Alves
99bfc76dd3 Merge branch 'master' of github.com:highfidelity/hifi into quiet-es-sim-spam 2016-06-13 11:14:26 -07:00
Seth Alves
4c45d081cd merge from upstream 2016-06-10 19:57:46 -07:00
Seth Alves
96bf66d14a Merge branch 'master' of github.com:highfidelity/hifi into quiet-es-sim-spam 2016-06-10 11:49:45 -07:00
Seth Alves
e1ae2a193f EntityMotionState now uses parent-relative position and rotation and velocity when deciding if it needs to send an edit packet to the entity-server 2016-06-10 11:49:15 -07:00
Seth Alves
203ea5ddc7 Merge branch 'master' of github.com:highfidelity/hifi into permissions-grid 2016-06-09 09:53:33 -07:00
Brad Davis
ff8d4883b1 Attempt to get better logging from pure virtual call crashes 2016-06-08 22:35:39 -07:00
Brad Hefta-Gaub
0df72548f8 Merge pull request #8024 from kencooke/audio-src-avx2 
AVX2 optimized audio resampler
 2016-06-08 12:43:52 -07:00
Ken Cooke
27d39eb1b0 Lightweight functions to detect SSE3, SSSE3, SSE4.1, SSS4.2, AVX and AVX2. 
These are cross platform, and return false on unsupported platforms.
 2016-06-07 06:53:50 -07:00
Seth Alves
e16d1fdc23 Merge branch 'master' of github.com:highfidelity/hifi into permissions-grid 2016-06-06 16:32:26 -07:00
Brad Hefta-Gaub
5190d8ab6b Merge pull request #8023 from jherico/settings 
Eliminate extraneous writes for unchanged values
 2016-06-06 12:22:11 -07:00
Seth Alves
d202a2bf11 better handling of missing settings keys 2016-06-06 11:59:39 -07:00
Brad Hefta-Gaub
f2bedc546f Merge pull request #8019 from jherico/settings 
Eliminate file IO contentions for settings
 2016-06-04 21:04:50 -07:00
Brad Davis
bc81f00dc7 Eliminate extraneous writes for unchanged values 2016-06-04 20:47:10 -07:00
Brad Davis
65d8f65ed7 Fix unix builds, make settings ACID 2016-06-04 18:39:46 -07:00
Brad Davis
39dcd1f9bd Eliminate file IO contentions for the settings 2016-06-04 17:55:30 -07:00
Andrew Meadows
bce8879d7c remove ShapeInfo::clearPoints() 
use getPoints() by ref and then clear
 2016-06-03 10:47:54 -07:00
Andrew Meadows
9dc0fa7796 don't automatically clear ShapeInfo points 2016-06-03 10:47:54 -07:00
Andrew Meadows
211bbb88e6 purge SHAPE_TYPE_ELLIPSOID which wasn't used 2016-06-03 10:47:54 -07:00
Andrew Meadows
5d9e320dd7 purge SHAPE_TYPE_LINE 2016-06-03 10:47:54 -07:00
Andrew Meadows
d591561a88 remove RenderableModelEntityItem::_points 
use ShapeInfo::_points instead
 2016-06-03 10:47:54 -07:00
Andrew Meadows
1132b4666a Merge pull request #7975 from jherico/shared_shapes 
Moving shape definition to a shared location
 2016-05-27 07:28:11 -07:00
Brad Davis
6a962d7aab Unix build fix 2016-05-26 15:51:36 -07:00
Brad Davis
2c02c963d4 Moving shape definition to a shared location 2016-05-26 12:22:39 -07:00
Brad Hefta-Gaub
06cb625d09 Merge pull request #7959 from hyperlogic/tony/improved-avatar-mixer-precision 
Improved Avatar Mixer Rotation Precision
 2016-05-25 17:14:12 -07:00
Anthony J. Thibault
a1c32f8c44 Merge branch 'master' into tony/improved-avatar-mixer-precision 2016-05-23 10:24:52 -07:00
Seth Alves
40e862cf9e quiet gcc 5 warnings 2016-05-21 16:53:01 -07:00
Andrew Meadows
83b8ef8131 clean up stream formatting of vec3 and friends 2016-05-20 09:41:26 -07:00
Andrew Meadows
f3fc00bc3a add comment for why MAX_HULL_POINTS is 42 2016-05-20 09:41:26 -07:00
Andrew Meadows
5a826d696a cleanup after code review 2016-05-20 09:41:26 -07:00
Andrew Meadows
7866fcf78c trim high-point convex hulls 2016-05-20 09:41:26 -07:00
Anthony J. Thibault
b95ba8141c AvatarData packet overhaul, uses a structure instead of raw memcpy 2016-05-19 20:26:00 -07:00
Brad Hefta-Gaub
d521cd82a0 Merge pull request #7908 from Atlante45/fix/settings 
fix settings getting reset
 2016-05-19 17:53:15 -07:00
Brad Hefta-Gaub
cef4a49c35 Merge pull request #7867 from huffman/fix/query-octree-crash 
Fix crash in JurisdictionMap
 2016-05-19 11:53:54 -07:00
Atlante45
10c412d8c7 Fix settings getting reset 
fixes bugzid:531
	When a setting handle was created but never initialized/used, it
would override the current value with the default value on destruction.
 2016-05-18 11:36:14 -07:00
Zach Pomerantz
59e17c2d5f Fix abs of unsigned warning 2016-05-17 22:57:29 -07:00
Anthony J. Thibault
2c6b0e5c95 Fix for linux warning. 2016-05-17 17:32:09 -07:00
Ryan Huffman
013d902376 Add vector include to OctalCode.h 2016-05-17 10:59:51 -07:00
Ryan Huffman
5fc18eafda Rename OctalCodePtr related functions 2016-05-17 10:59:51 -07:00
Ryan Huffman
35f147f557 Cleanup use of OctalCodePtrList and add allocateOctalCodePtr 2016-05-17 10:59:51 -07:00
Ryan Huffman
e819ab8475 Add mutex protection around octal code getters 2016-05-17 10:59:51 -07:00
Ryan Huffman
ef6d758e7f Fix JurisdictionMap multithreading issues 
Make octal code pointers use shared_ptr, add locks around access.
 2016-05-17 10:59:51 -07:00
Anthony J. Thibault
818d1f4601 Added six byte quaternion compression routines & tests 2016-05-16 17:48:54 -07:00
samcake
c627a555bf Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-05-16 16:27:51 -07:00
Anthony Thibault
8fecb51dde Merge pull request #7846 from hyperlogic/tony/improved-avatar-debug-draw 
Eye tracking bug fix and debug rendering improvements
 2016-05-11 17:41:49 -07:00
samcake
c6a081fb46 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-05-11 16:56:37 -07:00
Brad Hefta-Gaub
e01681eb52 Merge pull request #7856 from ZappoMan/NUEtweaks 
don't show help or login on first run
 2016-05-11 10:53:09 -07:00
Anthony J. Thibault
80a349c65b Merge branch 'master' into tony/improved-avatar-debug-draw 2016-05-10 14:50:13 -07:00
Brad Hefta-Gaub
df34b49b41 fix white space 2016-05-10 11:34:11 -07:00
Brad Hefta-Gaub
33c5cb519a cleanup firstRun with a common setting 2016-05-10 11:32:29 -07:00
Andrew Meadows
db9a4d6b8f cleanup for code review 2016-05-10 07:49:11 -07:00
Anthony J. Thibault
9821c276ad warning fix in release 2016-05-09 13:56:56 -07:00
Anthony J. Thibault
7f5296f566 Increased tolerance for near zero length vectors 
Also, replaced some magic numbers with constants.
 2016-05-09 11:53:09 -07:00
Anthony Thibault
cb5c7a3559 compile fix for macosx 2016-05-08 17:14:14 -07:00
Anthony J. Thibault
641e152699 Eye tracking bug fix and debug rendering improvement 
* Bug fix for eye tracking in HMD, the "up" orientation of your eyes now match your head.
* DebugDraw: added drawRay method.
* Application: Renamed preRender to postUpdate
* AvatarManager: added postUpdate method that iterates over all avatars.
* MyAvatar: Renamed preRender to preDisplaySide
* MyAvatar: split preRender code into postUpdate and preDisplaySide.
* Removed "Show who is looking at me", "Render focus indicator" and "Render lookat target" debug draw.
* Split "Show Look At Vectors" into "Show My Look At Vectors" and "Show Other Look At Vectors", to make it easier to debug eye tracking.
* "Show Look at Vectors" now draws the right eye red and the left eye blue.
* Removed Avatar and MyAvatar renderBody
* Removed look at rendering from head.
* GLMHelpers: Bugfix for generateBasisVectors when up primary and secondary axis were orthogonal
 2016-05-08 16:20:32 -07:00
Andrew Meadows
eeb100b62f use glm::isnan() instead of isnan() from math.h 2016-05-05 18:28:27 -07:00
Andrew Meadows
01950fba96 recover unused code that may prove useful someday 2016-05-05 18:28:27 -07:00
Andrew Meadows
64c2e2d175 remove warning about unused variable 2016-05-05 18:28:27 -07:00
Andrew Meadows
2cbc771eba reorder data members, remove cruft, 744->616 bytes 2016-05-05 18:28:27 -07:00
Andrew Meadows
bcf2cc8074 use references not pointers for ViewFrustums 
also unravelling some spaghetti:
(1) split Octree stuff out of ViewFrustum
(2) moved ViewFrustum from octree to shared lib
(3) removed some cruft
 2016-05-05 18:28:27 -07:00