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

583 commits

Author SHA1 Message Date
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
Atlante45
53d7aeab4f Fixed typo 2014-05-14 12:02:38 -07:00
Philip Rosedale
4732cbb575 Merge branch 'master' of https://github.com/worklist/hifi 2014-05-14 11:54:17 -07:00
Philip Rosedale
394985ef45 Switched to Halo gun in gun.js, work in progress on hydraMove to add flying 2014-05-14 11:52:01 -07:00
Atlante45
4f93858849 Merge branch 'master' of https://github.com/highfidelity/hifi into mouse_handling_in_editModels 2014-05-14 10:41:29 -07:00
Atlante45
5ef71d6a35 Full mouse handling 2014-05-14 10:40:50 -07:00
Ryan Huffman
dca555a8d4 Merge branch 'master' of git://github.com/highfidelity/hifi into 19614 2014-05-14 09:58:59 -07:00
Ryan Huffman
02676848c6 Fix order of components in streetAreaExample.js 2014-05-14 09:58:04 -07:00
Atlante45
624ae4732f Fixes to PickRay check 2014-05-13 14:58:34 -07:00
Atlante45
701bc63bd1 Removed old toolbar 2014-05-13 14:34:08 -07:00
Atlante45
c59358ac96 First cut at editModels with the mouse 2014-05-13 14:10:01 -07:00
ZappoMan
a56567a369 add support for adjustable FPS 2014-05-13 09:27:31 -07:00
Atlante45
37700c6ad3 Fixed prompt size 2014-05-12 17:10:19 -07:00
Atlante45
261eefd05b Merge branch 'master' of https://github.com/highfidelity/hifi into mouse_handling_in_editModels 2014-05-12 14:09:26 -07:00
ZappoMan
5309c5ad8b add more properties to animated models 2014-05-12 13:44:44 -07:00
ZappoMan
ed6f828b36 Merge branch 'master' of https://github.com/worklist/hifi into modelserver 2014-05-12 09:14:04 -07:00
Philip Rosedale
ea1bcd13a4 Updated guitar with more chords, key triggers 2014-05-09 17:39:03 -07:00
ZappoMan
106c8bffd8 first cut at animations in models 2014-05-09 16:08:06 -07:00
Atlante45
05283cd904 Merge branch 'master' of https://github.com/highfidelity/hifi into mouse_handling_in_editModels 2014-05-09 11:43:33 -07:00
Philip Rosedale
a7f44bf207 double fisted gun action 2014-05-09 00:16:11 -07:00
Philip Rosedale
4a1672957e guitar is now auto-attached 2014-05-08 23:23:44 -07:00
Philip Rosedale
95f6bcbbd6 finish air guitar, gun initial position on hand tweak 2014-05-08 22:54:35 -07:00
Atlante45
cd78be7d25 Some work on mouse tools for editModels.js 2014-05-08 16:47:18 -07:00
Andrzej Kapolka
c02b708ee5 Provide the option to avoid making duplicate attachments. 2014-05-08 15:54:30 -07:00
Brad Hefta-Gaub
9c54576aca Merge pull request #2814 from PhilipRosedale/master 
More arrow controls to move camera in mirror mode, new guitar chords
 2014-05-07 20:02:28 -07:00
Philip Rosedale
e6a8c79f9f Added more arrow controls to move camera when in mirror mode, new guitar chords. 2014-05-07 16:51:22 -07:00
Philip Rosedale
4e1eaf8337 Merge pull request #2809 from Atlante45/mute_env 
Mute environment
 2014-05-07 16:18:23 -07:00
