Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-24 01:39:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
40552 commits 25 branches 0 tags 1.1 GiB
Commit graph

5681 commits

Author SHA1 Message Date
ericrius1
fdb5d33866 MORE RANDOM YAHH 2016-02-24 16:42:24 -08:00
ericrius1
208096f2e0 fireworks but no smoke 2016-02-24 16:36:54 -08:00
ericrius1
769a5ecca9 tweaks 2016-02-24 16:33:28 -08:00
ericrius1
0a6a35ddd8 need multiple explosions at once 2016-02-24 16:30:29 -08:00
Howard Stearns
274f72af52 Merge branch 'master' of https://github.com/highfidelity/hifi into ac-sound-searcher-update 2016-02-24 16:28:52 -08:00
Howard Stearns
90b5cdb30f Fix bug. Annotate. 2016-02-24 16:27:46 -08:00
Zach Pomerantz
c2ed5e5474 Merge branch 'master' of github.com:highfidelity/hifi into fix/light-intensity 2016-02-24 16:24:09 -08:00
ericrius1
0499334938 toadd: different colors for fireworks 2016-02-24 16:14:46 -08:00
ericrius1
dea41edf9c tweaks 2016-02-24 16:01:38 -08:00
ericrius1
e245ad93d6 smoke and fire 2016-02-24 15:58:09 -08:00
Brad Hefta-Gaub
9273238b53 Merge pull request #7178 from Nex-Pro/20807 
CR for Job #20807 - Fix vertically mirrored particles.
 2016-02-24 13:43:40 -08:00
ericrius1
5520094bac exploding fireworks 2016-02-24 12:29:54 -08:00
ericrius1
8b07bd00f8 basic firework 2016-02-24 11:05:02 -08:00
ericrius1
67ec1732b3 increased eraser range 2016-02-23 18:46:38 -08:00
ericrius1
0ff8201994 fixed line gaps 2016-02-23 18:45:41 -08:00
Howard Stearns
d1088031bf Longer gap, as an experiment. 2016-02-23 18:13:40 -08:00
ericrius1
045d542f11 lines no longer disapear after drawing for a while 2016-02-23 18:03:38 -08:00
Clément Brisset
8e8e23452f Merge pull request #7156 from ZappoMan/depthReticleWork 
Depth reticle work
 2016-02-23 17:54:35 -08:00
Nex Pro
6403bb60a5 added particleOrientationTest.js for testing. 2016-02-24 01:20:49 +00:00
ericrius1
0b569a0fab only show overlay if within painting range 2016-02-23 16:49:03 -08:00
Seth Alves
7fb67e487e when releasing a near-grab, zero velocity if there is another grab, regardless of the isInitialGrab flag 2016-02-23 16:47:05 -08:00
Seth Alves
efca6ecb1d remove debug print 2016-02-23 16:37:08 -08:00
Seth Alves
acd2caf26c handle case where user grab data didn't have a heartbeat 2016-02-23 16:35:20 -08:00
ericrius1
cf88421cf5 plant and pot are separated for raycasting purposes 2016-02-23 16:30:53 -08:00
Howard Stearns
4bb76d6a20 Update sound searcher and spawner for load handling. 2016-02-23 16:26:47 -08:00
Seth Alves
0e028fbac8 keep a heart-beat timestamp in userData of grabbed entities. if grabbing something with an out-of-date heartbeat, reset it before grabbing 2016-02-23 16:21:41 -08:00
ericrius1
da5f4b16e9 Merge branch 'master' into growingPlant 2016-02-23 15:12:33 -08:00
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