Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-08 07:18:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
37270 commits 25 branches 0 tags 1.1 GiB
Commit graph

4975 commits

Author SHA1 Message Date
ericrius1
035ca25b48 arc ball finds other balls 2015-12-17 13:31:27 -08:00
ericrius1
6f82d680b9 removed unwanted file 2015-12-17 12:38:25 -08:00
Brad Davis
5088eec2a2 Move directory web UI into the overlay 2015-12-17 12:23:39 -08:00
Brad Davis
82c865af2c Rename QmlWebWindow to OverlayWebWindow, move ctor registration to script engine 2015-12-17 12:20:38 -08:00
James B. Pollack
8e2128c692 update light volume when you move light parent 2015-12-17 11:59:21 -08:00
ericrius1
5b52b5e5e7 Merge branch 'master' into polylineOptimizations 2015-12-17 11:41:34 -08:00
ericrius1
8d25a666d1 fixed bug where trail would remain after user released rave stick 2015-12-17 11:40:06 -08:00
ericrius1
2aaefbcfcb refactoring, adding headers 2015-12-17 11:32:48 -08:00
Brad Hefta-Gaub
63a63152a4 add procedural hand pose example 2015-12-17 11:10:49 -08:00
James B. Pollack
5cc5a2ab33 working non kinematic release 2015-12-17 10:58:14 -08:00
ericrius1
d4481818b2 lightsaber oriented right 2015-12-17 10:50:58 -08:00
ericrius1
57e51afd46 light stick 2015-12-17 10:35:20 -08:00
James B. Pollack
cd911b31d2 dont accidentally constrain all objects 2015-12-17 10:26:54 -08:00
ericrius1
f7811cf5dc light trails from rave stick 2015-12-17 10:25:51 -08:00
ericrius1
064c05e98c light trails 2015-12-17 10:04:51 -08:00
ericrius1
b127b6a9e8 separating out rave stick 2015-12-17 08:55:57 -08:00
Brad Hefta-Gaub
24dde9ea92 Merge branch 'master' of https://github.com/highfidelity/hifi into rightClickMenu 2015-12-16 21:28:42 -08:00
Brad Hefta-Gaub
0b9bd858a7 implement support for pose ScriptEndpoints 2015-12-16 21:28:27 -08:00
ericrius1
bb67ca87e2 lightsabers 2015-12-16 17:52:39 -08:00
ericrius1
f9f496ef5a adding beam effect 2015-12-16 17:32:30 -08:00
ericrius1
d8c8778316 rave stick in right orientation 2015-12-16 16:50:27 -08:00
Brad Davis
fa5bab08b1 Support web content inside QML 2015-12-16 16:25:38 -08:00
ericrius1
263557cc1a setting dimensions for rave stick 2015-12-16 16:18:57 -08:00
ericrius1
6a77ae5db2 adding rave stick 2015-12-16 15:47:34 -08:00
ericrius1
4155e3af71 refactoring 2015-12-16 15:22:56 -08:00
James B. Pollack
f55994b993 cleanup 2015-12-16 15:07:31 -08:00
James B. Pollack
f1ec28e169 visualize volumes 2015-12-16 14:55:01 -08:00
ericrius1
b29a6b16a9 modularizing flow art tools 2015-12-16 14:40:56 -08:00
James B. Pollack
40a096ca8d kinematic grab things 2015-12-16 14:34:01 -08:00
James B. Pollack
e0b8c6b48b show light volumes 2015-12-16 14:24:31 -08:00
James B. Pollack
40e6e4b133 add readme 2015-12-16 14:01:50 -08:00
ericrius1
fcfa396912 syntax tweak 2015-12-16 13:58:55 -08:00
James B. Pollack
e37d68449b rename folder 2015-12-16 13:57:40 -08:00
James B. Pollack
6cd86e8a6b midday 2015-12-16 12:23:10 -08:00
Clément Brisset
48429eddc8 Merge pull request #6666 from samcake/hdr 
Graphics: Adding a simple manual exposure for configuring the tone mapping
 2015-12-16 12:09:52 -08:00
James B. Pollack
b0bcbb03f2 remove floor and move sliders up a bit 2015-12-16 11:57:54 -08:00
James B. Pollack
b09575dc40 Merge branch 'master' into light_mod 2015-12-16 09:56:17 -08:00
samcake
b4b541178d Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster 2015-12-16 09:42:06 -08:00
James Pollack
28a5dba2d3 rename files 2015-12-16 01:31:24 -08:00
James Pollack
5a9549a2d9 headers 2015-12-16 01:21:22 -08:00
James Pollack
adf6cf8aa3 vary colors 2015-12-16 00:58:00 -08:00
Clément Brisset
7c8f019507 Merge pull request #6663 from birarda/baseball 
update link to bat script in createBatButton.js
 2015-12-15 19:26:33 -08:00
