Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-14 04:47:21 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
41398 commits 25 branches 0 tags 1.1 GiB
Commit graph

5844 commits

Author SHA1 Message Date
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
Seth Alves
b253cd53b9 Merge pull request #7190 from ericrius1/playaFireworks 
Playa fireworks
 2016-02-25 14:02:25 -08:00
Eric Levin
4d27d5c9f2 Update fireworksLaunchButtonEntityScript.js 2016-02-25 13:45:08 -08:00
Seth Alves
6dafc654eb only update heartbeat in userData of grabbed entity every 5 seconds 2016-02-25 13:19:56 -08:00
ericrius1
98cf784c6f more smoke fading 2016-02-25 10:32:21 -08:00
Zach Pomerantz
32ce7c6eab Rename light surfaceRadius->falloffRadius 2016-02-25 10:02:33 -08:00
ericrius1
54ee3d347c more velocity 2016-02-25 09:53:17 -08:00
ericrius1
f12acfb7f3 simplfied 2016-02-25 09:49:44 -08:00
ericrius1
d4d5aed518 smoke tweaks 2016-02-25 09:44:48 -08:00
ericrius1
9a108c298f smoke tweaks 2016-02-25 09:34:22 -08:00
Howard Stearns
077d331004 whitespace 2016-02-25 09:34:07 -08:00
ericrius1
728612f9a7 far trigger launches fireworks 2016-02-25 09:26:37 -08:00
ericrius1
8f914c6673 removed query string on entity script 2016-02-24 20:08:35 -08:00
ericrius1
ad49bcda72 lowered num fireworks 2016-02-24 18:29:44 -08:00
ericrius1
7cb57aa067 alpha tweaks 2016-02-24 18:15:34 -08:00
ericrius1
a1eab365ce added name to launch pad 2016-02-24 18:11:08 -08:00
ericrius1
29c4ac83c0 can set launch position in userdata 2016-02-24 18:00:57 -08:00
ericrius1
857ccc7409 move sound with thing 2016-02-24 17:53:46 -08:00
samcake
ae6e625894 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-02-24 17:30:40 -08:00
samcake
a0d7ce145e Adding support for emissive and occlusion maps, on to pr land 2016-02-24 17:30:29 -08:00
Chris Collins
f6a6560b86 Merge pull request #7175 from sethalves/grab-clean-up-abandoned 
grab script cleans up abandoned grabs
 2016-02-24 17:20:46 -08:00
ericrius1
08e7adc518 tweaks 2016-02-24 17:08:12 -08:00
ericrius1
45e8287d1d particle trail in right spot 2016-02-24 16:55:31 -08:00
ericrius1
c26ad2b9d0 relative smoke trail 2016-02-24 16:52:02 -08:00
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