Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-15 13:27:55 +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
493a91fa27 with debug box 2016-03-21 14:32:22 -07:00
ericrius1
e5b2483604 sound seems to be working" 2016-03-21 14:09:02 -07:00
ericrius1
68dc5a8251 just playing on start update 2016-03-21 13:57:54 -07:00
ericrius1
b7534fbd57 basics of virtual baton 2016-03-21 13:52:26 -07:00
ericrius1
6c5ad187a0 Merge remote-tracking branch 'upstream/master' 2016-03-21 11:51:38 -07:00
Brad Hefta-Gaub
6822f0643b Merge pull request #7397 from zzmp/fix/ambient-url-listener 
Add back ambientURL listener in editor
 2016-03-21 08:49:43 -07:00
Seth Alves
b600000307 refactor code a bit 2016-03-20 17:59:15 -07:00
Seth Alves
21c688390c make voxels.js buttons work, again 2016-03-20 17:40:03 -07:00
David Rowe
01685b2d44 Change entity editor tab name 2016-03-19 14:58:12 +13:00
David Rowe
3fa678a652 Style tabs and background 2016-03-19 14:52:40 +13:00
Zach Pomerantz
105b4e16a9 Add back ambientURL listener in editor 2016-03-18 16:18:41 -07:00
James B. Pollack
ce932640bd Merge pull request #7353 from huffman/fix-keylight-edit 
Fix keylight direction naming and usage in edit.js
 2016-03-18 12:35:48 -07:00
Menithal
066c517dd7 Grab.js: Update Position on Mouse Grab Start 
Fixes grab event issue where if the object is moving, the position does
not update until the user has moved their mouse.

This commit makes sure that the moment the user starts dragging on a
object that isnt grabbed by another, the position is immediately updated
instead of waiting for the user to move their mouse.
 2016-03-18 08:59:07 +02:00
David Rowe
6a2cb393fa Make copy of style.css as starting point for restyling entities editor 2016-03-18 16:56:08 +13:00
David Rowe
ebe13b7b93 Fix edit toolbar's upload button 2016-03-17 14:44:57 +13:00
David Rowe
62b24e6626 Explicitly enable button-down behavior in scripts 2016-03-17 11:49:49 +13:00
David Rowe
004a694741 Make toolbar buttons "click" 2016-03-17 11:25:37 +13:00
David Rowe
df870d6e82 Merge branch 'master' into 20852 2016-03-17 10:35:26 +13:00
Andrew Meadows
7acc56bf00 Merge pull request #7359 from zzmp/feat/bg-gpu-timer 
Add a DrawBackgroundDeferred gpu timer
 2016-03-16 07:58:53 -07:00
David Rowe
46a953885f Increase size of frame around and between buttons 
Makes easier to click and drag toolbar to new position.
 2016-03-16 11:43:11 +13:00
David Rowe
3a28772729 Regularize toolbar margins and make draggable from all four sides 2016-03-16 10:29:26 +13:00
David Rowe
a5e0d93dd5 Update directory, edit, and marketplace toolbar buttons 2016-03-16 10:29:25 +13:00
David Rowe
3991c984a8 Remove voxels button from edit.js toolbar 2016-03-16 10:29:23 +13:00
Seth Alves
2b73b2c6d8 debugging 2016-03-15 13:50:23 -07:00
ericrius1
9d24887ff4 Merge remote-tracking branch 'upstream/master' 2016-03-15 13:50:23 -07:00
Seth Alves
df0d96c276 Merge branch 'master' of github.com:highfidelity/hifi into equip-via-thumb 2016-03-15 09:36:11 -07:00
Seth Alves
9df8c4e969 add velocity argument to release 2016-03-15 09:00:01 -07:00
Brad Hefta-Gaub
11c318305f Merge pull request #7340 from sethalves/edit-js-grabbable 
edit.js has checkboxes for grabbable pseudo-properties
 2016-03-14 18:58:37 -07:00