Atlante45
31aedb4aa8 fixed overlay not moving on resize in editModels.js 2014-05-07 14:39:26 -07:00
Philip Rosedale
f6aaaad211 removed some unneeded stuff 2014-05-06 22:44:36 -07:00
Philip Rosedale
fc962749c0 Arrow keys adjust distance from camera in mirror mode, air guitar script 2014-05-06 22:41:08 -07:00
Atlante45
9c9556914e Slow down hydra move 2014-05-06 17:03:19 -07:00
Atlante45
abebb078b0 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-06 13:08:00 -07:00
Atlante45
61c2dd0468 Fixed orientation and offset issues 2014-05-06 13:07:31 -07:00
Ryan Huffman
5a7b133d25 Fix dates in XMLHttpRequest js files 2014-05-06 11:38:12 -07:00
Ryan Huffman
e191b8acb8 Merge remote-tracking branch 'upstream/master' into 19614 2014-05-06 11:32:38 -07:00
Ryan Huffman
39e6e61a6d Add XMLHttpRequest tests and examples 2014-05-06 11:31:33 -07:00
Philip Rosedale
53baf5652e avatar look at indicator smaller grey ball 2014-05-05 18:03:25 -07:00
Philip Rosedale
da0b36ed5c merge fix 2014-05-05 16:21:52 -07:00
Philip Rosedale
691b1d6069 Added lookAt rendering bubble 2014-05-05 16:19:09 -07:00
Brad Hefta-Gaub
e59c4a9aa2 Merge pull request #2783 from AndrewMeadows/inertia 
improved avatar walking on voxels
 2014-05-05 15:49:44 -07:00
Andrew Meadows
5ffd307926 Merge upstream/master into andrew/inertia 
Conflicts:
	interface/src/avatar/MyAvatar.h
 2014-05-05 13:54:25 -07:00
