Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 21:36:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
31930 commits 71 branches 56 tags 1.2 GiB
Commit graph

31930 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
c5716b715d merge from upstream 2015-09-18 14:22:11 -07:00
Seth Alves
26c14ab730 Merge pull request #5847 from ZappoMan/callEntityMethods 
fix grab behavior with toys, add better mechanism for toys to detect grab
 2015-09-18 14:21:59 -07:00
Seth Alves
7a8cee4cc3 fix release velocity so throwing things works reliably 2015-09-18 14:13:08 -07:00
Brad Hefta-Gaub
0d37511071 add support for scripts to call methods on entity scripts 2015-09-18 14:06:38 -07:00
Howard Stearns
868b541ca1 Merge pull request #5837 from AndrewMeadows/ik-repairs-002 
blend rotations between distinct IK end effector solutions
 2015-09-18 14:02:06 -07:00
Brad Hefta-Gaub
8f5055d212 Merge pull request #5838 from sethalves/hand-controller-adjustment 
rework handControllerGrab.js
 2015-09-18 13:30:29 -07:00
Brad Hefta-Gaub
416acb1d4a remove call to _entities.render() in displaySide() 2015-09-18 12:03:58 -07:00
Shared Vive Room
3c64db5c86 Adjust controller offset from 6 inches to 3 inches 
When using the vive controller the position of your wrist should
match your actual wrist a bit better, unless your name is Shaquille O'Neal.
 2015-09-18 12:02:05 -07:00
Andrew Meadows
07f3abfc91 fix bugs 2015-09-18 12:01:23 -07:00
Brad Hefta-Gaub
6edc817bf2 move the best zone logic out of EntityTreeRenderer::render() 2015-09-18 11:35:50 -07:00
Seiji Emery
e723a5c0fd whitespace + "waiting for entity server" 
No functionality changes, but now prints "waiting for entity server"
once if waiting for more than X seconds in startup().
 2015-09-18 11:18:33 -07:00
Seiji Emery
c25d8857d9 Merge branch 'master' of https://github.com/highfidelity/hifi into platform-js 2015-09-18 11:14:49 -07:00
Andrew Meadows
4cb2249cda premature optimization: remove another branch 2015-09-18 10:16:19 -07:00
Andrew Meadows
a85afb5280 simplify logic of RotationAccumulator::add() 2015-09-18 10:13:21 -07:00
Andrew Meadows
6ed0a57d9f avoid unecessary computation of last absolutePose 2015-09-18 10:09:23 -07:00
Seth Alves
b08f567999 put controller specific functions inside the controller object 2015-09-18 09:56:45 -07:00
Brad Hefta-Gaub
0ba1e8c945 remove renderingInWorldInterface signals 2015-09-18 09:49:57 -07:00
Seth Alves
b8c8ea2b53 move magic numbers to constant variables, add some comments 2015-09-18 07:20:35 -07:00
Andrew Meadows
9e94e7f1d0 less complicated RotationAccumulator 2015-09-18 07:11:36 -07:00
Seth Alves
6d7b129b83 rework handControllerGrab.js 2015-09-17 23:15:18 -07:00
Andrew Meadows
b6a153d926 split RotationAccumulator into its own files 2015-09-17 22:30:44 -07:00
Andrew Meadows
420acde720 blend IK effects between distinct end effectors 2015-09-17 22:11:59 -07:00
Brad Hefta-Gaub
4a34b142d1 remove render element proxies 2015-09-17 22:05:14 -07:00
Brad Hefta-Gaub
0811da14b8 use new feature for getEntityUserData 2015-09-17 21:14:07 -07:00
Brad Hefta-Gaub
d0a4622427 removed some debug code 2015-09-17 21:01:56 -07:00
Brad Hefta-Gaub
45c34e1617 only copy properties to the script values for properties that our type actually has 2015-09-17 20:55:19 -07:00
Brad Hefta-Gaub
7f9a6d7b8e whitespace fixes 2015-09-17 20:26:50 -07:00
Brad Hefta-Gaub
6de424237f add support for property groups in the desired properties logic 2015-09-17 20:24:15 -07:00
Brad Hefta-Gaub
ec86394556 Merge pull request #5835 from hyperlogic/tony/vive-eye-offset-fix 
Fix for getEyePose in OpenVRDisplayPlugin
 2015-09-17 20:22:10 -07:00
Brad Hefta-Gaub
08babecb75 add support for mapping EntityPropertyFlags to QScriptValues and wire in desiredProps 2015-09-17 19:51:21 -07:00
Anthony Thibault
493819c013 Merge pull request #5834 from AndrewMeadows/ik-repairs-001 
route hand data directly to new anim system
 2015-09-17 17:49:05 -07:00
Brad Hefta-Gaub
b16dfb8a9e whitespace repair 2015-09-17 17:41:54 -07:00
Brad Hefta-Gaub
81255c8379 whitespace repair 2015-09-17 17:40:41 -07:00
Brad Hefta-Gaub
4e2cb00ec3 first cut at only returning type specific properties in getEntityProperties 2015-09-17 17:33:53 -07:00
Shared Vive Room
4459708b0e Fix for getEyePose in OpenVRDisplayPlugin 2015-09-17 17:16:12 -07:00
Brad Hefta-Gaub
3deaa68b7b Merge pull request #5832 from samcake/HMDLightingBug 
Fix the lighting issue when the Rear View mirror is enabled
 2015-09-17 16:46:56 -07:00
Andrew Meadows
4505d5999c route hand data differently for new Anim system 2015-09-17 16:04:00 -07:00
Andrew Meadows
9746d31f5e notes for moving hand updates 2015-09-17 16:04:00 -07:00
Ryan Huffman
d0acd74861 Merge pull request #5833 from birarda/master 
fix for some locking races in SendQueue/Connection cleanup
 2015-09-17 15:04:52 -07:00
Stephen Birarda
285a6cc738 use erase directly for cleanupConnection 2015-09-17 14:51:48 -07:00
Howard Stearns
fb71a85bb8 Merge pull request #5831 from hyperlogic/tony/anim-qstring 
AnimGraph: prefer QString over std::string
 2015-09-17 14:36:39 -07:00
Stephen Birarda
a914ec82c3 more comment correctness for Socket 2015-09-17 14:17:43 -07:00
Stephen Birarda
1f9bb22b9e fix some wording in Socket comment 2015-09-17 14:17:03 -07:00
Stephen Birarda
36e2d4fc76 add check for NotStarted state in PL queue 2015-09-17 14:16:03 -07:00
Stephen Birarda
320429fd1e Merge branch 'master' of https://github.com/highfidelity/hifi 2015-09-17 14:15:05 -07:00
Stephen Birarda
4758dd2a53 correct locking races in SendQueue/Connection cleanup 2015-09-17 14:13:24 -07:00
Sam Gateau
b207d97f72 Fix the lighting when the rear view mirror is showing up 2015-09-17 12:28:17 -07:00
Brad Hefta-Gaub
58e0625192 Merge pull request #5824 from jherico/marge 
Debug Oculus plugin for performance testing
 2015-09-17 11:46:26 -07:00
Brad Hefta-Gaub
5549f4ec40 Merge pull request #5821 from ericrius1/paintCan 
Paint can tweaks
 2015-09-17 11:37:44 -07:00
Anthony J. Thibault
bef136d811 AnimGraph: prefer QString over std::string 2015-09-17 11:21:14 -07:00