Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-16 14:20:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
30164 commits 25 branches 0 tags 1.1 GiB
Commit graph

11515 commits

Author SHA1 Message Date
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
Bradley Austin Davis
53ccbfc4fa Merge branch 'core' into plugins 2015-08-03 22:25:50 -07:00
David Rowe
b71ad31812 Merge branch 'master' into 20639 2015-08-03 20:53:12 -07:00
Bradley Austin Davis
1a589160f4 Fixing the skinning shaders sizing problems 2015-08-03 18:44:51 -07:00
Howard Stearns
61afc362e7 For startAnimation (but not startAnimationByRole), use the specified parameters even if the animation 
was already playing.  This fixes the behavior exercised by the squeezeHands.js script.
Fixes https://app.asana.com/0/32622044445063/44025709513292
 2015-08-03 17:00:39 -07:00
Howard Stearns
2e5142e9bb Fix end of idle. 2015-08-03 16:09:48 -07:00
Sam Gateau
44e7223547 Fixing the skinning by simply reverting the change to the format for the inSkinIndex 2015-08-03 16:05:04 -07:00
ericrius1
12770edbe1 Merge branch 'master' into polyLineInProgress 2015-08-03 15:52:26 -07:00
ericrius1
94acb23f27 no longer redefining payloadRender method in effort to avoid linux build errors 2015-08-03 15:51:11 -07:00
Howard Stearns
cdb697760f Remove some debug. 2015-08-03 15:51:07 -07:00
Howard Stearns
4c1d1a65d5 Provide initial fight club animations and use them in rig. 
Still only active when you do Settings.setValue('enableRig', true) and restart.
(Will be more exposed after fadein/fadeout is implemented.)
 2015-08-03 15:41:15 -07:00
ericrius1
9125b3a2a9 attempting to fix windows and linux builds again 2015-08-03 14:53:02 -07:00
samcake
caa5732e06 Remove completely GL transform legacy support 2015-08-03 14:51:57 -07:00
Sam Gateau
647abe5009 Replace the glCOlor4f by a glVertexAttribute4f on the color slot instead 2015-08-03 13:41:02 -07:00
Sam Gateau
f23df03ea9 REsolve the bracket issue, 2015-08-03 13:10:06 -07:00
samcake
32c253453b REsolving the input 2015-08-03 12:47:51 -07:00
ericrius1
e36099f2b6 fixing ambiguous "call to overloaded function compiler" errors on windows and linux builds 2015-08-03 12:31:21 -07:00
ericrius1
e4ff3fa9da corrected author name at top of PolyLineEntity.h file 2015-08-03 11:26:48 -07:00
ericrius1
98a5d1e759 fixed merge conflics in hit effect 2015-08-03 11:25:18 -07:00
Andrew Meadows
b00d47d62e merge master into cleanup of legacy shapes 2015-08-03 11:19:29 -07:00
samcake
d3fc05e99f FIxed a few shaders varyings, problem identified on MAC to be solved 2015-08-03 11:18:08 -07:00
Andrew Meadows
acfc907704 Merge pull request #5438 from howard-stearns/rig 
Rig: Bottleneck animation management through a Rig class
 2015-08-03 11:14:21 -07:00
Sam Gateau
785fd03085 Merge branch 'core' of https://github.com/highfidelity/hifi into punk 2015-08-03 10:26:06 -07:00
samcake
85077604dc Merge pull request #5478 from jherico/marge 
CORE BRANCH - More shader fixes
 2015-08-03 10:25:33 -07:00
