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

15047 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ryan Huffman
054e832cf8 Fix misspelled variable names 2014-07-31 11:32:17 -07:00
Ryan Huffman
aa1c9d88dd Cleaup several qDebug calls and commented lines 2014-07-31 10:48:26 -07:00
Ryan Huffman
a670889ffb Remove TODO comment 2014-07-31 10:44:36 -07:00
Ryan Huffman
85ed18fd41 Cleanup editModels.js 2014-07-31 10:43:44 -07:00
Ryan Huffman
3e2bb0f168 Add more complete error handling for import/export models 2014-07-31 10:40:45 -07:00
Ryan Huffman
49e35bbc84 Fix bug with ModelItemProperties 
When copying from a ModelItem the properties should be considered
changed
 2014-07-31 01:14:18 -07:00
Ryan Huffman
68f1ad79d6 Update clipboard call to exportModels to not scale to tree size 2014-07-31 01:14:07 -07:00
Ryan Huffman
a39a7e2356 Update exportModels implementation 2014-07-31 01:13:17 -07:00
Ryan Huffman
6ecc12cdea Fix export models not cancelling correctly 2014-07-31 01:11:05 -07:00
Ryan Huffman
d54e3741ed Add ModelTree::findModelsInCube 2014-07-31 01:09:38 -07:00
Ryan Huffman
6a53765a47 Rename buttons in editModels.js 2014-07-30 19:06:23 -07:00
Ryan Huffman
01737e18b2 Update LocalModelOverlay to work prorperly with translations 2014-07-30 19:06:10 -07:00
Ryan Huffman
06e6505584 Update and add localModels overlay to editModels.js import/export 2014-07-30 18:39:44 -07:00
Ryan Huffman
43f61b4718 Add localmodels overlay type 2014-07-30 18:38:42 -07:00
Ryan Huffman
521bf6023e Implement pasteModels in Clipboard 2014-07-30 18:38:09 -07:00
Ryan Huffman
7bd1628465 Add SendModelsOperation 2014-07-30 18:36:43 -07:00
Ryan Huffman
051bbd5d34 Add LocalModelsOverlay 2014-07-30 18:34:22 -07:00
Ryan Huffman
06294b403b Add pasteModels 2014-07-30 18:31:58 -07:00
Ryan Huffman
d777e4be53 Merge branch 'master' of git://github.com/highfidelity/hifi into 19783 
Conflicts:
	interface/src/scripting/WindowScriptingInterface.cpp
	interface/src/scripting/WindowScriptingInterface.h
 2014-07-25 15:53:36 -07:00
Clément Brisset
f5dbc54b1c Merge pull request #3208 from binaryking/19701 
Code Review for Job #19701
 2014-07-25 12:09:14 -07:00
Clément Brisset
53b345d4cd Merge pull request #3209 from AndrewMeadows/ragdoll 
Ragdoll Part 5: send visible transforms when using ragdoll
 2014-07-25 11:50:15 -07:00
AndrewMeadows
73ec862474 Merge pull request #3207 from PhilipRosedale/master 
Velocity filter head position for less jitter in camera
 2014-07-25 09:50:21 -07:00
AndrewMeadows
361ec5d1ee Merge pull request #3204 from Barnold1953/jsBlendShapes 
Exposed Avatar Blendshape control to JS
 2014-07-25 09:40:48 -07:00
Philip Rosedale
a5d6b2282e Merge pull request #3201 from wangyix/master 
moved audio stats to own overlay; audio stats now reset when audiomixer is killed;
 2014-07-24 21:40:43 -07:00
Philip Rosedale
9a83be618a Merge pull request #3191 from Atlante45/make_scriptEngine_a_qScriptEngine 
ScriptEngine now inherit from QScriptEngine
 2014-07-24 21:38:13 -07:00
barnold1953
ce1b8cdafc Multicursor editvoxels support 2014-07-24 17:32:41 -07:00
Philip Rosedale
e272d0be75 Merge pull request #3203 from Atlante45/laser_pointer_js 
Laser pointer js
 2014-07-24 17:28:08 -07:00
Atlante45
9ca00b55a5 Spelling 2014-07-24 17:19:49 -07:00
barnold1953
d5ea2de4ea Merge branch 'master' of https://github.com/highfidelity/hifi into jsBlendShapes 2014-07-24 11:32:31 -07:00
barnold1953
9ac8b732f0 FIxed error on ubuntu 2014-07-24 10:32:34 -07:00
Andrew Meadows
1d124ebc61 fix comments 2014-07-24 08:49:41 -07:00
Andrew Meadows
2aaa628a67 send visible joint state when colliding as ragdoll 2014-07-24 08:42:34 -07:00
Mohammed Nafees
99ba0c6641 Merge remote-tracking branch 'upstream/master' into 19701 2014-07-24 20:28:23 +05:30
Philip Rosedale
a1b74c5272 remove unused code 2014-07-23 23:07:37 -07:00
Philip Rosedale
5aecbe690d made calculateAverageEyePosition private, changed to getEyePosition() where used outside head 2014-07-23 22:56:59 -07:00
Philip Rosedale
00fdc37822 add velocity filtering to eyePosition to reduce camera jitter from faceshift 2014-07-23 22:45:50 -07:00
Andrew Meadows
924cc600b0 merge upstream/master into andrew/ragdoll 2014-07-23 18:03:09 -07:00
AndrewMeadows
509b86f092 Merge pull request #3205 from birarda/select-library 
lowercase the SIXENSE_ROOT_DIR
 2014-07-23 18:01:23 -07:00
Stephen Birarda
e182f54180 exclude sixense debug on UNIX only, not APPLE 2014-07-23 17:52:50 -07:00
Philip Rosedale
f05855dcc2 Merge pull request #3199 from ey6es/master 
Fix for shadows in close-up inset mirror.
 2014-07-23 17:49:55 -07:00
Stephen Birarda
bc96975700 don't look for debug sixense on UNIX to avoid missing symbol 2014-07-23 17:49:38 -07:00
Clément Brisset
279a107272 Merge pull request #3200 from thoys/feature-multiple-JS-cursors 
Feature multiple js cursors
 2014-07-23 17:46:56 -07:00
Stephen Birarda
4cf27a0099 check in sixense not Sixense 2014-07-23 17:44:38 -07:00
barnold1953
3d3b4572e3 Added bot_randomExpression.js to test blendshapes 2014-07-23 17:19:41 -07:00
Andrew Meadows
7f2eb88fc2 merge upstream/master into andrew/ragdoll 2014-07-23 17:01:43 -07:00
Andrew Meadows
559188cace parent-relative linear slaving of verlet shapes 2014-07-23 17:00:17 -07:00
Andrew Meadows
72c7498454 add JointState::getDistanceToParent() 2014-07-23 16:56:40 -07:00
Andrew Meadows
b62f04e9fe check for nan's coming out of rotationBetween() 2014-07-23 16:51:53 -07:00
Andrew Meadows
c0e02107c5 minor cleanup 2014-07-23 16:51:26 -07:00
barnold1953
aba031a125 Proper blendshape JS api. 2014-07-23 16:25:45 -07:00