Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-22 15:33:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
63689 commits 75 branches 59 tags 1.2 GiB
Commit graph

3133 commits

Author SHA1 Message Date
Thijs Wenker
3c37bf8acd parentJointName property experiment 2017-11-17 20:33:06 +01:00
Andrew Meadows
98001b64d9
Merge pull request #11788 from ctrlaltdavid/21579-a 
Particles emitter fixes
 2017-11-17 11:31:12 -08:00
H Q
28eedd1a94 Small style mod 2017-11-17 11:30:21 -08:00
Stephen Birarda
dd27e3db31 add diff traversal reset when resetting state 2017-11-17 09:44:35 -08:00
ZappoMan
cd0fa989e1 debugging 2017-11-17 08:55:55 -08:00
H Q
21a28827c9 Remaining coding style changes, other small fixes 2017-11-17 07:59:52 -08:00
amantley
20fd893b47 Starting to implement the update function to ModelEntityItem_cpp Also put access to the currently playing frame in RenderableModelEntityItem_cpp 2017-11-16 18:38:28 -08:00
amantley
ded81fcab0 Merge remote-tracking branch 'origin/master' into character_entity_fixes 
Updating the branch to the latest code
 2017-11-16 13:53:17 -08:00
amantley
881b22ab15 added update function to modelEntityItem.cpp 2017-11-16 12:41:56 -08:00
H Q
14890495a2 Merge branch 'master' of https://github.com/highfidelity/hifi into ECWallet 
Syncing
 2017-11-16 12:38:45 -08:00
H Q
27350ddbfc Coding style corrections 2017-11-16 12:35:00 -08:00
Andrew Meadows
d538a9aaa8 fix typo making cylinders collide as sphere 2017-11-15 09:04:04 -08:00
H Q
0db9e876d6 Merge branch 'master' of https://github.com/highfidelity/hifi into ECWallet 2017-11-14 15:40:44 -08:00
H Q
44f2c92d30 Final ECSDA and nonce modifications for this dev cycle 2017-11-14 15:40:29 -08:00
David Rowe
2c542b73a0 Fix particles emitter rendering not updating when edit textures URL 2017-11-10 10:22:35 +13:00
amantley
3ce65ece87 Merge remote-tracking branch 'upstream/master' into character_entity_fixes 
this is just to synch this branch with the upstream master
 2017-11-09 10:38:34 -08:00
amantley
af0304fd6b preliminary changes for the property fixes 2017-11-09 10:04:12 -08:00
Clément Brisset
85efe5265d
Merge pull request #11724 from ctrlaltdavid/21580 
Fix serverScripts not being able to see entities in parent/child tree
 2017-11-07 10:36:20 -08:00
