Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 01:13:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
13467 commits 25 branches 0 tags 1.1 GiB
Commit graph

13467 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrew Meadows
a1afcfd42c remove JointState::applyRotationDelta() 
(use JointState::applyRotationDeltaInModelFrame()) instead)
 2014-06-03 15:57:16 -07:00
Andrew Meadows
7f46e9d514 remove JointState::getJointRotation() 
(use getRotationModelFrame() instead)
 2014-06-03 15:42:38 -07:00
Andrew Meadows
e7f32c211b remove world-frame hand/palm set methods 2014-06-03 14:48:57 -07:00
Andrew Meadows
05af993262 Add more model-frame methods 2014-06-03 14:24:04 -07:00
Andrew Meadows
03bf1fe69d Add joint manipulations in model-frame 2014-06-03 14:04:09 -07:00
Andrew Meadows
f99489c157 rolling back previous change for IK instability 2014-06-03 10:40:30 -07:00
Andrew Meadows
d7be5faa9d unravel rotation code by giving proper names 
The goal is: eliminate dependency on JointState::_combinedRotation
(which is joint-to-world) and store joint-to-model transforms instead
 2014-06-02 14:43:25 -07:00
Andrew Meadows
9b3773fa3b remove 'fromBind' argument to getJointRotation() 2014-06-02 14:20:13 -07:00
Andrew Meadows
a62a270004 merge andrew/inertia into andrew/ragdoll 
Conflicts:
	interface/src/avatar/Avatar.cpp
	interface/src/renderer/Model.h
 2014-06-02 11:56:27 -07:00
Andrew Meadows
9e60b758df Made JointState transforms private. 
Also changed some function names to be more descriptive.
Using "Hybrid" to describe frame with world-rotation + model-local-origin.
 2014-06-02 11:34:59 -07:00
Andrew Meadows
8e7daed2b3 Merge upsrtream/master into andrew/inertia 
Conflicts:
	interface/src/renderer/Model.cpp
 2014-06-02 11:32:23 -07:00
AndrewMeadows
c3646d2421 Merge pull request #2969 from ZappoMan/silencewarnings 
silence some unused variable warnings and move some debug code to only execute in debug mode
 2014-06-02 11:04:18 -07:00
AndrewMeadows
a9a7580e8b Merge pull request #2971 from ZappoMan/editModelsInDefaultScripts 
Edit models in default scripts
 2014-06-02 11:04:03 -07:00
AndrewMeadows
8146520c35 Merge pull request #2967 from ZappoMan/editModelsInDefaultScripts 
Added Edit Models to default scripts
 2014-06-02 10:51:22 -07:00
ZappoMan
758df4f58b silence some unused variable warnings and move some debug code to only execute in debug mode 2014-06-02 10:43:50 -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
8b51cd0d8a fix bug in Menu::removeAction() where we weren't removing the action key from the hash, memory leak, and other problems 2014-05-31 14:04:33 -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
Brad Hefta-Gaub
3038b193d1 Merge pull request #2965 from Atlante45/list_current_js_api 
List current js api
 2014-05-30 19:45:36 -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
Clément Brisset
a2ac7f7832 Merge pull request #2960 from ey6es/master 
If the skeleton doesn't have eye joints (as with the Fuse models), make ...
 2014-05-30 15:55:24 -07:00
Andrzej Kapolka
70afda6f86 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-30 15:19:34 -07:00
Andrzej Kapolka
6acd60fd55 Merge pull request #2964 from ZappoMan/modelPickingBugs 
fix ray picking at distances
 2014-05-30 15:19:07 -07:00
ZappoMan
b212f9edca fix ray picking at distances 2014-05-30 15:07:54 -07:00
Stephen Birarda
f71a2c0add Merge pull request #2963 from birarda/master 
don't force OAuthWebViewHandler to stay on top
 2014-05-30 14:55:04 -07:00
Stephen Birarda
d48a5dd305 don't force OAuthWebViewHandler to stay on top 2014-05-30 14:54:25 -07:00
Andrzej Kapolka
fc584f4c58 Merge pull request #2961 from ZappoMan/modelPickingBugs 
temporarily disable the model aligned box picking
 2014-05-30 14:25:35 -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
ZappoMan
8a4955d75b temporarily disable the model aligned box picking 2014-05-30 11:13:37 -07:00
Andrzej Kapolka
7b61dd5c40 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-30 11:05:06 -07:00
Andrzej Kapolka
164192fb50 If the skeleton doesn't have eye joints (as with the Fuse models), make up 
some positions based on the head and neck joints.
 2014-05-30 11:03:46 -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
Andrew Meadows
4eb4334ed8 replace Model::setJointRotation() with JointState::setRotation() 2014-05-30 09:57:32 -07:00
Andrew Meadows
557d7d428b minor rename and formatting 2014-05-30 08:28:15 -07:00
Andrew Meadows
e21dbd8726 rename updateWorldTransforms to computeTransforms 2014-05-30 08:20:11 -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
Andrzej Kapolka
b93b009cd8 Merge pull request #2953 from PhilipRosedale/master 
Fixes having large yaw movements get head and body out of alignment with oculus
 2014-05-29 19:00:37 -07:00
AndrewMeadows
5b74829318 Merge pull request #2955 from ey6es/cascade 
Basic cascaded shadow maps for increased shadow draw distance.
 2014-05-29 18:57:44 -07:00