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
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
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
Brad Hefta-Gaub
862be9a1f0
Merge pull request #5535 from nivardus/include-qdatastream-qt5.5
...
Qt 5.5 Compilation: Add QDataStream include
2015-08-08 22:03:36 -07:00
Bennett Goble
d5691b1196
Add QDataStream include to DomainServerWebSessionData.cpp
...
Fixes compilation error with Qt 5.5.0, QDataStream >> QSet
2015-08-08 17:17:29 -04:00
Andrew Meadows
331c8c0967
Merge pull request #5503 from AlexanderOtavka/panel-attachable-improvements
...
Improvements to FloatingUIPanels.
2015-08-07 17:21:51 -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
c0d287f48d
Merge pull request #5527 from ZappoMan/lod
...
change LOD dialog to no longer reset when you close the dialog box
2015-08-07 16:10:24 -07:00
Andrew Meadows
48c5a227a7
Merge pull request #5528 from ZappoMan/removeBrokenShadows
...
remove shadow menu items
2015-08-07 16:09:00 -07:00
Brad Hefta-Gaub
7a59688521
Merge pull request #5531 from ctrlaltdavid/find-scale-assert
...
Add temporary debug info for tracking down invalid scale value assert
2015-08-07 16:02:55 -07:00
Brad Davis
64fcd2da96
Merge pull request #5530 from ZappoMan/RenderableModelEntityItemOptimization
...
optimizations to RenderableModelEntityItem::render()
2015-08-07 15:32:07 -07:00
David Rowe
3995c4476d
Add temporary debug info for tracking down invalid scale value assert
2015-08-07 14:38: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
Howard Stearns
145b730f80
Clean up instantiation.
2015-08-07 12:27:26 -07:00
Zander Otavka
987fb56124
Simplify applied transformations in scripts.
2015-08-07 11:51:22 -07:00
ericrius1
d735c85806
moving polyLineEntity over to core profile
2015-08-07 11:41:55 -07:00
Zander Otavka
743e73874f
Add back the anchor to panel transform names.
...
position -> anchorPosition
rotation -> anchorRotation
scale -> anchorScale
2015-08-07 11:38:33 -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
Stephen Birarda
e9f2cadfff
Update BUILD_OSX.md
2015-08-07 10:49:20 -07:00
ZappoMan
8441868e74
change LOD dialog to no longer reset when you close the dialog box
2015-08-07 10:32:03 -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
Zander Otavka
f9630942aa
Small tweaks to improve code readability.
2015-08-07 09:31:21 -07:00
Zander Otavka
a46cc4e1c3
Fix issue with offsetRotation being applied twice.
2015-08-07 09:30:45 -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
Zander Otavka
09bb61e4d8
Add backwards compatibility for Image3DOverlays.
...
Using "billboard" to create an Image3DOverlay is deprecated. Instead,
use "image3d" or, even better, use overlayManager.js.
2015-08-07 02:45:05 -07:00
Zander Otavka
3356bf31ac
Refactor billboarding into Billboardable class.
2015-08-07 02:34:56 -07:00
Zander Otavka
3dcfa84a87
Fix billboarding behavior.
...
Billboards now always face the camera position. Also, OverlayPanels can
be set to face the avatar.
2015-08-07 01:38:33 -07:00
Zander Otavka
0b4be8fca2
Improve transforms for panels and attachables.
...
Add offsetScale to PanelAttachable for scaling all the contents of a
panel properly. Also reduce the number of transform operations per
second while rendering a PanelAttachable Overlay.
2015-08-06 21:46:55 -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
Zander Otavka
6e8c154c42
Undo registering PropertyBinding as a meta type.
2015-08-06 18:54:08 -07:00
Sam Gateau
561a058dc8
cleaning th ecode
2015-08-06 18:53:21 -07:00
