Anthony J. Thibault
558711f906
Smooth hips transition between idle and fly.
...
Also, take dt into account for the critically damped spring lerp calculation.
2018-06-04 16:57:41 -07:00
howard-stearns
f72f8c762b
goto client-side filtering (preliminary)
2018-06-04 16:52:20 -07:00
Zach Fox
c5ef5cfccb
Fix MS15582: In My Purchases, invisible buttons shouldn't be clickable
2018-06-04 16:13:18 -07:00
David Back
7b2a9770ba
Merge branch 'master' of https://github.com/highfidelity/hifi into fileChooser
2018-06-04 16:00:13 -07:00
David Rowe
a7a0cfeef2
Remove some deprecated functions from the Controller API
2018-06-05 10:56:19 +12:00
David Back
6b7d9586d1
apply fixes to other file dialogs and fix tablet dialog buttons
2018-06-04 15:56:10 -07:00
howard-stearns
25ee948662
Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll
2018-06-04 15:30:10 -07:00
Sam Gondelman
38e7b31c32
Merge pull request #13176 from SimonWalton-HiFi/low-connectivity
...
Try reducing concurrent downloads
2018-06-04 14:48:46 -07:00
Zach Fox
60aff7a224
Whoops
2018-06-04 14:41:18 -07:00
David Rowe
b5028a9626
Merge branch 'master' into 21880
...
# Conflicts:
# interface./src/scripting/WindowScriptingInterface.h
2018-06-05 09:13:54 +12:00
Zach Fox
7407507f0b
Fix MS15574: Tiny memory leak in Wallet.h
2018-06-04 14:13:25 -07:00
David Rowe
b4b63187ae
Fix typo
2018-06-05 08:48:10 +12:00
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
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
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
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
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
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
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
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
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
SamGondelman
86ee5c12d8
merge and update based on sam's changes
2018-05-31 17:53:36 -07:00
Anthony J. Thibault
ddce4750ee
Make RotationConstraintTests pass
...
A previous bug fix made ElbowConstraint::apply() always return true.
Because it as always modifying the rotation via swingTwistDecomposition().
The tests now no longer check for a false value.
2018-05-31 17:14:16 -07:00
Thijs Wenker
3779a4780e
Prevent the cursor from being stuck on the most outer edges of the screen
2018-06-01 02:07:02 +02:00
Thijs Wenker
a06c9eccca
- fix create-app camera orbit to not jump around on secondary monitor
...
- style fixes entityCameraTool.js
2018-06-01 00:16:42 +02:00
Wayne Chen
9f20d52d01
adding alternate solution.
2018-05-31 15:05:33 -07:00