David Rowe
05275afb4f Resending full scene is not necessary after all 2017-11-05 15:48:02 +13:00
David Rowe
2d27a6cf4c Merge branch 'master' into 21580 2017-11-05 13:59:43 +13:00
ZappoMan
d4b4d188ed allow splitting of edit or add entity packets across multiple edit packets when property list is larger than MTU 2017-11-04 13:40:41 -07:00
ZappoMan
74ceab1e68 fix mac and unic build 2017-11-02 19:30:39 -07:00
ZappoMan
baff900839 cleanup some writeLocks 2017-11-02 17:46:15 -07:00
ZappoMan
b5199220ab cleanup SpatiallyNestable Velocity to match WorldVelocity naming 2017-11-02 17:07:53 -07:00
ZappoMan
53c6eeb58b updatePosition now setPosition 2017-11-02 15:58:50 -07:00
ZappoMan
afaad5fcd7 Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup 2017-11-02 13:39:51 -07:00
Zach Fox
bb1ffbc06f Merge branch 'master' of https://github.com/highfidelity/hifi into pop_avatarEntityTests 2017-11-01 12:38:34 -07:00
Zach Fox
b335ba9a75 Timeout timer 2017-11-01 11:34:29 -07:00
Zach Fox
8a6a744099 It's working 2017-11-01 10:46:13 -07:00
David Rowe
328fc29bc5 Fix serverScripts not being able to see entities in parent/child tree 2017-11-01 17:01:19 +13:00
Zach Fox
93308dfcd3 Why did I think this would work before? 2017-10-31 16:21:10 -07:00
Nissim Hadar
03d2ca19b9 Moving consts into mode::Haze namespace. 2017-10-31 13:46:58 -07:00
Zach Fox
e9c144892a Fixes 2017-10-31 13:11:32 -07:00
Zach Fox
f5ada4fe62 Will it compile? 2017-10-31 12:33:28 -07:00
Zach Fox
6f96e0c7bd More progress 2017-10-31 12:14:12 -07:00
Zach Fox
90e9251176 It's a start 2017-10-31 11:28:19 -07:00
Nissim Hadar
f3147fc24f Merge branch 'master' into hazeZone 2017-10-30 21:41:23 -07:00
Nissim Hadar
3ddf970be3 Removed haze init variables from the model namespace. 2017-10-30 21:40:14 -07:00
Nissim Hadar
636f7858a3 Removed _degs and _m suffixes. 2017-10-30 19:45:08 -07:00
Brad Hefta-Gaub
c1a808e726
Merge pull request #11703 from AndrewMeadows/circles-and-quads 
fix Circles and quads
 2017-10-30 18:03:32 -07:00
Zach Fox
19420a0ff2 Move static cert verify to properties 2017-10-30 17:01:55 -07:00
Nissim Hadar
5fc68cae0d Converted Haze initialization values to static. 2017-10-30 11:51:19 -07:00
ZappoMan
f63db42c0e migrate SpatiallyNestable::getOrientation to getWorldOrientation, remove redundant getRotation 2017-10-28 10:14:25 -07:00
ZappoMan
a7a0f03ede rename SpatiallyNestable::getPosition() to SpatiallyNestable::getWorldPosition() 2017-10-27 18:39:17 -07:00
Nissim Hadar
fb6c5b98d6 Merge branch 'master' into hazeZone 2017-10-27 15:40:03 -07:00
Nissim Hadar
a5a135c2ba Fixes for 8672-8674. 2017-10-27 15:39:14 -07:00
ZappoMan
1000318dff tweak min dimension to match current behavior 2017-10-27 14:26:02 -07:00
Zach Fox
5ab737f66d
Merge pull request #11658 from zfox23/pop_dynamicTestsMaster 
Commerce: Owner Verification for Certified Entities
 2017-10-27 12:28:04 -07:00
Andrew Meadows
2c4d4373dc support asymmetrical cross section Cylinder 2017-10-27 10:41:16 -07:00
Nissim Hadar
420b0f321c Merge branch 'master' into hazeZone 2017-10-27 09:14:53 -07:00
Nissim Hadar
66c31caf4b Refactoring of the haze 2017-10-27 09:08:58 -07:00
Andrew Meadows
474609dabf enforce dimensions of Circles and Quads 2017-10-26 22:58:24 -07:00
Andrew Meadows
901e145712 remove redundant dimensionsChanged() 2017-10-26 22:57:33 -07:00
ZappoMan
431ee58577 more cleanup 2017-10-26 21:30:59 -07:00
ZappoMan
e5becba4e9 migrate away from updateXXX standardize on setXXX 2017-10-26 20:38:07 -07:00
Sam Gondelman
863a2041a6 Merge branch 'master' into pointerEvents 2017-10-25 17:22:19 -07:00
Andrew Meadows
2d0b94817c Merge pull request #11336 from 1P-Cusack/21389_PR2 
WL21389 PR2: Representation of collision shapes need updating (details below).
 2017-10-25 10:41:21 -07:00