Sam Gateau
1a276924f0 Merging core 2015-08-03 10:05:23 -07:00
David Rowe
7749b912ea Merge branch 'master' into 20639 2015-08-03 09:55:35 -07:00
ericrius1
b2753507dc cleanup of comments and dead code 2015-08-03 09:35:47 -07:00
ericrius1
f50c482451 Merge branch 'master' into polyLineInProgress 2015-08-03 08:46:01 -07:00
ericrius1
47bc8f50ab cleaning 2015-08-03 08:45:14 -07:00
Howard Stearns
8f616c04fb Fix https://app.asana.com/0/32622044445063/43589567731045 2015-08-02 21:46:39 -07:00
Brad Davis
5c07a7d85b Merge remote-tracking branch 'upstream/master' into plugins 2015-08-01 21:58:05 -07:00
Brad Davis
53feaf2ab6 More shader fixes 2015-08-01 20:17:57 -07:00
Bradley Austin Davis
f19653f3e2 Integrate glew 2015-08-01 20:08:19 -07:00
Brad Davis
180f912924 Merge remote-tracking branch 'upstream/master' into core 
Conflicts:
	interface/src/ui/overlays/Circle3DOverlay.cpp
	libraries/gpu/src/gpu/Format.h
	libraries/render-utils/src/GeometryCache.cpp
	libraries/render-utils/src/Model.cpp
	libraries/render-utils/src/text/Font.cpp
 2015-08-01 20:01:59 -07:00
ZappoMan
493836e363 remove QUADS from GLBackendShared and Format 2015-08-01 17:26:38 -07:00
ZappoMan
b02f751830 diff redux 2015-08-01 16:53:35 -07:00
ZappoMan
b138c16c7f use Austins QUAD to TRIANGLE_STRIP approach 2015-08-01 16:50:36 -07:00
Brad Davis
b84eef93c9 Core profile shader work and test code 2015-08-01 14:43:52 -07:00
ZappoMan
05a4a6aa9b implement on-the-fly conversion of FBXMeshParts that are quads, into their triangle equivalents 2015-08-01 13:07:56 -07:00
ZappoMan
452225ddaf removed QUADS from Font::drawString() 2015-08-01 11:51:07 -07:00
ZappoMan
1dd6c1117d change GeometryCache::renderQuad() to use TRIANGLES as lower level render primitive 2015-08-01 11:29:28 -07:00
Seth Alves
dbca3fe2fb attempt to give polyvox its own rendering bung 2015-08-01 05:58:22 -07:00
Sam Gateau
6a8faca0ee Install the GLCore way of doing input without all the legacy stuff 2015-07-31 22:46:06 -07:00
Seth Alves
443b9e1e78 attempt to give polyvox its own rendering bung 2015-07-31 21:58:43 -07:00
Howard Stearns
2713115336 Merge branch 'master' of https://github.com/highfidelity/hifi into rig 2015-07-31 18:05:47 -07:00
Howard Stearns
0dad1adf7d Speculative guard against crashing. 2015-07-31 18:05:14 -07:00
Sam Gateau
ca4dbdb996 Merging with upstream and compiling on windows 2015-07-31 16:14:53 -07:00
Seth Alves
299d834e0e Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-07-31 15:30:28 -07:00
Seth Alves
bbee001366 Merge pull request #5470 from birarda/master 
fix for unique_ptr<char> allocations
 2015-07-31 15:09:18 -07:00
Brad Davis
aea07fe671 Merge branch 'master' into gl4_1 
Conflicts:
	libraries/gpu/src/gpu/Config.slh
	libraries/render-utils/src/deferred_light_limited.slv
	libraries/render-utils/src/simple.slf
	libraries/render-utils/src/simple_textured.slf
	tests/render-utils/src/main.cpp
	tools/scribe/src/main.cpp
 2015-07-31 15:08:37 -07:00
Stephen Birarda
b0afdb21ad correct the unique_ptr char allocations 2015-07-31 14:29:05 -07:00
Andrew Meadows
661a916ebd merge rig into cleanup (removal of legacy shapes) 
Conflicts:
	interface/src/avatar/Avatar.h
	tests/physics/src/ShapeColliderTests.cpp
	tests/physics/src/ShapeColliderTests.h
 2015-07-31 13:40:51 -07:00
Brad Hefta-Gaub
b46a430fba Merge pull request #5468 from bwent/reset-position 
Add gettable naturalPosition property for model entities
 2015-07-31 11:03:27 -07:00
