Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 10:32:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
32849 commits 75 branches 59 tags 1.2 GiB
Commit graph

3547 commits

Author SHA1 Message Date
ericrius1
290659b9f6 increased lifetime 2015-10-01 11:46:37 -07:00
James Pollack
a4105eb321 add color pickers 2015-10-01 11:34:02 -07:00
Atlante45
d0bec38603 Fix currentAPI.js 2015-10-01 11:30:50 -07:00
ericrius1
ef5ad9eeb3 Laser stays visible when further away from surfaces 2015-10-01 11:02:22 -07:00
Seth Alves
2700529b33 lower action lifetime 2015-10-01 10:41:43 -07:00
Seth Alves
d4f954a0e2 allow more than one near-grab on an object 2015-10-01 10:25:30 -07:00
ericrius1
191a4740a3 laser color matches paint color 2015-10-01 09:50:58 -07:00
ericrius1
2899962d43 can now cycle colors with 4 and 2 buttons on hydra 2015-09-30 17:14:17 -07:00
ericrius1
3592b78b2b less points per line 2015-09-30 16:35:43 -07:00
ericrius1
e516281da8 Added closePaint script and removed no longer used spray paint scripts 2015-09-30 16:15:52 -07:00
James Pollack
c55d627e9b Different model, different sounds, release interval 2015-09-30 16:12:27 -07:00
Seth Alves
91965db5ab increase action lifetime to be more forgiving of clock skew. remove code that makes avatar a ghost while holding something 2015-09-30 16:07:22 -07:00
Seth Alves
cd2a1542e0 increase action lifetime to be more forgiving of clock skew. remove code that makes avatar a ghost while holding something 2015-09-30 16:05:16 -07:00
Seth Alves
4e057e5ada increase action lifetime to be more forgiving of clock skew. remove code that makes avatar a ghost while holding something 2015-09-30 16:03:54 -07:00
James Pollack
3cdb4e7186 importing 2015-09-30 14:23:11 -07:00
Seth Alves
dd0a16df04 don't leave search state if we intersect something that someone else is already grabbing 2015-09-30 14:19:59 -07:00
Seth Alves
b417abc3de try again on string startswith 2015-09-30 14:16:07 -07:00
Seth Alves
c27766facb move string startswith to utils.js 2015-09-30 14:07:23 -07:00
Seth Alves
f746a970de don't grab something if someone else is already grabbing it 2015-09-30 14:03:10 -07:00
Seth Alves
b34ea6ded4 store action lifetime as an expires integer 2015-09-30 13:46:23 -07:00
Seth Alves
7c6846c260 add lifetime and tag arguments to actions 2015-09-30 13:09:41 -07:00
James Pollack
8fc696c5f8 add ability to explort particle settings in nice format for interface 2015-09-30 12:41:08 -07:00
James Pollack
57d5418231 export just particle settings in interface compatible format 2015-09-30 12:27:51 -07:00
James Pollack
0865f94106 magic numbers 2015-09-30 11:31:33 -07:00
James Pollack
8bdf428f41 First version of ping pong gun 2015-09-30 11:21:51 -07:00
ericrius1
c03a9ddd58 Added fire to master script 2015-09-30 11:14:18 -07:00
James Pollack
ecad7f34f6 moar 2015-09-30 10:58:21 -07:00
Seth Alves
898e3917e3 improve actionInspector.js 2015-09-30 10:57:52 -07:00
James Pollack
99fbed6143 mostly working 2015-09-30 10:49:47 -07:00
Seth Alves
96d0df49e4 script to display entity-action details in an overlay 2015-09-30 10:41:39 -07:00
James Pollack
c3dfea4712 initial files 2015-09-30 10:26:24 -07:00
ericrius1
2b84c90f9d merged master hand controller 2015-09-30 10:18:13 -07:00
James B. Pollack
402fd44cff header file cleanup 2015-09-29 21:27:55 -07:00
James B. Pollack
80a457eb14 cleanup the main.js file for distribution 2015-09-29 19:47:00 -07:00
James B. Pollack
47b410df93 version 0.1 of particle explorer for distribution 2015-09-29 19:44:15 -07:00
ericrius1
00cab85a11 Removed whiteboard from reset script 2015-09-29 18:33:31 -07:00
ericrius1
259391a40b Merge branch 'toybox' of https://github.com/ericrius1/hifi into toybox 2015-09-29 18:32:56 -07:00
ericrius1
ba17225c19 Remove hand control script from PR 2015-09-29 18:32:52 -07:00
James Pollack
d4cc3994f4 add some 2 way bindings for settings sanity check 2015-09-29 17:47:41 -07:00
Eric Levin
68615e171a Update masterResetEntity.js 2015-09-29 17:40:05 -07:00
James Pollack
d0f20bfa63 working particle explorer w00t! 2015-09-29 17:01:10 -07:00
Brad Davis
166d267022 Merge pull request #5942 from ZappoMan/flickeringLightScript 
Change the update rate of the flickering light to 30hz
 2015-09-29 16:20:24 -07:00