Brad Hefta-Gaub
447918d148 Merge pull request #7348 from hyperlogic/tony/cppcheck-fixes 
Avatar & Animation cppcheck static analysis fixes
 2016-03-14 18:58:25 -07:00
Zach Pomerantz
0ea70f234f Add bg gpu timer display 2016-03-14 17:53:48 -07:00
Clément Brisset
e38c08ebd9 Merge pull request #7335 from imgntn/photosphere 
Add Photo Sphere Example
 2016-03-14 16:56:17 -07:00
Seth Alves
8b5b6f5a20 added HOLD state which uses presets but isn't persistent when button is released 2016-03-14 16:39:09 -07:00
Seth Alves
7e5a1e73e5 equip/de-equip with thumb button rather than bumper. trigger and bumper do the same thing 2016-03-14 15:25:59 -07:00
Ryan Huffman
850fb51f72 Fix keylight direction naming and usage 2016-03-14 14:45:00 -07:00
Seth Alves
a7a8bd2256 Merge branch 'master' of github.com:highfidelity/hifi into edit-js-grabbable 2016-03-14 13:54:02 -07:00
Seth Alves
d811c4f6b5 dynamic is the same as grabbable-by-default 2016-03-14 11:39:56 -07:00
Seth Alves
1f8a55da3a dynamic is the same as grabbable-by-default 2016-03-14 11:36:44 -07:00
Chris Collins
e577658315 Merge pull request #7333 from PhilipRosedale/testSound 
playTestSound.js - better clip for testing/showing audio
 2016-03-14 08:44:28 -07:00
Anthony Thibault
1e94d9bdf5 interface/src/avatar: cppcheck fixes 2016-03-13 18:56:15 -07:00
Brad Davis
798d2a73db Merge pull request #7326 from ZappoMan/toggleOverlay 
Various Overlay, Menu, and Away Mode bug fixes
 2016-03-13 11:44:19 -07:00
James B. Pollack
96bc17cd5e Update photo_sphere.js 2016-03-12 16:01:10 -08:00
Seth Alves
cca4a93b2b don't full up userData with default grabbable data 2016-03-12 14:09:52 -08:00
Seth Alves
be51040420 grabbable controlls are working 2016-03-12 13:20:04 -08:00
Seth Alves
f1992af38e started to add grabbable psuedo properties to edit.js 2016-03-12 13:20:00 -08:00
James B. Pollack
b0109133c0 add git handle 2016-03-11 22:02:49 -08:00
James B. Pollack
cecebc9ae4 add example 2016-03-11 22:01:01 -08:00
PhilipRosedale
9823ecffa7 new test sound script 2016-03-11 17:00:44 -08:00
Brad Hefta-Gaub
6083706151 CR feedback 2016-03-11 16:47:16 -08:00
Brad Hefta-Gaub
082bb8c4b8 auto-show reticle on mouse click 2016-03-11 12:49:42 -08:00
Brad Hefta-Gaub
e341419090 enter away mode when you remove the Vive HMD 2016-03-11 11:56:39 -08:00
Brad Hefta-Gaub
d32611a7f9 make away show overlays if they are hidden when you enter away 2016-03-11 11:45:52 -08:00
Brad Hefta-Gaub
d1c024fb39 Merge pull request #7286 from zzmp/fix/skybox-tex 
Clean up skybox rendering
 2016-03-11 08:50:23 -08:00
Brad Hefta-Gaub
d8d500c318 Merge pull request #7291 from ericrius1/uniformBugRepro 
Rapid uniform change test
 2016-03-11 08:45:52 -08:00
