Commit graph

380 commits

Author SHA1 Message Date
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
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
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
Brad Davis
65b49a958f Merge branch 'master' into 21484 2017-08-31 14:59:30 -07:00
Zach Fox
2a75d97006 First steps 2017-08-22 12:56:16 -07: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
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
David Kelly
6ae516c46a Merge remote-tracking branch 'upstream/context-overlays' into contextOverlays_renderMOde 2017-08-01 15:45:34 -07:00
Zach Fox
9147bc21d0 Getting there. 2017-07-26 11:41:27 -07:00
Andrew Meadows
e1eb223616 cleanup bad indentation, cruft, and constants 2017-07-20 16:12:33 -07:00
Andrew Meadows
d9c6126000 more descriptive names for methods that do stuff
also: changes to dimensions will trigger update to QueryAACube
2017-07-19 13:33:32 -07:00
Brad Davis
8130a91b8c Cleanup entity dependencies 2017-06-27 19:15:49 -07:00
Atlante45
73dd2abdaf Delete old sitting points code 2017-03-20 17:29:44 -07:00
David Kelly
2996298e79 First bit of cleanup
consolidate to one map, some minor other cleaning.  More coming.
2017-02-10 14:57:09 -07:00
David Kelly
61e558e568 Entity Edit Filters for zones
Part 1 - just put them in the zones entities.  Next I'll hook them
up and actually filter...
2017-02-08 09:53:25 -07:00
Howard Stearns
a1afbe7d5e Merge branch 'master' of https://github.com/highfidelity/hifi into edit-entity-filter 2017-01-25 19:16:29 -08:00
howard-stearns
ada685a376 cr changes 2017-01-23 15:31:55 -08:00
howard-stearns
0a4634446d typo 2017-01-23 13:09:28 -08:00
Ryan Huffman
4e358f76fe Remove trailing whitespace from EntityItemProperties.cpp 2017-01-20 14:36:45 -08:00
Stephen Birarda
5d1b53c600 move map population with properties back 2017-01-18 14:58:36 -08:00
Stephen Birarda
3556379034 leverage JSON filter changes to OctreeQuery in EntityServer 2017-01-18 14:58:36 -08:00
howard-stearns
00e53c8ea6 more tractable copy semantics 2017-01-18 13:21:28 -08:00
Ryan Huffman
b0c2a9d614 Add serverScripts entity property 2017-01-17 14:47:06 -08:00
howard-stearns
121d79ef36 getting there, but not yet complete 2017-01-13 16:59:51 -08:00
Faye Li Si Fi
9289dd36d4 Merge remote-tracking branch 'refs/remotes/highfidelity/master' into last-edited-property 2016-12-08 10:50:00 -08:00
Faye Li Si Fi
1fde68c86e better code style 2016-12-07 16:10:03 -08:00
Faye Li Si Fi
b6798adb5c yay 2016-12-07 15:40:37 -08:00
Faye Li Si Fi
0556661d13 getting rid of uneccessary flag, fix formatting, and getting it to work yay 2016-12-07 15:40:21 -08:00
Faye Li Si Fi
0fcb8803b6 attempt to expose last edited property to script 2016-12-07 12:27:31 -08:00
Brad Davis
5cbf7588ac Fixes for building on MSVC 2015 / Qt 5.8 2016-12-02 14:58:09 -08:00
Seth Alves
15c247fc5e quiet warnings 2016-11-11 06:37:22 -08:00
Seth Alves
850361f222 lastEditedBy property for entities 2016-11-10 15:26:28 -08:00
Seth Alves
9b7086b1fb added EntityItemProperties.merge function. when sending edits for avatar-entities, don't call setProperties on the entity. Fix currentFrame bug in AnimationPropertyGroup::copyToScriptValue 2016-10-17 16:11:37 -07:00
David Rowe
68499f49ad Fix count of textures 2016-09-10 10:15:13 +12:00
David Rowe
17d30796cc Use count of textures actually rendered
Textures specified in model may be invalid and so not actually rendered.
2016-09-03 13:07:00 +12:00
Brad Hefta-Gaub
e1845e2c3f add support for renderInfo properties to model entities 2016-08-31 15:00:21 -07:00
Anthony J. Thibault
31ed378dbf Added dpi entity property for web-entities 2016-08-23 10:10:26 -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
Andrew Meadows
431043e195 declare new shape types 2016-07-06 10:50:51 -07:00
Andrew Meadows
937bd0c1be SHAPE_TYPE_MESH --> SHAPE_TYPE_STATIC_MESH 2016-06-21 13:54:21 -07:00
Andrew Meadows
f41fb30ace add "Static Mesh" option to edit.js 2016-06-20 17:29:20 -07:00
Andrew Meadows
211bbb88e6 purge SHAPE_TYPE_ELLIPSOID which wasn't used 2016-06-03 10:47:54 -07:00
Brad Hefta-Gaub
0ec7eae58c fix shapes to property polymorph and persist 2016-05-27 16:59:42 -07:00
Brad Davis
cd1e910844 Add a generic shape primitive 2016-05-21 23:46:44 -07:00
Seth Alves
637735bbc3 unmangle merge 2016-05-20 18:07:38 -07:00
Seth Alves
f91a2403be merge from upstream 2016-05-20 17:07:34 -07:00