ericrius1
61bad36d5c tweaks 2015-12-15 18:49:04 -08:00
James B. Pollack
9a2d9997e9 prep for feedback 2015-12-15 18:20:12 -08:00
samcake
d2ebaef69e Adding a simple manual exposure control to configure the tonemapping and expose it to js. Add a convenient way to access the Job._concept._data with template 2015-12-15 18:18:42 -08:00
ericrius1
d9c93130e5 In a state where non uniform random vals are clear 2015-12-15 18:02:11 -08:00
Stephen Birarda
13c83bb262 update link to bat script in createBatButton.js 2015-12-15 17:23:29 -08:00
Brad Davis
29516619ee Merge pull request #6661 from ZappoMan/rightClickMenu 
first cut at simulating mouse/reticle behavior with input contorllers
 2015-12-15 16:08:59 -08:00
James B. Pollack
d4f55ed6d2 working lsiders 2015-12-15 15:55:03 -08:00
Brad Hefta-Gaub
3dcdfbc0f1 first cut at simulating mouse/reticle behavior with input contorllers 2015-12-15 13:59:22 -08:00
ericrius1
dca83a054e Changed additiveBlending to emitterShouldTrail 2015-12-15 10:30:57 -08:00
ericrius1
c561a53f7c Going to change additive blending to world position prop 2015-12-15 09:56:28 -08:00
James B. Pollack
109aa89619 end of day 2015-12-14 18:42:00 -08:00
samcake
3554f54e17 Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster 2015-12-14 17:38:56 -08:00
James B. Pollack
112dd4209b prep for incoming 2015-12-14 17:27:01 -08:00
James B. Pollack
8bdced8576 more work 2015-12-14 16:51:12 -08:00
James B. Pollack
ea0ffa5899 support changing values for lights via message 2015-12-14 16:39:25 -08:00
ericrius1
761dfeaccd 2 balls 2015-12-14 14:53:08 -08:00
James B. Pollack
e3e1bc1dc6 updates 2015-12-14 13:01:44 -08:00
James B. Pollack
76487bca7a updates 2015-12-14 13:01:03 -08:00
James B. Pollack
18458a8431 test scene 2015-12-14 12:04:44 -08:00
ericrius1
8d691f2132 light ball 2015-12-14 11:44:42 -08:00
James B. Pollack
4d9cb6a6df other variations 2015-12-14 11:41:34 -08:00
James B. Pollack
e43b60f9f5 other variations 2015-12-14 11:40:47 -08:00
James B. Pollack
1698e903c9 midday 2015-12-14 11:25:30 -08:00
Anthony J. Thibault
3f0cdb3c02 Merge branch 'master' into tony/js-avatar-default-pose 2015-12-14 11:19:24 -08:00
James B. Pollack
0fa82a6449 Merge branch 'master' into light_mod 2015-12-14 10:13:09 -08:00
ericrius1
3d782f1307 fixed merge conflicts 2015-12-14 10:11:49 -08:00
ericrius1
ab5b783cb7 zone tweal 2015-12-14 09:01:45 -08:00
Brad Hefta-Gaub
2815cb0fef first cut at adding advanced and developer menu groupings 2015-12-12 18:12:36 -08:00
James B. Pollack
a0b698c028 reorg props 2015-12-12 17:33:54 -08:00
James B. Pollack
77969e1481 breaktime 2015-12-12 17:31:49 -08:00
James B. Pollack
231bcdb8f0 name some things better and cleanup 2015-12-12 17:22:57 -08:00
James B. Pollack
7cace24002 light editing framework 2015-12-12 17:14:43 -08:00
James B. Pollack
0ddc2ba76e rename lasers to lines 2015-12-12 16:18:15 -08:00
James B. Pollack
0fe4803b04 start 2015-12-12 16:17:00 -08:00
James B. Pollack
fe05542440 more vis 2015-12-12 14:30:34 -08:00
Thijs Wenker
cfd2c2785c Merge branch 'master' of https://github.com/worklist/hifi into 20736 2015-12-12 21:16:02 +01:00
Thijs Wenker
cb948e0608 allow entity scripts to attach entities to a hand with handControllerGrab.js 2015-12-12 21:15:06 +01:00
James B. Pollack
70a0e51cc9 back to default state 2015-12-11 17:59:03 -08:00
samcake
b3acde4462 Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster 2015-12-11 17:49:00 -08:00
James B. Pollack
1b1edf6f7a actually delete lights now that it doesnt crash 2015-12-11 17:23:35 -08:00
James B. Pollack
11aaeb1ec0 only create particle beams if set 2015-12-11 14:48:07 -08:00
Brad Hefta-Gaub
64dd36d140 Merge pull request #6503 from imgntn/ratsteer 
Add rats to Drylake environment
 2015-12-11 13:08:03 -08:00