Zach Fox
91333cdf7b Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster 2017-10-25 10:26:50 -07:00
Brad Hefta-Gaub
18a74cea91 Merge pull request #11659 from zfox23/mergeRC57IntoMaster_20171023 
2017-10-23: Merge RC57 into Master
 2017-10-24 21:19:01 -07:00
ZappoMan
5901d1a311 clean up VERSION_ENTITIES stuff 2017-10-24 13:48:27 -07:00
ZappoMan
a1885926b5 some cleanup 2017-10-24 11:46:42 -07:00
LaShonda Hopper
dbd1a80046 [WL21389] Set Simulation::DIRTY_SHAPE flag when entity::Shape changes (details below). 
* Fixes an issue where ShapeEntityItem's collisionShapeType wasn't updated when its
  entity::Shape type was changed.
* Adds getNameForShapeType static method to ShapeInfo.
** Moves shapeTypeNames[] from EntityItemProperties.cpp to ShapeInfo.cpp
* Adds collisionShapeType to ShapeEntityItem::debugDump

* Tested creating shapes within the Creation Menu:
** Create Menu -> (Box/Sphere)
*** Observe Properties tab auto-focus
** From Properties tab elect alternate shape type from the Shape Dropdown list.

NOTE:  While this fixes an issue with the collision shape, it doesn't completely
       resolve the issues seen with the polyhedra or polygonal shapes noticed on
       RELEASE-7130 rebase.

Reviewed-by: Leander Hasty <leander@1stplayable.com>

Changes Committed:
    modified:   libraries/entities/src/EntityItemProperties.cpp
    modified:   libraries/entities/src/ShapeEntityItem.cpp
    modified:   libraries/shared/src/ShapeInfo.cpp
    modified:   libraries/shared/src/ShapeInfo.h
 2017-10-24 14:16:24 -04:00
LaShonda Hopper
789b850846 [WL21389] Addresses feedback from PR #11336. 
* Removes todos from ShapeEntityItem::shapeCalculator stub commit.
* Removes defined out debugging, as requested, from GeometryCache::computeSimpleHullPointListForShape.
* Moves cone handling to its own section for better contextual flow.

Changes Committed:
	modified:   libraries/entities/src/ShapeEntityItem.cpp
	modified:   libraries/render-utils/src/GeometryCache.cpp
 2017-10-24 14:16:23 -04:00
LaShonda Hopper
5b50b362f1 [WL21389] WL21389 PR2: Representation of collision shapes need updating (details below). 
This commit adds support for the polyhedrons and polygons sans
Torus and Quad which aren't currently supported within GeometryCache.

* Moves GeometryCache::_shapes from public to private scope
    * Nothing aside from the class should be directly altering this, only querying
    * Updated instances of direct referencing which looks to have been limited to prior
      testing of instancing and shapes.
* Adds an accessor function for ShapeData to GeometryCache
* Consolidates point list generation to helper function
    * GeometryCache::computeSimpleHullPointListForShape
* Moves GeometryCache::Shape to entity::Shape mapping to GeometryCache from
  RenderableShapeEntityItem
    * Adds conversion accessor to GeometryCache, GeometryCache::Shape getShapeForEntityShape
* Sets ShapeEntityItem::ShapeInfoCalculator callback committed earlier.
    * This helps circumvent the issue with library inclusion.  entity-render knows about
      entity; however, entity doesn't know about entity-renderer; however, GeometryCache
      data is needed within entity::ShapeEntityItem to compose the ShapeInfo point list data.
    * This callback is set up within Application::init of the Interface as it knows about
      both halves of the equation, and the callback needs to be setup prior to any entities
      collision data getting generated.
* Removes _type reset within ShapeInfo::setPointCollection
    * This should avoid any issues due to subversively setting the type or
      incorrectly setting the type as a tangential operation.
        * Audited instances of ShapeInfo::setPointCollection and all seemed to be
          calling the function immediately after having set the type via
          ShapeInfo::setParams