Zach Pomerantz
25607709a5 Add test for skybox 2016-03-10 22:52:07 -08:00
James B. Pollack
aa884d9e3b spatial 2016-03-10 22:45:44 -08:00
ericrius1
f3c9b49262 Merge remote-tracking branch 'upstream/master' 2016-03-10 13:50:57 -08:00
Brad Hefta-Gaub
509abbf1d4 remove inspect.js from default scripts 2016-03-10 13:31:27 -08:00
ericrius1
5ba96cb07c removed print statements 2016-03-10 12:47:31 -08:00
Brad Hefta-Gaub
6ed1ad10a1 remove hmdDefaults and hmdControls scripts, since they are borked 2016-03-10 12:12:24 -08:00
ericrius1
8fe926e535 added print statements 2016-03-10 11:41:12 -08:00
ericrius1
2af4dd90e1 updated shader links to be s3 2016-03-10 11:40:09 -08:00
Zach Pomerantz
f37049059e Finish name changes for rapidProceduralChange 2016-03-10 10:19:52 -08:00
Brad Hefta-Gaub
1547fc15aa Merge pull request #7305 from PhilipRosedale/editHandles 
Adjust edit handle sizes
 2016-03-10 09:46:43 -08:00
Zach Pomerantz
3cd0f0d237 Drive skybox off of timer 2016-03-09 19:34:48 -08:00
Zach Pomerantz
d89d89fd08 Add all entities and skybox 2016-03-09 18:35:03 -08:00
PhilipRosedale
c11487735f Adjust grab handle sizes 2016-03-09 17:46:38 -08:00
PhilipRosedale
6017db0f31 Adjust grab handle sizes 2016-03-09 17:43:44 -08:00
Chris Collins
ddb09ec222 Merge pull request #7285 from hyperlogic/tony/hand-controller-move-improvements 
Hand controller mouse improvements
 2016-03-09 16:34:35 -08:00
Seth Alves
fbbc27213d Merge pull request #7287 from PhilipRosedale/fireflies 
Fireflies
 2016-03-09 15:20:27 -08:00
James B. Pollack
7c44556234 Merge pull request #7301 from ericrius1/growingPlant 
Remove prematurely added VRVJ folder from examples folder
 2016-03-09 15:17:17 -08:00
ericrius1
05d26be300 delete file 2016-03-09 15:15:20 -08:00
ericrius1
7b20fdcc1a add file before delete 2016-03-09 15:14:51 -08:00
ericrius1
974189b546 deleted cartridge spawner 2016-03-09 15:10:35 -08:00
PhilipRosedale
5230d3a705 Added header 2016-03-09 14:45:26 -08:00
Seth Alves
143d8a0929 Merge pull request #7267 from ericrius1/growingPlant 
Plant that blooms flowers when it is watered by a water can
 2016-03-09 11:28:38 -08:00
ericrius1
c59a58a833 changing color of visual component to match sound cartridge 2016-03-09 11:22:47 -08:00
ericrius1
d65dcf7142 no more velocity 2016-03-09 11:11:20 -08:00
ericrius1
170dd418f8 chaged shader link 2016-03-09 10:35:11 -08:00
ericrius1
1a09c5d19f test script for uniform change 2016-03-09 10:33:18 -08:00
Anthony J. Thibault
e1a3c5b618 Fix for vertical pitch offset. 
Also, added hysteresis to the controller selection, to prevent flapping back and forth between controllers when they are at rest.
 2016-03-09 10:31:58 -08:00
ericrius1
8903a61c6e basic shader 2016-03-09 10:24:46 -08:00
ericrius1
41df11f614 spacing 2016-03-09 09:55:15 -08:00
PhilipRosedale
4728eeb862 less of them 2016-03-08 20:22:29 -08:00
PhilipRosedale
5487c4cdab Firefly script 2016-03-08 19:42:11 -08:00
ericrius1
deb2c5af63 parenting visual to sound entity 2016-03-08 18:30:27 -08:00
Anthony J. Thibault
deb17e1f93 Merge branch 'master' into tony/hand-controller-move-improvements 2016-03-08 17:45:50 -08:00
Anthony J. Thibault
f82dc4569e handControllerMouse.js: removed non-uniform scaling. 
If your controller moves in a circle, the mouse pointer should as well.
 2016-03-08 15:59:17 -08:00
Anthony J. Thibault
ce5d83d551 handConttollerMouse.js: improved comments 2016-03-08 15:32:12 -08:00
Anthony J. Thibault
27fb7a3143 handControllerMouse: improve determination of which controller is moving the most 
That controller will have exclusive control of the mouse reticle.
 2016-03-08 15:14:37 -08:00
