Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 12:53:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
13417 commits 71 branches 56 tags 1.2 GiB
Commit graph

491 commits

Author SHA1 Message Date
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