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
Andrew Meadows
331c8c0967
Merge pull request #5503 from AlexanderOtavka/panel-attachable-improvements
...
Improvements to FloatingUIPanels.
2015-08-07 17:21: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
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
David Rowe
3995c4476d
Add temporary debug info for tracking down invalid scale value assert
2015-08-07 14:38:43 -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
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
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
b3f6c45fa3
Update BUILD_OSX.md
2015-08-07 10:59:57 -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
Ryan Huffman
41e68b1c52
Disable back-face culling when rendering BillboardOverlay
2015-08-07 10:59:54 -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
e2be6f7604
add check if user is local user
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
fb22ccf652
Remove ERR_get_error call
2015-08-07 10:59:50 -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
cb8663de36
Debug null QUuid being stored in conenctionTokenHash
2015-08-07 10:59:47 -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
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
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
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
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