Brad Hefta-Gaub
d879300413 Merge pull request #7277 from sethalves/edit-vs-mouse-grab 
Edit vs mouse grab
 2016-03-08 14:19:40 -08:00
Seth Alves
40bc66c154 Merge pull request #7272 from imgntn/shapetype 
"Collision Shape Type" in edit.js instead of "Shape Type"
 2016-03-08 11:34:42 -08:00
ericrius1
9edc8aa5aa searching for name 2016-03-08 11:34:00 -08:00
ericrius1
503d2874ab initial vr vj set up 2016-03-08 10:59:01 -08:00
Seth Alves
04e36f925a use local message 2016-03-08 10:30:49 -08:00
Seth Alves
0b6f52f508 use local messaging to disable mouse-grab when edit.js is active 2016-03-08 10:27:34 -08:00
James B. Pollack
9db528d7a3 Merge pull request #7273 from imgntn/nomarketplaceinfo 
DIsable Right Click Marketplace Info for now from edit.js
 2016-03-08 09:08:29 -08:00
James B. Pollack
482964d8ad hide this for now 2016-03-07 20:37:14 -08:00
James B. Pollack
8381b1d2fd collision shape type 2016-03-07 20:21:14 -08:00
Anthony J. Thibault
26b4c904f3 handControllerMouse.js: transform hand controllers into sensor frame 2016-03-07 18:42:52 -08:00
ericrius1
7b69aa375e moved plant to home folder 2016-03-07 18:18:38 -08:00
James B. Pollack
fbe640e351 the model was different so adjust things 2016-03-07 16:38:15 -08:00
Anthony J. Thibault
0d62b10a8f Added Mat4 support to script 
Also, hooked up MyAvatar.sensorToWorldMatrix access to script.
 2016-03-07 16:16:14 -08:00
ericrius1
d4bc83f408 cleanup and bug fixes 2016-03-07 16:16:06 -08:00
Andrew Meadows
dfe0575237 Merge pull request #7260 from imgntn/newponggun 
New Ping Pong Gun Model
 2016-03-07 15:51:59 -08:00
ericrius1
3dc39600cd stop pouring on release 2016-03-07 15:32:40 -08:00
ericrius1
b9bd4cae93 better water effect 2016-03-07 14:58:59 -08:00
James B. Pollack
2d554f4b40 Merge pull request #7249 from ericrius1/playaFireworks 
Playa fireworks and associated tutorial
 2016-03-07 14:32:06 -08:00
ericrius1
ca747bb4e9 fixed dates 2016-03-07 14:29:17 -08:00
James B. Pollack
567039ef82 Update createPingPongGun.js 2016-03-07 14:28:16 -08:00
ericrius1
caca60c039 added headers to tutorial code 2016-03-07 14:09:21 -08:00
ericrius1
cdd4fdb03e slower growth 2016-03-07 14:04:45 -08:00
Seth Alves
e8001d0346 Merge pull request #7264 from imgntn/flashlightbrightfix 
Make the flashlight brighter
 2016-03-07 14:04:02 -08:00
James B. Pollack
9cd0762040 brighter 2016-03-07 12:26:21 -08:00
James B. Pollack
247ebb380b Merge pull request #7253 from hyperlogic/tony/distance-holding-fixes 
HandControllerGrab: fixes for distance holding
 2016-03-07 12:12:58 -08:00
Anthony Thibault
b096e062e6 Merge pull request #7250 from ZappoMan/smallFix 
fix a couple bugs in this script
 2016-03-07 09:13:58 -08:00
Chris Collins
86f60671a7 Merge pull request #7254 from ZappoMan/hackathonMusicPlayer 
Music Player
 2016-03-07 09:01:58 -08:00
James B. Pollack
830a61b874 update 2016-03-06 15:04:47 -08:00
James B. Pollack
9a860bd31a update ping pong gun model url 2016-03-06 15:01:35 -08:00
Brad Hefta-Gaub
78b608b970 Merge pull request #7225 from PhilipRosedale/hydraReticle 
Hand controller drives mouse, does not take over if set down
 2016-03-06 13:33:02 -08:00
