Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-28 05:10:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
31930 commits 71 branches 59 tags 1.2 GiB
Commit graph

3124 commits

Author SHA1 Message Date
Thijs Wenker
dfb9034b4e - delete new AudioListenerMode menu on script ending 
- style fix (function naming)
 2015-09-22 15:45:57 +02:00
Thijs Wenker
81932fe1d7 - added MyAvatar.audioListenerModeChanged signal , for registering changes. 
- updated the developerMenuItems.js script to include AudioListenerMode menu options under Developer > Audio
 2015-09-22 15:38:53 +02:00
Brad Hefta-Gaub
ea141aae92 Merge pull request #5865 from jherico/bart 
Instancing work, second pass
 2015-09-21 16:51:08 -07:00
Philip Rosedale
26e5f1ca48 Merge pull request #5842 from SeijiEmery/platform-js 
Platform.js
 2015-09-21 14:28:34 -07:00
Seth Alves
cee296e70c keep object from rotating during local grab 2015-09-21 13:50:42 -07:00
Bradley Austin Davis
e024d23366 Instancing work, second pass 2015-09-21 13:27:02 -07:00
David Rowe
52f6fe1d04 Clear entity list when you change domains 2015-09-21 09:59:00 -07:00
Brad Hefta-Gaub
ec87502f49 Merge pull request #5840 from jherico/bart 
Instanced rendering for Box entities
 2015-09-18 18:06:25 -07:00
Brad Hefta-Gaub
213cc25c75 Merge pull request #5856 from sethalves/hand-controller-adjustment 
fix releaseGrab in test script
 2015-09-18 17:52:12 -07:00
Seth Alves
fd1c8f6389 fix releaseGrab in test script 2015-09-18 17:39:50 -07:00
Philip Rosedale
aebadb1ab9 Merge pull request #5854 from sethalves/hand-controller-adjustment 
tone down distance throwing
 2015-09-18 17:20:22 -07:00
Seth Alves
cfde86a7ea tone down distance throwing 2015-09-18 17:07:10 -07:00
Philip Rosedale
bbc1c551eb Merge pull request #5853 from sethalves/hand-controller-adjustment 
fix when releaseGrab is called
 2015-09-18 16:30:01 -07:00
Brad Davis
8a703d0363 Instanced rendering, first pass 2015-09-18 16:29:29 -07:00
Seth Alves
236831d385 fix when releaseGrab is called 2015-09-18 16:28:15 -07:00
Philip Rosedale
928a74a306 Merge pull request #5852 from sethalves/hand-controller-adjustment 
Hand controller adjustment
 2015-09-18 16:21:12 -07:00
Seth Alves
5db3af3f4c formatting 2015-09-18 15:58:47 -07:00
Seth Alves
5367de35c1 fix distance-grab throwing 2015-09-18 15:45:36 -07:00
Eric Levin
35e38a443c Merge pull request #5849 from sethalves/hand-controller-adjustment 
Hand controller adjustment
 2015-09-18 15:22:29 -07:00
Andrew Meadows
269e3d7f23 Merge pull request #5836 from ZappoMan/getEntityPropertiesPerformance 
Entities.getEntityProperty() performance improvements
 2015-09-18 15:19:06 -07:00
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
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
Seth Alves
c5716b715d merge from upstream 2015-09-18 14:22:11 -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
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
Seth Alves
b08f567999 put controller specific functions inside the controller object 2015-09-18 09:56:45 -07:00
Seth Alves
b8c8ea2b53 move magic numbers to constant variables, add some comments 2015-09-18 07:20:35 -07:00
Seth Alves
6d7b129b83 rework handControllerGrab.js 2015-09-17 23:15:18 -07:00
Brad Hefta-Gaub
0811da14b8 use new feature for getEntityUserData 2015-09-17 21:14:07 -07:00
Brad Hefta-Gaub
5549f4ec40 Merge pull request #5821 from ericrius1/paintCan 
Paint can tweaks
 2015-09-17 11:37:44 -07:00
ericrius1
bbf6e8b599 using relative paths for entity scripts 2015-09-16 13:52:29 -07:00
ericrius1
0b21cc1777 paint can tweaks 2015-09-16 09:59:35 -07:00
Seth Alves
f7193dbb97 if the intersection distance is small, use grab-mode rather than distant-grab-mode 2015-09-15 16:55:51 -07:00
ericrius1
da208526cc spray can tweaks 2015-09-15 16:48:28 -07:00
ericrius1
9648f56062 some fixups to spray paint script 2015-09-15 15:48:21 -07:00
Seth Alves
e650e40388 try harder to have line rezzed when it's needed. don't ignore entities that are too close when doing line intersection 2015-09-15 11:32:56 -07:00
Seth Alves
7b5d6c20e9 double change in hand rotation before applying it to the object 2015-09-15 11:21:13 -07:00
Seth Alves
99b0046fc7 various adjustments 2015-09-15 10:43:17 -07:00
Seth Alves
d874c9b382 snip out tractor beam 2015-09-14 14:20:49 -07:00
Seth Alves
f4aad05621 reduce radius of hand-intersects-object test. fix lifetime of laser line 2015-09-14 14:07:16 -07:00
Brad Davis
9b81842850 Merge branch 'master' into homer 
Conflicts:
	assignment-client/src/octree/OctreeSendThread.cpp
	interface/src/Application.cpp
	libraries/entities-renderer/src/EntityTreeRenderer.cpp
	libraries/entities/src/EntityItem.cpp
	libraries/entities/src/EntityTree.cpp
	libraries/entities/src/EntityTreeElement.cpp
	libraries/entities/src/EntityTreeElement.h
	libraries/entities/src/EntityTreeHeadlessViewer.cpp
	libraries/entities/src/RecurseOctreeToMapOperator.cpp
	libraries/octree/src/Octree.h
	libraries/physics/src/EntityMotionState.cpp
 2015-09-11 16:31:18 -07:00
Seth Alves
f51f17b267 Merge pull request #5775 from ericrius1/paintCan 
Paint can
 2015-09-11 12:34:44 -07:00
ericrius1
0a46db60ac spawning particles on grab and deleting on release, with a lifetime, for better cleanup of particles 2015-09-11 12:01:01 -07:00
ericrius1
eabdd1f4d9 quick fix for particles hanging around 2015-09-11 11:33:21 -07:00
ericrius1
6e46e3d3b6 cleanup for paintcan 2015-09-11 11:24:53 -07:00
ericrius1
1991ba0eba absolute path for now- just for testing purposes before merge 2015-09-11 09:37:03 -07:00
Brad Davis
92eeb564fe PR comments 2015-09-10 20:57:43 -07:00