sam gateau
|
efa1dd0274
|
rename the files from skin to deformed
|
2018-09-25 17:32:04 -07:00 |
|
sam gateau
|
cc0019479a
|
fixing review comments
|
2018-09-25 14:07:07 -07:00 |
|
sam gateau
|
e41b8f06e1
|
Cleaning up the pipeline and checking that it is working for all cases
|
2018-09-25 13:57:50 -07:00 |
|
sam gateau
|
9f16024616
|
Merge branch 'master' of github.com:highfidelity/hifi into black-bis
|
2018-09-25 08:27:38 -07:00 |
|
Sam Gateau
|
69734ce21b
|
Getting better'
|
2018-09-24 22:34:43 -07:00 |
|
sam gateau
|
7cf7eaa7c8
|
Exposing the drawcall user info just a uint16 right now and use it for the skinning and blendshape
|
2018-09-24 17:34:42 -07:00 |
|
John Conklin II
|
be23d07621
|
Merge pull request #14010 from sethalves/thread-safe-settings
make settings thread safe
|
2018-09-24 17:24:50 -07:00 |
|
John Conklin II
|
55848e6959
|
Merge pull request #14008 from sethalves/fix-local-angular-velocity
fix bug that caused localAngularVelocity to get zeroed out
|
2018-09-24 14:32:57 -07:00 |
|
John Conklin II
|
a602bff217
|
Merge pull request #13981 from gcalero/android_settings
Android settings (AEC)
|
2018-09-24 13:55:30 -07:00 |
|
John Conklin II
|
1f6f51993d
|
Merge pull request #14029 from huffman/fix/keyboard-logging-in-edit
Remove verbose logging of keyboard messages in edit.js and gridTool.js
|
2018-09-24 12:54:43 -07:00 |
|
John Conklin II
|
45b206d748
|
Merge pull request #14065 from SamGondelman/blendshapeCrash
Fix blendshape crash on avatar removal
|
2018-09-24 12:39:52 -07:00 |
|
John Conklin II
|
d520152a95
|
Merge pull request #14004 from hyperlogic/feature/anim-stat-improvements
Small Improvements to Anim Stats
|
2018-09-24 11:56:01 -07:00 |
|
John Conklin II
|
9916496118
|
Merge pull request #14041 from huffman/fix/entity-list-no-highlight-74
Fix entity list selection failing when selecting entities not in list
|
2018-09-24 11:02:36 -07:00 |
|
SamGondelman
|
d772cdb34a
|
please
|
2018-09-24 10:16:35 -07:00 |
|
Sam Gateau
|
4210ce46aa
|
bringing the tex corrd transform in the Material struct and shaving one ubo
|
2018-09-23 23:10:56 -07:00 |
|
Sam Gateau
|
b3112f898a
|
Merge branch 'master' of https://github.com/highfidelity/hifi into black-bis
|
2018-09-22 18:04:24 -07:00 |
|
sam gateau
|
d8984dafa0
|
ui allows to enable/disable the deformer componenets
|
2018-09-21 16:45:21 -07:00 |
|
Seth Alves
|
86e502637e
|
Make Settings thread safe
|
2018-09-21 15:46:35 -07:00 |
|
John Conklin II
|
ea7bc26ad8
|
Merge pull request #14038 from wayne-chen/fixInterstitialButton
Fix Interstitial GoTo button stretch
|
2018-09-21 11:44:48 -07:00 |
|
John Conklin II
|
fa5bb84628
|
Merge pull request #14043 from huffman/fix/entity-list-sort-visible-lock-74
Fix sorting of entity list not working as expected
|
2018-09-21 11:44:17 -07:00 |
|
John Conklin II
|
428ace17e1
|
Merge pull request #14001 from wayne-chen/fixLoginFailTwiceCall
Fixing double loginFailed
|
2018-09-21 11:36:06 -07:00 |
|
John Conklin II
|
9c2a7931fb
|
Merge pull request #14036 from AndrewMeadows/crowd-update-tuning
tweak avatar update priority coefficients for load tests
|
2018-09-21 09:44:15 -07:00 |
|
sam gateau
|
aa02dcb087
|
Merge branch 'master' of github.com:highfidelity/hifi into black-bis
|
2018-09-21 08:19:50 -07:00 |
|
sam gateau
|
cae2c60e7f
|
Factorizing the deformer code in a separate file, and now trying to control dynamically the blend shape on off
|
2018-09-20 17:29:31 -07:00 |
|
sam gateau
|
d3ff4b8630
|
Factorizing the deformer code in a separate file, and now trying to control dynamically the blend shape on off
|
2018-09-20 17:26:26 -07:00 |
|
John Conklin II
|
0560b8678c
|
Merge pull request #14022 from jherico/fix/amd_highlight
Fix AMD highlighting effect
|
2018-09-20 16:17:10 -07:00 |
|
sam gateau
|
5d80a89094
|
Apply fix to gl41 backend needed for proper Resource BUffer on gl41
|
2018-09-20 16:09:08 -07:00 |
|
Ryan Huffman
|
1ee655c8f8
|
Fix sorting of entity list not working as expected
|
2018-09-20 13:51:00 -07:00 |
|
Ryan Huffman
|
72adfb7ff0
|
Fix entity list selection failing when selecting entities not in list
|
2018-09-20 13:46:22 -07:00 |
|
Wayne Chen
|
8bd698b143
|
leaving button in natural dims
|
2018-09-20 11:13:27 -07:00 |
|
Andrew Meadows
|
cf85c617a2
|
tweak avatar update priority coefs for load tests
|
2018-09-20 09:56:50 -07:00 |
|
sam gateau
|
b04cbbb0ac
|
Apply fix to gl41 backend needed for proper Resource BUffer on gl41
|
2018-09-20 09:16:43 -07:00 |
|
Sam Gateau
|
377464f5a2
|
Merge branch 'master' of https://github.com/highfidelity/hifi into black-bis
|
2018-09-19 19:00:30 -07:00 |
|
sam gateau
|
6b6551c8bd
|
the missing file
|
2018-09-19 17:29:10 -07:00 |
|
sam gateau
|
4fc6466250
|
update shaders
|
2018-09-19 17:27:58 -07:00 |
|
Ryan Huffman
|
8805ce49e3
|
Remove verbose logging of keyboard messages in edit.js and gridTool.js
|
2018-09-19 15:06:58 -07:00 |
|
Wayne Chen
|
8d0e55c1cd
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2018-09-19 13:00:33 -07:00 |
|
John Conklin II
|
3b1e0dc7d9
|
Merge pull request #13987 from zfox23/discovery_appUi
Discovery Notifications Project Checkpoint: Discovery apps now use AppUI module; PEOPLE app notifications
|
2018-09-19 12:38:28 -07:00 |
|
John Conklin II
|
6c63f92f39
|
Merge pull request #13933 from SamGondelman/accelerationSpread
Fix particle acceleration spread
|
2018-09-19 11:49:42 -07:00 |
|
John Conklin II
|
60c07280f8
|
Merge pull request #13971 from SamGondelman/parabola
Correct transparent parabola shader
|
2018-09-19 11:46:24 -07:00 |
|
Brad Davis
|
783ea21951
|
Fix AMD highlighting effect
|
2018-09-19 11:21:12 -07:00 |
|
sam gateau
|
c05cbf065b
|
fixing the texcoord1 input in skined vertex shader
|
2018-09-19 10:13:14 -07:00 |
|
Sam Gateau
|
61644c48f0
|
Update the slp tp reflect the chanes in the vertex shaders
|
2018-09-19 09:18:09 -07:00 |
|
sam gateau
|
609bc6385e
|
Merge branch 'black' of github.com:samcake/hifi into black-bis
|
2018-09-18 17:40:45 -07:00 |
|
sam gateau
|
ec6117e9bb
|
bringing the blendshape in skin shader only work in master
|
2018-09-18 17:40:29 -07:00 |
|
Wayne Chen
|
8b3fff120a
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2018-09-18 16:28:33 -07:00 |
|
Wayne Chen
|
be5f498c2f
|
reversion
|
2018-09-18 15:47:54 -07:00 |
|
Wayne Chen
|
48e4b38312
|
reversion
|
2018-09-18 15:28:15 -07:00 |
|
Wayne Chen
|
8274f4cb4c
|
reverting domain handler change
|
2018-09-18 15:26:12 -07:00 |
|
Zach Fox
|
d487914656
|
Prevent text notification from appearing when not necessary
|
2018-09-18 11:28:59 -07:00 |
|