Brad Hefta-Gaub
168fd2d72f read playlist URL from userData 2016-03-05 01:07:20 -08:00
Brad Hefta-Gaub
2f92a4cccd first cut at music player 2016-03-05 00:45:25 -08:00
Anthony J. Thibault
076b0b42d7 HandControllerGrab: fixes for distance holding 
Because controller poses are in avatar space, there is no need
to apply delta avatar position changes and rotation changes.
 2016-03-04 20:36:32 -08:00
ericrius1
65c8f7cc45 flowers growing 2016-03-04 17:55:45 -08:00
ericrius1
3ad2d1aa9b flowers spawning and growing correctly 2016-03-04 17:32:29 -08:00
ericrius1
ef437b7f99 flowers staying in place 2016-03-04 16:48:55 -08:00
PhilipRosedale
87e7dd9ce3 add vive button mapping 2016-03-04 16:16:05 -08:00
ericrius1
17dec9446a flowers are growing when watered 2016-03-04 16:15:37 -08:00
Brad Hefta-Gaub
6d56a0d051 more CR feedback 2016-03-04 15:55:08 -08:00
Brad Hefta-Gaub
2b4d206eca more CR feedback 2016-03-04 15:54:28 -08:00
Brad Hefta-Gaub
e776bf5819 CR feedback 2016-03-04 15:47:50 -08:00
Brad Hefta-Gaub
d8e7c60ce0 CR feedback 2016-03-04 15:47:25 -08:00
Brad Hefta-Gaub
3f85daf276 Merge branch 'master' of https://github.com/highfidelity/hifi into hackathonLightening 2016-03-04 15:31:32 -08:00
Brad Hefta-Gaub
add7f54af3 remove debug line 2016-03-04 15:29:32 -08:00
Brad Hefta-Gaub
21b66354ef remove debug line 2016-03-04 15:28:49 -08:00
Brad Hefta-Gaub
c9cd8eeba6 fix a couple bugs 2016-03-04 15:27:43 -08:00
Philip Rosedale
cb8e2b7018 Merge pull request #7246 from AndrewMeadows/stable-ik 
recover stability of arm IK
 2016-03-04 14:38:59 -08:00
Atlante45
3a5165ab66 Add json import for game entity 2016-03-04 11:54:03 -08:00
Atlante45
ab5a29b076 Bit of cleanup 2016-03-04 11:50:12 -08:00
PhilipRosedale
e01524abbe fix for clicking 2016-03-04 11:24:35 -08:00
Andrew Meadows
9bf4a30a23 fix typo in example script 2016-03-04 10:57:06 -08:00
Atlante45
f62a3ed8f6 Remove tabs 2016-03-04 10:46:30 -08:00
Atlante45
0364703f86 Move script to toybox 2016-03-03 17:29:11 -08:00
Atlante45
10d55666f2 Changed coin value 2016-03-03 12:23:50 -08:00
Atlante45
b00ff7a81c Display score and save high scores 2016-03-03 12:19:01 -08:00
Atlante45
d1f7cf6387 Added freeze on loss and points architecture 2016-03-03 10:51:37 -08:00
Atlante45
442bd22f46 New sounds + coins!!! 2016-03-03 09:56:11 -08:00
Atlante45
f582222389 Couple additional features 2016-03-03 03:24:12 -08:00
Brad Hefta-Gaub
a752f55deb example of a rainy day/night zone 2016-03-03 02:25:41 -08:00
Atlante45
d5d5eaaf9c Fix cooldown 2016-03-02 23:42:27 -08:00
Atlante45
bef2885957 Couple bounding box fixes 2016-03-02 22:25:30 -08:00
Atlante45
21b3f88dee Scale up/Add avatar rotation/Cleanup 2016-03-02 21:59:40 -08:00
Atlante45
cf52aeeed2 Use correctly resized avatar model with fly animation 2016-03-02 20:40:25 -08:00
Atlante45
48fe9b343e Couple trigger value fixes 2016-03-02 18:20:18 -08:00
Atlante45
811ed91e02 Port to entity script 2016-03-02 18:02:57 -08:00
Atlante45
553300a783 Added a pipe on the top, randomized the height 2016-03-02 17:37:26 -08:00
Atlante45
dc1acd7a5b Give pipes their own class 2016-03-02 16:40:53 -08:00
Atlante45
247f1ef0e8 Make Bird its own Class 2016-03-02 16:07:32 -08:00
Atlante45
6ae27fe1f9 More flappy bird work 2016-03-02 15:53:13 -08:00
Atlante45
3ef4e45dae Flappy bird first draft 2016-03-02 10:36:28 -08:00
ericrius1
8df0ed679d Merge remote-tracking branch 'upstream/master' into growingPlant 2016-03-02 08:47:29 -08:00
Brad Hefta-Gaub
cfce5af8d4 Merge pull request #7191 from samcake/orange 
Better Shading Model and support fr Stingray material
 2016-03-01 18:24:09 -08:00
