Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-10 04:27:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
41961 commits 25 branches 0 tags 1.1 GiB
Commit graph

5954 commits

Author SHA1 Message Date
ericrius1
d1d4a9d6b1 adjusted surface position 2016-02-23 14:48:45 -08:00
ericrius1
5e0de4bdee tweaks 2016-02-23 12:16:22 -08:00
ericrius1
4b45fd2d4d Merge branch 'master' into whiteboardV2 2016-02-23 12:15:59 -08:00
ericrius1
a2ece772ef refactor for laser pointer 2016-02-23 12:08:51 -08:00
Clément Brisset
f82e5e2cd6 Merge pull request #7166 from ericrius1/editFix 
Fixed bug with parsing numbers for edit js
 2016-02-23 11:57:19 -08:00
ericrius1
8d058c2bb3 eraser working 2016-02-23 11:53:27 -08:00
ericrius1
20fd79fc43 Lines markers 2016-02-23 11:25:46 -08:00
Brad Hefta-Gaub
a71a78b2d3 add comments and license header to reticleDepth.js 2016-02-23 11:22:24 -08:00
samcake
5e38aee0ba Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-02-23 11:21:00 -08:00
ericrius1
6682b9bd58 eraser is spawing 2016-02-23 10:36:17 -08:00
Brad Hefta-Gaub
8117d51324 Merge branch 'master' of https://github.com/highfidelity/hifi into depthReticleWork 2016-02-23 10:21:10 -08:00
ericrius1
81ed89531d whiteboard surface parented to whiteboard 2016-02-23 10:11:13 -08:00
ericrius1
b5ec79fd6d marker only draws when equipped and held down 2016-02-23 09:53:20 -08:00
samcake
9d0803e6b8 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-02-23 09:33:54 -08:00
ericrius1
749f4478ab Fixed bug with parsing numbers for editjs 2016-02-23 09:33:37 -08:00
ericrius1
69dc9ef68f added lifetime 2016-02-23 09:06:35 -08:00
Zach Pomerantz
2534bb14f3 Amend entityProperties for fixed-dec light values 2016-02-22 19:27:36 -08:00
Seth Alves
23b204c0c6 fix logic that checks getEntityProperties return value 2016-02-22 19:03:12 -08:00
Zach Pomerantz
dacf9f7123 Rm extra " in entityProperties 2016-02-22 15:18:45 -08:00
Zach Pomerantz
77ad4039bc Merge branch 'master' of github.com:highfidelity/hifi into fix/light-intensity 2016-02-22 15:11:12 -08:00
Zach Pomerantz
868e2ec961 Use "number" in entityProperties 2016-02-22 15:07:10 -08:00
Zach Pomerantz
1506686b79 Expose light surface to entityProperties 2016-02-22 15:07:09 -08:00
James B. Pollack
6b14fa8dcb Merge branch 'master' into cellscience 2016-02-22 14:25:22 -08:00
Seth Alves
f113a83c5b merge from upstream 2016-02-22 14:02:38 -08:00
Seth Alves
c470649076 don't crash if entity vanishes while doing touch test 2016-02-22 14:00:01 -08:00
Seth Alves
8a3b233659 don't crash if entity vanishes while doing touch test 2016-02-22 13:58:07 -08:00
Brad Hefta-Gaub
3f7a2eb10a add support in depthReticle.js to set depth to overlay depth when you're over a 2D overlay 2016-02-22 13:54:46 -08:00
Brad Hefta-Gaub
54b21abf02 remove editWithHacks and move to more generic depthReticle 2016-02-22 13:32:19 -08:00
Brad Hefta-Gaub
fc002df5e7 implement Reticle.depth using the apparent 3D look at logic instead 2016-02-22 13:24:14 -08:00
Ryan Huffman
e6ccf501fa Merge pull request #7135 from zzmp/fix/grid 
Update renderGrid to use a shader, and fix grid edit tools
 2016-02-22 12:58:23 -08:00
Brad Hefta-Gaub
715355464f Merge branch 'master' of https://github.com/highfidelity/hifi into depthReticleWork 2016-02-22 12:52:56 -08:00
Chris Collins
f24e4bc6b1 Merge pull request #7152 from sethalves/fix-touch 
fix grab-script touch
 2016-02-22 09:58:29 -08:00
Brad Hefta-Gaub
3f03678d02 add version of edit that sets reticle depth 2016-02-22 09:27:27 -08:00
samcake
377ee5a486 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-02-22 09:23:14 -08:00
Brad Hefta-Gaub
cbe80bffd6 go into away mode if you the HMD loses mouse capture 2016-02-21 12:57:14 -08:00
Seth Alves
5f79500e4d fix grab-script touch 2016-02-21 09:37:43 -08:00
Brad Hefta-Gaub
1a4591db58 Merge branch 'master' of https://github.com/highfidelity/hifi into hmdHacking 2016-02-21 09:30:41 -08:00
samcake
9b2a90b430 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-02-19 19:50:02 -08:00
samcake
39a7852979 MOving forward with PBR rendering, cleaning up the lighting shaders and the packi/unpack deferredBuffer shaders 2016-02-19 18:43:07 -08:00
Brad Hefta-Gaub
2810be8787 fix scripts to use new API 2016-02-19 17:57:49 -08:00
ericrius1
ec36995908 moar whiteboard logging removal 2016-02-19 17:36:02 -08:00
ericrius1
6fe9730897 all three markers 2016-02-19 17:33:54 -08:00
ericrius1
68e289b433 Fixed bug where spawning one marker would destroy the other 2016-02-19 17:32:33 -08:00
Zach Pomerantz
c9362a4073 Set grid major div min to 1 2016-02-19 15:58:08 -08:00
ericrius1
756b7e223d need to figure out why only one marker working 2016-02-19 15:56:12 -08:00
Zach Pomerantz
5d78867197 Set grid height via global y-coord 2016-02-19 15:41:38 -08:00
Zach Pomerantz
d74aa4f14d Rm extra , in gridControls 2016-02-19 14:54:19 -08:00
Howard Stearns
1d84bd17da Merge pull request #7134 from ericrius1/acInjectors 
Injector Load Test script
 2016-02-19 14:41:11 -08:00
ericrius1
9ae1ccee50 passing marker color accross 2016-02-19 14:15:55 -08:00
ericrius1
40176b0424 no gaps 2016-02-19 14:06:55 -08:00
Zach Pomerantz
fd6aa9a78b Add layering to renderGrid, draw edit grid not layered 2016-02-19 13:57:32 -08:00
ericrius1
e4508e1d34 added comment and name 2016-02-19 12:06:08 -08:00
ericrius1
0564cd8145 returning if less than min distance 2016-02-19 12:02:34 -08:00
ericrius1
9a8b76df47 no more zfighting 2016-02-19 11:32:13 -08:00
ericrius1
94bf15f328 need to fix zfighting 2016-02-19 11:21:17 -08:00
ericrius1
b58026bf4b max points 2016-02-19 11:04:17 -08:00
ericrius1
ddce8d5a3a Marker basics working, now just need to tweak 2016-02-19 10:59:05 -08:00
ericrius1
8e9cd3ae2a passing whiteboard in to marker 2016-02-19 10:38:13 -08:00
samcake
04543e7b0e Merge pull request #7138 from zzmp/fix/render-debug 
Update render/debug.js
 2016-02-19 10:10:43 -08:00
ericrius1
6765973a4a correct positioning on equip 2016-02-19 09:56:30 -08:00
ericrius1
f4ee9acb9c intersecting 2016-02-19 09:49:22 -08:00
samcake
d7b3945c4a Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-02-19 09:29:23 -08:00
Ryan Huffman
69a953725e Merge pull request #7132 from imgntn/edit-precision-things 
Revert step size change in edit.js
 2016-02-19 08:20:04 -08:00
Brad Hefta-Gaub
d1e1067e5a allow hydra mouse to know the correct size of screen to target 2016-02-18 22:30:31 -08:00
samcake
903824809c trying to have better support for the materials 2016-02-18 18:33:32 -08:00
Zach Pomerantz
2dd1cf2f15 Update Render.fromJSON to Render.load 2016-02-18 18:21:26 -08:00
ericrius1
33a232edde got rid of magic numbers 2016-02-18 18:17:37 -08:00
Zach Pomerantz
981d4d37ca Update render/debug.js 
- Add a toggle for the entire UI
- Set items sliders minimums to -1
- Fix off-by-one with debug buffer radios
 2016-02-18 17:45:55 -08:00
