howard-stearns
|
5257a254cb
|
more for the previous
|
2018-06-04 13:12:41 -07:00 |
|
howard-stearns
|
5a1b56d573
|
checkpoint with goto feeds working (but without filtering)
|
2018-06-04 13:11:06 -07:00 |
|
howard-stearns
|
e40fc20cb6
|
fix some bugs that had been introduced by various out-of-team prs.
|
2018-06-04 13:00:08 -07:00 |
|
howard-stearns
|
254abfa04a
|
add request-services to default scripts.
|
2018-06-04 12:59:08 -07:00 |
|
SamGondelman
|
bde3382657
|
merge with master
|
2018-06-04 12:55:17 -07:00 |
|
SamGondelman
|
8af1beca8d
|
add isGroupCulled for model overlays
|
2018-06-04 12:07:57 -07:00 |
|
Zach Fox
|
cf7a3d1af6
|
Fix MS7224: Add dimensions to printed Snapshot entity
|
2018-06-04 11:30:29 -07:00 |
|
Alexander Ivash
|
9bf3759e8d
|
allow control spinbox with mouse wheel
|
2018-06-04 21:27:00 +03:00 |
|
Alexander Ivash
|
826d853edf
|
fix blinking 'up' indicator on pressing 'down'
|
2018-06-04 21:26:59 +03:00 |
|
Alexander Ivash
|
56466e61d3
|
fix binding loops disallowing to increment/decrement spinbox value under certain conditions
|
2018-06-04 21:26:57 +03:00 |
|
Alexander Ivash
|
8d213efa75
|
introduce test 'controls gallery' application for controls testing
|
2018-06-04 21:26:56 +03:00 |
|
howard-stearns
|
24a67c6008
|
Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll
|
2018-06-04 11:15:39 -07:00 |
|
David Back
|
074892591d
|
fix auto-selecting subdir and not showing Choose when no row selected
|
2018-06-04 11:13:03 -07:00 |
|
John Conklin II
|
08fcad1932
|
Merge pull request #13227 from SamGondelman/entityMirror
Add local-only isVisibleInSecondaryCamera flag to entities
|
2018-06-04 11:06:00 -07:00 |
|
howard-stearns
|
bf7453482a
|
Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll
|
2018-06-04 10:26:49 -07:00 |
|
John Conklin II
|
29f2ab01d8
|
Merge pull request #13244 from danteruiz/fix-shortcuts
fix copy delete cut paste commands and menus (RC68)
|
2018-06-04 10:02:49 -07:00 |
|
John Conklin II
|
c981925c4d
|
Merge pull request #13287 from gcalero/workaround_buffer_corruption
Workaround for android buffer corruption issue
|
2018-06-04 09:51:06 -07:00 |
|
Anthony J. Thibault
|
c3d1daf855
|
Merge branch 'master' into nativeCGCode
|
2018-06-04 09:32:38 -07:00 |
|
John Conklin II
|
0d999533b4
|
Merge pull request #13289 from gcalero/workaround_buffer_corruption_rc68
Workaround buffer corruption rc68
|
2018-06-04 09:23:42 -07:00 |
|
Dante Ruiz
|
606b6d8947
|
fix code standard issue
|
2018-06-04 09:16:39 -07:00 |
|
Zach Fox
|
64cccc55d4
|
Merge pull request #13288 from zfox23/MS15529_secondaryCamNotifications
MS15529: Add secondary camera snapshot notification flag
|
2018-06-04 08:04:26 -07:00 |
|
Angus Antley
|
beaea7abe6
|
changed max face tracker info size to reflect summed coeff
|
2018-06-02 14:39:30 +01:00 |
|
amantley
|
2879eeb687
|
added flags for procedural face movement AvatarData.cpp toByteArray and parseDataFromBuffer
|
2018-06-01 17:18:48 -07:00 |
|
Andrew Meadows
|
db3520b332
|
also update queryAACube for 'Held' things
|
2018-06-01 16:38:57 -07:00 |
|
Andrew Meadows
|
9ae19714b5
|
also update queryAACube for children of worn entities
|
2018-06-01 16:38:57 -07:00 |
|
John Conklin II
|
378e84b7ce
|
Merge pull request #13257 from danteruiz/rc68-reload-scripts
adding back reload scripts shortcut and clean up AboutUtil(RC68)
|
2018-06-01 15:10:28 -07:00 |
|
Simon Walton
|
97613f1f07
|
Only set app ID on sandbox link
Also pass down the app ID from CMake files to installer and
server-console.
|
2018-06-01 14:13:52 -07:00 |
|
Gabriel Calero
|
44027f74fc
|
Workaround for android < Oreo
|
2018-06-01 18:11:07 -03:00 |
|
Gabriel Calero
|
61953d0070
|
Fix NullPointerException introduced with the workaround
|
2018-06-01 18:11:00 -03:00 |
|
Gabriel Calero
|
89c4b1ecdd
|
Workaround for android buffer corruption issue
|
2018-06-01 18:10:48 -03:00 |
|
Zach Fox
|
7f344c33a7
|
Docs update
|
2018-06-01 13:51:18 -07:00 |
|
Zach Fox
|
96858c9586
|
MS15529: Add secondary camera snapshot notification flag
|
2018-06-01 13:38:41 -07:00 |
|
howard-stearns
|
29b09d64e6
|
checkpoint with PAL working.
|
2018-06-01 13:33:45 -07:00 |
|
Gabriel Calero
|
85c6202e80
|
Workaround for android < Oreo
|
2018-06-01 17:11:14 -03:00 |
|
Gabriel Calero
|
459991988c
|
Fix NullPointerException introduced with the workaround
|
2018-06-01 15:48:57 -03:00 |
|
John Conklin II
|
ed8d12593d
|
Merge pull request #12789 from sethalves/fix-collisionless-property
make legacy ignoreForCollision property work right
|
2018-06-01 11:46:18 -07:00 |
|
amantley
|
01848fafe0
|
made all changes except those to AvatarData toByteArray function also to do: verify that transientBlendshapes are set to 0 in headData simulate when there are blendshapes from script but no face tracker present
|
2018-06-01 11:37:11 -07:00 |
|
howard-stearns
|
e6ffb9a3e5
|
Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll
|
2018-06-01 11:10:13 -07:00 |
|
Gabriel Calero
|
b2fe5a6d63
|
Workaround for android buffer corruption issue
|
2018-06-01 15:00:00 -03:00 |
|
John Conklin II
|
7c5da8494f
|
Merge pull request #13260 from wayne-chen/toggleAdvancedMovementFile-RC68-case-15453
JavaScript exception in toggleAdvancedMovementForHandControllers.js (RC68)
|
2018-06-01 10:50:57 -07:00 |
|
Seth Alves
|
708cbbc984
|
Merge pull request #13258 from wayne-chen/toggleAdvancedMovementFile-case-15453
JavaScript exception in toggleAdvancedMovementForHandControllers.js
|
2018-06-01 10:48:24 -07:00 |
|
Simon Walton
|
f58e1ebdd9
|
Only take down tablet if it was brought up
|
2018-06-01 10:41:08 -07:00 |
|
Simon Walton
|
2d9a5c62c1
|
Clean-up for compiler warnings
|
2018-06-01 10:02:41 -07:00 |
|
howard-stearns
|
84f5f0a653
|
Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll
|
2018-06-01 09:58:08 -07:00 |
|
Seth Alves
|
97b3fdfe68
|
make legacy collisionless property work right
|
2018-06-01 09:34:34 -07:00 |
|
John Conklin II
|
d5640558c1
|
Merge pull request #13266 from ctrlaltdavid/21884-68
Fix properties not populating particle explorer tab (RC68)
|
2018-06-01 09:33:04 -07:00 |
|
John Conklin II
|
194c33bf19
|
Merge pull request #13254 from danteruiz/add-back-reload-scripts
adding back reload scripts shortcut and clean up AboutUtil
|
2018-06-01 09:31:13 -07:00 |
|
Brad Hefta-Gaub
|
81d873a273
|
Merge pull request #13285 from hyperlogic/bug-fix/make-rotation-constraint-tests-pass
Make RotationConstraintTests pass
|
2018-05-31 21:37:36 -07:00 |
|
Simon Walton
|
c277cc7574
|
Fix minor error
|
2018-05-31 18:39:25 -07:00 |
|
Simon Walton
|
7d1d7f7bcd
|
Closing the open tablet dialog - try harder
|
2018-05-31 18:31:53 -07:00 |
|