samcake
16ac69315f Imroving the roughness/specular highlight nd fixing a bug with the CUbemap texture 2016-03-01 16:38:02 -08:00
ericrius1
2029532070 chapter 3 2016-03-01 15:44:20 -08:00
Brad Hefta-Gaub
77b371e375 fix away state when starting in HMD 2016-03-01 15:00:19 -08:00
ericrius1
7179960bbf chapter 2 2016-03-01 14:18:38 -08:00
ericrius1
bc7d7a3dae adding chapters 2016-03-01 12:43:06 -08:00
Andrew Meadows
c1b3858193 Merge pull request #7228 from ZappoMan/hmdHacking 
HMD and Away improvements
 2016-03-01 11:48:09 -08:00
samcake
7120b64a33 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-03-01 10:53:40 -08:00
samcake
89920370db A bunch of typo fixes after review 2016-03-01 10:53:08 -08:00
Brad Hefta-Gaub
ba7b5c6e23 some improvements 2016-03-01 10:43:49 -08:00
Brad Hefta-Gaub
ae824bb180 Merge pull request #7173 from ericrius1/whiteboardV2 
Whiteboard using markers and erasers
 2016-03-01 09:12:16 -08:00
Brad Hefta-Gaub
52c38e56a4 make the HMD away overlay 3d 2016-02-29 21:25:25 -08:00
Brad Hefta-Gaub
501d23021f slight improvement to Away to have the paused overlay follow your view in HMD 2016-02-29 20:53:18 -08:00
Brad Hefta-Gaub
95c92f7a27 tweak depthReticle to work better with away 2016-02-29 20:35:25 -08:00
Brad Hefta-Gaub
a3f4dbddcf Merge branch 'master' of https://github.com/highfidelity/hifi into hmdHacking 2016-02-29 20:23:14 -08:00
Brad Hefta-Gaub
2c3fdc995f Away improvements 2016-02-29 20:23:06 -08:00
samcake
e72035ee3d Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-02-29 18:55:30 -08:00
ericrius1
cf891ef5d9 ray casting works 2016-02-29 18:22:12 -08:00
Howard Stearns
c0eef51d41 Merge pull request #7222 from ZappoMan/depthReticleWork 
more reticle improvements
 2016-02-29 17:42:03 -08:00
PhilipRosedale
efe53c1a85 actually don't add to default yet 2016-02-29 17:12:43 -08:00
ericrius1
def0df9bff intersection with growable object 2016-02-29 16:59:03 -08:00
PhilipRosedale
b89b6be210 look for hydra first 2016-02-29 16:45:00 -08:00
PhilipRosedale
86249cc9db add hand controller mouse to default scripts 2016-02-29 16:23:03 -08:00
PhilipRosedale
0e17506137 hand controller doesn't take mouse if set down, renamed file. 2016-02-29 16:21:06 -08:00
Eric Levin
33fe2e9b36 Update markerEntityScript.js 2016-02-29 16:11:08 -08:00
ericrius1
0d9a8b22c8 water flowing in ray direction 2016-02-29 15:48:56 -08:00
ericrius1
b301b71c7d cast ray from spout in its direction 2016-02-29 15:06:28 -08:00
Brad Hefta-Gaub
dc4c4e8c94 some tweaks to auto-hide 2016-02-29 14:24:43 -08:00
Seth Alves
0268ca0888 Merge pull request #7219 from PhilipRosedale/editFix2 
More accurate X/Z movement with edit.js
 2016-02-29 13:23:02 -08:00