* Adds new ShapeType: SHAPE_TYPE_CIRCLE
    * This type is reserved for the circle which is now treated as a special
      type of Cylinder_Y with regard to collision as opposed to a simple hull.
    * Fixes the issue where jumping on a circle, at times, would
      result in the avatar sliding off towards an edge as if atop a
      squished cone.
* Also updates ShapeInfo::getType() to return ShapeType as opposed to int
    * Auditing calls showed that majority of places were comparing against ShapeType
    * ShapeType::_type is a ShapeType so returning the type explicitly
      is more consistent.
        * ShapeInfo file houses ShapeType enum so any file aware of ShapeInfo is aware of
          ShapeType enumeration.
* entity::Quad defaults to SHAPE_TYPE_ELLIPSOID
    * Like entity::Shape::Torus, entity::Shape::Quad is currently unsupported within
      GeometryCache::buildShapes.
    * Also it appears that a Quad shape can't be created within world via the creation menu.
        * There's no explicit option at present to create one.
        * Trying subvert the Cube/Box creation option to generate one results in an enforced
          stubby box as opposed to a quad.
    * Given the aforementioned points, entity::Shape::Quad will default to
      SHAPE_TYPE_ELLIPSOID as opposed to SHAPE_TYPE_BOX.
        * Added Todo regarding the shape being unsupported along with a notation to create
          a special ShapeType, SHAPE_TYPE_QUAD, for it should it be added in the future.
* Adds some comments and has some minor clean up.

Reviewed-by: Leander Hasty <leander@1stplayable.com>

Changes Committed:
	modified:   interface/src/Application.cpp
	modified:   interface/src/Util.cpp
	modified:   interface/src/Util.h
	modified:   libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
	modified:   libraries/entities/src/ShapeEntityItem.cpp
	modified:   libraries/entities/src/ShapeEntityItem.h
	modified:   libraries/physics/src/ShapeFactory.cpp
	modified:   libraries/render-utils/src/GeometryCache.cpp
	modified:   libraries/render-utils/src/GeometryCache.h
	modified:   libraries/shared/src/ShapeInfo.cpp
	modified:   libraries/shared/src/ShapeInfo.h
	modified:   tests/gpu-test/src/TestInstancedShapes.cpp
 2017-10-24 14:16:17 -04:00
ZappoMan
1128a98e88 implement callEntityClientMethod 2017-10-24 11:15:57 -07:00
Andrew Meadows
9981a44b71 add hook for ShapeInfo calculator 2017-10-24 14:15:08 -04:00
Zach Fox
1f6d989044 Merge branch 'RC-57' of https://github.com/highfidelity/hifi into mergeRC57IntoMaster_20171023 2017-10-23 17:37:43 -07:00
Zach Fox
3e139283ba Remove unnecessary newlines 2017-10-23 17:31:21 -07:00
Zach Fox
97d44e62c8 Fix bugs 2017-10-23 16:52:32 -07:00
Zach Fox
53081b51a6 Clean up as much as possible 2017-10-23 16:00:39 -07:00
Zach Fox
cda43ec1ea Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster 2017-10-23 11:52:59 -07:00
ZappoMan
a7e21d7e76 add remotelyCallable and remoteCallerID to provide additional security to Entities.callEntityServerMethod() 2017-10-22 14:30:58 -07:00
ZappoMan
934c9479af implement support for Entities.callEntityServerMethod() 2017-10-21 20:27:35 -07:00
Sam Gateau
7754061505 Merge pull request #11634 from highfidelity/hazeZone 
Fogbugz 8477: Crash on loading older domains that have zones without the haze component.
 2017-10-20 16:01:13 -07:00
Seth Alves
2b0285adc2 fix action (grab) deadlock 2017-10-20 15:05:21 -07:00
Nissim
5d0deaf946 Code review fixes. 2017-10-20 14:27:27 -07:00
Nissim
00c99d3d02 Corrected wrong else format. 2017-10-20 13:53:53 -07:00
Brad Hefta-Gaub
d6ad389dab Merge pull request #11611 from AndrewMeadows/faster-update-renderables 
Faster renderables update
 2017-10-20 13:43:08 -07:00
