MiladNazeri
|
098b432fd9
|
Merge pull request #13011 from ctrlaltdavid/21856-a
Docs to JSDoc review updates
|
2018-04-26 13:29:48 -07:00 |
|
Stephen Birarda
|
c8d7dc9b91
|
hide default port from addresses, fix localhost scheme
|
2018-04-26 13:29:26 -07:00 |
|
Stephen Birarda
|
97d793f867
|
hide default port from addresses, fix localhost scheme
|
2018-04-26 13:25:56 -07:00 |
|
Andrew Meadows
|
03e03727db
|
fix bug: interface sends too many updates on settle
|
2018-04-26 12:55:28 -07:00 |
|
Stephen Birarda
|
bc4ce12e64
|
Merge pull request #13008 from huffman/fix/download-correct-installer
Fix update installer URLs and add installer info to user activity data
|
2018-04-26 11:32:22 -07:00 |
|
Stephen Birarda
|
9f25103b09
|
Merge pull request #12972 from sethalves/fix-linux-clang-build
fix linux clang build
|
2018-04-26 10:46:51 -07:00 |
|
Ryan Huffman
|
4c8b8d8442
|
Improve installer campaign+type for updates and user activity data
|
2018-04-26 08:32:18 -07:00 |
|
David Rowe
|
08dc9b133f
|
Docs to JSDoc review
|
2018-04-26 21:10:28 +12:00 |
|
luiscuenca
|
e0770f06b1
|
Add scripts to Model Packager
|
2018-04-25 19:35:26 -07:00 |
|
Clément Brisset
|
2be40d487e
|
Merge pull request #13002 from birarda/sixty-six-one-mergeback
merge RC66.1 back to master
|
2018-04-25 15:47:56 -07:00 |
|
Liv Erickson
|
afea186784
|
fix for both functions
|
2018-04-25 14:39:04 -07:00 |
|
Stephen Birarda
|
956cc411d5
|
Merge branch 'RC66.1' of github.com:highfidelity/hifi into sixty-six-one-mergeback
|
2018-04-25 14:33:23 -07:00 |
|
John Conklin II
|
cb7b03652b
|
Merge pull request #12796 from MiladNazeri/feature/add-findByName
added Entities.findbyName
|
2018-04-25 14:00:10 -07:00 |
|
Liv Erickson
|
1860e66bd2
|
Merge branch 'master' of github.com:highfidelity/hifi into fix/import-whitespace
|
2018-04-25 13:52:55 -07:00 |
|
MiladNazeri
|
0f87e53902
|
Merge pull request #12963 from MiladNazeri/docs/DocsToJSDocsUpdate
Docs/docs to js docs update
|
2018-04-25 12:26:19 -07:00 |
|
John Conklin II
|
f04200a620
|
Merge pull request #12976 from ctrlaltdavid/21856
Docs to JSDoc
|
2018-04-25 11:36:34 -07:00 |
|
John Conklin II
|
748c8cdc58
|
Merge pull request #12861 from Zvork/taapre
Bloom and Temporal Anti-Aliasing improvements
|
2018-04-25 11:16:56 -07:00 |
|
John Conklin II
|
91b93db0c5
|
Merge pull request #12981 from birarda/bug/revert-hmac
revert HMAC packet verification for now
|
2018-04-25 10:07:36 -07:00 |
|
Bradley Austin Davis
|
ea0ef20416
|
Revert "HOTFIX version of PR 12969: Attempt to shutdown web surfaces more consistently"
|
2018-04-25 09:43:20 -07:00 |
|
Olivier Prat
|
e37b18336a
|
Improved anti-aliasing on text
|
2018-04-25 12:08:08 +02:00 |
|
Olivier Prat
|
f332849d9a
|
Merge branch 'master' of http://github.com/highfidelity/hifi into taapre
|
2018-04-25 09:19:21 +02:00 |
|
milad nazeri
|
4c736b2d62
|
Fixed defaults
|
2018-04-24 21:38:48 -07:00 |
|
David Rowe
|
cae9447ac5
|
Doc review
|
2018-04-25 15:09:47 +12:00 |
|
luiscuenca
|
165c3214a7
|
Avatar Scripts
|
2018-04-24 18:43:53 -07:00 |
|
Liv Erickson
|
10694e2256
|
Merge branch 'master' of github.com:highfidelity/hifi into fix/import-whitespace
|
2018-04-24 17:15:45 -07:00 |
|
John Conklin II
|
6062f21da1
|
Merge pull request #12961 from Atlante45/fix/es-deadlock
Enforce correct lock order between EntityTree and EntitySimulation
|
2018-04-24 15:40:32 -07:00 |
|
Anthony J. Thibault
|
2136134ed0
|
Debug Draw rendering now is visible on background skybox
|
2018-04-24 14:28:08 -07:00 |
|
John Conklin II
|
ce14dfb9a4
|
Merge pull request #12974 from AndrewMeadows/dont-feed-bullet-garbage
don't try to build convex hulls with nan data
|
2018-04-24 14:11:25 -07:00 |
|
Atlante45
|
d82333534c
|
Ensure the tree lock is always taken before the simulation lock
|
2018-04-24 13:46:05 -07:00 |
|
John Conklin II
|
236e75b6c6
|
Merge pull request #12903 from druiz17/add-more-hmd-data
Get the correct device name connect to OpenVr
|
2018-04-24 13:29:41 -07:00 |
|
Brad Hefta-Gaub
|
e6f15c720f
|
Merge pull request #12973 from birarda/bug/no-node-stats
66.1: fix connection to start stats sending for assignments
|
2018-04-24 13:23:39 -07:00 |
|
milad nazeri
|
23d07fa292
|
fixed spacing issue
|
2018-04-24 13:14:55 -07:00 |
|
John Conklin II
|
47c983a004
|
Merge pull request #12978 from AndrewMeadows/fix-crash-createConvexHull-RC66.1
RC66.1: don't try to build convex hulls with nan data
|
2018-04-24 13:03:13 -07:00 |
|
Stephen Birarda
|
63491588cb
|
Revert "Merge pull request #12690 from SimonWalton-HiFi/hmac-auth"
This reverts commit 7378c87ade, reversing
changes made to 92bf99f436.
|
2018-04-24 12:44:51 -07:00 |
|
Brad Hefta-Gaub
|
c6f4e118ce
|
Merge pull request #12953 from huffman/hotfix/node-list-connections
Hotfix, avatars disappear on quick reconnect
|
2018-04-24 12:38:21 -07:00 |
|
samcake
|
382161659e
|
Merge branch 'master' of https://github.com/highfidelity/hifi into taa-zvork
|
2018-04-24 11:37:00 -07:00 |
|
Sam Gateau
|
b342b16857
|
Fixing the crash on mac
|
2018-04-24 11:25:40 -07:00 |
|
Sam Gateau
|
2cae294ab4
|
Merge pull request #12904 from AndrewMeadows/lhf-needsToCallUpdate
LHF optimiaztion: only call ModelEntityItem::update() on instances that actually need it
|
2018-04-24 11:22:48 -07:00 |
|
Sam Gateau
|
da154d3e00
|
Merge pull request #12969 from jherico/fix/web_crash
Attempt to shutdown web surfaces more consistently
|
2018-04-24 10:15:25 -07:00 |
|
Brad Davis
|
4228b4269f
|
Fixing PR build
|
2018-04-24 10:06:28 -07:00 |
|
Brad Davis
|
a144de54e7
|
Attempt to shutdown web surfaces more consistently
|
2018-04-24 10:06:20 -07:00 |
|
milad nazeri
|
1121fe8da0
|
fix tabs
|
2018-04-23 21:47:53 -07:00 |
|
Brad Davis
|
ecaf162afb
|
Fixing PR build
|
2018-04-23 20:41:36 -07:00 |
|
Andrew Meadows
|
95d07345d4
|
don't try to build convex hulls with nan data
|
2018-04-23 17:00:38 -07:00 |
|
David Rowe
|
98f43b6a70
|
Interim JSDoc for MyAvatar - stubs for remainder
|
2018-04-24 10:47:33 +12:00 |
|
Andrew Meadows
|
ae186d46c6
|
don't try to build convex hulls with nan data
|
2018-04-23 14:46:23 -07:00 |
|
Brad Davis
|
861200db27
|
Attempt to shutdown web surfaces more consistently
|
2018-04-23 14:32:38 -07:00 |
|
John Conklin II
|
91197cadcf
|
Merge pull request #12967 from SimonWalton-HiFi/hmac-shortid-merge-fix
Fix for null sourceNode use
|
2018-04-23 14:11:06 -07:00 |
|
David Rowe
|
719062dd9f
|
Interim JSDoc for MyAvatar - first pass
|
2018-04-24 09:10:59 +12:00 |
|
John Conklin II
|
70689dd297
|
Merge pull request #12968 from birarda/bug/wrong-domain-local-id
fix setting of domain local ID from domain list
|
2018-04-23 13:50:21 -07:00 |
|
John Conklin II
|
5a3f44fa15
|
Merge pull request #12965 from NissimHadar/bug12979
Fix for bug #12979: Setting colors [0, 0, 254] from js api ends up as black color
|
2018-04-23 13:49:41 -07:00 |
|
Sam Gateau
|
d3fccc4104
|
Merge pull request #12881 from SamGondelman/scaleAssert
Minimum entity dimension (1mm)
|
2018-04-23 13:40:53 -07:00 |
|
Stephen Birarda
|
a6509f5ea7
|
fix connection to start stats sending for assignments
|
2018-04-23 13:25:18 -07:00 |
|
Seth Alves
|
6d8f769cf8
|
fix linux clang build
|
2018-04-23 13:18:36 -07:00 |
|
John Conklin II
|
b3dbf7a025
|
Merge pull request #12943 from vladest/fix_spinbox
Fix SpinBox.
|
2018-04-23 13:02:01 -07:00 |
|
Stephen Birarda
|
779386fbc4
|
fix setting of domain local ID from domain list
|
2018-04-23 12:29:02 -07:00 |
|
Simon Walton
|
f849d6f937
|
Change packetSourceAndHashMatchAndTrackBandwidth logging in same manner
|
2018-04-23 12:26:02 -07:00 |
|
Andrew Meadows
|
577f9a03e6
|
fix bug: animation reset on 'hold'
|
2018-04-23 12:08:40 -07:00 |
|
Andrew Meadows
|
748af5a65f
|
worry about multi-threads when updating animation props
|
2018-04-23 12:08:40 -07:00 |
|
Andrew Meadows
|
8e51d66092
|
fix bug: animation should reset on start running
|
2018-04-23 12:08:40 -07:00 |
|
Andrew Meadows
|
b48e9495a5
|
rollback change to MaterialEntityItem, we'll fix later
|
2018-04-23 12:08:40 -07:00 |
|
Andrew Meadows
|
75508385cf
|
more correct needsToCallUpdate() implementations
|
2018-04-23 12:08:40 -07:00 |
|
Andrew Meadows
|
e36dbab838
|
remove unused data member
|
2018-04-23 12:08:40 -07:00 |
|
NissimHadar
|
ea6585a0b9
|
Corrected tosRGBFloat() computation.
|
2018-04-23 11:53:35 -07:00 |
|
Gabriel Calero
|
001cd5e937
|
Merge remote-tracking branch 'upstream/master' into android_goto_splash
|
2018-04-23 14:25:26 -03:00 |
|
Sam Gateau
|
d1e2e9ce71
|
Merge pull request #12921 from SamGondelman/precisionq
Fix AMD shader compilation
|
2018-04-23 10:17:35 -07:00 |
|
Sam Gateau
|
7842ee8eac
|
Merge pull request #12962 from SamGondelman/menu
Android: Hide menu and fix shader compilation
|
2018-04-23 09:51:20 -07:00 |
|
milad nazeri
|
4ac06fe99f
|
Updating previous jsdocs
|
2018-04-22 22:22:33 -07:00 |
|
David Rowe
|
941e9360dd
|
JSDoc fixes
|
2018-04-23 16:09:56 +12:00 |
|
David Rowe
|
d65f66a73d
|
Interim JSDoc for Recording
|
2018-04-23 14:13:29 +12:00 |
|
David Rowe
|
6a2b7244eb
|
Interim JSDoc for Tablet
|
2018-04-23 11:06:17 +12:00 |
|
David Rowe
|
eeb511c359
|
Reticle JSDoc fix
|
2018-04-23 10:20:04 +12:00 |
|
David Rowe
|
4fb55ec2af
|
Interim JSDoc for Users
|
2018-04-23 09:59:14 +12:00 |
|
David Rowe
|
8e22941ad7
|
Interim JSDoc for Reticle
|
2018-04-23 09:22:45 +12:00 |
|
milad nazeri
|
e9b9c05b5d
|
removed cruft
|
2018-04-22 08:51:47 -07:00 |
|
David Rowe
|
2c39f2dbad
|
Interim JSDoc for Scene
|
2018-04-22 17:37:06 +12:00 |
|
David Rowe
|
62930eb576
|
Interim JSDoc for Script
|
2018-04-22 15:26:39 +12:00 |
|
Seth Alves
|
9e1bd69af3
|
Merge pull request #12918 from kitely/fix-addentity-failure
Fixed null pointer exception if importing an entity from JSON fails
|
2018-04-21 18:12:48 -07:00 |
|
David Rowe
|
01870af624
|
Interim JSDoc for ScriptDiscoveryService
|
2018-04-22 11:32:46 +12:00 |
|
MiladNazeri
|
3710ce593d
|
Merge pull request #12922 from ctrlaltdavid/21815
Controller API JSDoc
|
2018-04-21 10:44:05 -07:00 |
|
vladest
|
2e44220b80
|
Merge branch 'master' into fix_spinbox
|
2018-04-21 19:38:28 +02:00 |
|
Olivier Prat
|
fbd06f7d5e
|
Fixed compilation error on Android
|
2018-04-21 11:07:26 +02:00 |
|
David Rowe
|
3792b28a3e
|
Add input recorder examples
|
2018-04-21 14:53:40 +12:00 |
|
SamGondelman
|
ac7e8623bf
|
quiet shader warnings
|
2018-04-20 18:25:30 -07:00 |
|
MiladNazeri
|
080e26f408
|
Merge pull request #12952 from ctrlaltdavid/21851
Vec3 API JSDoc
|
2018-04-20 18:10:18 -07:00 |
|
Simon Walton
|
4973605bf7
|
Restore two makePrograms from previous commit
|
2018-04-20 17:52:40 -07:00 |
|
David Rowe
|
748052614f
|
Doc review
|
2018-04-21 12:45:00 +12:00 |
|
SamGondelman
|
d59f368ad6
|
hide menu, fix shaders
|
2018-04-20 17:38:38 -07:00 |
|
Seth Alves
|
84e71a9bca
|
missed a file
|
2018-04-20 16:08:57 -07:00 |
|
Seth Alves
|
6fc02638d7
|
control verbose logging with a menu-item in developer menu
|
2018-04-20 16:08:57 -07:00 |
|
Seth Alves
|
bec39369f7
|
remove some uncatagorized logging, suppress some categories by default
|
2018-04-20 16:08:57 -07:00 |
|
David Rowe
|
7087abd201
|
Merge branch 'master' into 21815
|
2018-04-21 10:49:56 +12:00 |
|
John Conklin II
|
39ad8be1b8
|
Merge pull request #12743 from SimonWalton-HiFi/short-id
Use 16-bit local IDs for Nodes in NL packets
|
2018-04-20 15:28:18 -07:00 |
|
Seth Alves
|
c20346ca53
|
Merge pull request #12937 from SamGondelman/startup
Make Audio.cpp threadsafe
|
2018-04-20 11:36:08 -07:00 |
|
Simon Walton
|
9f9a68188d
|
Merge remote-tracking branch 'upstream/master' into short-id
|
2018-04-20 11:10:21 -07:00 |
|
Seth Alves
|
ba43640950
|
Merge pull request #12785 from birarda/bug/xcode-warnings
fix some xcode warnings for unnecessary captured this
|
2018-04-20 10:30:27 -07:00 |
|
Seth Alves
|
512b1911eb
|
Merge pull request #12858 from ctrlaltdavid/21836
Update location.hostname JSDoc per serverless domains
|
2018-04-20 10:27:09 -07:00 |
|
SamGondelman
|
3b4b43cf66
|
try to fix audio crash on startup
|
2018-04-20 10:23:47 -07:00 |
|
John Conklin II
|
7378c87ade
|
Merge pull request #12690 from SimonWalton-HiFi/hmac-auth
Change packet authentication to use HMAC
|
2018-04-20 09:54:25 -07:00 |
|
John Conklin II
|
92bf99f436
|
Merge pull request #12786 from huffman/fix/node-list-connections
Fix avatars not coming back when briefly disconnected from avatar mixer
|
2018-04-20 09:53:50 -07:00 |
|