Seth Alves
472ff89f48 rearrange when avatar collisions are adjusted 2015-09-29 15:52:38 -07:00
Brad Hefta-Gaub
67823b79d5 change additional lifetime to 60 seconds to avoid processing hiccups 2015-09-29 15:48:46 -07:00
Brad Hefta-Gaub
90afeb4ce1 more debugging 2015-09-29 15:45:29 -07:00
ericrius1
d8e7da7b73 added painting to whiteboard 2015-09-29 15:43:59 -07:00
ericrius1
648fb7cb8c Merge branch 'master' into toybox 2015-09-29 15:40:46 -07:00
Seth Alves
8f2f14c9e5 keep track of state of avatar-collisions menu-item with global variables rather than per object ones 2015-09-29 15:30:24 -07:00
Seth Alves
2ba686ed89 cleanups 2015-09-29 15:11:52 -07:00
Seth Alves
d554eb8db9 avatar collisions are off during a grab 2015-09-29 15:09:25 -07:00
Brad Hefta-Gaub
f83eae4d42 more debugging 2015-09-29 14:45:24 -07:00
Seth Alves
b1a133e55c working on disabling avatar collisions during grab 2015-09-29 14:38:47 -07:00
Brad Hefta-Gaub
07515ce710 Merge pull request #5918 from PhilipRosedale/master 
Throw held objects with velocity from fingertip
 2015-09-29 14:37:44 -07:00
unknown
006650f23b Fix for PR comments 2015-09-29 14:34:23 -07:00
James Pollack
b9a83be4d3 cleanup 2015-09-29 14:31:13 -07:00
James B. Pollack
bbc32cdd1e Merge pull request #5937 from ericrius1/grabFix 
releaseGrab event now triggered for non physical entities
 2015-09-29 14:25:59 -07:00
Brad Hefta-Gaub
00c32fc7cd Merge pull request #5924 from jherico/marge 
Support for accessing IPD in scripts
 2015-09-29 14:24:53 -07:00
Brad Davis
9b13aac37d PR comments 2015-09-29 14:23:56 -07:00
ericrius1
7681d8d77d fixed commenting 2015-09-29 14:05:57 -07:00
ericrius1
644687f330 releaseGrab event now triggered for non physical entities 2015-09-29 14:04:03 -07:00
Seth Alves
e9dd165b1d try calling updateMotionBehaviorFromMenu 2015-09-29 14:00:22 -07:00
ericrius1
a1f922721a Merge branch 'toybox' of https://github.com/ericrius1/hifi into toybox 2015-09-29 13:57:20 -07:00
ericrius1
81c5d0c388 more whiteboard work 2015-09-29 13:57:17 -07:00
Seth Alves
f7b34f63c1 try calling updateMotionBehaviorFromMenu 2015-09-29 13:40:54 -07:00
Brad Hefta-Gaub
6a01c10453 more debug 2015-09-29 13:35:16 -07:00
Brad Hefta-Gaub
9c199b23a2 more debug 2015-09-29 13:32:28 -07:00
Brad Hefta-Gaub
4abb251728 more debug 2015-09-29 13:28:45 -07:00
James Pollack
cbd55ddba6 Add the hoop 2015-09-29 13:24:49 -07:00
Seth Alves
49da3c5034 disable avatar collisions while holding something 2015-09-29 13:24:03 -07:00
James B. Pollack
3bbc809710 Merge pull request #5930 from ericrius1/grabFix 
Setting hand data for close grab of non physical objects
 2015-09-29 13:17:21 -07:00
James Pollack
26554c5ac3 whitespace 2015-09-29 13:13:50 -07:00
Brad Hefta-Gaub
fdb9455540 debug 2015-09-29 13:12:55 -07:00
James Pollack
e615c62bd3 Prevent mouse grab from grabbing ungrabbable objects 2015-09-29 13:11:39 -07:00
James B. Pollack
23c9ffa1aa Merge pull request #8 from imgntn/ericrius1-toybox 
Add fences to master script
 2015-09-29 13:06:45 -07:00
