Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-08 04:09:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
32492 commits 69 branches 58 tags 1.2 GiB
Commit graph

32492 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
3d18edd9d1 update detectGrabExample.js 2015-09-18 15:13:09 -07:00
Seth Alves
612e906a44 change the names of entityMethods which the grab script will call. adjust the release velocity multiplier 2015-09-18 15:09:05 -07:00
Brad Davis
2f0ba40347 Merge pull request #5844 from ZappoMan/cruftRemovalMachine 
Cruft removal machine
 2015-09-18 14:59:16 -07:00
Seth Alves
d1a7aca7f0 add continue-distance-holding state. don't call callEntityMethod unless action creation works. increase distance-holding multiplier. 2015-09-18 14:45:49 -07:00
ericrius1
dd3f1301e6 Blocks are now multi colored 2015-09-18 14:36:41 -07:00
James B. Pollack
a897c17eb2 Remove grab-frame and reset position code 2015-09-18 14:31:40 -07:00
James B. Pollack
031761fa57 added some logging while things were broken 2015-09-18 14:27:57 -07:00
Brad Hefta-Gaub
d2a468b31d Merge pull request #5845 from hyperlogic/tony/vive-controller-offset-fix 
Adjust controller offset from 6 inches to 3 inches
 2015-09-18 14:26:27 -07:00
Brad Hefta-Gaub
020fb25ace CR feedback 2015-09-18 14:24:01 -07:00
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
samcake
a804767d8f Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-09-18 13:59:56 -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
David Rowe
ec146069b1 Reuse old property enum slots 2015-09-18 13:06:18 -07:00
ericrius1
86dfa6f590 2 sizes for blocks 2015-09-18 12:35:49 -07:00
David Rowe
03194437f5 Merge branch 'master' into 20681 
Conflicts:
	examples/entityScripts/sprayPaintCan.js
 2015-09-18 12:04:02 -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
samcake
64cf8590eb fix typos 2015-09-18 11:51:58 -07:00
samcake
5f5cc3dbaf fix typos 2015-09-18 11:51:28 -07:00
samcake
767407af9c Merging and cleaning shaders 2015-09-18 11:46:44 -07:00
Brad Hefta-Gaub
6edc817bf2 move the best zone logic out of EntityTreeRenderer::render() 2015-09-18 11:35:50 -07:00
David Rowe
68874eed96 Update particle scripts 2015-09-18 11:34:26 -07:00
samcake
d4fd2ea4c6 merging 2015-09-18 11:31:53 -07:00
ericrius1
8ada3dec6e Adding doll in 2015-09-18 11:29:16 -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
ericrius1
65722dc870 Removed master spawner as its no longer needed 2015-09-18 11:01:33 -07:00
ericrius1
6e4b838bf9 added collision sound to bbal 2015-09-18 10:59:28 -07:00
ericrius1
d6377ee6bb Added basketball to master reset script 2015-09-18 10:55:29 -07:00
James B. Pollack
15ea9219d6 collision timeouts 2015-09-18 10:41:44 -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
James B. Pollack
9a3a87eedf improve velocity calculations for wand 2015-09-18 10:03:21 -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
Sam Gateau
d0f7ddd3a6 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-09-18 00:03:19 -07:00
David Rowe
8634b59914 Make able to emit from within portion of ellipsoid volume 2015-09-17 23:49:57 -07:00
Seth Alves
6d7b129b83 rework handControllerGrab.js 2015-09-17 23:15:18 -07:00
David Rowe
9e2b5b75b6 Make able to emit in specified range of directions 
Controlled by polar and azimuth start and finish angles, around point or
from specified part of spheroid surface.
 2015-09-17 22:40:49 -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