Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-05 11:19:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
15102 commits 76 branches 59 tags 1.2 GiB
Commit graph

676 commits

Author SHA1 Message Date
Ryan Huffman
9ae65e4439 Update locationsMenu.js to use backgroundColor 2014-06-30 12:06:50 -07:00
Philip Rosedale
370540cc33 squeezeHands uses different animation on clench/release 2014-06-28 13:00:51 -07:00
Leonardo Murillo
21b839a8b5 Updating concertCamera script 2014-06-27 11:08:24 -07:00
Atlante45
5bea267cd2 make sitting points semi transparent 2014-06-27 10:54:57 -07:00
Atlante45
4281168fe9 Hide seat once you are seated 2014-06-27 10:03:50 -07:00
Atlante45
aad666be62 more sitting work 2014-06-27 09:48:27 -07:00
Atlante45
0b0cbdf340 Merge branch 'master' of https://github.com/highfidelity/hifi into sit_on_a_model 2014-06-26 11:35:29 -07:00
Philip Rosedale
64c89df5c1 Added another concert view 2014-06-26 10:52:37 -07:00
Philip Rosedale
c72e41dcd2 added Oculus angular velocity, moved sit icon up 2014-06-25 22:27:54 -07:00
Philip Rosedale
9af2b2b4dc removed commented code 2014-06-25 15:24:21 -07:00
Philip Rosedale
58d460da09 option to turn on/off string hair 2014-06-25 15:14:17 -07:00
Atlante45
cce6132a07 Add sitting points to the model properties display 2014-06-25 11:50:30 -07:00
Philip Rosedale
40dee3b39e Added JS calls for left/right estimated palm position on skeleton model, improved toy ball to use them 2014-06-25 05:24:22 -07:00
Philip Rosedale
88c01266ab more hair tweaks, don’t render in 1P, improved toy ball 2014-06-25 03:29:08 -07:00
Philip Rosedale
60c33c18c3 Expose mode shift period to JS, remove default value 2014-06-24 20:32:41 -07:00
Philip Rosedale
81e7f8e0a5 Merge branch 'master' of https://github.com/worklist/hifi 2014-06-24 16:21:35 -07:00
Philip Rosedale
5bb2c3c62f Added in-world test tone JS file 2014-06-24 16:14:40 -07:00
Philip Rosedale
556578b8dc first pass - hair as vertlet strands 2014-06-24 09:30:11 -07:00
Atlante45
4561a6e326 Fixed voxel being deleted even though voxel tool is not selected 2014-06-19 18:10:06 -07:00
Atlante45
266dc6be3e fixed tooltip not disapearing when deleting model 2014-06-19 18:09:17 -07:00
Atlante45
4a4efb0bfa Don't glow models if you can't grab it 2014-06-19 11:11:08 -07:00
Atlante45
676141024a Added angular size limit to hydras too. 2014-06-19 10:46:06 -07:00
Atlante45
641b9e8253 Set minimum angular size too model selection 2014-06-19 10:43:25 -07:00
Atlante45
900024eefe More intuitive rotation UI 2014-06-18 14:22:46 -07:00
ZappoMan
ed32ca721a fix bug 2014-06-18 12:19:01 -07:00
Clément Brisset
7597191081 Merge pull request #3042 from ZappoMan/editModelFeatures 
add support for changing the model URL of a model
 2014-06-18 11:52:01 -07:00
ZappoMan
26075d9d26 add support for changing the model URL of a model 2014-06-18 11:29:56 -07:00
Atlante45
97dd695213 if model takes too much angular size, don't select it 2014-06-17 18:32:45 -07:00
Brad Hefta-Gaub
a51d2deec6 Merge pull request #3039 from Atlante45/snapping_model_rotation 
Added snapped/smoothed rotation for models + tooltip
 2014-06-17 17:42:25 -07:00