Nissim
b0ca1353e4 Implemented Haze mode default. 2017-10-20 13:32:27 -07:00
Zach Fox
9e68e805a0 Get marketplace public key from backend 2017-10-20 10:38:59 -07:00
Zach Fox
c99e803ab7 Error handling 2017-10-19 17:19:37 -07:00
Zach Fox
74180bc4cd Implement static cert verification correctly 2017-10-19 16:39:13 -07:00
Zach Fox
0dc6211a7d Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster 2017-10-19 14:43:33 -07:00
Nissim
d01ecb71df Fixed gcc warning. 2017-10-19 14:41:02 -07:00
Nissim
e314ee432e Fixed gcc warning. 2017-10-19 14:20:47 -07:00
Nissim
9af87d46f2 Removed optimize pragma. 2017-10-19 13:51:33 -07:00
Nissim
61fc45c6bf Merge branch 'master' into hazeZone 2017-10-19 13:39:18 -07:00
Nissim
edd256c600 Fixed crash on invalid HazeMode. 2017-10-19 13:36:32 -07:00
Seth Alves
2c8c5e214c puff querybox if entity is in motion 2017-10-19 13:19:41 -07:00
Seth Alves
e8ca455547 cleanups + call updateQueryAACube when parent changes or action is deleted 2017-10-19 13:19:35 -07:00
Seth Alves
c1e8d5144c remove code which is no longer needed because of custom physics setters 2017-10-19 13:19:25 -07:00
Seth Alves
f2cb5d4aff clean-up concept of puffed queryAACube 2017-10-19 13:19:13 -07:00
Seth Alves
ae70f091c3 don't accept updates to queryAACube if this interface is simulation owner 2017-10-19 13:18:45 -07:00
Seth Alves
f75e59c0a6 keep grabbed and worn entities from spamming entity-server 2017-10-19 13:18:37 -07:00
Daniela
832e30ad1c Edited Packet headers. 2017-10-19 19:53:47 +01:00
Zach Fox
9537e19ad4 Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster 2017-10-19 10:58:55 -07:00
Nissim
a641d6de66 Variable rename. 2017-10-17 09:18:29 -07:00
Zach Fox
e1b0e5a2dd Move some include files around 2017-10-16 16:00:32 -07:00
Zach Fox
a4b8bf0be6 Bugfixes and CR 2017-10-16 15:33:10 -07:00
SamGondelman
c6b636901a fewer undesirable couplings 2017-10-16 13:46:23 -07:00
Zach Fox
3c572b0f7a Fix deadlock 2017-10-16 13:41:39 -07:00
Zach Fox
960f1fbfe4 Still broken, but safer 2017-10-16 13:28:14 -07:00
SamGondelman
d274d99411 merge from master 2017-10-16 12:17:37 -07:00
Andrew Meadows
23bb8608b1 minor optimizations in updateModelBounds() 2017-10-16 11:52:30 -07:00
Andrew Meadows
e109101acc update profiling timers 2017-10-16 11:52:30 -07:00
Zach Fox
febc725520 Merge branch 'RC-57' of https://github.com/highfidelity/hifi into pop_dynamicTests57 2017-10-16 09:53:15 -07:00
SamGondelman
5bfb0baf09 const references 2017-10-13 14:38:46 -07:00
Nissim Hadar
afb8b2d8e7 Merge branch 'master' into hazeZone 2017-10-13 13:40:06 -07:00
Nissim Hadar
9c9dfc7211 Replace light blend with glare. 2017-10-13 13:36:46 -07:00
Nissim Hadar
c76229934c Changed blend-in colour and blend-out colour to colour and glare colour 2017-10-13 12:21:00 -07:00
Nissim Hadar
5bfbaf4860 Renamed HazeMode to ComponentMode. 2017-10-13 11:24:56 -07:00
Bradley Austin Davis
4dcce6ef45 Merge pull request #11578 from hyperlogic/bug-fix/delete-on-wrong-thread 
Crash/Deadlock fix: Web3DOverlay could be destroyed on wrong thread.
 2017-10-12 17:37:05 -07:00
