Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-28 02:16:22 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
30529 commits 29 branches 28 tags 1.2 GiB
Commit graph

30529 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
76923583ee Interface only sends joint data to avatar-mixer if they have changed enough since the last send 2015-09-01 13:31:34 -07:00
Seth Alves
3d7aa6f4d6 Merge pull request #5676 from AndrewMeadows/dubnium 
remove a few warnings from linux build
 2015-09-01 11:45:06 -07:00
Seth Alves
5c0cdfe049 Merge pull request #5651 from AndrewMeadows/copernicium 
fix hand IK rotation for all models
 2015-09-01 11:21:13 -07:00
Andrew Meadows
fe2d03fd37 merge 
Conflicts:
	libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
	libraries/display-plugins/src/display-plugins/stereo/StereoDisplayPlugin.cpp
	libraries/shared/src/GLMHelpers.cpp
 2015-09-01 11:17:08 -07:00
Seth Alves
930c5cefc9 fix setSphere to create a world-space sphere rather than a voxel-space one 2015-09-01 11:10:21 -07:00
Seth Alves
ca1602e443 if avatar is already standing on a terrain-polyvox, try creating a new one where they are facing 2015-09-01 11:09:46 -07:00
Andrew Meadows
7410baedf0 merge highfidelity/master into andrew/copernicium 
Conflicts:
	interface/src/avatar/SkeletonModel.cpp
	libraries/animation/src/Rig.cpp
	libraries/animation/src/Rig.h
 2015-09-01 11:08:01 -07:00
David Rowe
2b17eafef4 Only render display names in front of camera 2015-09-01 10:24:50 -07:00
Seth Alves
320338a13f Merge branch 'master' of github.com:highfidelity/hifi into polyvox-again 2015-09-01 10:07:02 -07:00
Seth Alves
7b6d267c06 Merge pull request #5675 from AndrewMeadows/darmstadtium 
remove PhysicsEntity class
 2015-09-01 10:06:01 -07:00
Andrew Meadows
47c18fa18a reduced gravity effect in IK 2015-09-01 09:51:14 -07:00
Andrew Meadows
0e5b357362 revert unintended change to "gravity" term in IK 2015-09-01 09:51:14 -07:00
Andrew Meadows
bdcc68ce36 fix bug: allow IK to iterate more than once 
also changed name of parentTransform to be rootTransform
for more correctness
 2015-09-01 09:51:14 -07:00
Andrew Meadows
fba7478c52 remove menu items for legacy IK options 2015-09-01 09:51:14 -07:00
Andrew Meadows
617e210fc6 fix for vive controller to place hand for IK 2015-09-01 09:51:14 -07:00
Andrew Meadows
bb63267e30 fix hand IK rotations or all models 2015-09-01 09:45:14 -07:00
Andrew Meadows
802b3a88c3 more corret cmake file for sixense 2015-09-01 09:45:14 -07:00
Seth Alves
05957cdb6b Merge branch 'darmstadtium' of github.com:AndrewMeadows/hifi into polyvox-again 2015-09-01 09:23:27 -07:00
Seth Alves
0dfe6e8054 Merge branch 'master' of github.com:highfidelity/hifi into polyvox-again 2015-09-01 09:13:43 -07:00
Seth Alves
4cbfe96b70 allow a sphere set/clear to affect more than one polyvox at a time 2015-08-31 18:16:32 -07:00
Seth Alves
7369ca19e9 allow setting cuboid voxel spaces. clean up some locking 2015-08-31 18:01:15 -07:00
Seth Alves
6096c20db0 allow adding and deleting spheres 2015-08-31 18:00:31 -07:00
Seth Alves
54ddcf2841 fix normals in shader 2015-08-31 15:24:30 -07:00
Seth Alves
4d06890d90 lock/unlock less 2015-08-31 15:24:15 -07:00
David Rowe
e2ee074b7a Entity search uses radius, not diameter 2015-08-31 13:51:03 -07:00
Andrew Meadows
5a67865d74 Merge pull request #5679 from jherico/apu 
Magnetic sticks and balls, rough draft
 2015-08-31 13:17:29 -07:00
Andrew Meadows
de6afb4d74 Merge pull request #5660 from sethalves/polyvox 
Polyvox improvements
 2015-08-31 13:14:01 -07:00
Seth Alves
376a6bbb21 don't reload textures if the url didn't change 2015-08-31 11:48:08 -07:00
Seth Alves
3424071a33 Merge branch 'master' of github.com:highfidelity/hifi into polyvox-again 2015-08-31 11:17:46 -07:00
Howard Stearns
2dbfa5ce9f Be more uniform in deciding animation movement, and incorporate HMD standing mode (which sets position, but not velocity). 2015-08-31 11:10:05 -07:00
Howard Stearns
a907c5757b Do not reset animation frame when restarting while we're fading out. 
Keeps it smooth if we're oscillating on some theshold between running and not.)
 2015-08-31 11:09:28 -07:00
Brad Davis
dc7d20ff86 Working on ui 2015-08-30 23:50:02 -07:00
Brad Davis
9d07bf1585 Magballs: Removing entity scripts, using onUpdate 2015-08-30 19:20:47 -07:00
Seth Alves
41a2ff2fff working on stitching marching-cube polyvoxs together 2015-08-30 18:42:15 -07:00
Seth Alves
64d0ce47f3 attempting to stitch polyvox entites together 2015-08-30 09:59:33 -07:00
Bennett Goble
6f4fc24fb6 NodeConnectionData QDataStream #include 2015-08-30 12:05:56 -04:00
Brad Davis
a574251173 Cleaning up and moving entity script 2015-08-29 23:06:23 -07:00
Brad Davis
cffb0be384 Removing edge finding calculations 2015-08-29 22:49:14 -07:00
Brad Davis
ebb530aaac More magball work 2015-08-29 22:30:21 -07:00
Brad Davis
38b62108af Magnetic sticks and balls 2015-08-28 23:35:43 -07:00
Seiji Emery
e0f6db2152 Coding style 2015-08-28 16:36:44 -07:00
James B. Pollack
08986dcb17 Merge pull request #5669 from ZappoMan/breakdanceToy 
first cut at breakdance toy
 2015-08-28 16:36:00 -07:00
Brad Davis
f353d34479 Merge pull request #5680 from highfidelity/revert-5677-bart 
Revert "Add common vector constants to JS"
 2015-08-28 16:27:31 -07:00
Brad Davis
08e4fe2dc2 Revert "Add common vector constants to JS" 2015-08-28 16:26:56 -07:00
Seth Alves
f6fbf4f324 fix whitespace 2015-08-28 14:08:30 -07:00
Brad Hefta-Gaub
1e2374da87 Merge pull request #5677 from jherico/bart 
Add common vector constants to JS
 2015-08-28 13:43:13 -07:00
Seth Alves
7614cababb adjust whitespace 2015-08-28 13:21:34 -07:00
Brad Davis
2aa1976b5d Add common vector constants to JS, add some missing quaternionin functionality 2015-08-28 13:05:39 -07:00
Seth Alves
752c787f0b Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-08-28 12:50:31 -07:00
Seth Alves
540af4afcb remove unneeded call to computeShapeInfoWorker 2015-08-28 12:47:04 -07:00