ericrius1
d0660fc90a logging 2016-02-18 16:17:22 -08:00
ericrius1
bc0216633e more logging 2016-02-18 16:10:12 -08:00
ericrius1
c3a687e294 ac test 2016-02-18 16:06:53 -08:00
Zach Pomerantz
b68213f9bf Reintroduce grid to edit.js 2016-02-18 15:48:25 -08:00
ericrius1
b0664b587f bumped injector count 2016-02-18 15:39:38 -08:00
ericrius1
39d4fbf19d refactoring 2016-02-18 15:23:32 -08:00
James B. Pollack
f5ad297986 Merge branch 'master' into cellscience 2016-02-18 12:43:39 -08:00
ericrius1
efbb5ec967 updated test 2016-02-18 12:14:30 -08:00
ericrius1
ec1c7925c0 updated logging 2016-02-18 12:02:22 -08:00
ericrius1
1d9b3fadaf more logging 2016-02-18 12:00:24 -08:00
ericrius1
eabeb98076 injector load 2016-02-18 11:50:26 -08:00
Brad Hefta-Gaub
0467930c57 Merge branch 'master' of https://github.com/highfidelity/hifi into hmdHacking 
Conflicts:
	examples/controllers/handControllerGrab.js
 2016-02-18 10:30:43 -08:00
Chris Collins
e3ae2baa7b Merge pull request #7123 from ericrius1/editProps 
added collidesWith property to entities list
 2016-02-18 09:11:18 -08:00
James B. Pollack
acaa824cb5 but only position 2016-02-18 09:00:39 -08:00
James B. Pollack
e6662edcb4 revert step size change 2016-02-18 08:57:06 -08:00
ericrius1
5f5af9c6a0 fixed edit bug 2016-02-17 17:45:57 -08:00
ericrius1
728e8c763d ray cast 2016-02-17 17:30:01 -08:00
ericrius1
7f23ee04be basic marker entity script 2016-02-17 17:16:43 -08:00
James B. Pollack
89039747a2 Update entityProperties.html 
lowercase 'static' like other props
 2016-02-17 16:22:14 -08:00
ericrius1
df84a166e4 spawning marker tips- parenting to markers 2016-02-17 15:08:42 -08:00
ericrius1
073661b78d markers in right spot 2016-02-17 14:25:21 -08:00
ericrius1
9e8d123b16 spawning marker and whiteboard correctly 2016-02-17 13:58:04 -08:00
ericrius1
bb2fd0072c collision hull 2016-02-17 13:41:58 -08:00
ericrius1
bfc619497e spawning model 2016-02-17 13:33:19 -08:00
ericrius1
19cd3ec152 checkboxes working 2016-02-17 13:12:17 -08:00
Seth Alves
64e50c5329 keep search-line from freezing during a far-trigger 2016-02-17 12:35:23 -08:00
Seth Alves
69caf1df4d fix far-trigger 2016-02-17 12:04:25 -08:00
ericrius1
94fdf6b091 checkboxes working 2016-02-17 11:59:14 -08:00
ericrius1
f85916e808 checkbox keeps getting checked... 2016-02-17 10:27:53 -08:00
ericrius1
0f8f67ef0b removing dynamic. need to add others 2016-02-16 19:34:32 -08:00
James B. Pollack
f2445e81e0 Merge pull request #7110 from ericrius1/particlesInEdit2 
Particles in edit
 2016-02-16 18:33:01 -08:00
ericrius1
168fb67d67 making collidesWith a checkbox 2016-02-16 18:19:12 -08:00
ericrius1
ce2d76d3f3 made export settings a text area 2016-02-16 17:57:09 -08:00
ericrius1
7a3443968d added collides with property 2016-02-16 15:55:11 -08:00
ericrius1
c43500f38a added textures field to particle explorer 2016-02-16 15:36:03 -08:00
ericrius1
023fd0607d added alpha start 2016-02-16 15:29:42 -08:00
ericrius1
d9d0e78dc5 button close 2016-02-16 15:21:18 -08:00
Chris Collins
05b9d88f08 Merge pull request #7108 from imgntn/moreprecision 
More precision for edit.js
 2016-02-16 15:03:10 -08:00
ericrius1
bf21bc2d48 reworked exporting properties 2016-02-16 14:06:02 -08:00
ericrius1
ad43e4ff6d Fixed multiple particle tabs appearing 2016-02-16 12:56:34 -08:00
Brad Hefta-Gaub
a25581c656 clean up reticle scripting to be exposed through Reticle object (implemented int ApplicationCompositor) 2016-02-16 12:11:58 -08:00
ericrius1
46907f446b Listening for page loaded event instead of set timeout === less lag 2016-02-16 11:42:01 -08:00
ericrius1
46679b29f7 particle tab deleted when particle system deleted 2016-02-16 11:11:58 -08:00
ericrius1
1ad4d64748 removed tween 2016-02-16 10:32:24 -08:00
ericrius1
bc6e806ef2 removed tween 2016-02-16 10:23:22 -08:00
Andrew Meadows
f932999b2c Merge pull request #7113 from zzmp/rm/draw-on-hud 
Remove drawOnHUD property from 3d overlays
 2016-02-16 09:44:05 -08:00
Andrew Meadows
7dbb42c339 Merge pull request #7109 from zzmp/fix/edit-image-color 
Remove image color in edit.js
 2016-02-16 09:27:06 -08:00
ericrius1
f8c846f5d1 got rid of query string 2016-02-15 18:53:41 -08:00
ericrius1
d00b650ee2 Water sounds 2016-02-15 18:41:56 -08:00
ericrius1
b245499d53 near trigger 2016-02-15 18:30:36 -08:00
ericrius1
f61aea1c9b adding trigger 2016-02-15 18:18:58 -08:00
ericrius1
a5d4ec15ab watering on and off 2016-02-15 18:00:06 -08:00
ericrius1
f97eafc4ee hooking up water to hose 2016-02-15 16:40:03 -08:00
ericrius1
236ff068e2 hose in 2016-02-15 16:16:31 -08:00
ericrius1
a12886eebd growing stuff 2016-02-15 15:57:07 -08:00
ericrius1
03ca41c0c2 each flower needs to be its own object 2016-02-15 15:43:44 -08:00
ericrius1
969ae2e07b cactus getting watered 2016-02-15 15:26:58 -08:00
ericrius1
678caef9c6 flowers ready to be grown through watering 2016-02-15 15:16:49 -08:00
ericrius1
13a8557f03 basic architecture for watering plants set up 2016-02-15 15:12:15 -08:00
Zach Pomerantz
8c01d5f82b Remove camera tool's 3d hud overlays 2016-02-15 14:03:57 -08:00
Chris Collins
bf52d30216 Merge pull request #7107 from ericrius1/spraypaintFix 
Fix for spraypaint orientation
 2016-02-15 13:45:12 -08:00
ericrius1
f98941e80f switching between particle entities 2016-02-15 12:52:05 -08:00
ericrius1
85d8fc2944 particle image 2016-02-15 11:56:41 -08:00
Zach Pomerantz
b8e8859761 Remove image color in edit.js 
This removes the warning generated by ImageOverlay.qml
for the unhandled property, color.
 2016-02-15 11:51:11 -08:00
James B. Pollack
72186f916c more precision 2016-02-15 11:35:28 -08:00
ericrius1
80a368933f Fix for spraypaint orientation 2016-02-15 11:13:06 -08:00
ericrius1
3adc88aa70 need to fix icon 2016-02-15 11:11:23 -08:00
ericrius1
e4d4044a2b particleExplorer works in edit tab 2016-02-15 09:41:47 -08:00
samcake
545f276fdf Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-02-15 09:29:00 -08:00
ericrius1
b92c5555fe Merge branch 'master' into particlesInEdit2 2016-02-15 09:14:37 -08:00
ericrius1
3d939a7c23 twerkin 2016-02-15 09:07:16 -08:00
Brad Hefta-Gaub
376c23f1a3 Merge pull request #7100 from imgntn/edit_props 
Hide hyperlink property for web entities
 2016-02-12 18:29:35 -08:00
Brad Davis
b5cba79f0c Merge pull request #7095 from ZappoMan/hmdHacking 
Various bug fixes in related to HMD overlay support
 2016-02-12 17:50:42 -08:00
Brad Hefta-Gaub
48fe638312 Merge pull request #7104 from howard-stearns/update-orbitingSound 
update-orbitingSound.js
 2016-02-12 17:44:47 -08:00
Howard Stearns
9a3972c43f wait for sound to download 2016-02-12 17:42:44 -08:00
Brad Hefta-Gaub
d85a8a4fb9 Merge pull request #7103 from jherico/render-rate 
Don't drop to half the vsync rate when we can't keep up
 2016-02-12 17:11:03 -08:00
