Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-30 06:30:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
17175 commits 71 branches 59 tags 1.2 GiB
Commit graph

965 commits

Author SHA1 Message Date
David Rowe
c02cd66dcb Don't calibrate avatar for Leap Motion if mounted on HMD 2014-09-28 17:19:47 -07:00
ZappoMan
cbc502553b add rescale support to entity properties UI 2014-09-26 16:25:24 -07:00
ZappoMan
21b0e31ee1 Merge branch 'master' of https://github.com/highfidelity/hifi into moreWorkOnCollidingEntitites 2014-09-26 12:21:51 -07:00
ZappoMan
2d81d7c554 add support for ignore collisions and collisions will/wont move entities 2014-09-26 11:43:56 -07:00
Philip Rosedale
7c1333dcb0 Merge pull request #3486 from ZappoMan/moreWorkOnCollidingEntitites 
Improvements to entity collisions (using shape collider)
 2014-09-26 11:25:51 -07:00
Atlante45
a4a5d71caa Merge branch 'fix_attachment_bug_with_recording' of github.com:Atlante45/hifi into radio_js 
Conflicts:
	libraries/audio/src/AudioInjector.cpp
 2014-09-26 10:45:34 -07:00
Atlante45
cf925120ca Merge branch 'master' of https://github.com/highfidelity/hifi into fix_attachment_bug_with_recording 2014-09-25 19:23:46 -07:00
Atlante45
3baa992bc3 Fixed radio model 2014-09-25 18:56:37 -07:00
Atlante45
11a5358a6e Adapted radio.js to new funciton calls 2014-09-25 18:12:30 -07:00
ZappoMan
fa8c5b85ff allow you to edit mass 2014-09-25 17:00:35 -07:00
Brad Hefta-Gaub
0775e9dde4 Merge pull request #3479 from PhilipRosedale/master 
Improved eye contact, audio driven mouth and brows, linear audio scope
 2014-09-25 09:32:37 -07:00
Brad Hefta-Gaub
712f88baa3 Merge pull request #3476 from birarda/xbox-controller 
add script support for general SDL controllers
 2014-09-25 09:25:08 -07:00
Atlante45
2766b6a4d7 Make radio show up in front of you 2014-09-24 17:12:49 -07:00
Atlante45
75dc26c9ff Slider can moved when recording paused or stoped 2014-09-24 16:19:47 -07:00
Stephen Birarda
13d3eb02e3 report the 360 axis values in xbox.js 2014-09-23 17:19:57 -07:00
Stephen Birarda
00b0806c4d move JoystickManager to JoystickScriptingInterface, add Joystick class for SDL Joystick 2014-09-23 17:09:46 -07:00
Stephen Birarda
900daf48eb initial working connection of an xbox gamepad 2014-09-23 14:48:44 -07:00
Atlante45
af341247af Recorder.js UI + pause and slider bar implementation 2014-09-23 14:29:00 -07:00
Philip Rosedale
21a15cff2a Avatar can look at corrected position when looking at me 2014-09-23 12:50:47 -07:00
Atlante45
fb982870c6 Added passive play bar to Recorder.js 2014-09-23 11:51:19 -07:00
Atlante45
33236b6c40 Removed extra space 2014-09-23 11:02:25 -07:00
Andrew Meadows
57dd9fba28 adding move.js, removing swissArmyJetpack.js 2014-09-19 16:55:04 -07:00
AndrewMeadows
76f78e77d1 Merge pull request #3461 from PhilipRosedale/master 
final tweaks to movement script
 2014-09-19 09:23:14 -07:00
Philip Rosedale
6c808f2979 final tweaks to movement script 2014-09-19 09:22:27 -07:00
AndrewMeadows
2a5ec89e3b Merge pull request #3460 from PhilipRosedale/master 
Added JS support for neck position for headMove script
 2014-09-19 09:04:12 -07:00
Philip Rosedale
c6d6c347cd head move using neck measurement for movement rather than head. 2014-09-19 08:48:55 -07:00
Craig Hansen-Sturm
255d9346bb Merge pull request #3459 from Atlante45/JS_hook_for_recordings 
Added JS hooks for new Player options
 2014-09-18 17:13:07 -07:00
Atlante45
3ba178022e Added new options to ControlledAC.js 2014-09-18 17:02:11 -07:00
Atlante45
58b1db4f09 Added JS hooks for new Player options 2014-09-18 16:49:13 -07:00
Atlante45
b58c5f75dd Fixes 0 makes a voxel when tool off 2014-09-18 16:24:23 -07:00
Philip Rosedale
3f9eff2a90 Merge branch 'master' of https://github.com/worklist/hifi 2014-09-18 10:48:44 -07:00
Philip Rosedale
8c71ed3f10 Improving headMove, added JS call for neckPosition 2014-09-18 10:48:36 -07:00
Stephen Birarda
1ac6c8a568 Merge remote-tracking branch 'clement/rec_file_format_tweaks' into clement-recording-changes 2014-09-18 10:02:29 -07:00
Atlante45
881ca61a09 Modified recordings namefilter 2014-09-18 00:30:07 -07:00
Andrew Meadows
b311333ac3 initial tuning of headMove.js for avatar motor 2014-09-17 22:35:39 -07:00
Andrew Meadows
613b270d24 headMove.js using experimental avatar motor 2014-09-17 17:57:50 -07:00
AndrewMeadows
42a84b7ff1 Merge pull request #3429 from ctrlaltdavid/20021 
Code Review for Job #20021
 2014-09-17 09:19:29 -07:00
Craig Hansen-Sturm
896cb70ff6 Merge pull request #3424 from PhilipRosedale/master 
Fixes to audio attenuation jumps and better sample loop script
 2014-09-16 12:00:36 -07:00
David Rowe
ed2216d100 Apply right hand roll work-around only if Windows 2014-09-16 11:13:42 -07:00
ZappoMan
ffe1e2db00 fix crash in butterflies.js 2014-09-16 09:07:22 -07:00
Philip Rosedale
62b21f52af fix for sharp change in attenuation when too near a source 2014-09-16 01:18:42 -07:00
David Rowe
f890ea744b Add calibration of physical hand height 2014-09-15 23:09:00 -07:00
David Rowe
f1d7ab149f Add calibration of "zero" position according to avatar body 2014-09-15 21:25:50 -07:00
Philip Rosedale
af638a9963 Use dimensions, not radius 2014-09-15 20:55:25 -07:00
David Rowe
543e9e3eb5 Access wrist controller rotation only once per frame 2014-09-15 20:22:53 -07:00
David Rowe
a594136a9a Fix up hand roll, pitch, and yaw as best able for now 2014-09-15 20:12:13 -07:00
Philip Rosedale
ca556d7eb3 Merge branch 'master' of https://github.com/worklist/hifi 2014-09-15 20:00:49 -07:00
Philip Rosedale
4dc929eddb Simpler script with sphere to indicate emission point 2014-09-15 19:50:38 -07:00
Brad Hefta-Gaub
cb1c8a9bb2 Merge pull request #3417 from thoys/load-script-from-message-example-js 
load a javascript from a message when the user agrees
 2014-09-15 18:33:14 -07:00
Atlante45
9bed37c86c Update position of audio 2014-09-15 16:05:26 -07:00