Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 09:52:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
30095 commits 75 branches 59 tags 1.2 GiB
Commit graph

30095 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
David Rowe
ea03067a02 When eye tracking data is lot for > N seconds handle as "not tracking" 
Revert to default look-at behaviour and saccades until tracking resumes.
 2015-08-07 12:23:43 -07:00
David Rowe
e2bf5cad3e Resume eye tracking at start-up if was running at shut-down 2015-08-07 11:59:11 -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
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
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