James B. Pollack
35da54fc6c dead code and print statements 2015-12-11 11:51:32 -08:00
James B. Pollack
a31ba089c1 semicolons and print statements 2015-12-11 11:49:00 -08:00
James B. Pollack
4e9d81f187 add support for various beam visualizations 2015-12-11 11:38:16 -08:00
Howard Stearns
e8ffa598a2 Merge branch 'master' of https://github.com/highfidelity/hifi into scriptable-anim-var-triggers 2015-12-10 20:40:42 -08:00
Howard Stearns
dfec222c81 Report animation triggers to normal javascript animationStateHandlers, and update away.js as an example. 2015-12-10 20:39:01 -08:00
James B. Pollack
99bc47867a cleanup 2015-12-10 18:16:01 -08:00
samcake
5d395ae54f Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster 2015-12-10 18:06:43 -08:00
James B. Pollack
2acc0df1f0 beams with spotlights 2015-12-10 17:39:29 -08:00
James B. Pollack
16ab7e74de cleanup spotlights 2015-12-10 16:53:13 -08:00
James B. Pollack
efaa30a509 rotatable light 2015-12-10 16:18:40 -08:00
James B. Pollack
9fc456697e merge 2015-12-10 14:30:55 -08:00
James B. Pollack
c463e36ce6 make particle explorer visible 2015-12-10 14:02:52 -08:00
Anthony J. Thibault
020836f536 Fixed date on tPose.js 2015-12-10 14:00:22 -08:00
Anthony J. Thibault
652ce5501f Expose Avatar default pose to JavaScript 
New JavaScript API to get the avatar's default pose.

   MyAvatar.getDefaultJointRotation(index);
   MyAvatar.getDefaultJointTranslation(index);

See `examples/tPose.js` for example usage
 2015-12-10 13:57:31 -08:00
James B. Pollack
c3e9cde7fb beamz 2015-12-10 13:44:53 -08:00
James B. Pollack
1000b60280 far beams 2015-12-10 12:21:50 -08:00
James B. Pollack
31526091d3 create beams at start 2015-12-10 11:13:35 -08:00
Brad Hefta-Gaub
92d1038871 Merge pull request #6590 from imgntn/particle_explorer_updates 
Update Particle Explorer to Ignore New Parenting Properties
 2015-12-10 07:43:40 -08:00
Brad Hefta-Gaub
27d28900a4 Merge pull request #6580 from imgntn/parented_flashlight 
Update Flashlight to use Parenting
 2015-12-10 07:43:10 -08:00
Brad Hefta-Gaub
1512703182 Merge pull request #6593 from Atlante45/master 
Update toys relativeRotation/Position
 2015-12-10 07:37:08 -08:00
Brad Hefta-Gaub
bd1ab418a4 Merge pull request #6606 from hyperlogic/tony/remove-animation-start-automatically-property 
[PROTOCOL CHANGE] Entities: Removed Start Automatically property from Animation Group
 2015-12-10 07:35:55 -08:00
James B. Pollack
b16822ed8a swap sound file 2015-12-09 18:41:06 -08:00
Anthony J. Thibault
e9f529bf12 Entities: Removed Start Automatically property from Animation Group 
There is an issue when startAutomatically was set to true and animationPlaying was set to false.
This would cause clients to play the animation when they connected to the entity server, even though the server was not.
 2015-12-09 17:59:56 -08:00
James B. Pollack
1134d12ea0 particles 2015-12-09 16:08:32 -08:00
Atlante45
17daff920c Fix all entities using relative grab pos/rot 2015-12-09 14:25:18 -08:00
Atlante45
4ee5bf316a Fix bow offsets 2015-12-09 14:25:18 -08:00
Atlante45
65bc6aa371 Fix left hand grab 2015-12-09 14:25:18 -08:00
James B. Pollack
2fb318cc53 work with clements branch 2015-12-08 17:52:23 -08:00
Philip Rosedale
bda4e41958 Merge pull request #6581 from kencooke/audio-reverb 
New reverb parameters
 2015-12-08 14:59:58 -08:00
