Daniela
1d6985a9eb
Fix Animation hue bug.
2017-10-03 15:25:54 +01:00
Daniela
c22d2add17
Resolve conflict with hifi/master.
2017-09-27 17:06:12 +01:00
Daniela
179a426389
Address QA comments.
2017-09-26 17:44:46 +01:00
Bradley Austin Davis
bc4193f276
Merge branch 'master' into android_new
2017-09-19 14:27:31 -07:00
Bradley Austin Davis
b93e91b9f3
New android toolchain
2017-09-19 13:45:12 -07:00
Daniela
4568541737
Remove redundant variables.
2017-09-19 18:47:02 +01:00
Daniela
1426e10024
Fix texture loading issue with upstream master. Tune amount of points.
2017-09-19 17:47:00 +01:00
Daniela
7e53f0b7dc
Clean up.
2017-09-19 15:29:17 +01:00
Anthony J. Thibault
0757f513af
Merge branch 'master' into feature/ant-man
2017-09-18 11:36:39 -07:00
Artur Gomes
e37b98e0f5
Fix polyline optimization.
...
Add more points to the polyline to check if the optimizations are
working.
2017-09-15 19:20:33 +01:00
Seth Alves
cf2979dc78
Merge branch 'master' of github.com:highfidelity/hifi into rework-scriptengine-lifetime
2017-09-14 10:42:26 -07:00
Seth Alves
d89f2b77da
rework ScriptEngine lifetimes using 'smart' pointers
2017-09-14 10:42:21 -07:00
Anthony J. Thibault
7959988622
Merge branch 'master' into feature/ant-man
2017-09-14 10:37:45 -07:00
Brad Davis
f4d8216501
Fix race condition accessing QString sub-properties in zones
2017-09-13 18:06:21 -07:00
Artur Gomes
b65520e788
Merge remote-tracking branch 'upstream/master'
2017-09-13 12:32:17 +01:00
Artur Gomes
ae4e9b16e9
Fix some issues with the polyline optimizations.
2017-09-12 17:07:27 +01:00
Anthony J. Thibault
b81f85e1ae
Merge branch 'master' into feature/ant-man
2017-09-11 15:14:03 -07:00
Bradley Austin Davis
37b184d982
Fix crashes in entity rendering on OSX
2017-09-07 14:32:50 -07:00
Daniela
0655264b44
Replace bytes for uint8_t.
2017-09-07 14:21:41 +01:00
Daniela
3c32171c15
Add pack and unpack optimization in Entity Properties
2017-09-06 18:02:36 +01:00
Dante Ruiz
fec8482b69
Merge branch 'master' of github.com:highfidelity/hifi into feature/ant-man
2017-09-05 16:26:51 -07:00
Anthony J. Thibault
6618ba12e9
Merge branch 'master' into feature/ant-man
2017-08-31 18:10:39 -07:00
Brad Davis
65b49a958f
Merge branch 'master' into 21484
2017-08-31 14:59:30 -07:00
Menithal
0e3fc64f63
Fixed Inverse logic and Cleanup
2017-09-01 00:35:56 +03:00
Menithal
663e8514de
Found the culprit. Was overriding the value
2017-09-01 00:00:24 +03:00
Daniela
42be6434af
Merge branch 'master' of https://github.com/highfidelity/hifi
2017-08-31 18:03:39 +01:00
Anthony J. Thibault
c9cdaadeb5
Better scale support in SpatiallyNestable class.
...
Previously avatar used SpatiallyNestable scale to keep track of model rendering scale.
It now uses a new member variable _modelScale instead. This is important because the
notion of "Avatar" space does NOT include scale, so this is now reflected correctly in
the SpatiallyNestable class.
Similarly, EntityItems no longer stuff dimensions into the SpatiallyNestable scale
field. a new _dimensions member variable is used instead. The SpatiallyNestable scale
field for entities should always be one.
Parent joints can now have scale if getAbsoluteJointScaleInObjectFrame() returns a non-zero scale.
This is used in the case of the faux SENSOR_TO_WORLD_MATRIX_INDEX joint.
Overlays now ignore the SpatiallyNestable scale, and render using only orientation, position and dimensions.
Added qDebug stream support for Transform class.
2017-08-30 15:46:36 -07:00
Menithal
ea79748ed3
Some adjustments
2017-08-29 23:59:36 +03:00
Daniela
58f0601af2
Fix identation.
2017-08-29 17:19:41 +01:00
Zach Fox
0cdef28cfd
Fixup after Merge branch 'master' of https://github.com/highfidelity/hifi into SelectionScriptingInterface
2017-08-28 14:55:18 -07:00
Brad Davis
3ad32af975
Additional locking in model entities
2017-08-25 11:49:45 -07:00
Brad Davis
e817d3ced4
Threaded rendering & entity rendering refactor
2017-08-24 13:34:34 -07:00
Chris Collins
751440388a
Merge pull request #11225 from hyperlogic/bug-fix/simulation-deadlock-fix
...
Bug fix for deadlock between EntitySimulation and EntityItem locks.
2017-08-23 20:50:41 -07:00
Zach Fox
2a75d97006
First steps
2017-08-22 12:56:16 -07:00
Anthony J. Thibault
da20eac995
Bug fix for deadlock between EntitySimulation and EntityItem locks.
...
This is a classic deadlock between the main thread and the OctreeProcessor network thread.
On the main thread, the EntitySimulation lock is taken before the EntityItem read lock is taken.
On the network thread, the EntityItem write lock is taken before the EntitySimulation lock is taken.
To work around this issue the network thread no longer takes the EntitySimulation lock when calling
PhysicalEntitySimulation::addDynamic(). Instead, a fine grained lock around the EntitySimulation's dynamic lists
is used instead.
2017-08-21 17:14:49 -07:00
Chris Collins
72bb52c7ed
Merge pull request #11046 from rickdaniels/21448
...
Address bug #21448 "Correctly Size Bounding Boxes for Polylines"
2017-08-21 15:32:22 -07:00
Menithal
dc5e374485
Merge remote-tracking branch 'upstream/master' into 21484
2017-08-17 22:28:43 +03:00
Artur Gomes
83cdd1739d
Add hue, saturation and brightness dynamic brushes.
...
Add continuous drawing mode.
Add new brushes.
Remove some brushes.
Fix animation play distance for when painting in Desktop mode.
Fix Hue animation not starting from the chosen color (would always start
from red).
Fix multiple color polyline.
2017-08-16 18:35:15 +01:00
Artur Gomes
678dd5fbae
Do not test!
...
Add missing information to property.
2017-08-16 18:33:43 +01:00
Artur Gomes
03b70ed492
Do not test!
...
Add color qvector to polyline entity to allow for multiple colors
through the line.
Add some new icons to the tabs of the app.
2017-08-16 18:32:17 +01:00
Delanir
ed5515a2d4
Add new Property to polyline to enable different uv modes. 2
2017-08-16 18:25:00 +01:00
SamGondelman
a641fb7a7f
rename qvector findRayIntersection to avoid script conflicts
2017-08-15 18:03:52 -07:00
rick@ghostpunch.com
8d248f5ccd
Remove the attempt to determine the maximum width of a PolyLineEntity's strokes
...
using the _strokeWidths[] array, as the values don't seem to correspond with
reality. Use a flat 0.075M value for the maxium half of a stroke width instead.
2017-08-14 15:59:21 -04:00
rick@ghostpunch.com
87139f5d82
Remove debug print
2017-08-09 04:46:42 -04:00
rick@ghostpunch.com
cc69853ff1
Make requested style changes to code.
2017-08-09 04:37:47 -04:00
rick@ghostpunch.com
a730da5299
Account for PloyLine stroke width when calculating the dimensions
...
of the PolyLilne's bounding box.
2017-08-09 04:23:39 -04:00
SamGondelman
3645bf04b6
possibly fix most annoying crash
2017-08-08 18:10:53 -07:00
Menithal
982d4a451f
Updated Protocol to add allowTranslation
...
There still is a bug for the value no actually updating
2017-08-08 23:47:37 +03:00
rick@ghostpunch.com
c94d9b3810
Merge remote-tracking branch 'upstream/master' into 21448
2017-08-07 19:23:57 -04:00
Howard Stearns
71ce5a6494
Merge pull request #11016 from highfidelity/context-overlays
...
Context Overlays
2017-08-03 16:28:14 -07:00