SamGondelman
cc8ecdc596 put back entity signals for scripts 2017-10-12 17:28:00 -07:00
Nissim Hadar
b1174ce40c Merge branch 'master' into hazeZone 2017-10-12 17:04:42 -07:00
Zach Fox
1400c66506 Be a bit more thorough 2017-10-12 16:58:48 -07:00
Zach Fox
b56a38ca15 Re-add references to recentlyDeletedEntityItemIDs 2017-10-12 16:32:09 -07:00
Zach Fox
d75c0a00bb Closer than ever 2017-10-12 16:29:05 -07:00
Zach Fox
6a47884fcf Cleanup and fix 2017-10-12 13:41:19 -07:00
Brad Hefta-Gaub
1bba5ff812 Merge pull request #11554 from sethalves/import-av-entities 
Import av entities
 2017-10-12 13:30:53 -07:00
SamGondelman
1a047613bf fix pointerevents on entities from scripts 2017-10-12 12:31:36 -07:00
Zach Fox
50446619f5 Remove unnecessary (?) references to _recentlyDeletedEntityItemIDs 2017-10-12 11:59:46 -07:00
Zach Fox
abe1cd1b51 Minor cleanup 2017-10-12 11:53:47 -07:00
Zach Fox
0e96fc5cab It's working! 2017-10-12 11:37:26 -07:00
SamGondelman
53fde83922 cleaning up pointerevents, wip 2017-10-12 11:21:50 -07:00
Nissim Hadar
dc45c7af75 Implemented radio-buttons. 2017-10-12 11:18:18 -07:00
Zach Fox
5efa920712 Getting closer 2017-10-12 11:13:23 -07:00
Nissim Hadar
a21995db24 Added checkbox for altitude effect. 2017-10-11 22:10:58 -07:00
Nissim Hadar
96fd3123e8 Changed haze altitude to ceiling. 2017-10-11 20:36:24 -07:00
Nissim Hadar
832f9fb6e3 Renamed HAZE_MODE_RANGE_ONLY to HAZE_MODE_ENABLED. 2017-10-11 19:10:51 -07:00
Nissim Hadar
ea6b9ed28e Removed ...ALTITUDE_MODE from combo. 2017-10-11 18:58:59 -07:00
Anthony J. Thibault
0a943fbe7b Crash/Deadlock fix: Web3DOverlay could be destroyed on wrong thread. 
When script calls Entities.getChildrenIDs*() it is possible to deadlock the main thread, and also invoke
the destructor of Entities and Overlays, which is very NOT thread safe.

The fix is to use a pattern already in use in several places in our codebase.
Use the custom deleter parameter of std::shared_ptr to call deleteLater() instead of destroying the object in place.
This allows any thread to use shared_ptrs of SpatiallyNestables without fear.
 2017-10-11 17:32:34 -07:00
Zach Fox
c3e66c9581 Fixes 2017-10-11 16:56:47 -07:00
Zach Fox
5a3a3c4937 What is going on 2017-10-11 15:05:45 -07:00
Zach Fox
fa1bfe0d19 Maybe fixes? 2017-10-11 14:10:33 -07:00
Zach Fox
d8b84e6875 Minor cleanup 2017-10-11 13:26:32 -07:00
Zach Fox
9e570fdba3 First pass at encryption/decryption. Exciting! 2017-10-11 13:08:04 -07:00
Zach Fox
f05c709693 Remove static certificate verification for now 2017-10-11 12:06:11 -07:00
Zach Fox
1f8b68c952 Updates now that endpoint exists; add pending timer 2017-10-11 11:46:35 -07:00
Zach Fox
0ae69b6ad9 Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTests 2017-10-10 12:38:14 -07:00
Daniela
a46ef56af9 Merge with hifi:master. Packet Headers version were increased. 2017-10-10 17:26:33 +01:00
Nissim Hadar
c9be5ea100 Merge branch 'master' of https://github.com/highfidelity/hifi into hazeZone 2017-10-09 18:01:48 -07:00
Nissim Hadar
7d5a887f43 Refactoring. 2017-10-09 17:25:19 -07:00
Seth Alves
23f41457be Revert "Revert "fix importing of avatar entities"" 
This reverts commit 28a8b18060.
 2017-10-09 11:52:43 -07:00