Atlante45
4467ee266d Added snapped/smoothed rotation for models + tooltip 2014-06-17 17:19:16 -07:00
Stojce Slavkovski
8b5e3486a3 Merge branch 'master' of https://github.com/highfidelity/hifi into 19755 2014-06-17 23:22:03 +02:00
Atlante45
f367e1840d Added a detached mode by default in inpect.js 2014-06-17 10:37:35 -07:00
Atlante45
b3b3a72946 Disable editModels.js mouse events when ALT is pressed. (no conflict with inspect.js) 2014-06-16 10:55:34 -07:00
Atlante45
d5aa12db7d Added models support to inspect.js 2014-06-16 10:55:05 -07:00
Stojce Slavkovski
f1e008853c Merge branch 'master' of https://github.com/highfidelity/hifi into 19755 2014-06-15 12:36:14 +02:00
Stojce Slavkovski
1959768513 Merge branch 'master' of https://github.com/highfidelity/hifi into 19755 2014-06-13 00:45:06 +02:00
barnold1953
db94ae7449 Invert hydra move view and thrust controllers to match consoles 2014-06-12 10:27:54 -07:00
Dev5
41b9c3b704 Removed empty update function 2014-06-11 09:06:00 -07:00
Dev5
faa5b1d2f2 Added simple tree placement script that has a UI similar to edit voxels. It grows big trees, dont grow near something important. 2014-06-10 17:18:32 -07:00
Stojce Slavkovski
e25817cd88 switch to amazon image resources 2014-06-10 00:08:10 +02:00
Stojce Slavkovski
2cde2f5303 use worklist for assets 2014-06-08 16:03:43 +02:00
Stojce Slavkovski
83b096ca1d myBalance 
- balance formatting
	- symbol layout changes
 2014-06-08 15:56:37 +02:00
Stojce Slavkovski
8de2bdfb99 expose account details via AccountScriptingInterface 2014-06-07 23:17:49 +02:00
Stojce Slavkovski
39c1daca43 Merge branch 'master' of https://github.com/worklist/hifi into 19755 2014-06-07 22:29:36 +02:00
Stojce Slavkovski
976b76ac85 myBalance new layout changes 2014-06-07 22:29:06 +02:00
Stojce Slavkovski
9810335adf Merge branch 'master' of https://github.com/worklist/hifi into 19755 2014-06-07 10:33:41 +02:00
Stojce Slavkovski
fea1433ced Add initial mybalance script 2014-06-07 10:32:36 +02:00
Atlante45
69adf8d0dd Removed extra debug, fix model jumping when releasing one of the two triggers. 2014-06-06 11:19:43 -07:00
Atlante45
dece3ea095 Merge branch 'master' of https://github.com/highfidelity/hifi into temp_branch 2014-06-06 10:26:49 -07:00
Atlante45
9322e1f71b More work on editModels 2014-06-05 17:36:56 -07:00
Philip Rosedale
6bef0c1a6a both left and right hands in animation 2014-06-05 17:03:58 -07:00
Atlante45
145a159233 Slight glow on laser intersection 2014-06-05 15:45:25 -07:00
Philip Rosedale
8bce7127aa support for both hands, but no script for now in the left one 2014-06-04 15:19:49 -07:00
Philip Rosedale
e8fa75b4f3 Added squeezeHands.js 2014-06-04 15:17:17 -07:00
Atlante45
79092e3e81 editModels now has 2 modes 2014-06-04 14:18:28 -07:00
Atlante45
15863198d1 change editModels icon 2014-06-04 13:52:31 -07:00
Atlante45
9ea53f8070 some testing with editModels 2014-06-04 11:38:46 -07:00
Philip Rosedale
c97f0da109 Merge remote-tracking branch 'upstream/master' 2014-06-03 17:08:40 -07:00
Philip Rosedale
038b0de46e starting fist squeezing 2014-06-03 17:08:24 -07:00
Philip Rosedale
f7cd4d78ad Fix crazylegs.js to newer joint names 2014-06-03 17:02:52 -07:00
barnold1953
90754e320d Curved Oculus overlay around camera as a semicircle 2014-06-02 16:05:07 -07:00
Brad Hefta-Gaub
6f5d2ba233 Merge pull request #2970 from Barnold1953/master 
Mirror mode fix, particleBirds.js
 2014-06-02 13:02:05 -07:00