Brad Hefta-Gaub
bd80ecd4dc Merge branch 'master' of https://github.com/highfidelity/hifi into depthReticleWork 2016-02-29 13:17:24 -08:00
Philip Rosedale
3eabf0d451 Merge pull request #7209 from sethalves/auto-unhook-stuck-to-hand 
when trigger is squeezed, check for things stuck to hand and unhook them
 2016-02-29 12:59:02 -08:00
ericrius1
03ae48d465 going to find water spout from water can 2016-02-29 11:53:26 -08:00
ericrius1
00dcddd838 changed to water spout entity script 2016-02-29 11:44:33 -08:00
ericrius1
2cd8e088f5 water pouring out of can linked to angle can is held 2016-02-29 10:36:32 -08:00
PhilipRosedale
42f6ede43c azimuth = elevation, duh 2016-02-29 10:22:24 -08:00
PhilipRosedale
d1bc31afb6 azimuth function is really just a ratio 2016-02-29 10:16:34 -08:00
PhilipRosedale
08eacc436f Fixed rayPlane test again 2016-02-29 10:13:01 -08:00
ericrius1
b7e80b03ae Merge branch 'master' into growingPlant 2016-02-29 10:10:25 -08:00
samcake
4bec6ddf52 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-02-29 09:20:37 -08:00
Brad Hefta-Gaub
4009f03c38 move autohide/show behavior to depthReticle, make it a default script 2016-02-29 08:38:53 -08:00
PhilipRosedale
cee79c8274 Fixed bug in rayPlane test 2016-02-28 15:44:23 -08:00
Brad Hefta-Gaub
8de4a59078 add support for auto-hide reticle and seek lookat on auto-show of reticle 2016-02-28 13:06:49 -08:00
Brad Davis
d932cb7578 Merge pull request #7212 from ZappoMan/depthReticleWork 
add fade between depths in depth reticle
 2016-02-28 12:49:47 -08:00
PhilipRosedale
e9aed83920 suppress debug messages 2016-02-28 12:41:40 -08:00
Seth Alves
5bf8670bc2 fix SpatiallyNestable::getChildren 2016-02-28 12:16:41 -08:00
PhilipRosedale
1d681a2461 Add angular size and azimuth limits to object XZ translation 2016-02-28 12:00:13 -08:00
Brad Hefta-Gaub
e403c990d9 make fade non-linear 2016-02-27 17:13:09 -08:00
PhilipRosedale
47504a068e remove unused code 2016-02-26 16:58:38 -08:00
PhilipRosedale
7fd88793dc drag relative to plane where pointer collided selection box 2016-02-26 16:58:17 -08:00
Brad Hefta-Gaub
70614aba90 Merge pull request #7184 from imgntn/cellscience 
Cellscience Updates
 2016-02-26 16:53:00 -08:00