Thijs Wenker
4a18b5ffe4 small update to have the bow shoot arrows with the creatorSessionUUID in the userData 2015-12-08 20:29:18 +01:00
James B. Pollack
22a1ee83e6 ignore parenting properties 2015-12-08 10:39:04 -08:00
samcake
83279489f3 Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster 2015-12-08 09:46:29 -08:00
Seth Alves
71a5dfc4d6 Merge branch 'master' of github.com:highfidelity/hifi into parents 2015-12-07 17:04:02 -08:00
Leonardo Murillo
5d789095b5 Merge pull request #6570 from ctrlaltdavid/20740 
Update Leap Motion script to use animation state handlers
 2015-12-07 16:37:42 -08:00
Seth Alves
982e986f1a Merge branch 'master' of github.com:highfidelity/hifi into parents 2015-12-07 14:31:18 -08:00
Seth Alves
f99812a903 adjust method names to fit convention 2015-12-07 14:31:08 -08:00
Leonardo Murillo
25494ec867 Merge pull request #6562 from Atlante45/baseball 
Baseball
 2015-12-07 14:11:21 -08:00
James B. Pollack
6925276819 cleanup 2015-12-07 14:01:53 -08:00
Atlante45
84bc947854 Typo 2015-12-07 14:00:06 -08:00
James B. Pollack
873496e64b cleanup 2015-12-07 13:53:40 -08:00
Ken Cooke
90ef92c79b Fix slider layout 2015-12-07 13:34:55 -08:00
James B. Pollack
18e544cc53 Merge branch 'master' into ratsteer 2015-12-07 13:18:19 -08:00
Ken Cooke
4803b3bd9f Merge branch 'master' of https://github.com/highfidelity/hifi into audio-reverb 2015-12-07 13:08:21 -08:00
Ken Cooke
8683bb5002 New reverb parameters 2015-12-07 13:05:30 -08:00
James B. Pollack
27ce0a36d3 cleanup logging 2015-12-07 12:20:06 -08:00
James B. Pollack
e9f21b4dba make lights parented to flashlight instead of updated in loop 2015-12-07 11:30:10 -08:00
samcake
9f4fd3b684 Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster 2015-12-07 09:49:00 -08:00
Ryan Huffman
9d47ac000e Merge pull request #6479 from thoys/editjs-left-click 
No more right-click-move editing in edit.js
 2015-12-07 08:29:01 -08:00
Thijs Wenker
22bdc1ae84 Make it possible to use the focus-right-click-drag-camera in the edit.js script again. Still keep right-clicking ignore Toolbar and entity selection events. 2015-12-07 13:49:49 +01:00
samcake
fae1bd98c8 Merge pull request #6569 from Atlante45/graphics 
Alpha/Roughness G-Buffer debugging
 2015-12-06 18:56:38 -08:00
Seth Alves
f0fb9966ad expose parent-joint-index to edit.js 2015-12-06 12:34:41 -08:00
samcake
10fe6de9a9 Merge branch 'graphics' of https://github.com/highfidelity/hifi into graphicsMaster 2015-12-06 10:49:08 -08:00
samcake
8e26094293 Merge branch 'graphicsMaster' of https://github.com/samcake/hifi into graphicsMaster 2015-12-06 10:48:21 -08:00
James B. Pollack
378b71d701 dont spin by default 2015-12-05 17:51:55 -08:00
James B. Pollack
7859241ad3 spin the earth for fun 2015-12-05 17:43:13 -08:00
James B. Pollack
906540272e disable collisions for now because of shapetype 2015-12-05 17:39:43 -08:00
James B. Pollack
30b32765b9 make earth grabbable to show parenting 2015-12-05 17:32:02 -08:00
James B. Pollack
ade32cbf61 remove collisions and add parenting 2015-12-05 17:30:38 -08:00
James B. Pollack
a899fe0e1b fix typo 2015-12-05 17:26:11 -08:00
James B. Pollack
945b5bd00f cleanup 2015-12-05 17:11:27 -08:00
James B. Pollack
d518def974 poll by default 2015-12-05 17:01:54 -08:00
James B. Pollack
7fc3d0f34e header 2015-12-05 16:58:50 -08:00
James B. Pollack
4a5b9bd523 start position 2015-12-05 16:57:09 -08:00
James B. Pollack
4999b34327 cleanup interval 2015-12-05 16:54:55 -08:00
James B. Pollack
f33f4cbcae cleanup 2015-12-05 16:22:17 -08:00
James B. Pollack
1f2d726211 awesome stuff 2015-12-05 16:16:58 -08:00
James B. Pollack
3b6cd4c2d1 initial live earthqukes commit 2015-12-05 14:11:59 -08:00
Atlante45
0603ead972 Have panels collapsed by default 2015-12-04 21:01:53 -08:00
Atlante45
acb9e2774e Basic implementation of debug zone resizing 2015-12-04 21:01:53 -08:00
Atlante45
41af377878 More g-buffer debugging options 2015-12-04 21:01:53 -08:00
David Rowe
404deba78d Adjust avatar thumb root joint angle to look better 2015-12-05 16:26:21 +13:00
David Rowe
560b9f012f Get hand positioning and orientation working again 2015-12-05 16:25:28 +13:00
Atlante45
b45b1cc513 More work on live g-buffer debug 2015-12-04 17:43:00 -08:00
Atlante45
5bfcd4ed91 Fix scripted checkbox 2015-12-04 17:30:45 -08:00
samcake
119cc733b5 Merging with master 2015-12-04 17:17:33 -08:00
James B. Pollack
bfe12cf8db stability improvments 2015-12-04 15:49:04 -08:00
James B. Pollack
b8e731fd22 adjustments 2015-12-04 15:25:55 -08:00
James B. Pollack
f867ebf1d1 every sixth rat 2015-12-04 15:18:35 -08:00
Atlante45
1d498af76e Merge branch 'master' of https://github.com/highfidelity/hifi into baseball 2015-12-04 15:18:25 -08:00
James B. Pollack
b1ec1eb113 make injectors more stable 2015-12-04 15:17:13 -08:00
Philip Rosedale
06c8235b19 Merge pull request #6544 from sethalves/distance-grab-adjustment 
distance-hold adjustment
 2015-12-04 14:34:10 -08:00