ericrius1
da16a6f55b fixed merge 2015-09-29 13:02:00 -07:00
James Pollack
c52cd30843 Merge branch 'master' into ericrius1-toybox 2015-09-29 13:01:59 -07:00
James Pollack
66ef92b659 thicker, heavier gates, wand collision shape 2015-09-29 12:52:34 -07:00
ericrius1
06194b6088 fixed formatting 2015-09-29 12:51:01 -07:00
Brad Hefta-Gaub
3cf7553c2a new flickering light script 2015-09-29 11:51:26 -07:00
James Pollack
a58cf66f2e wand adjustments 2015-09-29 11:07:21 -07:00
James Pollack
63c02712c1 add shape types 2015-09-29 10:52:54 -07:00
James Pollack
337909b539 actual model url 2015-09-29 10:47:32 -07:00
James Pollack
48290a5275 Merge remote-tracking branch 'upstream/master' into ericrius1-toybox 2015-09-29 10:42:32 -07:00
ericrius1
932f7ce92c up to date 2015-09-29 10:39:07 -07:00
ericrius1
35e4ec17ea add which hand for near grab of non physical objects 2015-09-29 10:35:38 -07:00
ericrius1
d07c93ef8f adds hand setting when grabbing near non physical objects 2015-09-29 10:22:03 -07:00
James Pollack
676c02c77e file updates 2015-09-29 10:19:39 -07:00
ericrius1
1662471583 whiteboard changes 2015-09-29 10:16:44 -07:00
James Pollack
1ceefc3c63 add model key and url 2015-09-29 10:00:45 -07:00
ericrius1
c4be6e2fb2 Merge branch 'master' into toybox 2015-09-29 09:47:13 -07:00
ericrius1
8857042363 whiteboard 2015-09-29 09:46:49 -07:00
ericrius1
80405450ce Paint can now just sprays out stream 2015-09-29 09:00:12 -07:00
James B. Pollack
4c86b1ce03 ballin 2015-09-28 18:47:32 -07:00
ericrius1
04d797e964 paint can 2015-09-28 17:59:42 -07:00
Eric Levin
e8e9957846 Merge pull request #5911 from ZappoMan/rayIntersectionWork 
adding surface normals to ray intersection
 2015-09-28 17:21:40 -07:00
ericrius1
3f83d5a99a Animation playing for doll, but looping 2015-09-28 17:14:35 -07:00
ericrius1
d47f938f8d blocks 2015-09-28 17:05:58 -07:00
ericrius1
afcd59a549 Moved cat to stool 2015-09-28 17:04:03 -07:00
ericrius1
a21530282b logging frame 2015-09-28 16:56:46 -07:00
ericrius1
5e28462e2a testing doll animation 2015-09-28 16:51:23 -07:00
unknown
56a0456f70 Adjust force multiplier and timestep 2015-09-28 16:49:55 -07:00
Brad Davis
7b1c04512a Adding support for accessing IPD in scripts 2015-09-28 16:24:38 -07:00
Seth Alves
89ab1f626f Merge pull request #5921 from huffman/import-export-fix 
Import/Export entities fix
 2015-09-28 16:21:18 -07:00
unknown
5c7cf76035 Distance grab works with walking and turning 2015-09-28 16:13:35 -07:00
James Pollack
f79414649e add gravity to fences 2015-09-28 15:57:53 -07:00
James Pollack
09a53d553a Add fences to Toybox master script, add gravity to bubble wand 2015-09-28 15:55:25 -07:00
Ryan Huffman
42c33ba699 Fix edit.js import on Windows 
Forcefully prepend "file:///" to the local file url used for importing
 2015-09-28 15:40:37 -07:00
James Pollack
7ce086396c Merge branch 'master' into ericrius1-toybox 2015-09-28 15:31:03 -07:00
James Pollack
afa179b9c4 hoop 2015-09-28 15:08:48 -07:00
unknown
5fc7965042 Throw held objects with velocity from fingertip 2015-09-28 13:04:58 -07:00
Brad Hefta-Gaub
ae73a7e97f Merge pull request #5904 from imgntn/grab_updates_1 
[Scripts] Add ability for entities to declare themselves ungrabbable
 2015-09-28 12:55:51 -07:00
