samcake
|
ba29ebaeb0
|
Moving the view controller up into workload and exposing timings
|
2018-04-26 13:08:26 -07:00 |
|
samcake
|
6d755a2127
|
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
|
2018-04-25 17:36:02 -07:00 |
|
samcake
|
17f8e789fc
|
less warning maybe ?
|
2018-04-25 15:53:50 -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 |
|
samcake
|
5db3eee4ad
|
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
|
2018-04-25 15:21:43 -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 |
|
MiladNazeri
|
0f87e53902
|
Merge pull request #12963 from MiladNazeri/docs/DocsToJSDocsUpdate
Docs/docs to js docs update
|
2018-04-25 12:26:19 -07:00 |
|
samcake
|
32e83c256a
|
Adjusting the task::Engine run signature to appease gcc gods and other warnings
|
2018-04-25 12:23:30 -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 |
|
samcake
|
5b5cad38e8
|
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
|
2018-04-25 10:03:42 -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 |
|
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 |
|
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 |
|
samcake
|
adfc935fdb
|
Merge with master
|
2018-04-24 13:04:16 -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
|
33bbbcef83
|
Merging with master
|
2018-04-24 11:49:34 -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 |
|
samcake
|
f686ef1f25
|
Exposing more uniforms to ui for refining the controller
|
2018-04-23 18:02:09 -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 |
|
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 |
|