Thijs Wenker
a035a2f639
Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager
2019-01-03 11:09:27 +01:00
Thijs Wenker
725a14ce80
Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager
2019-01-03 11:06:19 +01:00
David Rowe
14d39d1747
Make mouselook yaw and pitch directly proportional to mouse movement
2019-01-03 15:53:37 +13:00
David Back
937aa718ae
remove selected particle property defaults
2019-01-02 18:22:55 -08:00
SamGondelman
ea11497a67
Merge remote-tracking branch 'upstream/master' into NOverlays7
2019-01-02 18:09:19 -08:00
Sam Gondelman
aeafb3c9a7
Merge pull request #14569 from SamGondelman/NOverlays6
...
Case 20281: Add missing Text Entity properties
2019-01-02 18:07:37 -08:00
David Rowe
36da8bfa58
Remove TODOs
2019-01-03 15:05:21 +13:00
David Back
0e89e37c8e
fix thumb rotations, fix text height, adjust readme
2019-01-02 17:40:00 -08:00
Anthony Thibault
006bd8f939
Merge remote-tracking branch 'upstream/master' into feature/improve-eye-look-at-interest-calculation
2019-01-02 16:58:10 -08:00
NissimHadar
65d975fe5b
Added detection of Rift and Vive controllers.
2019-01-02 16:53:38 -08:00
Ryan Huffman
61ac9d0050
Update various styling in Avatar Packager
2019-01-02 16:47:09 -08:00
NissimHadar
4918f7d186
Merge branch 'master' of https://github.com/highfidelity/hifi into 20301-addPlatformInfo
2019-01-02 16:24:52 -08:00
NissimHadar
dc4be42b20
Corrected AWS update for text results.
2019-01-02 16:14:05 -08:00
David Rowe
2ccef09d00
Make operation clearer
2019-01-03 12:35:44 +13:00
Thijs Wenker
cb91a4bc6d
Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager
2019-01-03 00:10:22 +01:00
Ryan Huffman
41effbf862
Remove unused variable in MarketplaceItemUploader.cpp
2019-01-02 15:01:00 -08:00
Ryan Huffman
d29233872e
Remove avatar packager from Android builds
2019-01-02 14:59:47 -08:00
Roxanne Skelly
3d8a323fae
Remove unused variable
2019-01-02 14:17:06 -08:00
Antonina Savinova
4838a9107a
Merge pull request #14624 from davidkelly/dk/17207
...
ACs don't need to call into flagtimeForConnecitonStep
2019-01-02 13:41:30 -08:00
Ryan Huffman
f3d2d7c95b
Merge pull request #14638 from huffman/fix/entity-list-text-mb
...
Fix texture MB column not sorting correctly in entity list
2019-01-02 13:32:05 -08:00
NissimHadar
56ee91dc60
Fixed Ubuntu warnings.
2019-01-02 13:23:20 -08:00
NissimHadar
1e8e633025
Merge branch 'master' of https://github.com/highfidelity/hifi into 20301-addPlatformInfo
2019-01-02 11:47:34 -08:00
David Back
b92beca7d1
bad merge
2019-01-02 11:26:38 -08:00
unknown
dde7fbdfce
how did these happen
2019-01-02 11:15:22 -08:00
unknown
f8f13e974d
property range audit - add range info via macros accessible via API, tweak min/max/steps in entityProperties
2019-01-02 11:12:10 -08:00
Jeff Clinton
d5ef7ba175
Merge pull request #14610 from roxanneskelly/Case20106
...
Case 20106-AC agents spawned with -n don't come back
2019-01-02 11:07:40 -08:00
Anthony Thibault
71991c2e2f
Added max angles and isTalking into the lookAtCostFunction
2019-01-02 11:05:01 -08:00
SamGondelman
32bec57cfe
Merge remote-tracking branch 'upstream/master' into NOverlays6
2019-01-02 09:53:29 -08:00
Roxanne Skelly
9dfb07c827
Merge branch 'master' of https://github.com/highfidelity/hifi into Case20377
2019-01-02 09:22:27 -08:00
Jeff Clinton
7143689ddf
Merge pull request #14620 from amantley/hmdSmoothFix
...
VIVE can now auto-detect hmd and desktop modes
2019-01-02 09:15:32 -08:00
Jeff Clinton
bb27acf934
Merge pull request #14530 from SamGondelman/NOverlays4
...
Case 20134: Grid Entities
2019-01-02 09:12:34 -08:00
Jeff Clinton
032178673a
Merge pull request #14634 from SamGondelman/NOverlays5
...
Case 20200: Update EntityScriptingInterface to not find local entities (#2 )
2019-01-02 09:00:56 -08:00
Thijs Wenker
20c169bd39
Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager
2019-01-02 14:03:13 +01:00
Roxanne Skelly
2e457e2212
Checkpoint trait flow control
2019-01-01 20:50:46 -08:00
David Rowe
3b531f3c99
Update JSDoc
2019-01-02 13:41:55 +13:00
David Rowe
d073dc22ac
Misc fixes
2019-01-02 13:39:31 +13:00
NissimHadar
c0a784fa94
Get graphics card type works on Mac laptop
2019-01-01 12:44:09 -08:00
Anthony Thibault
d87bc3e898
Update eye look at interest calculation
...
This now takes distance, your facing toward them, and their facing toward you into the interest calculation.
Also, separate the logic for myAvatar look at from other avatars snapping their gaze toward myAvatar.
Previously these two separate elements where merged together in a single loop.
2018-12-31 13:37:22 -08:00
NissimHadar
a3dde612d1
Can get total memory on Mac
2018-12-31 11:56:27 -08:00
NissimHadar
9c00bdcddb
getCPUBrand works on Mac
2018-12-31 11:00:29 -08:00
Anthony Thibault
95c93e59a7
Make the Out of Range Strategy drop down wider
...
So the "DropAfterDelay" item is not cut off on the Settings > Controlls > Calibration screen.
2018-12-31 09:23:33 -08:00
NissimHadar
bb54353644
Compilation error.
2018-12-30 22:36:15 -08:00
NissimHadar
abe8352230
Merge branch '20466-addPlatformInfo' of https://github.com/NissimHadar/hifi into 20466-addPlatformInfo
2018-12-30 22:19:44 -08:00
NissimHadar
4b4ef4412a
Merge branch 'master' of github.com:highfidelity/hifi into 20466-addPlatormInfo
2018-12-30 20:24:16 -08:00
NissimHadar
76ce63da64
Can read graphics card type.
2018-12-30 20:24:00 -08:00
David Rowe
f381361c82
Fix typos
2018-12-31 13:53:59 +13:00
David Rowe
d12b504a88
Use Controller axis value timestamp for mouse movement Controller events
2018-12-31 12:15:51 +13:00
David Rowe
84c6bb4797
Introduce optional timestamp into internal Controller axis values
...
This can be used to determine if consecutive identifical values should
be output.
2018-12-31 12:15:51 +13:00
David Rowe
4aa26715c0
Remove unused variable
2018-12-31 12:15:51 +13:00
David Rowe
40e6f1cad5
Fix Controller mouse move missing values during rapid movement
2018-12-31 12:15:51 +13:00
