Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-12 19:47:22 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
34317 commits 25 branches 0 tags 1.1 GiB
Commit graph

274 commits

Author SHA1 Message Date
Seth Alves
c2f9a49598 don't grab light 2015-11-04 11:15:57 -08:00
Seth Alves
1e498a41f0 rework search logic 2015-11-04 10:46:20 -08:00
Brad Davis
439bdbc0e4 Merge pull request #6298 from samcake/controllers 
Controllers : Removing dead files
 2015-11-03 19:57:37 -08:00
Atlante45
d8797ef9d7 Initialize relativePosition/Rotation 2015-11-03 16:07:37 -08:00
samcake
57bc2f3093 Removing dead js files 2015-11-03 15:37:36 -08:00
Stephen Birarda
8346ce27b3 allow a non-colliding grab of locked entities 2015-11-03 14:22:41 -08:00
Seth Alves
27b239176f fix grab 2015-11-03 10:16:56 -08:00
James B. Pollack
192e4c8185 Merge pull request #6274 from ZappoMan/rightClickMenu 
add example of overriding default rightClick behavior
 2015-11-02 18:58:12 -08:00
Seth Alves
fe2c0effd0 oops left debug on 2015-11-02 16:17:46 -08:00
Seth Alves
0a5f43bba7 fix up boolean test 2015-11-02 16:16:13 -08:00
Seth Alves
181901ed19 distance grab works better with hmd on 2015-11-02 14:42:28 -08:00
Brad Hefta-Gaub
b94258f953 add example of overriding default rightClick behavior 2015-11-02 11:55:50 -08:00
Brad Hefta-Gaub
286905c20c Merge pull request #6250 from jherico/peek 
Adding peek support for endpoints
 2015-10-31 16:09:27 -07:00
Seth Alves
9346366fc5 fix grab script 2015-10-31 14:28:54 -07:00
Brad Davis
abbfe15395 Adding peek support for endpoints 2015-10-31 14:26:14 -07:00
Brad Hefta-Gaub
46f9a432ab fix handControllerGrab.js 2015-10-31 14:21:50 -07:00
Seth Alves
896ed3927c merge from upstream 2015-10-30 19:17:43 -07:00
Seth Alves
944f0965c0 some refactoring and a bug fix -- grab script can throw things again 2015-10-30 16:35:50 -07:00
Seth Alves
cf83ca22bb change how kinematic objects get data back to entity when an action is active 2015-10-30 15:30:54 -07:00
Seth Alves
b102081f2f upon release, set velocity after returning entity to being dynamic 2015-10-30 11:35:51 -07:00
Seth Alves
93503d0a21 make kinematic grab set entities kinematic in bullet and update entity position 2015-10-30 11:03:13 -07:00
Brad Davis
f21633e368 Merge pull request #6222 from ZappoMan/hardwareChanged 
Handle input plugin register/remove when activated/deactivated by menus
 2015-10-29 12:24:17 -07:00
Brad Davis
ccbae81dad Merge branch 'master' into HEAD 
Conflicts:
	interface/src/avatar/SkeletonModel.cpp
 2015-10-29 10:24:38 -07:00
Brad Hefta-Gaub
a3cd032a41 register/remove devices when the input plugins are activated/deactivated 2015-10-29 10:06:21 -07:00
samcake
b90af1a1ce Fixing typo and review comments 2015-10-28 13:21:45 -07:00
samcake
07c13f4d66 Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers 2015-10-28 12:54:46 -07:00
Brad Hefta-Gaub
30f7c44f61 emit hardwareChanged signal to scripts 2015-10-28 09:34:18 -07:00
samcake
6ec87086bc Adding the state controller 2015-10-27 16:57:06 -07:00
Seth Alves
8d0aaed41a fix bug that was deleting actions with 0 ttl. in js interface, action parameter 'lifetime' is now called 'ttl' 2015-10-26 13:50:21 -07:00
Brad Davis
b2c3311947 Merge pull request #6174 from samcake/controllers 
Controllers : Adding a moving average for the velocity field returned by the Hydra controller
 2015-10-26 13:46:32 -07:00
Brad Hefta-Gaub
88ba6cda24 Merge pull request #6177 from jherico/guns 
Controller Branch - Fix gun.js
 2015-10-26 10:51:08 -07:00
Brad Davis
75b2ee94b2 PR feedback 2015-10-25 19:37:41 -07:00
Brad Davis
3e50174114 Updating gun.js to new controller API 2015-10-24 16:26:50 -07:00
Brad Hefta-Gaub
394511ac1b fix frisbee.js to work with new API 2015-10-24 09:50:09 -07:00
Brad Hefta-Gaub
6cffe8cb6a Merge pull request #6169 from EdgarPironti/controllers2 
fix toyball.js
 2015-10-23 20:21:00 -07:00
samcake
eae316100a Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers 2015-10-23 18:18:27 -07:00
samcake
d400c694f6 Cleaning up for release 2015-10-23 18:09:54 -07:00
Brad Davis
304fe49628 Merge pull request #6170 from ZappoMan/fixScripts 
various controller script updates
 2015-10-23 17:43:54 -07:00
Brad Hefta-Gaub
060f87d14a CR feedback 2015-10-23 17:33:45 -07:00
samcake
be843a0035 adding a rnning average on the velocity values returned by the hydra and adding a simple js to test 2015-10-23 17:32:54 -07:00
EdgarPironti
0959c98132 Fixed tab 2015-10-23 17:26:44 -07:00
Brad Hefta-Gaub
9ba1b800d9 CR feedback 2015-10-23 17:15:39 -07:00
Brad Hefta-Gaub
090dc5409b CR feedback 2015-10-23 17:14:59 -07:00
Brad Hefta-Gaub
ed20e7d209 CR feedback 2015-10-23 17:14:13 -07:00
EdgarPironti
c64290b5cd Removed unused variables 2015-10-23 17:13:29 -07:00
Brad Hefta-Gaub
6b795364c8 make handGrab treat shoulder bumbers and triggers as merged control 2015-10-23 16:30:40 -07:00
EdgarPironti
5c09391170 fix toyball.js 2015-10-23 16:19:40 -07:00
AlessandroSigna
5d8d8c8f0d Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers 2015-10-23 15:50:39 -07:00
AlessandroSigna
37e1e43ce0 Fix paddleBall.js 2015-10-23 15:48:29 -07:00
Brad Hefta-Gaub
7e3192d0f6 fix drumstick.js 
fix drumstick.js
 2015-10-23 14:22:50 -07:00