James B. Pollack
51b0c48866 splicing and dicing 2015-12-04 14:05:31 -08:00
James B. Pollack
3211bec7ce increase distance for rat to be in the nest and deleted 2015-12-04 13:57:59 -08:00
James B. Pollack
7ed0e3d8ae change clear rat order 2015-12-04 13:56:38 -08:00
James B. Pollack
a9aecb5c49 add rat sounds 2015-12-04 13:54:59 -08:00
Atlante45
c27944ae28 Simple normal map debug 2015-12-04 10:44:23 -08:00
Seth Alves
4246672813 enable head-moving of distance grabbing 2015-12-04 10:38:24 -08:00
Brad Hefta-Gaub
d9a1563396 Merge pull request #6152 from sethalves/parents 
Parents
 2015-12-04 10:26:57 -08:00
James B. Pollack
493a8f6f82 Merge branch 'master' into ratsteer 2015-12-04 10:26:47 -08:00
ericrius1
7e7327042a Merge branch 'master' into polylineOptimizations 2015-12-04 09:53:01 -08:00
Seth Alves
17b5ade9c0 allow moving distantly grabbed objects with head 2015-12-03 16:45:46 -08:00
Seth Alves
a600df5ea6 try a different method of exagerating hand motion onto distanly held object 2015-12-03 16:04:39 -08:00
Clément Brisset
d6a2a2550b Merge pull request #6526 from imgntn/butterfly 
Update model for butterflies.js
 2015-12-03 15:25:55 -08:00
ericrius1
5f881e7650 polylines now take color as a uniform 2015-12-03 13:46:29 -08:00
James B. Pollack
fbca1c9754 another toy 2015-12-03 11:12:28 -08:00
James B. Pollack
cf5c8c08e2 update toys to be inverted while held 2015-12-03 11:10:22 -08:00
ericrius1
2336dd96dd lights 2015-12-02 18:10:45 -08:00
David Rowe
a0dcf72a3b Use animation handlers to control hand position and orientation 2015-12-03 14:09:46 +13:00
ericrius1
d2d0326c02 using deployed texture 2015-12-02 16:44:47 -08:00
David Rowe
0f3722a05c Fix Leap Motion calibration avatar pose 2015-12-03 13:14:22 +13:00
ericrius1
07430fb75a Merge branch 'master' into polylineOptimizations 2015-12-02 15:59:32 -08:00
ericrius1
8aeb559848 flowy 2015-12-02 15:58:30 -08:00
Seth Alves
6eae98fb28 merge from upstream 2015-12-02 14:38:26 -08:00
James B. Pollack
a9438490fe update butterfly model 2015-12-02 12:53:19 -08:00
Brad Hefta-Gaub
33b859df33 Merge pull request #6416 from kencooke/audio-reverb 
New reverb
 2015-12-02 11:22:12 -08:00
Brad Hefta-Gaub
ba0ce5f3b3 Merge pull request #6480 from samcake/controllers 
Playback: Trying to get the Agent to Master connection more reliable
 2015-12-02 11:08:15 -08:00
Ken Cooke
fbd7549430 Better reverb script defaults 2015-12-02 11:05:06 -08:00
samcake
0ae7060316 the correct includes 2015-12-02 10:23:31 -08:00
Brad Hefta-Gaub
112cdaf028 Merge pull request #6512 from AndrewMeadows/remove-debug-cruft 
remove debug option for disabling physics updates
 2015-12-02 10:00:29 -08:00