Brad Hefta-Gaub
df6437236e some CR feedback 2016-02-12 16:13:12 -08:00
Howard Stearns
25671fbefe Update orbitingSound.js to use a sample file that exists and setOptions function. 2016-02-12 16:01:23 -08:00
Brad Davis
908e153c36 Don't drop to half the vsync rate when we can't keep up 2016-02-12 15:57:27 -08:00
ericrius1
2c895151f6 multiple flowers blooming 2016-02-12 15:32:07 -08:00
samcake
e3307d91ad Fix the debugging tool to be able to freeze the frustum for scene fetch and culling 2016-02-12 14:59:43 -08:00
ericrius1
b5cc022df0 blooming flowers 2016-02-12 14:58:31 -08:00
James B. Pollack
c469fc6a29 hide hyperlink property for web entities 2016-02-12 14:30:21 -08:00
ericrius1
11047f676b stable 2016-02-12 13:58:12 -08:00
James B. Pollack
f346ac7023 logging 2016-02-12 13:58:02 -08:00
ericrius1
4c3e3538e8 multiple plants 2016-02-12 13:17:22 -08:00
Chris Collins
3321265ae7 Merge pull request #7086 from howard-stearns/clear-away-on-buttons 
Clear pause/away on controller button press
 2016-02-12 12:56:42 -08:00
ericrius1
4f79590919 flower growing in 2016-02-12 11:10:36 -08:00
Brad Hefta-Gaub
1160ecb335 improvements in HMD UI behavior 2016-02-12 10:51:33 -08:00
ericrius1
e32a317533 working 2016-02-12 10:44:35 -08:00
samcake
5acfd5ff53 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-02-12 09:59:48 -08:00
Seth Alves
94bc1764a8 fix auto-updating of adjustments to worn or equipped entities 2016-02-12 06:58:44 -08:00
Seth Alves
ca5525cc3f if an entity already was near-picked, don't do a distance-to-center check on it. 2016-02-12 06:58:14 -08:00
ericrius1
a608725658 changing colors for flower 2016-02-11 20:44:07 -08:00
ericrius1
332ade1db2 bloom tween 2016-02-11 20:34:46 -08:00
ericrius1
f09dd81a14 programatically adjusting flower stretching on sphere 2016-02-11 19:06:11 -08:00
samcake
f12030c1a4 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-02-11 18:41:02 -08:00
ericrius1
12561f8fcf pretty flowers 2016-02-11 17:06:39 -08:00
ericrius1
b4340f7b70 basic flower petal 2016-02-11 16:28:15 -08:00
howard-stearns
7c4e31687c simpler/better/more reliable (peek) 2016-02-11 13:27:56 -08:00
Chris Collins
c6bc91f8b2 Merge pull request #7084 from jherico/toolTabs 
Allow closed tabs to delete properly
 2016-02-11 13:20:20 -08:00
howard-stearns
0d8404e7e8 interact more safely with mappings 2016-02-11 13:05:47 -08:00
howard-stearns
93d72833bf Merge branch 'master' of https://github.com/highfidelity/hifi into clear-away-on-buttons 2016-02-11 12:10:53 -08:00
Brad Davis
2ee1f18e06 Allow closed tabs to delete properly 2016-02-11 10:27:24 -08:00
Chris Collins
a4afa03fe5 Merge pull request #7077 from sethalves/clean-up-grab-signaling 
Clean up grab signaling + various fixes
 2016-02-11 10:20:56 -08:00
samcake
31230e81bb Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-02-11 10:05:58 -08:00
samcake
99e9b3ecdd Merge pull request #7043 from zzmp/fix/render-ui 
Revamp the render engine ui
 2016-02-11 09:57:51 -08:00
Zach Pomerantz
3bace3cdbb Rework the qml for brevity 2016-02-11 08:48:01 -08:00
Zach Pomerantz
9c5881345a Disable the AO gpuTimer pending cpp fix 2016-02-11 08:48:00 -08:00
Zach Pomerantz
dbc59ccc2b Revamp render engine debug JS script 2016-02-11 08:47:59 -08:00
Seth Alves
880aedd444 update to track grab-script changes 2016-02-10 19:01:25 -08:00
Seth Alves
ecf22cd8b8 update toybox toys to use changed grab entityMethod calls 2016-02-10 18:22:20 -08:00
howard-stearns
a2ca0e8470 initial exploration 2016-02-10 17:01:11 -08:00
Seth Alves
8e16bda7bb start to clean up grab generated signals 2016-02-10 16:40:50 -08:00
ericrius1
7fe555d3a5 initial plant script 2016-02-10 15:44:34 -08:00
Andrew Meadows
d121dab937 Merge pull request #7057 from sethalves/grab-then-equip 
Grab then equip
 2016-02-10 14:16:31 -08:00
Brad Hefta-Gaub
d7db08d150 Merge pull request #7042 from howard-stearns/virtualBaton 
Virtual baton
 2016-02-10 13:48:34 -08:00
Howard Stearns
989192e9fd Make randomize clearer. 2016-02-10 12:53:05 -08:00
Howard Stearns
31d72ffb8d 2 is magic. 2016-02-10 12:17:58 -08:00
Howard Stearns
4241f4b305 Convert all simple one-liners containing ') { ' to instead take up three lines. 2016-02-10 12:03:07 -08:00
Seth Alves
9d21c3d549 Merge branch 'master' of github.com:highfidelity/hifi into grab-then-equip 2016-02-10 11:35:25 -08:00
samcake
9326aebf20 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-02-10 09:38:54 -08:00
Ken Cooke
a875542142 Merge pull request #7053 from birarda/integrate-new-hrtf 
Integrate the new audio HRTF in AudioMixer
 2016-02-10 07:34:50 -08:00
Seth Alves
c2cbca88cb allow grabbing with one hand and then equipping with other 2016-02-09 16:54:32 -08:00
samcake
da158bcd85 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-02-09 15:52:28 -08:00
Seth Alves
43592fd699 Merge pull request #7048 from hyperlogic/tony/avatar-on-moving-platform 
Better avatar animation when attached to a moving entity
 2016-02-09 14:30:02 -08:00
samcake
b1b08bf2f7 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-02-09 09:24:55 -08:00
Anthony J. Thibault
072172b1a2 SpatiallyNestable: now with velocity support! 
Moved velocity and angularVelocity into the SpatiallyNestable base class.

Entity velocity and angularVelocity properties are now relative to their parent, similar to the way position and orientation work for entities.

MyAvatar rig animations now use SpatiallyNestable to convert velocity into local frame to drive the animation state machine.
 2016-02-08 19:43:23 -08:00
samcake
40e49b2376 Starting to remove empty bricks and empty cells 2016-02-08 18:23:29 -08:00
ericrius1
3acc077bbd replaced sound url for example entity 2016-02-08 17:47:57 -08:00
howard-stearns
cecf2fb611 Up the number. 2016-02-08 17:00:29 -08:00
ericrius1
85ddb7100c fixed gap range bug 2016-02-08 16:51:04 -08:00
howard-stearns
d174e86347 fix batonName for entity script case 2016-02-08 16:45:25 -08:00
ericrius1
b60ba0c5a7 can now change loop 2016-02-08 16:22:05 -08:00
Anthony J. Thibault
97bcc54360 CharacterController: separate target velocity from parent velocity. 
Also, disable damping on the rigidBody used by the CharacterController.
 2016-02-08 16:01:36 -08:00
Stephen Birarda
445662f5ae clean sweep of old now unused audio files 2016-02-08 15:38:12 -08:00
ericrius1
bad4a5d601 changed ac script to take into account duration 2016-02-08 12:49:56 -08:00
ericrius1
193857f344 added explanatory comment about format of interval time 2016-02-08 11:51:52 -08:00
samcake
ad3f3a6dcf Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-02-08 10:30:54 -08:00
ericrius1
2a7a81f01c Merge branch 'master' into acSoundSearcher 2016-02-08 10:07:05 -08:00
ericrius1
4ab3bd204d no comment 2016-02-08 10:05:11 -08:00
Howard Stearns
9670cf3fe3 Reference correct filename. 2016-02-08 09:37:56 -08:00
Howard Stearns
61e521bc63 Fix build (and remove unneeded test file). 2016-02-08 09:33:32 -08:00
Brad Hefta-Gaub
c28612ea9a Merge pull request #7037 from sethalves/dressing-room 
Dressing room + grab fixes
 2016-02-08 09:19:29 -08:00
