Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-16 09:40:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
13691 commits 25 branches 0 tags 1.1 GiB
Commit graph

13691 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrew Meadows
03bf1fe69d Add joint manipulations in model-frame 2014-06-03 14:04:09 -07:00
Brad Hefta-Gaub
03f0ff111f Merge pull request #2976 from talentraspel/19751 
dynamically malloc/free arrays to avoid stack overflow on windows.
 2014-06-03 12:10:44 -07:00
Stephen Birarda
c02d87fdf7 Merge pull request #2975 from talentraspel/19749 
start timer BEFORE moving it to another thread, because Qt otherwise wil...
 2014-06-03 11:31:53 -07:00
Kai Ludwig
23b56bf174 start timer BEFORE moving it to another thread, because Qt otherwise will protest and the timer does not run at all - at least on windows. 
this fixes restarted servers not getting properly recognized by the interface - at least on windows.
 2014-06-03 20:10:55 +02:00
barnold1953
75bee69ef8 Fixed coding standard 2014-06-03 10:49:54 -07:00
Andrew Meadows
f99489c157 rolling back previous change for IK instability 2014-06-03 10:40:30 -07:00
Kai Ludwig
162939fda1 dynamically malloc/free arrays to avoid stack overflow on windows. 
starting with 0 for array index will give a reasonable value for 'first'.
 2014-06-03 19:11:53 +02:00
Brad Hefta-Gaub
6061330826 Merge pull request #2973 from matsukaze/master 
Job #19700 BUG: Crash in NodeBounds::draw() fixed.
 2014-06-02 22:41:02 -07:00
Andrzej Kapolka
ac7d23bf54 Working on support for streaming Qt enums/flags. 2014-06-02 19:00:48 -07:00
barnold1953
f4391bcdbe _distance variable 2014-06-02 17:23:32 -07:00
barnold1953
10d0b6af03 Fixed Oculus overlay color bug 2014-06-02 16:47:51 -07:00
Philip Rosedale
656849199c Merge branch 'master' of https://github.com/worklist/hifi 2014-06-02 16:23:02 -07:00
barnold1953
4ed03e996a Added Oculus Options menu 2014-06-02 16:15:51 -07:00
barnold1953
90754e320d Curved Oculus overlay around camera as a semicircle 2014-06-02 16:05:07 -07:00
Andrzej Kapolka
6db385de7a Ported over fixes that I made when working on delta-encoding for avatars. 2014-06-02 15:16:08 -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
Brad Hefta-Gaub
6f5d2ba233 Merge pull request #2970 from Barnold1953/master 
Mirror mode fix, particleBirds.js
 2014-06-02 13:02:05 -07:00
Clément Brisset
2121648c7d Merge pull request #2972 from polac/19748 
Fixing the BUG #19748: Sit.js doesn't handle overlays correctly.
 2014-06-02 12:18:28 -07:00
Clément Brisset
12a40106f5 Merge pull request #2968 from AndrewMeadows/inertia 
Make JointState a proper class: Part 1
 2014-06-02 12:15:50 -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
Mika Impola
da3a272475 Fixing the BUG #19748: Sit.js doesn't handle overlays correctly. 2014-06-02 21:47:31 +03:00
barnold1953
e669f1d835 Fixed and tested particle birds 2014-06-02 11:41:50 -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
barnold1953
9e882957c4 Removed debug prints from particleBirds.js 2014-06-02 10:44:50 -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
barnold1953
863e2c56ae Fixed mirror mode for non-headless models. 2014-06-02 10:41:10 -07:00
barnold1953
7997946389 Added particleBirds.js example script 2014-06-02 09:43:01 -07:00
barnold1953
db578995a8 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-06-02 09:20:12 -07:00
Philip Rosedale
f0cfdaab64 Merge remote-tracking branch 'upstream/master' 2014-06-02 08:59:00 -07:00
matsukaze
46d45a2d43 Job #19700 BUG: Crash in NodeBounds::draw() fixed. 
QMap and QReadWriteLock are orthogonal. Combined them into a wrapper
class called NodeToJurisdictionMap, replacing typedef. This allows us to
avoid changing method signatures wherever NodeToJurisdictionMap is used.
The lock is bound with the map and is available to all clients of the
NodeToJurisdictionMap. The lock allows multi-threaded access to the map.

Fixed compiler warning in NodeBounds.cpp regarding loss of precision
during conversion of double to GLfloat.
 2014-06-02 05:55:58 -04: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