Clément Brisset
2121648c7d Merge pull request #2972 from polac/19748 
Fixing the BUG #19748: Sit.js doesn't handle overlays correctly.
 2014-06-02 12:18:28 -07:00
Mika Impola
da3a272475 Fixing the BUG #19748: Sit.js doesn't handle overlays correctly. 2014-06-02 21:47:31 +03:00
barnold1953
e669f1d835 Fixed and tested particle birds 2014-06-02 11:41:50 -07:00
barnold1953
9e882957c4 Removed debug prints from particleBirds.js 2014-06-02 10:44:50 -07:00
barnold1953
7997946389 Added particleBirds.js example script 2014-06-02 09:43:01 -07:00
barnold1953
db578995a8 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-06-02 09:20:12 -07:00
ZappoMan
cad5e12aad make editVoxels.js and editModels.js play nice together with the delete menu item 2014-05-31 14:05:05 -07:00
ZappoMan
f92facea76 changed Models/Delete and Voxels/Delete to both use same menu item name of 'Delete' so that either option will correctly delete either. 2014-05-31 13:30:45 -07:00
ZappoMan
30a5048840 add editModels to defaultScripts 2014-05-31 13:24:23 -07:00
ZappoMan
22a8f88195 add support for Menu.menuExists() and menu.menuItemExists() 2014-05-31 13:24:07 -07:00
Brad Hefta-Gaub
a257af76dc Merge pull request #2966 from Atlante45/grab_attachements 
First pass at grabbing attachment
 2014-05-30 19:46:03 -07:00
Atlante45
4ffd51d9c4 First pass at grabbing attachment 2014-05-30 18:40:50 -07:00
Atlante45
2e5b45cfa1 print dressing 2014-05-30 17:48:35 -07:00
Atlante45
a661ea3179 Made API listing alphabetical, more clean and faster to print out. 2014-05-30 17:40:04 -07:00
Atlante45
2514906bd7 Fixed minor issue in currentAPI.js 2014-05-30 17:25:42 -07:00
Atlante45
e217ed7f75 Merge branch 'master' of https://github.com/highfidelity/hifi into list_current_js_api 2014-05-30 17:18:45 -07:00
Atlante45
9ca80cf4b3 Added script that lists the current JS API 2014-05-30 17:18:26 -07:00
Andrzej Kapolka
1c77d93914 Merge pull request #2959 from PhilipRosedale/master 
Add ability to toggle sit.js with "." key, for Oculus users
 2014-05-30 14:16:46 -07:00
Andrzej Kapolka
be9703d46f Merge pull request #2958 from Atlante45/click_drag_attach 
Update joints list everytime I try to attach
 2014-05-30 14:15:43 -07:00
Philip Rosedale
9d59251d27 add keyboard shortcut (“.”) to toggle sitting, so that Oculus user can sit 2014-05-30 10:47:51 -07:00
Atlante45
0b31971592 Update joints list everytime I try to attach 2014-05-30 10:42:54 -07:00
Brad Hefta-Gaub
c3b87504d9 Merge pull request #2957 from Atlante45/fix_for_editModel 
Fixed JS parse error
 2014-05-30 10:24:54 -07:00
Atlante45
a7f10798b2 Fixed JS parse error 2014-05-30 10:23:36 -07:00
barnold1953
06a9ac22e7 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-30 09:26:07 -07:00
Philip Rosedale
169e7d61fd Merge pull request #2954 from ctrlaltdavid/19715 
Code Review for Job #19715
 2014-05-29 20:03:24 -07:00