bwent
aab1f70800 Renaming vars 2015-07-31 10:47:05 -07:00
Brad Davis
155f88e267 Merge remote-tracking branch 'upstream/master' into plugins 
Conflicts:
	interface/src/devices/OculusManager.cpp
	interface/src/devices/TV3DManager.cpp
	interface/src/devices/TV3DManager.h
	libraries/gpu/src/gpu/GPUConfig.h
 2015-07-31 10:28:06 -07:00
bwent
67760fad79 Add gettable naturalPosition property for model entities 2015-07-31 10:15:35 -07:00
Howard Stearns
b685378ab0 Merge branch 'master' of https://github.com/highfidelity/hifi into rig 2015-07-31 10:08:30 -07:00
Seth Alves
3b88500735 Merge branch 'polyvox' of github.com:sethalves/hifi into polyvox 2015-07-30 21:22:52 -07:00
Seth Alves
f2fb156d66 merge from upstream 2015-07-30 21:21:13 -07:00
Seth Alves
241e767ab6 move setHandPosition from SkeletonModel to AvatarRig. Tell Rig::initJointStates joint-indexes for hands and elbows and shoulders 2015-07-30 18:44:09 -07:00
Seth Alves
c80516a051 Merge branch 'rig' of github.com:howard-stearns/hifi into rig 2015-07-30 18:39:09 -07:00
Seth Alves
c1f777e18f move setHandPosition from SkeletonModel to AvatarRig. Tell Rig::initJointStates joint-indexes for hands and elbows and shoulders 2015-07-30 18:39:01 -07:00
samcake
fbf21cb089 FIxed the problem on Mac, by removing all of the gpuConfig includesgit status 
q
:q
wq
 2015-07-30 18:27:47 -07:00
Bradley Austin Davis
f3e701e0d5 Don't allow leaving VR mode to target the rift 2015-07-30 17:40:02 -07:00
Bradley Austin Davis
ac0ec0a458 Ensure the app moves back to a non-rift screen if the saved geometry is bad 2015-07-30 17:09:08 -07:00
Howard Stearns
51ed912f5e Merge branch 'rig' of https://github.com/howard-stearns/hifi into rig 2015-07-30 17:03:06 -07:00
Howard Stearns
78a900c866 Prototype blend. Just equal weighting for now. 2015-07-30 17:01:48 -07:00
Anthony J. Thibault
e52bf2e12d Fix for head cauterization. 
When rendering rigidly bound mesh clusters were not properly using
the cauterization matrix set.
 2015-07-30 15:51:34 -07:00
Seth Alves
8d2aacb46d send X texture to renderer 2015-07-30 15:36:07 -07:00
Sam Gateau
14f4c9c6c0 REmove more of the unnecessary GLBacken .h and GPUCOnfig.h include, The gpu::Context is now completely agnostic of the True Backend 2015-07-30 15:07:36 -07:00
Anthony J. Thibault
7a10b31dd9 Clear translation on root joint. 
Also, delete/rename all instances of updateJointState except for the one in Rig
and derived classes.
 2015-07-30 15:04:27 -07:00
Seth Alves
52ee9526ce add 3 new texture-url properties for polyvox 2015-07-30 13:20:19 -07:00
Brad Davis
f7a2513f26 Merge remote-tracking branch 'upstream/master' into plugins 
Conflicts:
	interface/CMakeLists.txt
	interface/src/Application.cpp
	interface/src/Menu.cpp
	interface/src/Menu.h
	interface/src/avatar/MyAvatar.h
	tests/ui/src/main.cpp
 2015-07-30 12:55:22 -07:00
