David Rowe
|
309e7f7333
|
Tidying
|
2018-01-11 14:48:45 +13:00 |
|
Andrew Meadows
|
b3fcca8446
|
Merge pull request #12132 from hyperlogic/bug-fix/prevent-hands-from-entering-body
Bug fix to prevent wrists entering the avatar's torso.
|
2018-01-10 17:22:50 -08:00 |
|
SamGondelman
|
e9d751fd23
|
try to avoid reusing uniform buffer locations
|
2018-01-10 17:01:01 -08:00 |
|
David Rowe
|
951f52c4b2
|
Merge branch 'master' into 21679
|
2018-01-11 13:54:06 +13:00 |
|
Dante Ruiz
|
980807c657
|
make changes
|
2018-01-10 16:50:41 -08:00 |
|
David Rowe
|
753bd21e68
|
location API JSDoc
|
2018-01-11 13:44:16 +13:00 |
|
Ken Cooke
|
6a2e3cc272
|
Enable stereo codecs for AvatarAudioStream
|
2018-01-10 15:14:18 -08:00 |
|
Nissim Hadar
|
8396997dec
|
Renamed enum element.
|
2018-01-10 13:35:57 -08:00 |
|
SamGondelman
|
df574c6bc9
|
keep requesting render update until textures load
|
2018-01-10 13:19:53 -08:00 |
|
Anthony J. Thibault
|
ae997928c1
|
Bug fix to prevent wrists entering the avatar's torso.
This was inadvertently disabled in PR #11978.
|
2018-01-10 11:51:44 -08:00 |
|
Nissim Hadar
|
c99a936720
|
Bumped up protocol version.
|
2018-01-10 11:45:37 -08:00 |
|
Dante Ruiz
|
d0bff29471
|
fixing merge conflict
|
2018-01-10 10:11:53 -08:00 |
|
Nissim Hadar
|
9f25b01b10
|
Merge branch 'master' of https://github.com/highfidelity/hifi into stageRemoval
|
2018-01-10 09:30:05 -08:00 |
|
Sam Gateau
|
539ee82937
|
Merge pull request #12033 from Zvork/compactvb
More compact representation of meshes on GPU
|
2018-01-10 09:11:33 -08:00 |
|
Sam Gateau
|
8c80247925
|
Merge pull request #12123 from SamGondelman/meta
Model meta render item is only withTypeShape if visual geometry request fails
|
2018-01-10 09:09:19 -08:00 |
|
Sam Gateau
|
6d6aad4aa8
|
Merge pull request #12060 from SamGondelman/burp5
Reduce EntityItem access in EntityRenderer::needsRenderUpdateFromEntity
|
2018-01-10 09:08:54 -08:00 |
|
Ken Cooke
|
660032d8fb
|
Fix bug in how emitAudioPacket() determines mono/stereo.
Compressed bytes were counted as if audio samples.
|
2018-01-10 06:54:27 -08:00 |
|
Olivier Prat
|
5ae4b99b90
|
Merge branch 'master' of git://github.com/highfidelity/hifi into compactvb
|
2018-01-10 11:20:00 +01:00 |
|
Olivier Prat
|
2960ad845c
|
Fixed weird rendering bug.
|
2018-01-10 10:55:45 +01:00 |
|
Olivier Prat
|
cc8a717a81
|
Merge branch 'master' of git://github.com/highfidelity/hifi into roughness_metal
|
2018-01-10 10:07:32 +01:00 |
|
Nissim Hadar
|
bb04b68e42
|
Merge branch 'master' of https://github.com/highfidelity/hifi into stageRemoval
|
2018-01-09 15:51:46 -08:00 |
|
Nissim Hadar
|
5b1f8e83d4
|
Removed gcc warning.
|
2018-01-09 15:46:15 -08:00 |
|
Dante Ruiz
|
c4253f3b3b
|
Merge branch 'master' of github.com:highfidelity/hifi into soft-entities
|
2018-01-09 15:31:38 -08:00 |
|
Nissim Hadar
|
0b1e321ccf
|
Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance
|
2018-01-09 15:25:03 -08:00 |
|
Nissim Hadar
|
b53e411184
|
Corrected pushing of default lights.
|
2018-01-09 15:24:46 -08:00 |
|
Melissa Brown
|
7b50480a43
|
Merge pull request #12070 from 1st-BrainStormer/master
WL#21651: Extend MIDI javascript support.
|
2018-01-09 14:06:15 -08:00 |
|
Nissim Hadar
|
4ecb056210
|
Merge branch 'master' of https://github.com/highfidelity/hifi into stageRemoval
|
2018-01-09 13:44:13 -08:00 |
|
Nissim Hadar
|
c3f6faed00
|
Deal correctly with inheritance at top-most level.
|
2018-01-09 13:27:57 -08:00 |
|
SamGondelman
|
7c56a9ffb2
|
model meta is only withTypeShape if visual geometry request fails
|
2018-01-09 12:43:43 -08:00 |
|
Atlante45
|
776a2e8373
|
Fix concurrent access crash in avatar mixer
|
2018-01-09 11:24:34 -08:00 |
|
Olivier Prat
|
db9e5fdae8
|
Merged from master but rendering seems broken
|
2018-01-09 11:05:34 +01:00 |
|
Bruce Brown
|
e9f8dafbc8
|
Corrected bitwise operators, Removed midiRaw signal.
|
2018-01-08 20:10:22 -08:00 |
|
Anthony J. Thibault
|
fbea22e0f0
|
Renamed imag component to dual, using the correct nomenclature
Also removed incomplete test from unit tests.
|
2018-01-08 18:21:23 -08:00 |
|
Nissim Hadar
|
c841ec6c8c
|
Copy Skybox URL to Ambient URL if background mode is Skybox and Ambient URL is blank.
|
2018-01-08 18:15:20 -08:00 |
|
SamGondelman
|
4f5727e6b0
|
add _needsRenderUpdate flag
|
2018-01-08 17:10:44 -08:00 |
|
Nissim Hadar
|
7811ddb904
|
Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance
|
2018-01-08 15:39:09 -08:00 |
|
Nissim Hadar
|
b2b1807490
|
Changes per code review.
|
2018-01-08 15:37:06 -08:00 |
|
Nissim Hadar
|
46b494c802
|
Removed the Stage functionality - it is now implemented as a script.
|
2018-01-08 14:34:46 -08:00 |
|
SamGondelman
|
7c17603f3e
|
Merge remote-tracking branch 'upstream/master' into burp5
|
2018-01-08 14:27:31 -08:00 |
|
Melissa Brown
|
2fddace71e
|
Merge pull request #12019 from Delanir/C10594
Case 10594 - Fix entity property href not being able to reset (empty) ...
|
2018-01-08 14:22:28 -08:00 |
|
Nissim Hadar
|
569cf1a30e
|
Merge branch 'master' of https://github.com/highfidelity/hifi into stageRemoval
|
2018-01-08 14:16:03 -08:00 |
|
John Conklin II
|
fab28e7d44
|
Merge pull request #12106 from SamGondelman/overlayFix
Fix avatar texture loading
|
2018-01-08 14:01:15 -08:00 |
|
Anthony J. Thibault
|
d08f94a74d
|
Code review feedback
* Removed AnimPose::fuzzyEqual
* Fixed DualQuaternion ctor
|
2018-01-08 13:36:23 -08:00 |
|
Anthony J. Thibault
|
59b843781e
|
Merge branch 'master' into feature/dual-quat
|
2018-01-08 13:18:42 -08:00 |
|
SamGondelman
|
97c0b33975
|
fix avatar texture loading
|
2018-01-08 12:50:05 -08:00 |
|
Nissim Hadar
|
452c16e706
|
Removed backgroundPropertiesChanged
|
2018-01-08 12:11:36 -08:00 |
|
Nissim Hadar
|
0a21e5de04
|
Removed _backgroundPropertiesChanged
|
2018-01-08 12:07:21 -08:00 |
|
MiladNazeri
|
56d4429a8b
|
Merge pull request #12020 from ctrlaltdavid/21646
Window JSDoc
|
2018-01-08 11:53:34 -08:00 |
|
Nissim Hadar
|
a33f3446f6
|
Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance
|
2018-01-08 11:51:13 -08:00 |
|
Nissim Hadar
|
d0c0d6a388
|
Set skybox mode as per legacy background mode if needed.
|
2018-01-08 11:50:28 -08:00 |
|
Olivier Prat
|
c904302057
|
Added back multiplication of specular for point / directional / spot lighting by PI as Naty Hoffman recommends. Limited texture LOD of ambient map by LOD computed for filtering to prevent aliasing
|
2018-01-08 15:23:39 +01:00 |
|
Olivier Prat
|
10b39751e1
|
Merge branch 'master' of git://github.com/highfidelity/hifi into roughness_metal
|
2018-01-08 14:50:05 +01:00 |
|
Nissim Hadar
|
93fffb4bbe
|
Removed PROP_BACKGROUND_MODE.
|
2018-01-07 14:21:22 -08:00 |
|
Nissim Hadar
|
8e793e790a
|
Deleted unused include file.
|
2018-01-07 14:11:26 -08:00 |
|
Nissim Hadar
|
8206ae6ffb
|
Removed BackgroundMode packet type.
|
2018-01-07 13:50:42 -08:00 |
|
Howard Stearns
|
724db93389
|
Merge pull request #12002 from howard-stearns/consistent-goToUser
Consistent go to user
|
2018-01-07 11:07:39 -08:00 |
|
Nissim Hadar
|
bc98cbd58f
|
Merge branch 'keylightInheritance' of https://github.com/NissimHadar/hifi into keylightInheritance
|
2018-01-06 23:26:28 -08:00 |
|
nissim.hadar
|
1acf7bae20
|
Removed reference to BackgroundMode.
|
2018-01-06 23:24:28 -08:00 |
|
Nissim Hadar
|
d5be9365fe
|
Merge branch 'keylightInheritance' of https://github.com/NissimHadar/hifi into keylightInheritance
|
2018-01-06 10:02:12 -08:00 |
|
nissim.hadar
|
33cc17a52f
|
Removing unused Background mode.
|
2018-01-06 02:27:49 -08:00 |
|
nissim.hadar
|
d2ac27f1b8
|
Code clean-up
|
2018-01-06 01:48:58 -08:00 |
|
nissim.hadar
|
579aec7118
|
Only check for zone fields.
|
2018-01-06 01:37:23 -08:00 |
|
Olivier Prat
|
b296b96e5e
|
Merged with master
|
2018-01-06 10:01:00 +01:00 |
|
Nissim Hadar
|
f742ab7952
|
Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance
|
2018-01-05 23:14:51 -08:00 |
|
Nissim Hadar
|
9e5eba4d3a
|
Merge branch 'keylightInheritance' of https://github.com/NissimHadar/hifi into keylightInheritance
|
2018-01-05 23:11:40 -08:00 |
|
Bruce Brown
|
f233c93aaa
|
Requested updates
|
2018-01-05 19:50:16 -08:00 |
|
Anthony Thibault
|
1a97d1de0f
|
Merge pull request #11953 from hyperlogic/feature/exp-smoothing-input-filter
Added exponential smoothing filter for vive pucks.
|
2018-01-05 16:50:55 -08:00 |
|
Andrew Meadows
|
4745a0e32d
|
Merge pull request #12093 from AndrewMeadows/simulation-ownership-004
more stable simulation ownership for system of constraints
|
2018-01-05 14:17:53 -08:00 |
|
Andrew Meadows
|
b28684f15e
|
Merge pull request #12087 from ctrlaltdavid/21661
Laser auto-on with tablet and Web overlays
|
2018-01-05 14:08:01 -08:00 |
|
Brad Hefta-Gaub
|
7a3835eb33
|
Merge pull request #11945 from jherico/android_nov
Updating android toolchain for QML
|
2018-01-05 13:34:03 -08:00 |
|
Brad Hefta-Gaub
|
6a3609093d
|
Merge pull request #12051 from dback2/polyobjimportfixes
Poly obj import fixes
|
2018-01-05 13:33:29 -08:00 |
|
Nissim Hadar
|
d645163294
|
Fixed gcc warning.
|
2018-01-05 13:16:02 -08:00 |
|
Nissim Hadar
|
635fd2d0cf
|
Use older C++ version for Ubuntu
|
2018-01-05 12:48:21 -08:00 |
|
Seth Alves
|
487dab641f
|
Merge pull request #12090 from AndrewMeadows/simulation-ownership-003
more stable simulation ownership
|
2018-01-05 12:27:52 -08:00 |
|
Sam Gateau
|
91eb718074
|
Merge pull request #12091 from SamGondelman/overlayFix
Update model render items on texture load and fix no haze issue
|
2018-01-05 12:26:56 -08:00 |
|
Nissim Hadar
|
3963c0a5a1
|
Code review improvements.
|
2018-01-05 12:22:20 -08:00 |
|
Ryan Downe Karpf
|
a3245aec57
|
Merge pull request #12079 from RebeccaStankus/log-filtering
Log filtering
|
2018-01-05 08:40:41 -08:00 |
|
Olivier Prat
|
413ea99916
|
Merge branch 'master' of git://github.com/highfidelity/hifi into roughness_metal
|
2018-01-05 08:30:26 +01:00 |
|
Sam Gondelman
|
5cf25a20c9
|
use correct model ptr
|
2018-01-04 21:21:58 -08:00 |
|
Nissim Hadar
|
cf7d6a2eab
|
Added correct use of legacy background combo.
|
2018-01-04 20:30:10 -08:00 |
|
David Rowe
|
5463f1ae6b
|
Merge branch 'master' into 21646
|
2018-01-05 16:58:58 +13:00 |
|
Nissim Hadar
|
c10d2a5461
|
Added correct use of legacy background combo.
|
2018-01-04 19:48:25 -08:00 |
|
Bruce Brown
|
a1c3ad360f
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2018-01-04 18:42:52 -08:00 |
|
Nissim Hadar
|
adbc4d0c39
|
Removed background mode from code (still in the protocol).
|
2018-01-04 18:23:25 -08:00 |
|
SamGondelman
|
a9d5dda976
|
always push default haze to current frame
|
2018-01-04 17:54:23 -08:00 |
|
David Back
|
7558b00467
|
better fix for model scale floor, remove abs
|
2018-01-04 17:49:39 -08:00 |
|
Anthony J. Thibault
|
51ab38f484
|
warning fix
|
2018-01-04 17:32:22 -08:00 |
|
David Back
|
307867a91f
|
adjust to for loop
|
2018-01-04 16:53:35 -08:00 |
|
Andrew Meadows
|
623a29b14a
|
add ownership infection for constraints
|
2018-01-04 16:48:06 -08:00 |
|
David Back
|
6b9658f8cf
|
merge
|
2018-01-04 16:41:58 -08:00 |
|
Anthony J. Thibault
|
fac0982c67
|
need to use sizeof(TransformType), not sizeof(mat4)
|
2018-01-04 16:37:12 -08:00 |
|
Anthony J. Thibault
|
b8c88fca3b
|
Dual Quaternion skinning optimization
Reduce expensive conversion from quat -> matrix -> quat, by keeping
the inverseBindPose in a Transform instance instead of a mat4.
|
2018-01-04 16:17:23 -08:00 |
|
Anthony J. Thibault
|
aacf2d489f
|
removed comments
|
2018-01-04 16:17:21 -08:00 |
|
Anthony J. Thibault
|
bcd813ac62
|
Optimizations and cleanup
|
2018-01-04 16:15:44 -08:00 |
|
Anthony J. Thibault
|
e86fd4f992
|
Removed SKIN_COMP define, re-enabled cauterization
|
2018-01-04 16:15:42 -08:00 |
|
Anthony J. Thibault
|
b69edceb4f
|
Fixed rotation polarity and weights are now 16 bit.
|
2018-01-04 16:15:41 -08:00 |
|
Anthony J. Thibault
|
5bb0b06061
|
WIP: Dual Quaternion compensation for spinning the right way.
|
2018-01-04 16:15:39 -08:00 |
|
Anthony J. Thibault
|
8bdddf7211
|
Full Dual Quaternion support
|
2018-01-04 16:15:38 -08:00 |
|
Anthony J. Thibault
|
3896b31a72
|
Line numbers for shader when there are compilation errors
|
2018-01-04 16:13:46 -08:00 |
|
Anthony J. Thibault
|
18113d824c
|
Created Model::TransformComponents class
|
2018-01-04 16:13:44 -08:00 |
|