Atlante45
17e3bd6110 CR comments 2014-05-29 18:24:21 -07:00
Atlante45
b89d0a292c code cleanup 2014-05-29 15:56:46 -07:00
Atlante45
fd0c195132 Code cleanup 2014-05-29 15:55:17 -07:00
Atlante45
c7b636365c Don't attach to joints in range when I grab 2014-05-29 15:50:23 -07:00
Atlante45
3e207f9452 fixed display error in editVoxels with new boundaries 2014-05-29 15:09:42 -07:00
Atlante45
980e873a13 Better prints in editModels 2014-05-29 15:02:09 -07:00
barnold1953
133593edd5 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-29 14:51:23 -07:00
Atlante45
b34453647b editModels click/drag/attach tweaks 2014-05-29 14:34:10 -07:00
David Rowe
bd4d167684 Make JavaScript audio samples able to be looped 
Add a "loop" property to AudioInjectorOptions and provide an example JavaScript file.
 2014-05-29 14:13:02 -07:00
barnold1953
055a62e7e5 Replaced nonfunctioning particleBird.js with awesome particleBirds.js 2014-05-29 11:48:15 -07:00
Atlante45
37613f086b Merge branch 'master' of https://github.com/highfidelity/hifi into click_drag_attach 
Conflicts:
	interface/src/renderer/Model.cpp
 2014-05-29 10:28:09 -07:00
AndrewMeadows
6f2e481638 Merge pull request #2948 from huffman/19728 
Code Review for Job #19728
 2014-05-29 08:59:00 -07:00
Philip Rosedale
79405444d1 Merge pull request #2947 from PhilipRosedale/master 
Set max voxel size of 16 meters in script for voxel creation
 2014-05-28 21:05:23 -07:00
Philip Rosedale
e0d68607cd Set max voxel size of 16 meters in script for voxel creation 2014-05-28 21:02:33 -07:00
Ryan Huffman
cfe176c60e Add locationsMenu.js 2014-05-28 20:50:39 -07:00
Atlante45
372ddc92fd Added attaching of model to MyAvatar when close enough 2014-05-28 16:00:37 -07:00
ZappoMan
e3d880248f tweaks 2014-05-28 12:03:40 -07:00
ZappoMan
0e7f3e0e37 Merge branch 'master' of https://github.com/worklist/hifi into aacube 2014-05-28 10:37:28 -07:00
ZappoMan
6fd22856f2 hacking on non-AABox models 2014-05-28 10:24:02 -07:00
Philip Rosedale
8d7e682a1f Merge pull request #2937 from huffman/19714 
Code Review for Job #19714
 2014-05-27 20:20:45 -07:00
Atlante45
285bd0d2f2 Switched to findRayIntersection 2014-05-27 15:50:39 -07:00
Ryan Huffman
ca6cc86ca1 Add playSoundWave.js 2014-05-27 11:35:00 -07:00
Brad Hefta-Gaub
517d51cba7 Merge pull request #2928 from PhilipRosedale/master 
Improved playSound.js to work without a spatial controller
 2014-05-27 11:04:25 -07:00
Philip Rosedale
ab80e3dc84 improved playSound.js to work if no spatial controller attached 2014-05-27 10:32:55 -07:00
Clément Brisset
6bb933996f Merge pull request #2920 from ZappoMan/aacube 
Add RayPick support for models
 2014-05-24 17:03:59 -07:00
ZappoMan
efd0580cfb add ray picking to the model scripting interface 2014-05-23 17:09:37 -07:00
Philip Rosedale
d341e7314d squared force on thrust controller 2014-05-23 16:25:19 -07:00
Atlante45
7b9f6f8505 Merge branch 'master' of https://github.com/highfidelity/hifi into point_and_glow 2014-05-23 11:32:52 -07:00
Atlante45
37a939588f Mode sure the closest model is always selected 2014-05-23 11:28:48 -07:00
Atlante45
53141ff1c1 Glow when grabbed with the mouse (for now) 2014-05-23 11:10:56 -07:00
wangyix
a6d0384c3b Merge remote-tracking branch 'upstream/master' 2014-05-23 10:08:46 -07:00
Philip Rosedale
22548b9956 Merge pull request #2909 from PhilipRosedale/master 
add visual indicator of thrust direction
 2014-05-23 09:58:55 -07:00
