Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-01 21:32:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
30519 commits 73 branches 59 tags 1.2 GiB
Commit graph

11717 commits

Author SHA1 Message Date
Brad Davis
0f70797ab4 Merge pull request #5711 from ZappoMan/fixEntityScriptIncludes 
fix a bug in entity script includes and file based includes on windows
 2015-09-03 21:21:42 -07:00
Brad Hefta-Gaub
b0f239b89d also make sure local file includes work for non-entity scripts 2015-09-03 19:06:26 -07:00
Brad Hefta-Gaub
063320771c fix a bug in entity script includes and file based includes on windows 2015-09-03 16:37:24 -07:00
Howard Stearns
41daea7d92 Merge pull request #5710 from sethalves/fix-stuck-avatars 
Fix stuck avatars
 2015-09-03 16:26:07 -07:00
Seth Alves
218521fc02 put AVATAR_MIN_ROTATION_DOT back to previous value 2015-09-03 16:08:46 -07:00
Seth Alves
0c8848a463 don't update _lastSendJointData if we didn't send 2015-09-03 15:41:40 -07:00
Brad Hefta-Gaub
3984dc9ecd Merge pull request #5682 from jherico/bart 
Add common vector constants to JS, add some missing Quat functionality
 2015-09-03 14:51:02 -07:00
Seth Alves
1071b98260 fix differential avatar-joint sending to work if more than 2 avatars are in the domain 2015-09-03 14:38:46 -07:00
Seth Alves
36ca789d92 fix differential avatar-joint sending to work if more than 2 avatars are in the domain 2015-09-03 14:08:04 -07:00
Brad Davis
8dc3905767 Add common vector constants to JS, add some missing quaternion functionality 2015-09-03 11:51:35 -07:00
Andrew Meadows
cd1dac50ad Merge pull request #5687 from howard-stearns/delete-collision-sounds-after-use 
Delete collision sounds (and their threads) after use.
 2015-09-03 09:59:02 -07:00
Brad Davis
2901155a7b Fix Oculus mirroring to window 2015-09-02 18:28:44 -07:00
Brad Davis
1f83d04423 Fix oculus crash on switching display plugin to something else 2015-09-02 18:28:43 -07:00
Brad Hefta-Gaub
b199e9e593 Merge pull request #5703 from jherico/marge 
Support HTML colors in overlays
 2015-09-02 17:58:44 -07:00
Eric Levin
d55c92780c Merge pull request #5704 from AndrewMeadows/erbium 
fix for Controller.getSpatialControlNormal()
 2015-09-02 16:30:01 -07:00
Howard Stearns
389e752b6e Merge pull request #5695 from AndrewMeadows/dysprosium 
avoid bad joints when computing avatar bounding capsule
 2015-09-02 15:58:42 -07:00
Brad Davis
54b7a063e2 Support HTML colors in overlays 2015-09-02 15:56:37 -07:00
Andrew Meadows
c61bc190de fix finger and palm-normal directions for JS 2015-09-02 14:16:02 -07:00
Andrew Meadows
992bd5c9d2 fix sixense and vive rotation readings for palms 2015-09-02 11:37:36 -07:00
Seth Alves
3e11852845 Merge pull request #5685 from howard-stearns/standing-hmd-animations 
Standing hmd animations
 2015-09-02 10:57:45 -07:00
Andrew Meadows
dd2f94bc88 Merge pull request #5696 from birarda/sixense-fix 
fix for sixense compile when not present
 2015-09-01 19:56:03 -07:00
Stephen Birarda
9a4d666b0c no consts if HAVE_SIXENSE not set 2015-09-01 15:33:54 -06:00
Stephen Birarda
2ce225d76c fix for sixense not present on OS X 2015-09-01 15:33:46 -06:00
Andrew Meadows
4a7a384c65 avoid bad joints when computing bounding capsule 2015-09-01 14:12:14 -07:00
Seth Alves
e32b9191f5 bump AvatarData protocol version 2015-09-01 13:35:58 -07:00
Seth Alves
6f80c484b4 cleanups 2015-09-01 13:33:19 -07:00
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
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
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
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
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
Howard Stearns
d003ec9c58 Delete collision sounds (and their threads) after use. 
This has been broken ever since I added avatar collision sounds around https://github.com/highfidelity/hifi/pull/5159 or so.
 2015-08-31 15:49:17 -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
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
Seth Alves
a5cd3ff046 release _threadRunning if decompressVolumeDataAsync exits early 2015-08-28 11:04:56 -07:00
Seth Alves
1ac5c19f44 if someone else changes a polyvox, we need to localy recompute the collision shape 2015-08-28 10:39:23 -07:00
Seth Alves
92b5fe3457 fix thinko -- if the changes didn't happen, put them back on the list and don't clear their dirty flags 2015-08-28 10:31:28 -07:00
Seth Alves
0bcd6b8ec5 remove no-longer-used #define 2015-08-28 10:30:56 -07:00