Howard Stearns
4a50d7c456 Merge branch 'master' of https://github.com/highfidelity/hifi into virtualBaton 2016-02-07 18:41:04 -08:00
Howard Stearns
b08f364447 yes! 2016-02-07 18:29:10 -08:00
Howard Stearns
e52b910e53 connectionTest 2016-02-07 16:39:29 -08:00
Howard Stearns
b6472217c4 Clear accepted/bestPromise .winner when disconnected. 2016-02-07 16:08:40 -08:00
Howard Stearns
8b27b90566 Verify validId before reporting a winning reponse to a proposal. 2016-02-07 14:57:29 -08:00
Howard Stearns
1a0017900c noisy connectionTest 2016-02-07 14:10:55 -08:00
Howard Stearns
8f714980df debuggable 2016-02-07 13:49:46 -08:00
Howard Stearns
7b39700136 one ring to rule 2016-02-07 13:33:21 -08:00
Howard Stearns
dc50efe7ec final? 2016-02-07 10:42:43 -08:00
Eric Levin
0932df621a Changed MIN_TIME_INTERVAL to be in milliseconds 2016-02-05 22:15:16 -08:00
Eric Levin
053f163b92 Changed wait time of avatar list query to entity query to update time so avatar positions don't pile up 2016-02-05 22:13:25 -08:00
ericrius1
6d64da2df7 expiration time is 5 seconds now 2016-02-05 17:28:55 -08:00
ericrius1
4c33c6e171 clean up 2016-02-05 17:13:29 -08:00
samcake
e5f3805d0e Fixing the item insert in cell criteria for subcell and adding debgging tool 2016-02-05 16:49:43 -08:00
ericrius1
1c54de6f57 better logging 2016-02-05 16:11:43 -08:00
ericrius1
a5c037b23f possible bug fix for sound not playing on avatar rentry 2016-02-05 16:09:30 -08:00
ericrius1
208007c9d8 log 2016-02-05 15:43:15 -08:00
Seth Alves
d567020283 trying to zero velocity during an equiped adjustment 2016-02-05 15:01:46 -08:00
Seth Alves
07c70a1ba2 refix double action grabs 2016-02-05 14:25:46 -08:00
Seth Alves
b1267f9d37 try to put things back when a double-parent equip is released. if an equpped object is pulled too far from a hand, automatically unequip it. 2016-02-05 13:53:45 -08:00
ericrius1
609ddda74e adjusting for interval and interval spread 2016-02-05 13:49:44 -08:00
ericrius1
a65c869239 removed commenting 2016-02-05 13:36:31 -08:00
ericrius1
120c5ac370 Able to switch url sounds 2016-02-05 13:35:45 -08:00
ericrius1
355f60f088 Not adding deleted avatars to the list of avatars to use for querying 2016-02-05 11:07:21 -08:00
Babiuch, Ryan Nicholas
aab98db812 Merge branch 'master' of github.com:highfidelity/hifi 2016-02-05 12:49:38 -06:00
samcake
57b6ad3c54 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-02-05 09:23:31 -08:00
ericrius1
aa49db9992 updating sound volume 2016-02-04 19:21:12 -08:00
Seth Alves
ae6a5aa286 add some debugging to handControllerGrab 2016-02-04 18:10:43 -08:00
Seth Alves
27711a04b9 Merge branch 'master' of github.com:highfidelity/hifi into dressing-room 2016-02-04 18:10:03 -08:00
ericrius1
9b0e20d82b stopping sound injector if sound was looping 2016-02-04 17:57:25 -08:00
ericrius1
f6a091b941 basic of new design working 2016-02-04 17:41:52 -08:00
ericrius1
16af9b9e31 deleting sound entity if it hasn't been around for a while 2016-02-04 17:12:25 -08:00
ericrius1
c8704234b1 basic setup for new design 2016-02-04 16:19:23 -08:00
James B. Pollack
c377254cb0 revert junkyardreset 2016-02-04 14:34:41 -08:00
ericrius1
8591de4873 getting avatar position 2016-02-04 11:57:22 -08:00
samcake
cc7f03e7e4 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-02-04 10:29:41 -08:00
James B. Pollack
663dadd1b4 only disconnect mouse if connected 2016-02-04 08:51:42 -08:00
Babiuch, Ryan Nicholas
142ec76600 Merge branch 'master' of github.com:highfidelity/hifi 2016-02-04 08:18:47 -06:00
Howard Stearns
287d91d4b2 better 2016-02-03 20:57:35 -08:00
Bradley Austin Davis
c1d45b0c78 Remove declarative form creation from WindowScriptingInterface 2016-02-03 14:50:59 -08:00
ericrius1
e3fe20c818 query octree right away 2016-02-03 13:50:10 -08:00
Babiuch, Ryan Nicholas
786400eb53 Merge branch 'WorkingEnergy' 2016-02-03 14:53:28 -06:00
Babiuch, Ryan Nicholas
d7951f4300 Merge branch 'master' of github.com:highfidelity/hifi 2016-02-03 14:52:08 -06:00
Seth Alves
56679c6a1d Merge branch 'master' of github.com:highfidelity/hifi into dressing-room 2016-02-03 12:50:52 -08:00
Andrew Meadows
00f30201a7 Merge pull request #7003 from sethalves/save-held-adjustments 
automatically save adjustments to offsets of equipped items
 2016-02-03 12:21:17 -08:00
ericrius1
03f90c2070 fixed potential bug 2016-02-03 12:11:09 -08:00
Brad Hefta-Gaub
839ce50bde Merge pull request #7018 from jherico/qml 
QML fixes
 2016-02-03 11:59:27 -08:00
Babiuch, Ryan Nicholas
3d727d76c2 Merge branch 'master' of github.com:highfidelity/hifi 2016-02-03 13:39:13 -06:00
Babiuch, Ryan Nicholas
3cb2f9c4b7 Exposed energy cost multiplier to scripting. 
- field: costMultiplier
 2016-02-03 13:29:42 -06:00
Howard Stearns
055de61ec6 update 2016-02-03 11:10:04 -08:00
Seth Alves
ad2a7bfc3c code review 2016-02-03 10:54:08 -08:00
Andrew Meadows
cd56d635e1 Merge pull request #7012 from sethalves/adjust-palm-position 
base palm position on finger joint rather than an offset from hand joint
 2016-02-03 10:34:39 -08:00
samcake
edbcef20d4 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-02-03 09:44:05 -08:00
Seth Alves
e0ab6b6716 Merge branch 'dressing-room' of github.com:imgntn/hifi into dressing-room 2016-02-03 09:30:21 -08:00
Babiuch, Ryan Nicholas
7dd5bca17f Bug fixes and debt reductions on energy calculations. 
- removed superfluous code interfacing with scripts
- favor floats over doubles in cost calculations
- default avatar energy is maximum float value for cases where energy script is not loaded in order to still manipulate entities.
 2016-02-03 10:46:28 -06:00
ericrius1
a95176be8f added 0 prefix to nums 2016-02-02 18:22:39 -08:00
samcake
cb59cccc0c Adding 2 lists per brick now, the subcelItems and the regular items, trying to use it, probably buggy 2016-02-02 18:10:56 -08:00
ericrius1
89d235e2c2 First cut complete 2016-02-02 18:09:26 -08:00
ericrius1
e6a1300cd9 random interval spread 2016-02-02 17:28:21 -08:00
ericrius1
c26d7e61b5 interval is working 2016-02-02 17:18:24 -08:00
ericrius1
1bfe14c70e If sound is already downloaded, it's fetched from cache 2016-02-02 16:38:14 -08:00
Seth Alves
30e97c2a76 run attachedEntitiesManager.js by default, but without a UI 2016-02-02 16:34:06 -08:00
Howard Stearns
59f1cdfc18 Reinit bestPromise with each proposal. 2016-02-02 16:18:33 -08:00
ericrius1
964763b88c caching sounds 2016-02-02 15:54:37 -08:00
Howard Stearns
03244fbeb5 fix promise-sending. 2016-02-02 15:37:22 -08:00
Bradley Austin Davis
f24f2749e1 Make users.js show QML window for edit friends 2016-02-02 15:19:12 -08:00
James B. Pollack
0587981a20 add doppleganger features 2016-02-02 15:07:38 -08:00
ericrius1
d08bdb371a receiving push messages from entity script 2016-02-02 14:50:30 -08:00
Howard Stearns
fbcacbe14a simpler betterNumber test. 2016-02-02 14:31:32 -08:00
Seth Alves
260d27f4d7 increase drop-on-joint radius. fix bug that kept from dropping on hips (index 0). save adjustments if in dressing room 2016-02-02 14:31:20 -08:00
Howard Stearns
3d01b3ec2b watchdog 2016-02-02 14:15:03 -08:00
ericrius1
0aa68328c8 adding sound entity script 2016-02-02 13:59:56 -08:00
Howard Stearns
61393818fe Merge branch 'master' of https://github.com/highfidelity/hifi into virtualBaton 2016-02-02 13:41:54 -08:00
Howard Stearns
38443af437 typo 2016-02-02 13:36:40 -08:00
Howard Stearns
cdff3323fb typo 2016-02-02 13:25:42 -08:00
Howard Stearns
d0af2220dc Virtual baton. 2016-02-02 13:20:41 -08:00
ericrius1
93220c3b01 two sounds 2016-02-02 10:51:10 -08:00
ericrius1
20d1ba11c3 Basic ac sound playing and entity searching 
Injecting sounds from entity
 2016-02-02 10:37:23 -08:00