samcake
586ed51436 rename AgentPoolCOntroller.js 2015-12-02 09:56:16 -08:00
Brad Hefta-Gaub
b6398a7930 fix PlayRecordingOnAC.js to use new API 2015-12-02 09:51:52 -08:00
samcake
c7b9d7d26e Merge branch 'master' of https://github.com/highfidelity/hifi into controllers 2015-12-02 09:49:03 -08:00
Seth Alves
0595ef0938 merge from upstream 2015-12-02 09:30:19 -08:00
James B. Pollack
e67f372bcf make pistol shoot differently and not alter controller mappings 2015-12-01 18:24:13 -08:00
samcake
86af28dbab Fighting for one hour with the ready message being misunderstood by master 2015-12-01 18:18:18 -08:00
James B. Pollack
1eca1540c6 Merge pull request #6519 from ericrius1/toyboxSounds 
added collision sounds to flashlight, spraycan, and bow
 2015-12-01 17:08:19 -08:00
Eric Levin
34234da2d1 fixed spacing 2015-12-01 17:05:51 -08:00
ericrius1
40fb45c6d3 fixed accidental newline in handgrab 2015-12-01 17:04:10 -08:00
ericrius1
0fd1bdaec5 fixed accidental newline in handgrab 2015-12-01 17:03:11 -08:00
ericrius1
e4199439af added collision sounds to some toys 2015-12-01 17:00:43 -08:00
ericrius1
386afa272c disable grab while attachment version of pistol script is running 2015-12-01 16:50:09 -08:00
Eric Levin
948479b0e8 Merge pull request #6517 from imgntn/disable2hands 
Support disabling both hands in handControllerGrab.js
 2015-12-01 16:25:23 -08:00
ericrius1
191f7f2c22 no audio for now 2015-12-01 16:22:11 -08:00
James B. Pollack
aca0fa7beb support disabling both hands 2015-12-01 16:03:19 -08:00
James B. Pollack
52d6fdac1a Merge pull request #6487 from ctrlaltdavid/20740 
Get the Leap Motion working again
 2015-12-01 15:40:48 -08:00
Atlante45
c4e43c4e0b Merge branch 'baseball-test' of github.com:Atlante45/hifi into baseball 2015-12-01 15:16:05 -08:00
Atlante45
f06b5b05b3 Merge branch 'master' of https://github.com/highfidelity/hifi into baseball 2015-12-01 15:14:58 -08:00
Atlante45
0b93e637e8 Update bat rotation 2015-12-01 15:13:46 -08:00
Atlante45
e6763c2208 Update bow's relative position 2015-12-01 15:03:25 -08:00
Atlante45
97454ae446 Update handControllerGrab.js 2015-12-01 14:32:59 -08:00
Seth Alves
e0eae23dd3 Merge pull request #6515 from imgntn/personal_lasers 
Personal lasers in handControllerGrab.js
 2015-12-01 13:29:05 -08:00
James B. Pollack
fb8316ff12 reduce pistol vol 2015-12-01 13:15:08 -08:00
James B. Pollack
3c8e31cd42 Merge pull request #6509 from ericrius1/toyboxFixes 
Toybox Tweaking
 2015-12-01 13:07:10 -08:00
James B. Pollack
b787e71587 Update doll.js 2015-12-01 13:06:30 -08:00
James B. Pollack
31d2f6463f cleanup 2015-12-01 13:03:51 -08:00
James B. Pollack
25422084b9 make it so that only you can see your beams until youre grabbing something 2015-12-01 13:02:40 -08:00
Anthony Thibault
dde971cb4f Merge pull request #6514 from howard-stearns/update-ScriptableAvatar 
Update ScriptableAvatar
 2015-12-01 12:44:04 -08:00
samcake
b6530b8b30 Merge branch 'master' of https://github.com/highfidelity/hifi into controllers 2015-12-01 12:37:13 -08:00
samcake
ff3ae85245 Separating the ui to get the url from the actual loading to maybe avoid playbackMaster.js crash? 2015-12-01 12:36:49 -08:00
Seth Alves
b8d800f5b8 Merge branch 'master' of github.com:highfidelity/hifi into parents 2015-12-01 11:59:10 -08:00
Howard Stearns
6e15ae9d7d Update robot agent script to randomly select among all HiFi avatars, identified by name, and with a random turn from front. 2015-12-01 11:49:17 -08:00
Philip Rosedale
8e40889068 Merge pull request #6508 from sethalves/fix-observers-dont-see-equip-motion 
possible fix for observers not seeing a held entity moving
 2015-12-01 11:41:08 -08:00