ericrius1
5762c33cfe strokes are now parented to whiteboard surface 2016-02-26 15:07:22 -08:00
ericrius1
d0752143dc markers and eraser reset to original positions after being dropped 2016-02-26 14:49:48 -08:00
ericrius1
48f03ba476 markers resetting 2016-02-26 14:29:43 -08:00
ericrius1
a544ffc942 not emitting right now 2016-02-26 14:20:40 -08:00
ericrius1
0015e28b95 particle tweaks 2016-02-26 14:14:39 -08:00
ericrius1
e83c1f71a6 front and back 2016-02-26 12:17:46 -08:00
ericrius1
ed9f279a63 moved whiteboard Surface up 2016-02-26 12:12:27 -08:00
ericrius1
df3e26edd5 calligraphy 2016-02-26 12:05:30 -08:00
Brad Hefta-Gaub
6d9c585604 add fade between depths in depth reticle 2016-02-26 12:01:59 -08:00
ericrius1
6e0ddb3918 really fixed rotation 2016-02-26 11:48:15 -08:00
ericrius1
1542b9da12 rotation works right now 2016-02-26 11:33:59 -08:00
ericrius1
c81f3256dd rotation 2016-02-26 10:58:22 -08:00
Seth Alves
5594f1e4e5 if equipped entity vanishes, reset grab state 2016-02-26 10:27:34 -08:00
ericrius1
25a2d1eb93 fixed rotation 2016-02-26 10:14:27 -08:00
Seth Alves
6c9cf386a6 when trigger is squeezed, check for things stuck to hand and unhook them 2016-02-26 10:14:09 -08:00
ericrius1
b70d96ea96 Merge branch 'master' into whiteboardV2 2016-02-26 09:17:43 -08:00
ericrius1
d65479be77 Merge branch 'master' into growingPlant 2016-02-26 08:55:21 -08:00
samcake
3ee6f9d6f2 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-02-25 23:48:53 -08:00
Andrew Meadows
ef433c0e01 legacy support for EntityViewer.setKeyholeRadius() 2016-02-25 22:24:37 -08:00
ericrius1
0ce4385554 no offset increment 2016-02-25 18:22:54 -08:00
ericrius1
4d2a65926c test 2016-02-25 18:06:13 -08:00
Brad Hefta-Gaub
25634ea0ca Merge pull request #7204 from PhilipRosedale/betterLeap 
Leap Motion can near grab entities
 2016-02-25 17:48:56 -08:00
PhilipRosedale
4845de68dd fixed typo 2016-02-25 17:29:53 -08:00
PhilipRosedale
0cc1c930c5 mapped finger curl to trigger value 2016-02-25 17:04:46 -08:00
ericrius1
0602bf7f1a logging 2016-02-25 16:20:35 -08:00
Philip Rosedale
86d6d255fa Merge pull request #7199 from sethalves/fix-grab-heartbeat 
only update heartbeat in userData of grabbed entity every 5 seconds
 2016-02-25 16:17:11 -08:00
ericrius1
a79d334bed no query string 2016-02-25 16:12:34 -08:00
Brad Hefta-Gaub
82cbf19bca Merge pull request #7078 from zzmp/fix/light-intensity 
Reimplement light attenuation for spot and point lights
 2016-02-25 16:08:28 -08:00
ericrius1
668894b3e0 should work multiuser now 2016-02-25 16:05:03 -08:00
ericrius1
24bf4f851f can erase any stroke at any time 2016-02-25 15:23:02 -08:00
Brad Hefta-Gaub
9e2d326b30 Merge pull request #7177 from howard-stearns/ac-sound-searcher-update 
Update sound searcher and spawner for load handling.
 2016-02-25 15:10:42 -08:00
ericrius1
ddae2d4f74 only erase stroke map on release and preload 2016-02-25 15:00:54 -08:00
ericrius1
4de951242c eraser positioned correctly 2016-02-25 14:54:34 -08:00
ericrius1
22a5f3dcc0 wait even longer 2016-02-25 14:28:48 -08:00
ericrius1
338427ed3e wait longer before sending message 2016-02-25 14:28:35 -08:00
ericrius1
e9ad06fca7 removed query string 2016-02-25 14:25:12 -08:00
ericrius1
ef85d0451a removed files that shouldn't be there 2016-02-25 14:24:06 -08:00
ericrius1
21808242ba stashin 2016-02-25 14:20:13 -08:00
samcake
610189ded3 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-02-25 14:14:04 -08:00
samcake
96fb9c4466 cleaning up macos warnings, separating Metallic maps from the default, gamma corrected gray textures 2016-02-25 14:13:35 -08:00