Commit graph

419 commits

Author SHA1 Message Date
Sam Gondelman
1cc2cd3194
Merge pull request #15237 from SamGondelman/particleShapes
Case 21859: Particle Entity emitter shapes, including model
2019-04-03 11:03:33 -07:00
Anthony J. Thibault
782b8f5da6 Case 22010: Bump protocol number to fix joint order mismatch
The joint order change was introduced in PR #15178, to fix an FBX Serializer bug.
2019-04-02 13:26:50 -07:00
Sam Gondelman
414a39bd8a
Merge branch 'master' into particleShapes 2019-04-01 22:20:13 -07:00
Brad Davis
7d4e59bfe3 Force packet version change 2019-03-31 16:44:23 -07:00
SamGondelman
432a3f1610 uniform sampling of ellipsoid points 2019-03-19 12:59:03 -07:00
Ken Cooke
a5a305f181 Handle InjectorGainSet packet at the audio-mixer 2019-03-15 12:05:51 -07:00
Howard Stearns
97bfa538ff unlimited certified copies in a domain 2019-03-07 09:51:20 -08:00
Roxanne Skelly
3ef02085ff Merge commit '041a561dbcaa7280fd2c14ba2051b2add756ca6f' 2019-03-05 15:07:49 -08:00
danteruiz
f715dbe243 fix tablet scaling 2019-02-28 13:32:12 -08:00
SamGondelman
544f54e69a fix model scale 2019-02-21 14:10:36 -08:00
Simon Walton
8033e93eda Add avatar-priority boolean to zone entities
RC-79 version
2019-02-19 17:38:37 -08:00
SamGondelman
0955512a80 add billboard mode to web entities and fix picking/culling 2019-01-31 15:45:10 -08:00
SamGondelman
6ad0b3412a showKeyboardFocusHighlight + fixes 2019-01-28 20:43:47 -08:00
SamGondelman
13cb70a6a5 Merge remote-tracking branch 'upstream/master' into NOverlays12 2019-01-28 11:37:15 -08:00
SamGondelman
a10f52c66d merge with master 2019-01-25 14:16:07 -08:00
SamGondelman
5d19666f60 merge with master 2019-01-23 17:58:56 -08:00
SamGondelman
9a734b2011 merge with master 2019-01-23 17:48:24 -08:00
SamGondelman
ac513df103 ring gizmo entities 2019-01-23 17:46:04 -08:00
John Conklin II
1768d91780
Merge pull request #14733 from hyperlogic/bug-fix/translation-precision
Avatar Protocol: Fix for precision issues with translation
2019-01-23 14:07:58 -08:00
Anthony Thibault
286f23d512 Updated protocol version and fixed bugs 2019-01-17 15:19:54 -08:00
SamGondelman
611998f799 add pulse group properties to shapes, particles, text, web, image, and grid 2019-01-16 13:34:10 -08:00
Clement
6bd6c45b60 Remove dead IdentityRequest code 2019-01-15 11:40:08 -08:00
SamGondelman
4b67a79561 more web entity wip 2019-01-11 09:57:42 -08:00
Andrew Meadows
9b253690db bump packet version number 2019-01-09 17:28:00 -08:00
SamGondelman
10068cc42c merge with master 2019-01-08 12:14:32 -08:00
SamGondelman
1b5c1d0677 working on primitiveMode and groupCulled 2019-01-08 10:02:03 -08:00
Roxanne Skelly
d54fec4476 Merge branch 'master' of https://github.com/highfidelity/hifi into Case20377 2019-01-07 18:17:40 -08:00
SamGondelman
f60b272f11 fix crash 2019-01-07 17:24:07 -08:00
SamGondelman
3341d75eda merge with master 2019-01-07 15:49:16 -08:00
SamGondelman
b609cfaa2b renderLayer 2019-01-07 15:43:35 -08:00
Sam Gondelman
db3187ec6c
Merge branch 'master' into propFix 2019-01-07 14:57:38 -08:00
Adam Smith
7e75ed5daa
Merge pull request #14586 from SamGondelman/NOverlays8
Case 20322, Case 12279, Case 15803: Improve PolyLines to support glow and faceCamera
2019-01-07 14:53:27 -08:00
Roxanne Skelly
37d4846722 Merge branch 'master' of https://github.com/highfidelity/hifi into Case20377 2019-01-07 11:56:48 -08:00
Jeff Clinton
75d26dc45f
Merge pull request #14659 from luiscuenca/addAvatarToAvatarCollisionOption
Add menu checkbox to toggle collisions with other avatars
2019-01-07 08:58:09 -08:00
luiscuenca
d630fe9dbd Add menu checkbox to toggle collisions with other avatars 2019-01-04 16:38:48 -07:00
SamGondelman
1452d237e2 trying to fix avatar entity issue 2019-01-04 14:34:46 -08:00
Roxanne Skelly
4f9cce1ea9 Merge branch 'master' of https://github.com/highfidelity/hifi into Case20377 2019-01-04 13:46:45 -08:00
Sam Gondelman
0e6eecc64b
Update PacketHeaders.h 2019-01-03 15:20:55 -08:00
Sam Gondelman
5a6f9eb9e3
Merge branch 'master' into NOverlays8 2019-01-03 15:11:48 -08:00
Roxanne Skelly
2b1547b9fa Merge branch 'master' of https://github.com/highfidelity/hifi into Case20377 2019-01-03 13:39:19 -08:00
SamGondelman
4cd1cd6606 merge with master 2019-01-03 12:56:41 -08:00
Seth Alves
ad1235ce94 also bump entity protocol version 2019-01-03 08:19:13 -08:00
Seth Alves
78aff6e95c grab js api; send grab information through trait system 2019-01-03 08:17:52 -08:00
Roxanne Skelly
9dfb07c827 Merge branch 'master' of https://github.com/highfidelity/hifi into Case20377 2019-01-02 09:22:27 -08:00
Roxanne Skelly
4fc263ff24 Merge branch 'master' of https://github.com/highfidelity/hifi into Case20377 2018-12-27 14:13:40 -08:00
Roxanne Skelly
da70271acf Checkpoint #2 Case20377 - Add Ack for BulkAvatarTraits 2018-12-26 13:46:08 -08:00
Roxanne Skelly
3a282045ff Checkpoint trait-level flow control 2018-12-21 15:48:58 -08:00
SamGondelman
05e0fb464e new improved polylines 2018-12-19 15:01:49 -08:00
SamGondelman
6094a2f0a0 add back line entities, undo polyline changes temporarily 2018-12-14 15:41:11 -08:00
SamGondelman
b261665072 working on lines 2018-12-12 09:39:01 -08:00