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
31960 commits 71 branches 59 tags 1.2 GiB
Commit graph

3154 commits

Author SHA1 Message Date
James B. Pollack
f8d743aff0 Update to use new grab methods, only specifically request properties that we are actually using 2015-09-21 17:38:49 -07:00
James B. Pollack
92152b250a Merge remote-tracking branch 'highfidelity/master' into bubblewand_hotfix_2 2015-09-21 17:37:23 -07:00
James B. Pollack
81358b7f14 wand changes 2015-09-21 17:01:31 -07:00
Brad Hefta-Gaub
ea141aae92 Merge pull request #5865 from jherico/bart 
Instancing work, second pass
 2015-09-21 16:51:08 -07:00
James B. Pollack
2cb875e40d Merge remote-tracking branch 'highfidelity/master' into bubblewand_hotfix_2 2015-09-21 16:45:37 -07:00
James B. Pollack
cd6ad306ac start transitioning to new grab methods 2015-09-21 16:45:23 -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
James B. Pollack
f3eef9322c Remove toybox reference in spawner script 2015-09-21 11:10:42 -07:00
James B. Pollack
c2a2abe615 Remove nested bubble entities and related code 2015-09-21 11:05:51 -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
James B. Pollack
ccf125c047 Cleanup comments 2015-09-18 15:40:39 -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
James B. Pollack
031761fa57 added some logging while things were broken 2015-09-18 14:27:57 -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
James B. Pollack
15ea9219d6 collision timeouts 2015-09-18 10:41:44 -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
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
James B. Pollack
8a7798fcd7 disable bubble particle burst until i know the right for an entity to watch and see if it is deleted. 2015-09-17 22:00:44 -07:00
Brad Hefta-Gaub
0811da14b8 use new feature for getEntityUserData 2015-09-17 21:14:07 -07:00
James B. Pollack
5ac084ad4f Randomize bubble gravity, code cleanup 2015-09-17 20:57:07 -07:00
James B. Pollack
df0b9e7dbb refactor bubble wand to prevent duplicate bubbles 2015-09-17 15:59:19 -07:00
Brad Hefta-Gaub
5549f4ec40 Merge pull request #5821 from ericrius1/paintCan 
Paint can tweaks
 2015-09-17 11:37:44 -07:00
James B. Pollack
75df4e96e8 cleanup 2015-09-16 18:48:06 -07:00
James B. Pollack
a8fe3b3edd keep the bubble with the wand, make the wand smaller 2015-09-16 18:08:56 -07:00
James B. Pollack
9aa2067e3e cleanup unused reset stuff 2015-09-16 17:26:18 -07:00
James B. Pollack
e1e567b1b5 remove mouth mode 2015-09-16 17:09:54 -07:00
James B. Pollack
3e7cc7d6eb remove sounds from bubble 2015-09-16 17:02:52 -07:00