Philip Rosedale
6998dfae3c add visual indicator of thrust direction 2014-05-23 09:57:47 -07:00
AndrewMeadows
18046c9e9a Merge pull request #2907 from PhilipRosedale/master 
Velocity damped hand positions
 2014-05-23 09:50:39 -07:00
wangyix
645002493f Merge remote-tracking branch 'upstream/master' 2014-05-23 09:48:05 -07:00
wangyix
2dd78b36db moved _sequenceNumber to OctreeSendThread 2014-05-23 09:47:08 -07:00
Philip Rosedale
2681312b54 Velocity damped hand positions 2014-05-23 00:09:15 -07:00
ZappoMan
519f5539d9 also support deleting mouse selected model 2014-05-22 14:37:34 -07:00
ZappoMan
b5056dcd3a fix broken mouse edit 2014-05-22 13:01:02 -07:00
ZappoMan
66b9d582a8 fix broken mouse edit 2014-05-22 12:43:23 -07:00
ZappoMan
b9e73a6ef7 added delete support to edit models 2014-05-22 12:23:01 -07:00
Philip Rosedale
5c564cb2cb Added FWD button as grab controller (so PrioVR will work) 2014-05-22 09:55:08 -07:00
Philip Rosedale
f0a1d2a172 Move with grab button 2014-05-22 07:24:30 -07:00
Brad Hefta-Gaub
0c3f574302 Merge pull request #2890 from Atlante45/no_voxel_tool_selected 
Made voxelTools unselected by default to avoid accidental voxelEdit at l...
 2014-05-21 11:01:31 -07:00
Atlante45
9b3b5201c9 Made voxelTools unselected by default to avoid accidental voxelEdit at login 2014-05-21 10:39:26 -07:00
Brad Hefta-Gaub
6bb4664611 Merge pull request #2884 from polac/19521 
Code Review for Job #19521
 2014-05-20 17:02:30 -07:00
ZappoMan
b228da34a5 slight DRY 2014-05-18 20:43:27 -07:00
ZappoMan
31ae7ceaff added isLocked() to lock the ground plane in hq 2014-05-18 20:31:55 -07:00
Mika Impola
cc1bd5d63b Fixed cropping of the image. 2014-05-17 21:24:29 +03:00
Mika Impola
fd3e871242 Updating button position when window is resized. 2014-05-17 21:04:27 +03:00
Atlante45
0edcd732fe Added rotation and scale to overlay anchers 2014-05-16 17:36:27 -07:00
Philip Rosedale
5dcd942e8e removed dead code 2014-05-16 09:44:03 -07:00
Philip Rosedale
4532c93419 debug off 2014-05-16 09:36:55 -07:00
Philip Rosedale
25f1e180f5 revert test change 2014-05-16 09:34:54 -07:00
Philip Rosedale
85b94ff71c added dead zone to pitch in hydra move, animated models show up where you are 2014-05-16 09:20:15 -07:00
Philip Rosedale
ad4556ab56 Merge branch 'master' of https://github.com/worklist/hifi 2014-05-15 21:58:09 -07:00
Atlante45
61fd09e0bd Add ability to anchor an overlay 2014-05-15 16:24:31 -07:00
Mika Impola
aac73c3665 Script to make your avatar sit down. 2014-05-15 21:44:45 +03:00
Philip Rosedale
951109594e Merge branch 'master' of https://github.com/worklist/hifi 2014-05-15 09:29:01 -07:00
Philip Rosedale
ca6571188c Merge branch 'master' of https://github.com/worklist/hifi 2014-05-14 14:02:17 -07:00
ZappoMan
0a8dc78c96 tweaks to animation script example 2014-05-14 13:08:32 -07:00
ZappoMan
7c44162209 animated model example 2014-05-14 13:00:35 -07:00
ZappoMan
18de6dddec Merge branch 'master' of https://github.com/worklist/hifi into modelserver 2014-05-14 12:21:44 -07:00