James Pollack
ade78fda9e balls 2015-09-28 12:24:21 -07:00
ericrius1
45281f8aae modified spraypaint can to spray out particles but no paint 2015-09-28 10:34:03 -07:00
ericrius1
660490d754 removed magBalls 2015-09-28 10:29:12 -07:00
James B. Pollack
affb0253db Update handControllerGrab.js 
added a semicolon to the end of a return statement
 2015-09-28 10:26:52 -07:00
James Pollack
02aa6ca6d1 constant updates 2015-09-28 10:21:02 -07:00
ericrius1
1b096d1573 Merge branch 'master' into toybox 2015-09-28 09:31:49 -07:00
ericrius1
bab3c6fcf2 adjust lastFrame 2015-09-28 09:31:11 -07:00
Brad Hefta-Gaub
3e758f3c6b fix Triangle::getNormal, add normal display to rayPickExample 2015-09-28 09:05:39 -07:00
Brad Hefta-Gaub
ce3da099f6 normalize the surface normal from the triangle, coding standard fix, update example 2015-09-28 08:30:49 -07:00
James B. Pollack
fff8bbf104 add some vec3 folders to generics 2015-09-27 15:53:18 -07:00
James B. Pollack
b70a7a705c make vec3folder abstract 2015-09-27 15:03:37 -07:00
James B. Pollack
46dbf45e07 add custom dat.gui build with basic array support, add vec3 support client side (only one-way at the moment) as folder example 2015-09-27 14:45:42 -07:00
James B. Pollack
6e00070b5e working 2 way generics 2015-09-27 11:48:52 -07:00
James B. Pollack
e029ee2a57 working two-way generic with visibility toggle as example 2015-09-27 10:44:52 -07:00
James B. Pollack
88d6af3914 improve generic implementation 2015-09-27 10:18:59 -07:00
James B. Pollack
c824d569e0 change generic box spawn position 2015-09-26 23:41:28 -07:00
James B. Pollack
c60701d49a headers 2015-09-26 23:27:24 -07:00
James B. Pollack
4f7e7e1d5f start generic two-way implementation, fix some typos 2015-09-26 23:24:00 -07:00
James B. Pollack
06a6462636 add function for manually updating display 2015-09-26 14:14:21 -07:00
James B. Pollack
7a59a7dc43 add two-way code but dont enable 2015-09-26 14:10:30 -07:00
James B. Pollack
5013e98b6c cleanup, comments 2015-09-26 12:47:22 -07:00
James B. Pollack
22515a9375 fix naming, match initial properties 2015-09-26 12:40:46 -07:00
James B. Pollack
51de351c50 convert tabs to spaces 2015-09-26 12:28:15 -07:00
James B. Pollack
f953456007 comments 2015-09-26 12:21:55 -07:00
James B. Pollack
f3c13f5d69 do grouping differently so names look better 2015-09-26 12:18:20 -07:00
James B. Pollack
f84762f2d7 remove old gui file 2015-09-26 12:02:59 -07:00
James B. Pollack
46fabf964d cleanup 2015-09-26 11:54:57 -07:00
James B. Pollack
a0b3bd91a3 cleanup logging 2015-09-26 11:40:31 -07:00
James B. Pollack
d8e7cd89ad Cleanup, comments 2015-09-26 11:27:58 -07:00
James B. Pollack
57aca0c418 New way to do two-way bindings between dynamically created GUI and in-world object properties. Uses partcile system properties, specifically. 2015-09-26 11:18:22 -07:00
James B. Pollack
b254353b38 Update collectHifiStats.js 
Clears the current batch after we send it to the endpoint.
 2015-09-26 07:09:41 -07:00
James Pollack
8f25e54027 Hoop, ball, ground 2015-09-25 18:34:34 -07:00
ericrius1
bcd2171491 updated chair model 2015-09-25 16:28:12 -07:00
ericrius1
534cffcf85 fixed animation bug with doll 2015-09-25 16:23:35 -07:00
ericrius1
e94d9b39fd made pots and chair not grabbable 2015-09-25 15:42:13 -07:00
James Pollack
1f7914766c Add ability to prevent an object from being grabbable by specifying a custom key grabbableKey to grabbable:false 2015-09-25 15:26:29 -07:00
James Pollack
2c0c2a0979 Merge remote-tracking branch 'upstream/master' into thoys-20672 2015-09-25 14:49:31 -07:00
ericrius1
c53ad3c534 combined arm chair 2015-09-25 12:34:35 -07:00
ericrius1
f5e44675bb removed start and end frame 2015-09-25 12:11:22 -07:00