Seth Alves
|
7403929323
|
missed this in the last commit -- bump protocol version
|
2015-08-10 15:15:54 -07:00 |
|
Andrew Meadows
|
80b36f9f12
|
fix typo
|
2015-08-10 15:11:00 -07:00 |
|
Seth Alves
|
b26d6d2b9c
|
Merge pull request #5542 from ZappoMan/RenderableModelEntityItemOptimization
Renderable model entity item optimizations
|
2015-08-10 15:10:12 -07:00 |
|
Seth Alves
|
74287c3cf5
|
Merge pull request #5482 from ericrius1/polyLineInProgress
Added PolyLine Entity and painting scripts to demonstrate its functionality (WARNING: protocol change) Test this please
|
2015-08-10 14:57:52 -07:00 |
|
Andrew Meadows
|
43bf4a85d2
|
add RotationConstraint and friends
|
2015-08-10 14:48:22 -07:00 |
|
Andrew Meadows
|
f9a4b82edd
|
add swing-twist decomposition util with unit-tests
|
2015-08-10 14:47:15 -07:00 |
|
ericrius1
|
59d5f61af4
|
incremented protocol number
|
2015-08-10 14:20:46 -07:00 |
|
ericrius1
|
8e7398ac7d
|
small comment change
|
2015-08-10 13:41:30 -07:00 |
|
David Rowe
|
8e93ee654e
|
Merge branch 'master' into 20639
|
2015-08-10 13:25:24 -07:00 |
|
Howard Stearns
|
88505c180d
|
Merge branch 'master' of https://github.com/highfidelity/hifi into restore-eye-joint-rotations
|
2015-08-10 12:34:59 -07:00 |
|
Howard Stearns
|
964d04d24f
|
Restore correct space for eye joint rotations.
Also, do not correct for camera position on my avatar. (That will be done by zero or one receivers.)
|
2015-08-10 12:34:01 -07:00 |
|
ericrius1
|
c9ad8e6e10
|
fixed comment formatting.
|
2015-08-10 12:10:27 -07:00 |
|
ericrius1
|
0f7c21ddd7
|
rearranged entity props and added check in setNormals to avoid uninitialized binormal values
|
2015-08-10 11:55:47 -07:00 |
|
Brad Davis
|
59dc6c9cca
|
Merge remote-tracking branch 'upstream/master' into plugins
|
2015-08-10 11:47:54 -07:00 |
|
Andrew Meadows
|
5acd1e7d58
|
Merge pull request #5467 from sethalves/polyvox
Polyvox improvements (Warning: protocol change)
|
2015-08-10 11:12:10 -07:00 |
|
ericrius1
|
c299d77c92
|
fixed implicit double to float casting and incorrect header author attribution
|
2015-08-10 10:57:53 -07:00 |
|
ZappoMan
|
ae958dd42d
|
Merge branch 'master' of https://github.com/highfidelity/hifi into RenderableModelEntityItemOptimization
|
2015-08-10 09:59:45 -07:00 |
|
ZappoMan
|
668778cfd9
|
optimize JointState::setRotationInConstrainedFrameInternal() to short cut cases where targetRotation matches previous targetRotation
|
2015-08-09 16:55:43 -07:00 |
|
ZappoMan
|
942958c4f1
|
only setJointState() if animation frame actually changed
|
2015-08-09 16:07:56 -07:00 |
|
Bradley Austin Davis
|
bfd0362bd8
|
Fixing mac build
|
2015-08-08 18:00:08 -07:00 |
|
Brad Davis
|
5515b9d8ee
|
Decouple Application and plugin definitions, cleanup container usage
|
2015-08-08 17:51:16 -07:00 |
|
Brad Davis
|
ba498e8f33
|
Fixing plugin construction after removing OVR dependency from interface
|
2015-08-08 14:02:26 -07:00 |
|
Brad Davis
|
ccc4a59992
|
Cleanup and PR comments
|
2015-08-08 13:54:37 -07:00 |
|
Brad Davis
|
caf93d1aff
|
Merge branch 'master' into plugins
Conflicts:
interface/src/Application.cpp
interface/src/Menu.h
|
2015-08-08 13:18:13 -07:00 |
|
David Rowe
|
051a398fa2
|
Merge branch 'master' into 20639
|
2015-08-07 18:26:56 -07:00 |
|
Andrew Meadows
|
331c8c0967
|
Merge pull request #5503 from AlexanderOtavka/panel-attachable-improvements
Improvements to FloatingUIPanels.
|
2015-08-07 17:21:51 -07:00 |
|
SamGondelman
|
23fea1f221
|
working on toybox script, squeezeHands, and default mappings
|
2015-08-07 16:59:50 -07:00 |
|
ericrius1
|
4fbd6f6337
|
removed old PacketHeaders.h file, updated udt version
|
2015-08-07 16:42:10 -07:00 |
|
ericrius1
|
6a4e2728ee
|
deleted old packet headers file
|
2015-08-07 16:29:57 -07:00 |
|
ericrius1
|
19e645fc65
|
fixed the way colors are handled to work with new core profile changes
|
2015-08-07 16:26:52 -07:00 |
|
ericrius1
|
205a2d53b6
|
no longer returning early on NaN
|
2015-08-07 16:15:51 -07:00 |
|
Andrew Meadows
|
48c5a227a7
|
Merge pull request #5528 from ZappoMan/removeBrokenShadows
remove shadow menu items
|
2015-08-07 16:09:00 -07:00 |
|
Bradley Austin Davis
|
cd6667303e
|
Merge remote-tracking branch 'upstream/master' into plugins
|
2015-08-07 15:32:33 -07:00 |
|
Brad Davis
|
64fcd2da96
|
Merge pull request #5530 from ZappoMan/RenderableModelEntityItemOptimization
optimizations to RenderableModelEntityItem::render()
|
2015-08-07 15:32:07 -07:00 |
|
Bradley Austin Davis
|
fb2c84484e
|
Merge remote-tracking branch 'upstream/master' into plugins
|
2015-08-07 15:26:43 -07:00 |
|
Seth Alves
|
732f9ceca5
|
pass voxel dimensions from PolyVoxEntityItem to pixel-shader so that the textures line up with the edges
|
2015-08-07 14:21:20 -07:00 |
|
Seth Alves
|
0a5ed0eb9b
|
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
|
2015-08-07 13:50:22 -07:00 |
|
Seth Alves
|
b1e69537f3
|
Merge pull request #5524 from howard-stearns/cleanup-jointstate
Clean Up JointState
|
2015-08-07 13:50:02 -07:00 |
|
ZappoMan
|
cec0f8ed1d
|
optimize ModelEntityItem::getAnimationFrame()
|
2015-08-07 13:43:57 -07:00 |
|
Seth Alves
|
f9685efa4b
|
set payload bounds for polyvoxs
|
2015-08-07 13:43:34 -07:00 |
|
Seth Alves
|
fcb30dbbe7
|
hook textures up to polyvoxs
|
2015-08-07 13:33:00 -07:00 |
|
ZappoMan
|
f4c3c30f6a
|
quick optimization to RenderableModelEntityItem::render()
|
2015-08-07 12:49:48 -07:00 |
|
David Rowe
|
b70c1a4960
|
Merge branch 'master' into 20639
|
2015-08-07 12:33:13 -07:00 |
|
Howard Stearns
|
145b730f80
|
Clean up instantiation.
|
2015-08-07 12:27:26 -07:00 |
|
ericrius1
|
d735c85806
|
moving polyLineEntity over to core profile
|
2015-08-07 11:41:55 -07:00 |
|
ZappoMan
|
87f609b9af
|
remove shadow menu items, left in the dead code for now, until we have a plan for replacing shadows
|
2015-08-07 11:26:07 -07:00 |
|
Sam Gateau
|
fdb370e798
|
cleaning th ecode
|
2015-08-07 10:59:56 -07:00 |
|
Sam Gateau
|
dcedcc2fa6
|
cleaning th ecode
|
2015-08-07 10:59:55 -07:00 |
|
Sam Gateau
|
30900cb802
|
SImple fix to the case of multiple material in a mesh with different opacity
|
2015-08-07 10:59:55 -07:00 |
|
Howard Stearns
|
5aa85a5b03
|
Don't let individual startAnimation get messed up by blend/fade.
|
2015-08-07 10:59:54 -07:00 |
|
bwent
|
d4e22ba78e
|
clean up formatting, make connectionUUID const in NodeList
|
2015-08-07 10:59:53 -07:00 |
|
bwent
|
1f2bd62f54
|
clean-up formatting
|
2015-08-07 10:59:52 -07:00 |
|
samcake
|
6864c7bcb4
|
Ready for release
|
2015-08-07 10:59:51 -07:00 |
|
Sam Gateau
|
0e3e0d05f1
|
Introducing the Normal fitting algorithm for better normal in the deferred buffer
|
2015-08-07 10:59:51 -07:00 |
|
bwent
|
d9c98ca4cd
|
Add connection token to sign with username when connecting to domain-server
|
2015-08-07 10:59:50 -07:00 |
|
bwent
|
6368fc2ae6
|
Parital fix for padding error using RSA_sign and RSA_verify
|
2015-08-07 10:59:49 -07:00 |
|
bwent
|
cb57b6ccab
|
fix username signature not const
|
2015-08-07 10:59:49 -07:00 |
|
bwent
|
ba225875cf
|
debugging
|
2015-08-07 10:59:48 -07:00 |
|
bwent
|
64cac1db5e
|
To debug RSA padding error
|
2015-08-07 10:59:47 -07:00 |
|
bwent
|
f14fcdee60
|
Fix DomainServerConnectionTOken packet writing/resetting
|
2015-08-07 10:59:46 -07:00 |
|
bwent
|
ff558a8b56
|
Generate session token UUIDs to be signed with username
|
2015-08-07 10:59:46 -07:00 |
|
ericrius1
|
3910cb0d69
|
Merge branch 'master' into polyLineInProgress
|
2015-08-07 10:12:02 -07:00 |
|
Stephen Birarda
|
eec382ade8
|
Merge pull request #5513 from bwent/domain-server-authentication
Add connection token UUId to sign with username when connecting to domain-server
|
2015-08-07 10:05:00 -07:00 |
|
Seth Alves
|
44ee13a185
|
Merge branch 'cleanup-jointstate' of github.com:howard-stearns/hifi into polyvox
|
2015-08-07 09:24:40 -07:00 |
|
Seth Alves
|
3953bb5b01
|
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
|
2015-08-07 09:08:01 -07:00 |
|
Seth Alves
|
19aec4a3e7
|
update polyvox shader
|
2015-08-07 09:07:54 -07:00 |
|
Brad Hefta-Gaub
|
a10d310403
|
Merge pull request #5526 from samcake/daft
Fix the multi part per mesh with various opacity level issue
|
2015-08-07 08:57:31 -07:00 |
|
Seth Alves
|
c07119c30b
|
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
|
2015-08-07 07:37:25 -07:00 |
|
Howard Stearns
|
a840a17106
|
Change name originalRotation defaultRotation.
|
2015-08-06 19:45:58 -07:00 |
|
Seth Alves
|
66f595f4b2
|
Merge pull request #5520 from howard-stearns/single-animation-vs-blend
Don't let individual startAnimation get messed up by blend/fade.
|
2015-08-06 18:55:14 -07:00 |
|
Sam Gateau
|
e4ce1002ea
|
cleaning th ecode
|
2015-08-06 18:54:58 -07:00 |
|
Sam Gateau
|
561a058dc8
|
cleaning th ecode
|
2015-08-06 18:53:21 -07:00 |
|
Sam Gateau
|
f0f141a2b4
|
SImple fix to the case of multiple material in a mesh with different opacity
|
2015-08-06 18:51:44 -07:00 |
|
Howard Stearns
|
42cc34cd64
|
JointState has our own copy of any ivars we want from FBXJoint, instead of keeping a reference to the fbx.
|
2015-08-06 16:54:09 -07:00 |
|
Zander Otavka
|
be4e827281
|
Merge: master -> panel-attachable-improvements.
|
2015-08-06 16:29:38 -07:00 |
|
Brad Hefta-Gaub
|
0947bf2cd0
|
Merge pull request #5517 from samcake/punk
Improving the quality of the normal encoding in the Deferred Buffer
|
2015-08-06 15:13:08 -07:00 |
|
Howard Stearns
|
02f57286e4
|
Don't let individual startAnimation get messed up by blend/fade.
|
2015-08-06 11:30:18 -07:00 |
|
Bradley Austin Davis
|
7e60aee1bf
|
Merge branch 'master' into plugins
Conflicts:
interface/src/Application.cpp
interface/src/Application.h
interface/src/avatar/Head.cpp
interface/src/avatar/MyAvatar.cpp
interface/src/avatar/MyAvatar.h
interface/src/avatar/SkeletonModel.cpp
interface/src/avatar/SkeletonModel.h
interface/src/devices/3DConnexionClient.cpp
interface/src/ui/overlays/Overlays.cpp
|
2015-08-06 11:03:37 -07:00 |
|
bwent
|
ffccc9ca96
|
clean up formatting, make connectionUUID const in NodeList
|
2015-08-06 10:11:22 -07:00 |
|
bwent
|
a8f9f9d746
|
clean-up formatting
|
2015-08-05 17:43:03 -07:00 |
|
samcake
|
07a9dd3404
|
Ready for release
|
2015-08-05 17:41:23 -07:00 |
|
Sam Gateau
|
95682e6270
|
Introducing the Normal fitting algorithm for better normal in the deferred buffer
|
2015-08-05 17:17:00 -07:00 |
|
David Rowe
|
d7b42e264e
|
Merge branch 'master' into 20639
Conflicts:
interface/CMakeLists.txt
|
2015-08-05 16:49:06 -07:00 |
|
Atlante45
|
3dc8bd47ae
|
Fix warning and remove unused headers
|
2015-08-05 16:46:44 -07:00 |
|
Zander Otavka
|
4a1fcbf160
|
Fix error in an unused method declaration.
|
2015-08-05 16:11:09 -07:00 |
|
bwent
|
ab2b54a6b2
|
Add connection token to sign with username when connecting to domain-server
|
2015-08-05 15:33:59 -07:00 |
|
Stephen Birarda
|
998a8168a3
|
remove an extra unneeded message
|
2015-08-05 14:38:14 -07:00 |
|
Stephen Birarda
|
653e0d29c7
|
resolve conflicts on merge with upstream/core
|
2015-08-05 14:37:30 -07:00 |
|
Stephen Birarda
|
6c337b8aeb
|
repairs for build type of glew external
|
2015-08-05 14:30:36 -07:00 |
|
bwent
|
8868148c94
|
Parital fix for padding error using RSA_sign and RSA_verify
|
2015-08-05 14:07:25 -07:00 |
|
Bradley Austin Davis
|
89cc2ccfa5
|
More merge comments
|
2015-08-05 13:53:19 -07:00 |
|
Bradley Austin Davis
|
649b9d6ce9
|
Fixing signed/unsigned comparisons
|
2015-08-05 13:48:05 -07:00 |
|
Brad Davis
|
754bf5c6f7
|
Merge pull request #5509 from birarda/core
get GLEW for all platforms as external project
|
2015-08-05 13:41:48 -07:00 |
|
Sam Gondelman
|
513c652ab3
|
merge from master and attempt to fix connexion conflicts
|
2015-08-05 12:42:39 -07:00 |
|
Stephen Birarda
|
cc909507f4
|
get GLEW for all platforms as external project
|
2015-08-05 12:34:11 -07:00 |
|
Anthony Thibault
|
49be7c49b7
|
Merge pull request #5506 from howard-stearns/smooth-faded-animations
Smooth fading of animations in and out.
|
2015-08-05 12:02:44 -07:00 |
|
Bradley Austin Davis
|
04d579be7a
|
Removing integrated glew
|
2015-08-05 11:21:59 -07:00 |
|
Howard Stearns
|
bb974edf7f
|
Add assert on mix range.
|
2015-08-05 11:09:04 -07:00 |
|
Howard Stearns
|
f51b5be167
|
Simplify fade normalization, eliminating a loop.
|
2015-08-05 11:00:40 -07:00 |
|
Andrew Meadows
|
5be8583b7d
|
Merge pull request #5494 from sethalves/gzip-json-entity-persist-files
gzip json entity persist files
|
2015-08-05 10:56:03 -07:00 |
|
Howard Stearns
|
653e46fdd3
|
const methods.
|
2015-08-05 10:51:26 -07:00 |
|
bwent
|
60fdc390c5
|
fix username signature not const
|
2015-08-05 10:42:10 -07:00 |
|
bwent
|
fc385d9bc1
|
debugging
|
2015-08-05 10:29:30 -07:00 |
|
Seth Alves
|
eb87023416
|
code review
|
2015-08-05 10:16:45 -07:00 |
|
Howard Stearns
|
2f2b59b6b6
|
Merge branch 'master' of https://github.com/highfidelity/hifi into smooth-faded-animations
|
2015-08-05 10:05:05 -07:00 |
|
samcake
|
6783ec300a
|
Merge pull request #5499 from jherico/homer
CORE PROFILE: Fix star point smoothing... sort of
|
2015-08-04 20:15:09 -07:00 |
|
Howard Stearns
|
a1f86cc7b8
|
Make MSVC happy.
|
2015-08-04 19:49:12 -07:00 |
|
David Rowe
|
0c174e27c3
|
Merge branch 'master' into 20639
|
2015-08-04 18:36:53 -07:00 |
|
Seth Alves
|
80909b4531
|
work toward getting textures on polyvox entities
|
2015-08-04 17:53:47 -07:00 |
|
Seth Alves
|
56c0f9c814
|
work toward getting textures on polyvox entities
|
2015-08-04 17:37:15 -07:00 |
|
Bradley Austin Davis
|
fc5ec22810
|
Fix diagonal slashes in text
|
2015-08-04 17:28:42 -07:00 |
|
Howard Stearns
|
731bcba956
|
Merge branch 'master' of https://github.com/highfidelity/hifi into smooth-faded-animations
|
2015-08-04 17:27:23 -07:00 |
|
Seth Alves
|
419caccd8e
|
unmangle merge
|
2015-08-04 17:06:17 -07:00 |
|
Howard Stearns
|
61198a658c
|
Smooth fading of animations in and out.
Also, turn on the secret rig animations from Javascript with MyAvatar.setEnableRigAnimations(true). (persists)
|
2015-08-04 17:04:15 -07:00 |
|
Seth Alves
|
78091fd983
|
Merge branch 'master' of github.com:highfidelity/hifi into polyvox-render
|
2015-08-04 16:56:45 -07:00 |
|
Sam Gateau
|
730ad2da2f
|
removing dead code
|
2015-08-04 16:37:01 -07:00 |
|
Sam Gateau
|
d2360d1406
|
Merge branch 'core' of https://github.com/highfidelity/hifi into punk
|
2015-08-04 16:31:33 -07:00 |
|
Sam Gateau
|
fc0ee28b84
|
FIx the mirror rendering bugs by replacing the prvious technique by a simple true mirror during the final blit for both rear view mirror and full screen mirror, not working for HMD
|
2015-08-04 16:31:20 -07:00 |
|
Bradley Austin Davis
|
2221c839c3
|
Fix star point smoothing... sort of
|
2015-08-04 16:29:07 -07:00 |
|
samcake
|
59b69be251
|
Merge pull request #5501 from jherico/lisa
CORE PROFILE: Working on HMD crash on mac
|
2015-08-04 16:27:37 -07:00 |
|
Bradley Austin Davis
|
4f759ee46a
|
Merge remote-tracking branch 'upstream/master' into core
|
2015-08-04 16:26:16 -07:00 |
|
Seth Alves
|
9171033f21
|
Merge branch 'master' of github.com:highfidelity/hifi into rig
|
2015-08-04 16:06:38 -07:00 |
|
Seth Alves
|
b318c1122c
|
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
|
2015-08-04 16:00:27 -07:00 |
|
Seth Alves
|
fcec6cb1f0
|
Merge pull request #5464 from nnesse/master
Remove redundant code in getOrCreateChildElementAt()
|
2015-08-04 15:54:14 -07:00 |
|
Seth Alves
|
a218f0de83
|
Merge pull request #5483 from AndrewMeadows/caesium
remove legacy shapes and friends
|
2015-08-04 15:40:20 -07:00 |
|
Bradley Austin Davis
|
241ee00ca5
|
Working on HMD crash on mac
|
2015-08-04 15:18:01 -07:00 |
|
Eric Levin
|
f506e58687
|
Merge pull request #5490 from howard-stearns/restart-animations-at-specified-parameters
restart animations at specified parameters
|
2015-08-04 15:09:11 -07:00 |
|
Sam Gateau
|
79e4cdd514
|
Merge branch 'core' of https://github.com/highfidelity/hifi into punk
|
2015-08-04 14:55:00 -07:00 |
|
samcake
|
a2536c75f4
|
Merge pull request #5498 from jherico/lisa
CORE PROFILE: Fix bug in lightmap and specular map fragment shaders
|
2015-08-04 14:54:09 -07:00 |
|
Brad Davis
|
6d15a274a6
|
Merge pull request #5496 from samcake/daft
CORE PROFILE: Removing the line width completely from gpu::lib
|
2015-08-04 14:42:00 -07:00 |
|
Sam Gateau
|
10fcce7064
|
FIx again the issue of the COlor 32 format to NUINT8
|
2015-08-04 14:38:43 -07:00 |
|
Bradley Austin Davis
|
c454bc96a0
|
Fix bug in lightmap and specular map fragment shaders
|
2015-08-04 14:36:42 -07:00 |
|
Seth Alves
|
45643a3aad
|
try, try again
|
2015-08-04 14:36:16 -07:00 |
|
Sam Gateau
|
0d727934bb
|
Merge branch 'core' of https://github.com/highfidelity/hifi into punk
|
2015-08-04 14:27:30 -07:00 |
|
Seth Alves
|
a4bf169ade
|
on windows, copy zlib dll next to programs that link with shared
|
2015-08-04 14:13:41 -07:00 |
|
Bradley Austin Davis
|
89aa596717
|
Fix white rendering of many primitives
|
2015-08-04 14:05:05 -07:00 |
|
Sam Gateau
|
34183b9ddf
|
COmmenting the remove of the glLIneWidth and demoving dead code
|
2015-08-04 12:36:35 -07:00 |
|
bwent
|
54dd5da64c
|
To debug RSA padding error
|
2015-08-04 12:02:23 -07:00 |
|
bwent
|
af293ec6dd
|
Fix DomainServerConnectionTOken packet writing/resetting
|
2015-08-04 12:02:23 -07:00 |
|
bwent
|
244cc016ab
|
Generate session token UUIDs to be signed with username
|
2015-08-04 12:02:23 -07:00 |
|
Sam Gateau
|
d07ab353fc
|
remove glLineWidth completely because it s not available anymore for wide lines in core
|
2015-08-04 11:57:20 -07:00 |
|
Seth Alves
|
ff477b35a8
|
fix zlib include directory
|
2015-08-04 11:33:39 -07:00 |
|
Seth Alves
|
dbda5ba40e
|
change polyvox rendering
|
2015-08-04 11:26:29 -07:00 |
|
Bradley Austin Davis
|
3c76c0d4b6
|
Merge remote-tracking branch 'upstream/master' into core
|
2015-08-04 10:23:54 -07:00 |
|
Seth Alves
|
fb9fa76018
|
adjust comments
|
2015-08-04 08:26:28 -07:00 |
|
Seth Alves
|
5369f4c5eb
|
adjust comments
|
2015-08-04 08:25:33 -07:00 |
|
Seth Alves
|
adcd91e3ff
|
Added an option to domain-server settings to persist entities as gzipped json. With this setting enabled, persist files take much less space on disk than with the other two options.
|
2015-08-04 07:23:24 -07:00 |
|
Bradley Austin Davis
|
d415ee1f2e
|
Case sensitivity breaking ubuntu
|
2015-08-04 01:08:52 -07:00 |
|
Bradley Austin Davis
|
7593a134db
|
Moving oglplus to rely on glew on all platforms
|
2015-08-04 00:57:55 -07:00 |
|
Bradley Austin Davis
|
29c9e6e45e
|
Updating plugins to core profile
|
2015-08-04 00:33:03 -07:00 |
|