Niels Nesse
85f06639a5 Remove redundant code in getOrCreateChildElementAt() 2015-07-30 12:50:57 -07:00
Bradley Austin Davis
a260be9a4d HMDTools dialog restoration phase 2, electric boogaloo 2015-07-30 12:25:21 -07:00
Brad Davis
5878a4661c Restoring HMD tools dialog, phase 1 2015-07-30 11:35:55 -07:00
Sam Gateau
d84e2d31ea Merge with master 2015-07-30 11:20:00 -07:00
Brad Davis
382ef057b0 Revert to using QGLWidget 2015-07-30 10:59:05 -07:00
Seth Alves
03456f1a06 Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-07-30 10:13:44 -07:00
Howard Stearns
06aa107762 Merge branch 'master' of https://github.com/highfidelity/hifi into rig 2015-07-30 09:57:02 -07:00
Anthony J. Thibault
4bb415fd0d Fix for torso twist. 
Off by one error, 0 is a valid parent bone index.
 2015-07-30 09:31:23 -07:00
Brad Hefta-Gaub
96fdb32edc Merge pull request #5461 from venkatn93/avatar 
HBAO implementation
 2015-07-30 08:46:55 -07:00
Brad Hefta-Gaub
b95e4e1e93 Merge pull request #5323 from MarcelEdward/20605 
Removed the  line where the directory is stripped off the RelativeFile
 2015-07-30 07:30:01 -07:00
Marcel Verhagen
fa6d6a5123 Added the & references to the const variables 2015-07-30 15:08:02 +02:00
Seth Alves
a9556660c4 fix linux build 2015-07-29 20:53:24 -07:00
Brad Hefta-Gaub
398bace83c Merge pull request #5439 from samcake/punk 
Remove alias gl calls from Batch and Introduce a ResetStage Batch command
 2015-07-29 20:05:06 -07:00
David Rowe
83ab37be0f Merge branch 'master' into 20639 
Conflicts:
	interface/src/Menu.h
 2015-07-29 19:46:01 -07:00
Howard Stearns
ebd0e38d49 Merge branch 'master' of https://github.com/highfidelity/hifi into rig 2015-07-29 18:54:40 -07:00
Howard Stearns
dc34c025bd whitespace 2015-07-29 18:54:05 -07:00
Niraj Venkat
291e0e21ae HBAO final implementation 2015-07-29 18:47:27 -07:00
samcake
70d64a7777 Really fixing the depth write mask issue on clear... 2015-07-29 18:27:10 -07:00
samcake
e32e45ed2b make sure the writting mask is on for depth buffer 2015-07-29 18:06:46 -07:00
Howard Stearns
59fe2a168e Merge branch 'rig' of https://github.com/howard-stearns/hifi into rig 2015-07-29 18:00:11 -07:00
Seth Alves
b7ecffa0be treat a "g" in an obj file the same as a "o" 2015-07-29 17:55:56 -07:00
Anthony J. Thibault
c2934bdb5d Fix avatar head, eye and torso twist. 
* Updated SkeletionModel::updateRig to explicitly pass a set of HeadParameters
  to the rig to do procedural animation.
* Moved torso lean procedural animation from SkeletonModel into Rig.
* Moved eye tracking procedural animation from HeadModel into Rig.
* Moved neck procedural animation from HeadModel into Rig.
 2015-07-29 17:35:29 -07:00
Sam Gateau
ab4b940d83 merge with upstream 2015-07-29 17:11:13 -07:00
Niraj Venkat
4f2630c561 Merge branch 'master' of https://github.com/highfidelity/hifi into avatar 2015-07-29 16:54:37 -07:00
Sam Gateau
4972cb024f Try to make the inlucde sequence simpler in gpu for GLBackend 2015-07-29 16:48:23 -07:00
David Rowe
02ae008c9c Merge branch 'master' into 20639 
Conflicts:
	interface/CMakeLists.txt
 2015-07-29 16:24:30 -07:00
Sam Gateau
269db0ff6f fixing the stars rendering that was vilently broken durign the hunt for GPUCOnfig.h includes 2015-07-29 16:08:16 -07:00
Howard Stearns
d73f133daa Merge branch 'master' of https://github.com/highfidelity/hifi into rig 2015-07-29 15:45:00 -07:00