Ryan Huffman
57d92bcfa6 Stop creation of GridTool altogether in edit.js 2016-02-02 10:13:24 -08:00
Seth Alves
3bbecf5c8b Merge branch 'adjust-palm-position' of github.com:sethalves/hifi into dressing-room 2016-02-02 10:04:35 -08:00
Seth Alves
53e3f5a5d1 Merge branch 'save-held-adjustments' of github.com:sethalves/hifi into dressing-room 2016-02-02 10:04:15 -08:00
Ryan Huffman
dad36b73fc Disable gridTool in edit.js 2016-02-02 09:57:52 -08:00
Seth Alves
fec479d70a Merge branch 'master' of github.com:highfidelity/hifi into dressing-room 2016-02-02 09:25:11 -08:00
James B. Pollack
d25dbfff9f Merge pull request #6993 from hyperlogic/tony/mirrored-doppelganger 
doppelganger.js: mirror joint rotations & translations about x-axis
 2016-02-01 19:09:42 -08:00
Seth Alves
2501be16cb base palm position on finger joint rather than an offset from hand joint. double size of near-grab sphere 2016-02-01 18:11:27 -08:00
James B. Pollack
43844dd0be Merge pull request #7008 from ericrius1/editPropsDecimals 
Fixed bug where lack of 0 as prefix for numbers would throw an error
 2016-02-01 17:35:44 -08:00
ericrius1
1387f5f322 Fixed bug where lack of 0 as prefix for numbers would throw an error 2016-02-01 16:44:55 -08:00
Seth Alves
c570f4af67 Merge branch 'master' of github.com:highfidelity/hifi into dressing-room 2016-02-01 16:15:42 -08:00
Seth Alves
3209ac4f68 use controller hand rotation rather than IK hand rotation in grab script 2016-02-01 15:42:32 -08:00
ericrius1
25d5904d2d trying to destroy web window 2016-02-01 15:23:54 -08:00
Seth Alves
e4ef3ae869 automatically save adjustments to offset of equipped items 2016-02-01 15:06:53 -08:00
ericrius1
0bd6d22611 going to destroy entire page and recreate 2016-02-01 14:46:09 -08:00
Seth Alves
793b0f400f Merge branch 'master' of github.com:highfidelity/hifi into dressing-room 2016-02-01 14:35:37 -08:00
Brad Hefta-Gaub
9361c1655e Merge pull request #6980 from howard-stearns/performance-stats-repro-scripts 
Performance stats repro scripts
 2016-02-01 13:52:53 -08:00
Seth Alves
2207588c01 merge from upstream 2016-02-01 13:19:45 -08:00
ericrius1
81f95c6fc7 better starting values for particles 2016-02-01 12:48:40 -08:00
ericrius1
84f862d9c1 receiving web event from particle gui 2016-02-01 12:23:39 -08:00
howard-stearns
ae10d4343c Add data for a 2k triangle model. 2016-02-01 11:47:33 -08:00
Seth Alves
9dc6f08ae2 Merge pull request #6995 from imgntn/removeHighFreqMsg 
Remove high frequency messages from grab script
 2016-02-01 11:44:43 -08:00
Howard Stearns
d8069b6dbf Whitespace and jslinting. 2016-02-01 11:28:51 -08:00
Howard Stearns
11d80cdc94 Merge branch 'master' of https://github.com/highfidelity/hifi into performance-stats-repro-scripts 2016-02-01 10:38:13 -08:00
Seth Alves
aa6742a844 merge from james/removeHighFreqMsg 2016-02-01 10:01:50 -08:00
Seth Alves
d034850c49 Merge branch 'equip-via-parenting' of github.com:sethalves/hifi into dressing-room 2016-02-01 09:59:52 -08:00
Seth Alves
182ae22b44 merge James' doppelganger changes into Tony's 2016-02-01 09:58:35 -08:00
Seth Alves
6ca17a904a merge James' doppelganger changes into Tony's 2016-02-01 09:58:24 -08:00
Seth Alves
a65ff76da1 Merge branch 'tony/mirrored-doppelganger' of github.com:hyperlogic/hifi into dressing-room 2016-02-01 09:56:52 -08:00
Seth Alves
9a4431560f Merge branch 'master' of github.com:highfidelity/hifi into equip-via-parenting 2016-02-01 09:14:53 -08:00
Seth Alves
fb33131ac5 Merge pull request #6985 from imgntn/entitySpawnerAC 
Show how to use an AC to spawn / respawn entities
 2016-02-01 07:05:07 -08:00
Seth Alves
6927f9f503 Merge pull request #6984 from huffman/fix-edit-import-cancel 
Fix 'Import Entities' causing error when cancelling
 2016-02-01 07:04:36 -08:00
Seth Alves
f5ccf19f41 Merge pull request #6982 from howard-stearns/update-away-for-image-overlay 
Update away.js to use an image instead of text.
 2016-02-01 07:04:11 -08:00
Seth Alves
bc86298097 merge from upstream 2016-02-01 07:01:12 -08:00
Babiuch, Ryan Nicholas
47f7d55e2c Working energy usage for entity manipulation. 
- Working example in examples/example/ui/MyEnergyBar.js
 2016-02-01 08:32:52 -06:00
James B. Pollack
499e6d9804 update readme 2016-01-30 20:04:51 -08:00
James B. Pollack
7767dfb213 remove high freq messages 2016-01-30 19:59:56 -08:00
Anthony Thibault
6813f692da doppelganger.js: mirror joint rotations & translations about x-axis 
It's not pretty, mostly due to the lack of JavaScript access to the skeleton parent linkage information,
and lack of conversions between absolute and relative-to-parent joint rotations/translations.
 2016-01-30 16:16:26 -08:00
Seth Alves
6697b5ae5f get multi-near-grabs working again 2016-01-29 18:36:22 -08:00
Seth Alves
9a16bc7d22 when a parented equip or grab releases and the object should fall, give it a little velocity so bullet doesn't consider it static 2016-01-29 18:01:57 -08:00
Seth Alves
0c5c682887 unmuddle saved state in Settings and userData 2016-01-29 17:38:24 -08:00
ericrius1
f9a76a7502 Merge branch 'master' into particlesInEdit2 2016-01-29 17:20:48 -08:00
Philip Rosedale
1766f3fc23 remove debug 2016-01-29 17:20:22 -08:00
Philip Rosedale
ca459e0bd6 Merge branch 'master' of https://github.com/highfidelity/hifi into flocking 2016-01-29 17:18:35 -08:00
Philip Rosedale
11890badd8 Changes per PR suggestions 2016-01-29 17:16:48 -08:00
ericrius1
559fb9cbde fixed merge conflicts 2016-01-29 16:42:10 -08:00
Seth Alves
464f74fc1b don't attempt to distance-grab non-physical objects 2016-01-29 16:37:19 -08:00
Seth Alves
9ca89172f6 change grab script to equip with parenting rather than action. various other changes to messaging. added initial version of attachedEntitiesManager.js. updated toybox scripts to track messaging changes 2016-01-29 15:17:46 -08:00
Seth Alves
f554e25e36 Merge branch 'master' of github.com:highfidelity/hifi into equip-via-parenting 2016-01-29 15:15:28 -08:00
James B. Pollack
cb2fbd7e7f clear octree interval 2016-01-29 14:29:27 -08:00
James B. Pollack
5e5c6158bb show how to use an ac to spawn and respawn entities 2016-01-29 14:22:21 -08:00
Ryan Huffman
9a2af26906 Fix 'Import Entities' causing error when cancelling 2016-01-29 14:12:27 -08:00
Brad Davis
c4794dd0d5 Fix entity properties HTML 2016-01-29 13:41:43 -08:00
Howard Stearns
a117e73ea4 Update away.js to use an image instead of text. 2016-01-29 11:56:08 -08:00
howard-stearns
5376ba9b7d update to match lod doc 2016-01-29 11:27:27 -08:00
Philip Rosedale
a72c49793e speedups per code review 2016-01-29 10:57:17 -08:00
James B. Pollack
43f3b6409a Merge pull request #6966 from ericrius1/zoneEntityProps 
Moves zone props to top of entity properties panel
 2016-01-29 09:34:04 -08:00
Philip Rosedale
ee95f7906b Fish flocking example 2016-01-29 00:59:06 -08:00
Philip Rosedale
9f95a9de89 Limits on distance and mass for far grabbing 2016-01-29 00:52:59 -08:00
Brad Hefta-Gaub
8efe15cb21 Merge pull request #6963 from jherico/qmlOverlays 
Make all 2D overlays QML-based
 2016-01-28 23:33:30 -08:00
ericrius1
6be550a144 resolved conflicts 2016-01-28 17:08:24 -08:00
ericrius1
1a7887520d in progress 2016-01-28 16:38:24 -08:00
Brad Davis
5b817ccc21 Make all 2D overlays QML 2016-01-28 16:03:26 -08:00
James B. Pollack
96ddb9febb Merge pull request #6970 from ericrius1/webEntityURL 
Moved source URL up to top of entity properties panel
 2016-01-28 16:02:21 -08:00