Andrew Meadows
ab6367ff4e remove debug option for disabling physics updates 2015-12-01 11:13:01 -08:00
ericrius1
a83f374036 tweaking light trail 2015-12-01 10:50:25 -08:00
Seth Alves
7f95e1eec6 make sure observed held objects are active in bullet, disable equip spring action 2015-12-01 10:49:07 -08:00
Atlante45
db0083ab83 Merge branch 'baseball' of github.com:birarda/hifi into baseball 2015-12-01 10:25:07 -08:00
Stephen Birarda
05862eff00 add fire sounds to assets JSON 2015-12-01 10:22:42 -08:00
ericrius1
191cab2e5f adding light trail app 2015-12-01 10:15:47 -08:00
ericrius1
a3f8c52aa3 temp fix for doll, moved cat 2015-12-01 10:09:29 -08:00
Ken Cooke
a725c8b12e Merge branch 'master' of https://github.com/highfidelity/hifi into audio-reverb 2015-12-01 09:12:24 -08:00
Ken Cooke
e25e6b5003 Test script with sliders for all reverb parameters 2015-12-01 06:44:56 -08:00
Sam Cake
921cd94c07 Finally a more stable api and playback use case 2015-12-01 00:15:12 -08:00
Seth Alves
e62eb08301 Merge branch 'master' of github.com:highfidelity/hifi into parents 2015-11-30 21:38:02 -08:00
James B. Pollack
1ba6bfa2e0 lazers 2015-11-30 18:58:53 -08:00
samcake
196f7e71c4 Merge branch 'master' of https://github.com/highfidelity/hifi into controllers 2015-11-30 18:35:04 -08:00
samcake
1b197987ec MOnday spent on improving the Agent/Clint coordination, but still bugs 2015-11-30 18:34:40 -08:00
Atlante45
083205916f Merge branch 'master' of https://github.com/highfidelity/hifi into baseball 2015-11-30 18:25:53 -08:00
ericrius1
b67c481726 resolved merge conflicts 2015-11-30 18:19:57 -08:00
Atlante45
ac85ed9787 Merge branch 'baseball' of github.com:Atlante45/hifi into baseball-test 2015-11-30 18:15:59 -08:00
ericrius1
90595949f1 moved exterminator game out of dry lake 2015-11-30 18:14:57 -08:00
Atlante45
3bbd20a7bd Merge branch 'master' of https://github.com/highfidelity/hifi into baseball-test 2015-11-30 18:02:34 -08:00
ericrius1
8992f6bb44 moved pistol to toybox 2015-11-30 17:57:01 -08:00
Atlante45
6903cd4d8f Merge branch 'baseball' of github.com:birarda/hifi into baseball 2015-11-30 17:19:39 -08:00
Stephen Birarda
52dc2cf746 change the assets file to json 2015-11-30 17:17:06 -08:00
ericrius1
71d361ed3b fixed hydra paint, adding more interactive brushes 2015-11-30 17:06:35 -08:00
Atlante45
52fb711656 Move baseballCrowd to correct directory 2015-11-30 17:06:09 -08:00
Stephen Birarda
cba09beff4 add pop sounds (which don't require attribution) 2015-11-30 17:02:30 -08:00
James B. Pollack
8b7cfde02a Merge pull request #6505 from imgntn/boww 
Fix release hand message for bow
 2015-11-30 17:02:08 -08:00
James B. Pollack
7c12379ada fix release hand message 2015-11-30 17:00:40 -08:00
Seth Alves
b7ebe5b92b merge from upstream 2015-11-30 16:59:52 -08:00
Stephen Birarda
c451ede051 add crowd noises to assets yaml 2015-11-30 16:59:13 -08:00
Stephen Birarda
4a80e72d14 complete attribution for removed files 2015-11-30 16:48:05 -08:00
Stephen Birarda
f7537e3dc3 add initial version of asset description 2015-11-30 16:44:14 -08:00
Howard Stearns
6f50d91208 Merge pull request #6461 from hyperlogic/tony/remove-joint-states 
Refactor of Rig and MyAvatar animation JavaScript interface
 2015-11-30 16:28:15 -08:00
Ryan Huffman
6fe370c4ef Remove old comment in firework.js 2015-11-30 16:02:00 -08:00
Ryan Huffman
0ed249f0e7 Update script path include in firework.js 2015-11-30 16:01:53 -08:00
Stephen Birarda
1b1efe53d9 fix for two space indentation in createBatButton.js 2015-11-30 15:59:12 -08:00
Stephen Birarda
733665d722 fix spacing in baseballCrowd.js 2015-11-30 15:53:42 -08:00
Clément Brisset
e168966b87 Merge pull request #6409 from birarda/injector-hybrid 
more efficient threading of networked AudioInjector objects
 2015-11-30 15:36:41 -08:00
ericrius1
706a67b9a1 lowered restitution to 0 to avoid too many collision sounds playing 2015-11-30 15:10:32 -08:00
Seth Alves
02c4730388 Merge branch 'master' of github.com:highfidelity/hifi into parents 2015-11-30 14:09:31 -08:00
Stephen Birarda
a33e57dfdb remove audio files from history 2015-11-30 14:06:09 -08:00
Stephen Birarda
4573e5c59e resolve conflicts on merge with upstream/master 2015-11-30 13:32:38 -08:00
James B. Pollack
8267c70bb1 hide avoiders 2015-11-30 12:45:10 -08:00
James B. Pollack
bd58a45d5a Merge branch 'ratsteer' of https://github.com/imgntn/hifi into ratsteer 2015-11-30 12:44:22 -08:00
James B. Pollack
cd4ac8ac69 good enough 2015-11-30 12:44:06 -08:00
ericrius1
b7884f487c rats 2015-11-30 11:44:34 -08:00
ericrius1
22efcb1854 Added sounds to pistol 2015-11-30 11:42:34 -08:00
James B. Pollack
1190f1b6cc Merge branch 'master' into ratsteer 2015-11-30 11:25:50 -08:00
Anthony J. Thibault
11bfed4185 Merge branch 'master' into tony/remove-joint-states 2015-11-30 11:21:44 -08:00
samcake
1be494a257 Merge branch 'master' of https://github.com/highfidelity/hifi into controllers 2015-11-30 09:36:29 -08:00
Sam Cake
3f43fde459 AFter 3 days on that piece of shit i just give up, js is just too hard to debug, i m very sad 2015-11-30 04:11:17 -08:00
Seth Alves
9548b0e138 get parent-id field working 2015-11-29 13:38:27 -08:00
Seth Alves
bbc9d5d131 add missing single-quote 2015-11-29 13:04:45 -08:00
James Pollack
44f69a2a18 Merge branch 'master' into bow 2015-11-29 11:37:25 -08:00
Seth Alves
e91a8684a4 Merge branch 'master' of github.com:highfidelity/hifi into parents 2015-11-29 10:17:36 -08:00
James Pollack
0625d4f4c2 remove debugging string 2015-11-28 23:40:58 -08:00
James Pollack
55f797838f remove unused key 2015-11-28 23:22:00 -08:00
James Pollack
1e2398cbea use constants 2015-11-28 23:04:52 -08:00
James Pollack
1315201bdc update name of function 2015-11-28 22:55:44 -08:00
James Pollack
017ffb8f2e change way messages get sent to the hand disabler 2015-11-28 22:54:31 -08:00
James Pollack
8f51ee6f58 rename hand disabler 2015-11-28 22:29:12 -08:00
James B. Pollack
fe0a732b5d remove rattest file 2015-11-27 13:11:00 -08:00
James B. Pollack
b23a9dd346 Merge branch 'master' into ratsteer 2015-11-27 13:06:36 -08:00
James B. Pollack
8daeb0fa0d revert hand grab script to current master 2015-11-27 12:18:11 -08:00
James B. Pollack
9ec2a01475 isolate grab script changes from bow branch 2015-11-27 12:13:53 -08:00
James B. Pollack
b6a165d3ef Merge branch 'master' into bow 2015-11-27 11:41:21 -08:00
James B. Pollack
0ba6d172e8 Merge branch 'bow' of https://github.com/imgntn/hifi into bow 2015-11-27 11:21:33 -08:00
James B. Pollack
c237485023 revert playaspawner 2015-11-27 11:21:18 -08:00
Seth Alves
ca75802b9c unmangle merge 2015-11-26 06:43:28 -08:00
Seth Alves
36e293608a more adding parentID to edit.js 2015-11-26 05:31:52 -08:00
Sam Cake
37d3083e07 Getting the Actor class starting to work and usable for the playback master! 2015-11-26 00:41:46 -08:00
samcake
3273fbcad4 Creating the master / agent hiring system 2015-11-25 17:10:38 -08:00
Anthony J. Thibault
23def8d173 Merge branch 'master' into tony/remove-joint-states 2015-11-25 13:55:23 -08:00
Clément Brisset
5ff482071e Merge pull request #6465 from ericrius1/polyLineFix 
moved logic to build vertex buffer to renderable polyline class, recalculati…
 2015-11-25 11:02:02 -08:00
samcake
184669762a Merge branch 'master' of https://github.com/highfidelity/hifi into controllers 2015-11-25 10:28:55 -08:00