ZappoMan
ccadf3be57 Merge branch 'master' of https://github.com/worklist/hifi into modelserver 2014-05-05 12:39:36 -07:00
ZappoMan
3bb72c04a5 Merge branch 'master' of https://github.com/worklist/hifi into modelserver 2014-05-05 12:36:03 -07:00
ZappoMan
5aabd302fc tweaks to placeModelsWithHands 2014-05-05 12:35:49 -07:00
Atlante45
1ecf0e3b9d Used wrong formula in previous commit 2014-05-05 11:43:58 -07:00
Atlante45
7855bf8e24 Fix scale issue in editVoxels.js (closes #2776) 2014-05-05 11:35:50 -07:00
Atlante45
0b4516e09b editModels,js switched to use actual models instead of particles. 2014-05-02 15:32:29 -07:00
Atlante45
55ce204ee3 Merge branch 'master' of https://github.com/highfidelity/hifi into editModels_js 2014-05-02 14:50:52 -07:00
ZappoMan
8443bb0afc fix a scale to fit bug, and add features to place models with hands 2014-05-02 13:19:33 -07:00
Atlante45
ab0a0165c7 Working version of editModels.js 2014-05-02 11:19:12 -07:00
Atlante45
4e88d66c95 Merge branch 'master' of https://github.com/highfidelity/hifi into editModels_js 2014-05-02 10:17:11 -07:00
ZappoMan
cc091c0bc9 added sample 2014-05-02 09:39:29 -07:00
ZappoMan
715e6b8e60 debugging model editing 2014-05-02 09:10:30 -07:00
AndrewMeadows
05e5277084 Merge pull request #2764 from ZappoMan/modelserver 
Model Server, Renderer, Scripting, etc
 2014-05-01 15:39:12 -07:00
Andrew Meadows
b4d3df47fb Disable gravity on script start 2014-05-01 12:09:34 -07:00
Ryan Huffman
eccedda284 Add fileBrowserExample.js 2014-05-01 10:56:23 -07:00
ZappoMan
293963c546 implement snap to center in model 2014-05-01 09:02:41 -07:00
ZappoMan
bb6444f5a9 more hacking got it working 2014-05-01 07:30:56 -07:00
ZappoMan
85484affa9 hacking 2014-04-30 17:55:54 -07:00
Atlante45
8068a915aa More work on editModels 2014-04-30 16:50:40 -07:00
ZappoMan
3322d1f7ff example JS for models 2014-04-30 14:18:57 -07:00
Atlante45
8cad705e2d Merge branch 'master' of https://github.com/highfidelity/hifi into editModels_js 2014-04-30 11:13:07 -07:00
Ryan Huffman
65fd2a7724 Merge remote-tracking branch 'upstream/master' into 19612 
Conflicts:
	interface/src/Menu.cpp
 2014-04-30 09:57:17 -07:00
Ryan Huffman
45beeaa8d5 Add dialog + location + window JS examples 2014-04-30 09:45:53 -07:00
ZappoMan
4aa96e1fbe added support for returning accuracy of ray intersections and other octree tests that can fail due to getting lock 2014-04-29 15:10:28 -07:00
Atlante45
827e64ec0a Merge branch 'master' of https://github.com/highfidelity/hifi into editModels_js 2014-04-29 14:56:36 -07:00
Atlante45
ef281e2a5f Merge branch 'master' of https://github.com/highfidelity/hifi into editModels_js 2014-04-29 11:01:57 -07:00
Andrew Meadows
2c7fcada3b make gravity transitions faster 2014-04-29 10:00:12 -07:00
Andrew Meadows
4937a0af2e add status button for local gravity 2014-04-28 17:29:44 -07:00
Andrew Meadows
c7dbc5984f add local gravity option parameter for MyAvatar 2014-04-28 16:40:22 -07:00
Atlante45
0457f2035d more editModels work 2014-04-28 14:02:09 -07:00
Andrew Meadows
ea2e96ac6f toggle collision and gravity with timers 2014-04-28 13:02:54 -07:00
Andrew Meadows
a7c4b02f2d merge new work into andrew/inertia 2014-04-28 09:52:06 -07:00
Atlante45
2224025b38 Merge branch 'master' of https://github.com/highfidelity/hifi into editModels_js 2014-04-25 16:42:09 -07:00
Andrew Meadows
b05a315b5a merge upstream/master into andrew/inertia 
Conflicts:
	interface/src/avatar/MyAvatar.cpp
 2014-04-25 14:52:44 -07:00
Andrew Meadows
39252a8339 swissArmyJetpack.js now toggles "obey gravity" 2014-04-25 14:17:39 -07:00
Andrew Meadows
afb12bcd70 add swissArmyJetpack.js 2014-04-24 19:12:23 -07:00
Atlante45
4927a77382 Some testing with editModels.js 2014-04-24 18:15:39 -07:00
Atlante45
9bdcfe6d04 Undo now fully support local subtrees 2014-04-24 11:01:12 -07:00
Thijs Wenker
ebc6f4e78e Removed UTF-8 new line characters, QT script errors on those lines in Windows. 2014-04-23 14:40:06 +02:00
ZappoMan
ae443a3136 fix headers 2014-04-22 11:27:50 -07:00
ZappoMan
a473fe3aee fix header 2014-04-21 15:14:14 -07:00
ZappoMan
ffc73e04eb added new load testing example script 2014-04-21 11:48:42 -07:00
Atlante45
178f845ad0 Rescale import when using keys +/- 2014-04-18 16:40:13 -07:00
Atlante45
7782e53363 Restored scale copy 2014-04-18 16:26:10 -07:00
Atlante45
8a7a590602 Merge branch 'master' of https://github.com/highfidelity/hifi into placement_tool 
Conflicts:
	interface/src/ui/Stats.cpp
 2014-04-18 16:07:08 -07:00
Atlante45
c4102e3af0 Improved scale selector, changed first swatch behaviours, improved placement tool 2014-04-18 16:04:20 -07:00
AndrewMeadows
aaac7ac82c Merge pull request #2688 from ey6es/master 
Added head translation for Faceplus.
 2014-04-18 13:45:00 -07:00
Stephen Birarda
e4d30c5f1f Update dancing_bot.js 
put gangnam style animation back - it's royalty free
 2014-04-18 10:57:50 -07:00
AndrewMeadows
a10aaa537e Merge pull request #2692 from ZappoMan/moonshot 
added wet/dry mix, and alternate distance attenuation features
 2014-04-18 10:34:55 -07:00
Atlante45
01fe3f45c5 Merge branch 'master' of https://github.com/highfidelity/hifi into placement_tool 2014-04-18 10:23:01 -07:00
Stephen Birarda
9713edbba9 Update dancing_bot.js 
conceal URL from dancing_bot script (even though it will stay in history)
 2014-04-18 09:00:43 -07:00
ZappoMan
fa787adce2 added wet/dry mix, and alternate distance attenuation features 2014-04-18 08:55:32 -07:00
Andrzej Kapolka
828bedc3e8 Slight fix for dancing bot script. 2014-04-17 17:07:02 -07:00