Zach Fox
a7d43c63b6 Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTests 2017-10-09 11:38:13 -07:00
Andrew Meadows
0bcecdbe66 be picky when finding nearby entities at login 2017-10-09 10:27:46 -07:00
Seth Alves
28a8b18060 Revert "fix importing of avatar entities" 2017-10-07 16:54:05 -07:00
Brad Hefta-Gaub
62fc193bff Merge pull request #11532 from sethalves/import-av-entities 
fix importing of avatar entities
 2017-10-06 17:59:54 -07:00
Zach Fox
c70ee6055f Don't clear cert ID if static properties change; updates to DDV 2017-10-06 17:12:40 -07:00
Zach Fox
59a6726af6 Checkpoint; lotsa changes... 2017-10-06 16:55:05 -07:00
Nissim Hadar
e34fb1c874 Merge branch 'master' into hazeZone 2017-10-06 13:20:12 -07:00
Zach Fox
1fa9bd8fc6 Better implementation of location change and bugfixes 2017-10-06 12:22:29 -07:00
Seth Alves
9064114ce5 fix mistaken logic-flip in recent PR 2017-10-06 11:03:48 -07:00
Seth Alves
f4dedf05bb move variables into block that needs them 2017-10-06 11:02:26 -07:00
Nissim Hadar
320c888ce4 Added checkbox to allow separate control of keylight attenuation. 2017-10-05 20:31:45 -07:00
Nissim Hadar
cbaae2c79b WIP - haze colour. 2017-10-05 12:59:56 -07:00
Seth Alves
b96fac2f00 Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities 2017-10-05 11:43:25 -07:00
Seth Alves
53a49272dc fix importing of avatar-entities 2017-10-05 11:43:19 -07:00
Nissim Hadar
1e2bd23c0b Fixed typo in variable name. 2017-10-05 11:31:08 -07:00
Nissim Hadar
794cb961d5 Merge branch 'master' into hazeZone 2017-10-04 23:03:59 -07:00
Nissim Hadar
ad03301df8 WIP - implementing range+altitude mode. 2017-10-04 23:03:21 -07:00
Nissim Hadar
8b72e3044a WIP - implementing range+altitude mode. 2017-10-04 22:26:53 -07:00
Nissim Hadar
6dcd8b7b57 Haze Range works. 2017-10-04 21:47:20 -07:00
Zach Fox
27d6cc2657 Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTests 2017-10-04 15:49:33 -07:00
Zach Fox
4cfb860e23 Wow, this actually seems to be working 2017-10-04 15:45:12 -07:00
Zach Fox
f974672e7b Working way better than I expected 2017-10-04 15:19:06 -07:00
Zach Fox
b35eaf2cc8 Throw a bunch of code at the wall and hope some sticks 2017-10-04 15:06:55 -07:00
Zach Fox
f7ea50ef3b Free memory 2017-10-04 14:02:28 -07:00
Nissim Hadar
eef778a463 Replaced uint8_t with uint32_t in server packet. 2017-10-04 13:47:13 -07:00
Zach Fox
cf7c1934f8 Progress? 2017-10-04 13:16:33 -07:00
Nissim Hadar
62cfaaaf38 Sam's corrections. 2017-10-04 12:56:14 -07:00
Zach Fox
ab08dc6bd6 Progress? 2017-10-04 12:33:58 -07:00
Nissim Hadar
2ce86ebfae WIP - working on byte order in server messages. 2017-10-04 11:56:35 -07:00
Nissim Hadar
3f677ec7c9 WIP - working on byte order in server messages. 2017-10-04 10:23:59 -07:00
Zach Fox
2cdd5c29f3 Uncertified rez rights 2017-10-04 09:58:29 -07:00
Nissim Hadar
8c430d36fa WIP - working on byte order in server messages. 2017-10-03 21:59:40 -07:00
Nissim Hadar
76f843c741 WIP - working on byte order in server messages. 2017-10-03 21:46:50 -07:00
Nissim Hadar
75509b9ecb WIP - working on byte order in server messages. 2017-10-03 21:39:41 -07:00
Nissim Hadar
4019c3bc10 WIP - working on byte order in server messages. 2017-10-03 21:36:20 -07:00
Nissim Hadar
3505fedc00 WIP - working on byte order in server messages. 2017-10-03 21:34:21 -07:00
Nissim Hadar
16a10a8a0c WIP - working on byte order in server messages. 2017-10-03 20:57:56 -07:00
Nissim Hadar
89381e7c8e Moved _hazeProperties.getProperties(properties); into the ReadLock 2017-10-03 19:43:35 -07:00
Nissim Hadar
c1f4735468 Replaced HazeMode with uint8_t in transport protocol. 2017-10-03 19:39:34 -07:00
Brad Hefta-Gaub
a1979a2600 Merge branch 'master' into RC-56 2017-10-03 18:16:21 -07:00
Nissim Hadar
d4acb00aa5 Merge branch 'master' into hazeZone 2017-10-03 17:44:31 -07:00
Zach Fox
ed40e41b94 Potential progress? Not totally sure 2017-10-03 16:18:29 -07:00
SamGondelman
fc6e5df2cb fix text/web registration point usage 2017-10-03 15:02:21 -07:00
SamGondelman
c9d2d40e1e possibly fix registration offset issue 2017-10-03 14:44:11 -07:00
Zach Fox
9c4b02c659 Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTests 2017-10-03 14:37:07 -07:00
Zach Fox
b7e50c5b73 First steps 2017-10-03 14:36:22 -07:00
Seth Alves
6040c4a3e8 Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities 2017-10-03 14:06:01 -07:00
Seth Alves
05e173a1d0 Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities 2017-10-03 13:11:03 -07:00
Anthony J. Thibault
1389c2e31d Bug fix for deadlock in ModelEntityItem::setCompundShapeURL() 
The fix was to prevent ModelEntityItem::hasCompoundShapeURL() from taking
a readlock on the entity, instead a finer grained lock (ThreadSafeValueCache)
is made around the _compoundShapeURL QString.
 2017-10-03 12:15:23 -07:00
Nissim Hadar
86c497a12f Merge branch 'master' into hazeZone 
# Conflicts:
#	libraries/networking/src/udt/PacketHeaders.cpp
#	libraries/networking/src/udt/PacketHeaders.h
 2017-10-03 10:34:33 -07:00
Daniela
2b18296cfd Merge remote-tracking branch 'upstream/master' 
# the commit.
 2017-10-03 15:26:22 +01:00
Daniela
1d6985a9eb Fix Animation hue bug. 2017-10-03 15:25:54 +01:00
Nissim Hadar
93a2776cb5 Changes for debug 2017-10-02 18:13:23 -07:00
Seth Alves
e7fa8131ea make json importer understand AVATAR_SELF_ID 2017-10-02 16:44:03 -07:00
Howard Stearns
9b0ebf0e07 doh! string not boolean 2017-10-02 16:18:28 -07:00
Seth Alves
ca11d19b3e allow importing of avatar entities from json 2017-10-02 16:06:44 -07:00
Howard Stearns
0b7af66016 more linux warnings 2017-10-02 15:38:59 -07:00