ericrius1
804f82f2f1 good progress- can create particle entity from menu 2016-01-28 15:57:35 -08:00
ericrius1
0511ff70ac particle panel in tool window 2016-01-28 14:34:19 -08:00
ericrius1
628158e2fb Merge branch 'master' into zoneEntityProps 2016-01-28 13:26:10 -08:00
ericrius1
c30109ec29 trying to sync again 2016-01-28 13:21:48 -08:00
ericrius1
2acc88261f added particles 2016-01-28 13:14:36 -08:00
Howard Stearns
33226796ff Merge pull request #6964 from ericrius1/editHref 
Validate href entity property (hifi:// only)
 2016-01-28 12:29:18 -08:00
ericrius1
98453c085b Moved source URL up to top of entity properties panel 2016-01-28 12:08:21 -08:00
Andrew Meadows
3e35a5fc2d Merge pull request #6937 from ctrlaltdavid/20790 
Make entity properties be undefined after entity is unloaded
 2016-01-28 11:59:01 -08:00
ericrius1
3fff5868e8 Fix syntax error 2016-01-28 11:57:33 -08:00
ericrius1
40c66a94be Moves text props to top of Entity Props panel 2016-01-28 11:44:50 -08:00
ericrius1
191e6090e7 Moves zone props to top of entity props panel 2016-01-28 11:36:23 -08:00
ericrius1
cd5e81de36 Validating href for edit.js 2016-01-27 16:02:02 -08:00
howard-stearns
1fcb90ad7f checkpoint 2016-01-27 13:34:25 -08:00
Seth Alves
18a1f0884e Merge pull request #6884 from ericrius1/junkyardReset 
Junkyard reset script
 2016-01-27 11:19:02 -08:00
Seth Alves
3b7f8ef77d honor hardcoded equip offsets 2016-01-26 15:44:26 -08:00
James B. Pollack
d8dbb717d5 Update junkyardResetEntityScript.js 2016-01-26 14:06:17 -08:00
Seth Alves
11d2f9a8fc equip via parenting rather than action. change name of a messaging channel. minor cleanups. 2016-01-26 14:02:21 -08:00
ericrius1
e6379fcaa8 Naming changes 2016-01-26 12:57:41 -08:00
David Rowe
2834dee00d Remove erroneous edit.js call with missing entity ID 2016-01-26 22:07:42 +13:00
Brad Hefta-Gaub
1ef01d670d Revert "Make entity properties be undefined after entity is unloaded" 2016-01-25 18:07:14 -08:00
ericrius1
793654cbca Merge branch 'master' into junkyardReset 2016-01-25 17:10:58 -08:00
Eric Levin
d92b527f99 Merge pull request #6928 from imgntn/bow-parented-string 
Fix Separation of Bow and Bowstring
 2016-01-25 16:19:57 -08:00
Brad Hefta-Gaub
7d8a3de711 Merge pull request #6927 from AndrewMeadows/zero-velocities 
entity.js will zero velocities when entities cease to be dynamic
 2016-01-25 16:00:54 -08:00
James B. Pollack
eca75ba66d cleanup 2016-01-25 14:48:15 -08:00
Andrew Meadows
73805e831b zero velocities when entities cease to be dynamic 2016-01-25 14:05:48 -08:00
James B. Pollack
9be2a73d4a update bow to use parenting for prenotch string 2016-01-25 12:36:03 -08:00
David Rowe
9429f48a7c Remove erroneous edit.js call with missing entity ID 
JavaScript exception was being thrown now that entity properties are
undefined if entity is not found.
 2016-01-24 08:39:50 +13:00
Seth Alves
41a2173901 adjust grab script so that avatars can't bootstrap themselves during an object hand-off 2016-01-22 16:38:28 -08:00
samcake
f98f8d5bbb Revert "Adds a fix for a rendering issue where models with a texture driving both color and opacity would be rendered fully opaque" 2016-01-22 11:51:02 -08:00
samcake
7df3e9f306 Merge pull request #6876 from ericrius1/droplets 
Adds a fix for a rendering issue where models with a texture driving both color and opacity would be rendered fully opaque
 2016-01-21 18:32:43 -08:00
Brad Hefta-Gaub
e1c369dc10 Merge pull request #6766 from samcake/hdr 
Ambient Occlusion
 2016-01-21 18:10:52 -08:00
samcake
2471a88e85 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-21 15:53:25 -08:00
Brad Davis
ae6cba85e8 More atmosphere removal 2016-01-21 15:15:16 -08:00
ericrius1
e11e4d196b tweaks for coding standards 2016-01-21 13:24:07 -08:00
ericrius1
b3b1793035 removed edit.js changes 2016-01-21 12:03:09 -08:00
Philip Rosedale
7387d6e5f1 Merge pull request #6869 from imgntn/pistolfix 
Make Pistol Quieter and Minor Adjustments
 2016-01-21 11:15:07 -08:00
ericrius1
5132406d37 Test script for lod testing 2016-01-21 10:51:15 -08:00
ericrius1
641607f334 reset script 2016-01-21 10:22:56 -08:00
James B. Pollack
e63e509835 Update createPistol.js 2016-01-21 09:33:38 -08:00
Chris Collins
5dc1eb986e Merge pull request #6874 from imgntn/fixgrabparticlesystems 
Remove Particle Search Beams from Grab Script and Create / Destroy Systems on Demand
 2016-01-21 09:25:11 -08:00
Seth Alves
311e0cee67 Merge pull request #6820 from AndrewMeadows/collision-mask 
use "collidesWith" instead of "collisionMask"
 2016-01-21 09:13:34 -08:00
Eric Levin
0cfd9e429a Merge pull request #6872 from imgntn/messageTests 
Add Messaging Tests and Organize
 2016-01-21 09:05:23 -08:00
samcake
8d1ab01018 exposing one more parameter 2016-01-20 18:32:44 -08:00
ericrius1
99e69616fa basic comms 2016-01-20 17:50:52 -08:00
Eric Levin
6f646dc193 Update weatherBox.js 
Added header
 2016-01-20 17:41:40 -08:00
ericrius1
3b75cbea3a removed old weather box 2016-01-20 16:32:30 -08:00
James B. Pollack
c2b5dfdfe6 clear sphere 2016-01-20 16:09:37 -08:00
James B. Pollack
6f1ea9a3d3 cleanup 2016-01-20 15:20:59 -08:00
ericrius1
eb5a950f85 texture opacity potential fix 2016-01-20 15:08:39 -08:00
James B. Pollack
53b4a509f7 remove particle search beams and create / destroy systems on demand 2016-01-20 14:17:32 -08:00
ericrius1
055d56b9e5 lightning texture appearing> 2016-01-20 14:16:38 -08:00
James B. Pollack
a57ccdd0e8 messages 2016-01-20 13:37:58 -08:00
ericrius1
44fd7e8c15 Model and lightning showing up 2016-01-20 11:57:33 -08:00
samcake
07c630bcda And cleaning again hopping to have the pr build 2016-01-20 11:44:01 -08:00
James B. Pollack
b91e5c27e1 Update createPistol.js 2016-01-20 10:45:40 -08:00
ericrius1
fa9a066f9a model tweaks 2016-01-20 10:44:25 -08:00
James B. Pollack
8d3468265f make pistol collision sound quieter, other adjustments 2016-01-20 10:44:02 -08:00
samcake
320c799379 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-20 10:14:02 -08:00
samcake
379c882834 Debugging the darkness and pointing out bugs 2016-01-20 02:03:09 -08:00
ericrius1
a16b267b24 Merge branch 'master' into droplets 2016-01-19 18:27:40 -08:00
ericrius1
4e052dca61 color cloud adjustment 2016-01-19 18:26:32 -08:00
ericrius1
d2a815176b lightning strikes 2016-01-19 17:09:39 -08:00
ericrius1
713496a8a0 lightning strikes 2016-01-19 16:02:41 -08:00
Brad Hefta-Gaub
55093aafea Merge pull request #6826 from kevinmthomas-carpool/LoadScriptFromEntityFix 
Fixed entity script loading functionality for the jsstreamplayer.
 2016-01-19 13:14:43 -08:00
samcake
c5c3f464cd Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-19 12:13:11 -08:00
samcake
6f93fb3114 Can now process the AO at lower resolution in orer to gsave performances 2016-01-19 12:12:51 -08:00
Andrew Meadows
4a91ed3d66 fix bad conflict resolution 2016-01-19 11:42:29 -08:00
Andrew Meadows
d990482c0a use collidesWith for bow.js workaround 2016-01-19 11:42:29 -08:00
Andrew Meadows
db77f22a61 use "collidesWith" instead of "collisionMask" 
but make "collisionMask" work for those who want it
 2016-01-19 11:41:22 -08:00
Seth Alves
8ba800fda8 Merge pull request #6851 from AndrewMeadows/collisionless2 
namechange "ignoreForCollisions" to "collisionless"
 2016-01-19 11:33:55 -08:00
ericrius1
5245bdc96e tweaks 2016-01-19 11:09:30 -08:00
Brad Hefta-Gaub
e15c7f089e Merge pull request #6850 from sethalves/various-fixes 
Various fixes
 2016-01-19 10:15:46 -08:00
Brad Hefta-Gaub
15899558aa Merge pull request #6842 from AlessandroSigna/vrShop 
Vr shop
 2016-01-19 09:39:28 -08:00
Andrew Meadows
48374ef5bc more ignoreForCollisions to collisionless 2016-01-19 09:06:17 -08:00
Andrew Meadows
7fb145e819 namechange ignoreForCollisions --> collisionless 2016-01-19 09:06:17 -08:00
samcake
df496b065c Merging with master 2016-01-18 16:40:34 -08:00
Seth Alves
9428da61cf fix property name typo 2016-01-18 14:31:55 -08:00
samcake
91dff3195e Remove the setup values used for debuging 2016-01-18 14:28:26 -08:00
samcake
93c7c182b3 Exposing the gpu RangeTimer counter for the AO effect 2016-01-18 14:10:59 -08:00
Seth Alves
823428290d Merge branch 'master' of github.com:highfidelity/hifi into various-fixes 2016-01-18 13:26:45 -08:00
Seth Alves
94bafb4a1e Merge pull request #6832 from AndrewMeadows/no-collisionsWillMove 
namechange collisionsWillMove --> dynamic
 2016-01-18 11:51:59 -08:00
Seth Alves
8b6e89a5c4 fix stopFarTrigger entity method call. re-add code to keep more than one distance grab per object from happening 2016-01-18 11:13:33 -08:00
samcake
10de1ac9b5 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-18 11:03:34 -08:00
Seth Alves
d8dceade2e Merge pull request #6833 from PhilipRosedale/searchChoice 
Choice of hand ray pick or head pick
 2016-01-18 11:03:30 -08:00
AlessandroSigna
737a00a2cb Typo fixed 2016-01-18 16:20:32 +01:00
Philip Rosedale
9b3155188d Squeeze a little to search, a lot to grab 2016-01-17 19:10:40 -08:00
Philip Rosedale
23a8d57ca2 Always show search ray 2016-01-17 14:14:00 -08:00
Philip Rosedale
588719a4c2 merge conflict fix 2016-01-17 13:07:55 -08:00
samcake
86e9c5ac9b Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-16 22:17:08 -08:00
samcake
39f1649cdf refining the settings for the blur pass and splitting the uniforms in 2 buffers, one per frame with transform info and one for the parameters which are rarely changing 2016-01-16 22:16:07 -08:00
James B. Pollack
8c4abd2a2d Merge pull request #6847 from howard-stearns/tribbles 
tribbles
 2016-01-16 18:28:58 -08:00
James B. Pollack
28f1a86527 Merge pull request #6821 from ericrius1/whiteboardFix 
Some fixes to whiteboard to get rid of gaps between lines and jagged …
 2016-01-16 18:19:33 -08:00
James B. Pollack
3631db4e2d Merge pull request #6845 from howard-stearns/render-matrix 
render test script
 2016-01-16 18:16:49 -08:00
Andrew Meadows
c1a1cbf718 fix typo 2016-01-16 15:55:10 -08:00
Howard Stearns
1985aa9d77 Drops a bunch of "tribbles" (small spheres) in front of you. 
They edit change color at 60hz and jump randomly at an average 1hz for 30 seconds, and then dissapear after 60 seconds.
Useful for testing the load of physical objects.
 2016-01-16 13:26:39 -08:00
Howard Stearns
994d13df5a A test script to confirm that the specified edit rate can be achieved for the specified number of objects. 2016-01-16 11:32:19 -08:00
Howard Stearns
63db6d0f72 A script to test rendering load by creating a rectangular matrix of the specified objects, with no physical or entity changes after creation, either in front of you or overhead. 2016-01-16 11:17:13 -08:00
ericrius1
d54c177a5f add weather box 2016-01-15 15:37:52 -08:00
Andrew Meadows
84282d0114 final repairs after rebase 2016-01-15 15:28:26 -08:00
Andrew Meadows
e763c055b3 more namechanges in JS scripts 2016-01-15 15:24:46 -08:00
Andrew Meadows
29a52bf0ba namechange collisionsWillMove --> dynamic 2016-01-15 15:23:52 -08:00
ericrius1
dcb346fffb lillypond 2016-01-15 15:14:11 -08:00
samcake
fef5e3c8da Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-15 14:44:57 -08:00
Philip Rosedale
210b3ba1ec Merge pull request #6819 from sethalves/grab-script-fixes 
grab script fixes
 2016-01-15 09:40:57 -08:00
samcake
3f4f10c38c Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-15 09:21:13 -08:00
samcake
ae18bb8ef7 FIxed the stereo rendering 2016-01-14 19:23:29 -08:00
AlessandroSigna
41e6dd48e0 Overlay manager exposing findRayIntersection 2016-01-14 18:27:17 -08:00
AlessandroSigna
e4501e3a8f Added cart, cash, inspect and readme 2016-01-14 18:23:39 -08:00
EdgarPironti
40279c8fc5 Item, Review, Shop and Vendor scripts. 2016-01-14 18:20:40 -08:00
Philip Rosedale
c5556b1c29 Merge pull request #6841 from ericrius1/diceOverlay 
added dice icon back to dice.js script
 2016-01-14 17:49:04 -08:00
ericrius1
d4491a9ec2 added dice icon back to dice.js script 2016-01-14 17:13:07 -08:00
Brad Hefta-Gaub
a70adc8a57 Merge pull request #6823 from jherico/tool_window 
Tool window in QML
 2016-01-14 16:56:27 -08:00
Philip Rosedale
a8d13cb947 Merge pull request #6831 from hyperlogic/tony/squeeze-hands-part-deux 
Simplify grab animation logic
 2016-01-14 15:49:00 -08:00
samcake
577666da6e Merging upstream master 2016-01-14 15:10:54 -08:00
Philip Rosedale
30199106ec Choice of hand ray pick or head pick 2016-01-13 20:47:05 -08:00
samcake
0285d48de3 Exposing many more controls of the AO in order to adjust the effect 2016-01-13 18:57:47 -08:00
Anthony J. Thibault
75b3523c33 Simplify grab animation logic 
Moved all animation control out of the handControllerGrab.js script and back into
squeezeHands.js

Deleted old hydra/squeezeHands.js to avoid confusion.

Added new sqeezeHands.js script to the default scripts.
 2016-01-13 17:57:51 -08:00
U-GAPOS\andrew
3aa1837e07 disable collisions between arrow and bow 
(the bow is currently kinematic while held)
 2016-01-13 16:57:51 -08:00
Brad Davis
b6272b7824 Migrate tool window to overlay/QML 2016-01-13 15:40:37 -08:00
Kevini M. Thomas
007013254e Fixed entity script loading functionality for the jsstreamplayer. 2016-01-13 14:34:44 -05:00
ericrius1
061cf5021c Don't clean up whiteboard on script shutdown 2016-01-12 19:31:43 -08:00
ericrius1
9dae425bfd Some fixes to whiteboard to get rid of gaps between lines and jagged lines 2016-01-12 19:28:41 -08:00
Seth Alves
699431a9ab testing something with chris 2016-01-12 17:27:36 -08:00
Seth Alves
1128982e65 pull grab script changes over from another branch 2016-01-12 17:16:56 -08:00
samcake
0d8e247626 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-12 16:56:51 -08:00
samcake
6779874da8 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-12 16:06:34 -08:00
Andrew Meadows
c52c543ab8 use strings for JS collisionGroup API 2016-01-12 15:11:27 -08:00
Andrew Meadows
00e5d040a2 use collision masks to prevent grab-bootstrap 2016-01-12 15:10:18 -08:00
Howard Stearns
d1a72e8d63 Merge pull request #6807 from hyperlogic/tony/grab-script-hand-animation 
Move hand animation control into grab script
 2016-01-12 13:02:59 -08:00
samcake
31bea5034c Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-12 10:02:15 -08:00
Howard Stearns
38b0fd2747 Merge pull request #6806 from PhilipRosedale/energybar 
Energybar example script and test script for scaling
 2016-01-12 09:36:14 -08:00
Philip Rosedale
3fdfa1b624 simpler loop 2016-01-11 17:49:46 -08:00
Philip Rosedale
40aecf3bf4 I was told there would be no math 2016-01-11 17:36:12 -08:00
samcake
38e9d2281d Merging with master 2016-01-11 15:49:16 -08:00
Brad Hefta-Gaub
ddd9b0826b Merge pull request #6798 from ericrius1/menuTweaks 
separating out marketplace icon from edit toolbar and making directory icon from directory.js movable and persistent
 2016-01-11 12:20:12 -08:00
Anthony J. Thibault
3d8f8e5618 Set WANT_DEBUG_STATE to false 2016-01-11 10:39:27 -08:00
Anthony J. Thibault
8f78a0624c Merge branch 'master' into tony/grab-script-hand-animation 2016-01-11 10:16:51 -08:00
Philip Rosedale
b8565358ff Added basic energy bar example 2016-01-11 09:16:33 -08:00
ericrius1
8182372e02 Made drag selection area bigger for marketplace and directory icons. Added marketplace.js to default scripts 2016-01-11 08:39:34 -08:00
Philip Rosedale
e4855b7595 Script that drops different kinds of entities near you 2016-01-10 15:34:46 -08:00
samcake
1517d792ae Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-10 09:39:37 -08:00
ericrius1
a66bc791a3 directory.js - icon is now movable and persistent 2016-01-08 16:33:51 -08:00
ericrius1
7e7424ec2b Removed marketplace icon from edit menu 2016-01-08 16:22:10 -08:00
ericrius1
b3f19ef4d6 separating out marketplace 2016-01-08 16:08:43 -08:00
Anthony J. Thibault
4c1ad6900d handControllerGrab.js: removed previous animationStateHandler 
Which was conflicting with the new HandAnimationBuddy animationStateHandler
 2016-01-08 11:28:02 -08:00
Brad Hefta-Gaub
b9068d0738 fix selectAudioDevice.js to honor new menu spec 2016-01-08 11:22:21 -08:00
Brad Hefta-Gaub
fb484584e4 fix edit.js to honor new menu spec 2016-01-08 11:21:55 -08:00
samcake
97071288ed Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-08 09:23:55 -04:00
Anthony J. Thibault
cac19b8579 grab animation work 
Hand animations now have 5 states:

* idle
* open
* grasp
* point
* farGrasp

The handControllerGrab.js script now chooses one of these five animations, based on the state of the HandController object.

Also, removed hand trigger AnimVar setting from C++ Rig class.
 2016-01-07 19:36:57 -08:00
Anthony J. Thibault
c2736cb68c Merge branch 'master' into tony/grab-script-hand-animation 2016-01-07 16:58:10 -08:00
Anthony J. Thibault
5d19de76ab Added avatarAttachmentTest.js script 2016-01-07 16:15:24 -08:00
Brad Hefta-Gaub
a78d5274e7 Merge pull request #6780 from jherico/z_order 
Address some z-ordering issues in overlay windows
 2016-01-06 20:08:52 -08:00
Anthony J. Thibault
1251be1b2b Merge branch 'master' into tony/grab-script-hand-animation 2016-01-06 16:26:56 -08:00
Anthony J. Thibault
b42fe22e03 Fixing bad line ending. 2016-01-06 16:26:16 -08:00
Seth Alves
01c9de4f9d Merge pull request #6771 from ericrius1/directDistanceGrab 
Squeezing bumper while distance grabbing now brings object to your hand in all cases
 2016-01-06 15:30:23 -08:00
ericrius1
1f6e45d135 Fix for close grab jumping 2016-01-06 15:10:53 -08:00
ericrius1
67f4c250fd Search sphere goes away on far to near grab 2016-01-06 14:59:31 -08:00
ericrius1
cb03eda6d1 Instant far to near grabbing now works by using the bumper, or equip, button 2016-01-06 13:37:26 -08:00
Brad Hefta-Gaub
6ac8d081dc include debug log in collision example 2016-01-06 13:02:07 -08:00
Brad Hefta-Gaub
d4e039ea7a include debug log in collision example 2016-01-06 13:00:50 -08:00
Brad Hefta-Gaub
a5f618ef33 include debug log in collision example 2016-01-06 12:54:14 -08:00
Brad Davis
1b82200ecb Address some z-ordering issues in overlay windows 2016-01-06 10:58:56 -08:00
Seth Alves
8800a74186 Merge pull request #6778 from imgntn/mousegrabfix 
Only grab/release mouse grab with left button
 2016-01-06 10:36:36 -08:00
samcake
7e2cf741c0 Clen up, exposingthe level of obscurance 2016-01-06 13:16:16 -04:00
samcake
12ad08560f Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-06 09:50:58 -04:00
Anthony J. Thibault
3e6ff0eb68 Moved hand animation control into grab script. 2016-01-05 19:56:56 -08:00
Anthony Thibault
95f821d61a Merge pull request #6732 from sethalves/set-model-entity-joints 
hook up a way for scripts to set model-entity joint state
 2016-01-05 17:31:18 -08:00
James B. Pollack
8c7c436ef2 fix 2016-01-05 16:54:18 -08:00
Clément Brisset
a2135dfdd2 Merge pull request #6720 from ctrlaltdavid/20760 
Fix particle radius and rgba start, middle, finish interpolation
 2016-01-05 16:48:13 -08:00
ericrius1
eb44e54d87 fixed merge conflicts 2016-01-05 16:28:22 -08:00
ericrius1
882ec9fe80 Using offset from intersection point to center of object for insta-grab 2016-01-05 16:24:15 -08:00
Seth Alves
086ea66c04 Merge branch 'master' of github.com:highfidelity/hifi into set-model-entity-joints 2016-01-05 16:24:10 -08:00
James B. Pollack
7c18359fba cleanup 2016-01-05 16:17:11 -08:00
James B. Pollack
68e03a08c0 targets fix 2016-01-05 15:43:49 -08:00
Seth Alves
b59934573a Merge branch 'master' of github.com:highfidelity/hifi into set-model-entity-joints 2016-01-05 13:50:12 -08:00
Seth Alves
cd82383d33 Merge branch 'master' of github.com:highfidelity/hifi into improve-grab-action-reliability 2016-01-05 11:13:38 -08:00
Seth Alves
942e77166e merge from upstream 2016-01-05 11:11:19 -08:00
Andrew Meadows
0473891e86 Merge pull request #6671 from sethalves/near-grab-via-parenting 
queryAACube plumbing
 2016-01-05 11:01:28 -08:00
ericrius1
a80e77ff80 Squeezing bumper while distance grabbing now brings object to your hand 2016-01-05 11:01:00 -08:00
Seth Alves
212d2d9e8f merge from upstream 2016-01-05 10:27:45 -08:00
Andrew Meadows
f888cc93f6 Merge pull request #6752 from imgntn/particle_grab_cleanup 
Add Dynamic Lifetimes to Grab Beam Particle Systems
 2016-01-05 10:12:21 -08:00
Seth Alves
ce1b8ae6f0 Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting 2016-01-04 19:35:36 -08:00
Seth Alves
afc1757adf Merge branch 'master' of github.com:highfidelity/hifi into set-model-entity-joints 2016-01-04 19:17:45 -08:00
Eric Levin
f569d08ca8 Merge pull request #6761 from imgntn/grab_add_beam 
Add Beam Visualization When Grab Doesn't Intersect
 2016-01-04 15:36:05 -08:00
Seth Alves
9304477233 split out calls for rotation and translation 2016-01-04 15:29:06 -08:00
samcake
78ff43bed2 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-04 18:57:13 -04:00
Seth Alves
9a979f4abf update doppelganger script 2016-01-04 14:18:24 -08:00
Seth Alves
e18298c974 Merge branch 'doppelganger' of github.com:imgntn/hifi into set-model-entity-joints 2016-01-04 14:16:30 -08:00
David Rowe
f04222b5ac Merge branch 'master' into 20760 2016-01-05 10:29:04 +13:00
James B. Pollack
29612f2246 Merge pull request #6760 from ericrius1/muzzleFix 
Fix to pistol.js so muzzle flash particle system doesn't stick around…
 2016-01-04 12:53:38 -08:00
James B. Pollack
4bb03f8c2d add beam visualization if sphere doesnt actually hit anything 2016-01-04 12:34:08 -08:00
James B. Pollack
0be5725f71 Merge pull request #6744 from ericrius1/raveGlow 
Added glow effect to ravestick
 2016-01-04 11:49:54 -08:00
ericrius1
4360595ed6 Fix to pistol.js so muzzle flash particle system doesn't stick around forever 2016-01-04 11:29:57 -08:00
samcake
2486d94b03 A working prototype of ao... 2016-01-04 14:36:46 -04:00
Brad Hefta-Gaub
ec8a2ae093 Merge pull request #6739 from jherico/qml_window 
Support QML and Web content in overlay windows
 2016-01-03 10:18:26 -10:00
Seth Alves
9145a8a753 back out off-brand change 2016-01-03 07:29:24 -08:00
Seth Alves
9f828448a0 add comment 2016-01-03 07:29:14 -08:00